Ported Slic3r::GCode storage to XS

2 files changed, 12 insertions, 11 deletions

diff --git a/t/cooling.t b/t/cooling.t
index 6fc5cf71b..42d0414c1 100644
--- a/t/cooling.t
+++ b/t/cooling.t
@@ -18,9 +18,12 @@ sub buffer {
     my $print_config = Slic3r::Config::Print->new;
     $print_config->apply_dynamic($config);
     
+    my $gcodegen = Slic3r::GCode->new;
+    $gcodegen->apply_print_config($print_config);
+    $gcodegen->set_layer_count(10);
     my $buffer = Slic3r::GCode::CoolingBuffer->new(
         config      => $print_config,
-        gcodegen    => Slic3r::GCode->new(print_config => $print_config, layer_count => 10, extruders => []),
+        gcodegen    => $gcodegen,
     );
     return $buffer;
 }
@@ -30,14 +33,14 @@ $config->set('disable_fan_first_layers', 0);
 
 {
     my $buffer = buffer($config);
-    $buffer->gcodegen->elapsed_time($buffer->config->slowdown_below_layer_time + 1);
+    $buffer->gcodegen->set_elapsed_time($buffer->config->slowdown_below_layer_time + 1);
     my $gcode = $buffer->append('G1 X100 E1 F3000', 0, 0, 0.4) . $buffer->flush;
     like $gcode, qr/F3000/, 'speed is not altered when elapsed time is greater than slowdown threshold';
 }
 
 {
     my $buffer = buffer($config);
-    $buffer->gcodegen->elapsed_time($buffer->config->slowdown_below_layer_time - 1);
+    $buffer->gcodegen->set_elapsed_time($buffer->config->slowdown_below_layer_time - 1);
     my $gcode = $buffer->append("G1 X50 F2500\nG1 X100 E1 F3000\nG1 E4 F400", 0, 0, 0.4) . $buffer->flush;
     unlike $gcode, qr/F3000/, 'speed is altered when elapsed time is lower than slowdown threshold';
     like $gcode, qr/F2500/, 'speed is not altered for travel moves';
@@ -46,7 +49,7 @@ $config->set('disable_fan_first_layers', 0);
 
 {
     my $buffer = buffer($config);
-    $buffer->gcodegen->elapsed_time($buffer->config->fan_below_layer_time + 1);
+    $buffer->gcodegen->set_elapsed_time($buffer->config->fan_below_layer_time + 1);
     my $gcode = $buffer->append('G1 X100 E1 F3000', 0, 0, 0.4) . $buffer->flush;
     unlike $gcode, qr/M106/, 'fan is not activated when elapsed time is greater than fan threshold';
 }
@@ -56,7 +59,7 @@ $config->set('disable_fan_first_layers', 0);
     my $gcode = "";
     for my $obj_id (0 .. 1) {
         # use an elapsed time which is < the slowdown threshold but greater than it when summed twice
-        $buffer->gcodegen->elapsed_time($buffer->config->slowdown_below_layer_time - 1);
+        $buffer->gcodegen->set_elapsed_time($buffer->config->slowdown_below_layer_time - 1);
         $gcode .= $buffer->append("G1 X100 E1 F3000\n", $obj_id, 0, 0.4);
     }
     $gcode .= $buffer->flush;
@@ -69,7 +72,7 @@ $config->set('disable_fan_first_layers', 0);
     for my $layer_id (0 .. 1) {
         for my $obj_id (0 .. 1) {
             # use an elapsed time which is < the threshold but greater than it when summed twice
-            $buffer->gcodegen->elapsed_time($buffer->config->fan_below_layer_time - 1);
+            $buffer->gcodegen->set_elapsed_time($buffer->config->fan_below_layer_time - 1);
             $gcode .= $buffer->append("G1 X100 E1 F3000\n", $obj_id, $layer_id, 0.4 + 0.4*$layer_id + 0.1*$obj_id); # print same layer at distinct heights
         }
     }
@@ -83,7 +86,7 @@ $config->set('disable_fan_first_layers', 0);
     for my $layer_id (0 .. 1) {
         for my $obj_id (0 .. 1) {
             # use an elapsed time which is < the threshold even when summed twice
-            $buffer->gcodegen->elapsed_time($buffer->config->fan_below_layer_time/2 - 1);
+            $buffer->gcodegen->set_elapsed_time($buffer->config->fan_below_layer_time/2 - 1);
             $gcode .= $buffer->append("G1 X100 E1 F3000\n", $obj_id, $layer_id, 0.4 + 0.4*$layer_id + 0.1*$obj_id); # print same layer at distinct heights
         }
     }
diff --git a/t/gcode.t b/t/gcode.t
index fb85ee5e4..ef2209a80 100644
--- a/t/gcode.t
+++ b/t/gcode.t
@@ -13,10 +13,8 @@ use Slic3r::Geometry qw(scale convex_hull);
 use Slic3r::Test;
 
 {
-    my $gcodegen = Slic3r::GCode->new(
-        layer_count     => 1,
-        extruders       => [],
-    );
+    my $gcodegen = Slic3r::GCode->new();
+    $gcodegen->set_layer_count(1);
     $gcodegen->set_origin(Slic3r::Pointf->new(10, 10));
     is_deeply $gcodegen->last_pos->arrayref, [scale -10, scale -10], 'last_pos is shifted correctly';
 }