WIP Undo / Redo: ModelID / ModelBase renamed to ObjectID / ObjectBase

2 files changed, 16 insertions, 17 deletions

diff --git a/xs/t/15_config.t b/xs/t/15_config.t
index 397f7e479..1f9fc939b 100644
--- a/xs/t/15_config.t
+++ b/xs/t/15_config.t
@@ -9,19 +9,19 @@ use Test::More tests => 147;
 foreach my $config (Slic3r::Config->new, Slic3r::Config::Static::new_FullPrintConfig) {
     $config->set('layer_height', 0.3);
     ok abs($config->get('layer_height') - 0.3) < 1e-4, 'set/get float';
-    is $config->serialize('layer_height'), '0.3', 'serialize float';
+    is $config->opt_serialize('layer_height'), '0.3', 'serialize float';
     
     $config->set('perimeters', 2);
     is $config->get('perimeters'), 2, 'set/get int';
-    is $config->serialize('perimeters'), '2', 'serialize int';
+    is $config->opt_serialize('perimeters'), '2', 'serialize int';
     
     $config->set('extrusion_axis', 'A');
     is $config->get('extrusion_axis'), 'A', 'set/get string';
-    is $config->serialize('extrusion_axis'), 'A', 'serialize string';
+    is $config->opt_serialize('extrusion_axis'), 'A', 'serialize string';
     
     $config->set('notes', "foo\nbar");
     is $config->get('notes'), "foo\nbar", 'set/get string with newline';
-    is $config->serialize('notes'), 'foo\nbar', 'serialize string with newline';
+    is $config->opt_serialize('notes'), 'foo\nbar', 'serialize string with newline';
     $config->set_deserialize('notes', 'bar\nbaz');
     is $config->get('notes'), "bar\nbaz", 'deserialize string with newline';
 
@@ -59,7 +59,7 @@ foreach my $config (Slic3r::Config->new, Slic3r::Config::Static::new_FullPrintCo
         )
     {    
         $config->set('filament_notes', $test_data->{values});
-        is $config->serialize('filament_notes'), $test_data->{serialized}, 'serialize multi-string value ' . $test_data->{name};
+        is $config->opt_serialize('filament_notes'), $test_data->{serialized}, 'serialize multi-string value ' . $test_data->{name};
         $config->set_deserialize('filament_notes', '');
         is_deeply $config->get('filament_notes'), [], 'deserialize multi-string value - empty ' . $test_data->{name};
         $config->set_deserialize('filament_notes', $test_data->{serialized});
@@ -68,12 +68,12 @@ foreach my $config (Slic3r::Config->new, Slic3r::Config::Static::new_FullPrintCo
 
     $config->set('first_layer_height', 0.3);
     ok abs($config->get('first_layer_height') - 0.3) < 1e-4, 'set/get absolute floatOrPercent';
-    is $config->serialize('first_layer_height'), '0.3', 'serialize absolute floatOrPercent';
+    is $config->opt_serialize('first_layer_height'), '0.3', 'serialize absolute floatOrPercent';
     
     $config->set('first_layer_height', '50%');
     $config->get_abs_value('first_layer_height');
     ok abs($config->get_abs_value('first_layer_height') - 0.15) < 1e-4, 'set/get relative floatOrPercent';
-    is $config->serialize('first_layer_height'), '50%', 'serialize relative floatOrPercent';
+    is $config->opt_serialize('first_layer_height'), '50%', 'serialize relative floatOrPercent';
     
     # Uh-oh, we have no point option to test at the moment
     #ok $config->set('print_center', [50,80]), 'valid point coordinates';
@@ -86,11 +86,10 @@ foreach my $config (Slic3r::Config->new, Slic3r::Config::Static::new_FullPrintCo
     
     $config->set('use_relative_e_distances', 1);
     is $config->get('use_relative_e_distances'), 1, 'set/get bool';
-    is $config->serialize('use_relative_e_distances'), '1', 'serialize bool';
-    
+    is $config->opt_serialize('use_relative_e_distances'), '1', 'serialize bool';
     $config->set('gcode_flavor', 'teacup');
     is $config->get('gcode_flavor'), 'teacup', 'set/get enum';
-    is $config->serialize('gcode_flavor'), 'teacup', 'serialize enum';
+    is $config->opt_serialize('gcode_flavor'), 'teacup', 'serialize enum';
     $config->set_deserialize('gcode_flavor', 'mach3');
     is $config->get('gcode_flavor'), 'mach3', 'deserialize enum (gcode_flavor)';
     $config->set_deserialize('gcode_flavor', 'machinekit');
@@ -106,7 +105,7 @@ foreach my $config (Slic3r::Config->new, Slic3r::Config::Static::new_FullPrintCo
     is_deeply [ map $_->pp, @{$config->get('extruder_offset')} ], [[10,20],[30,45]], 'set/get points';
     $config->set('extruder_offset', [Slic3r::Pointf->new(10,20),Slic3r::Pointf->new(30,45)]);
     is_deeply [ map $_->pp, @{$config->get('extruder_offset')} ], [[10,20],[30,45]], 'set/get points';
-    is $config->serialize('extruder_offset'), '10x20,30x45', 'serialize points';
+    is $config->opt_serialize('extruder_offset'), '10x20,30x45', 'serialize points';
     $config->set_deserialize('extruder_offset', '20x10');
     is_deeply [ map $_->pp, @{$config->get('extruder_offset')} ], [[20,10]], 'deserialize points';
     $config->set_deserialize('extruder_offset', '0x0');
@@ -120,7 +119,7 @@ foreach my $config (Slic3r::Config->new, Slic3r::Config::Static::new_FullPrintCo
     # truncate ->get() to first decimal digit
     $config->set('nozzle_diameter', [0.2,3]);
     is_deeply [ map int($_*10)/10, @{$config->get('nozzle_diameter')} ], [0.2,3], 'set/get floats';
-    is $config->serialize('nozzle_diameter'), '0.2,3', 'serialize floats';
+    is $config->opt_serialize('nozzle_diameter'), '0.2,3', 'serialize floats';
     $config->set_deserialize('nozzle_diameter', '0.1,0.4');
     is_deeply [ map int($_*10)/10, @{$config->get('nozzle_diameter')} ], [0.1,0.4], 'deserialize floats';
     $config->set_deserialize('nozzle_diameter', '3');
@@ -133,7 +132,7 @@ foreach my $config (Slic3r::Config->new, Slic3r::Config::Static::new_FullPrintCo
     
     $config->set('temperature', [180,210]);
     is_deeply $config->get('temperature'), [180,210], 'set/get ints';
-    is $config->serialize('temperature'), '180,210', 'serialize ints';
+    is $config->opt_serialize('temperature'), '180,210', 'serialize ints';
     $config->set_deserialize('temperature', '195,220');
     is_deeply $config->get('temperature'), [195,220], 'deserialize ints';
     {
@@ -147,7 +146,7 @@ foreach my $config (Slic3r::Config->new, Slic3r::Config::Static::new_FullPrintCo
     is $config->get_at('wipe', 0), 1, 'get_at bools';
     is $config->get_at('wipe', 1), 0, 'get_at bools';
     is $config->get_at('wipe', 9), 1, 'get_at bools';
-    is $config->serialize('wipe'), '1,0', 'serialize bools';
+    is $config->opt_serialize('wipe'), '1,0', 'serialize bools';
     $config->set_deserialize('wipe', '0,1,1');
     is_deeply $config->get('wipe'), [0,1,1], 'deserialize bools';
     $config->set_deserialize('wipe', '');
@@ -162,7 +161,7 @@ foreach my $config (Slic3r::Config->new, Slic3r::Config::Static::new_FullPrintCo
     
     $config->set('post_process', ['foo','bar']);
     is_deeply $config->get('post_process'), ['foo','bar'], 'set/get strings';
-    is $config->serialize('post_process'), 'foo;bar', 'serialize strings';
+    is $config->opt_serialize('post_process'), 'foo;bar', 'serialize strings';
     $config->set_deserialize('post_process', 'bar;baz');
     is_deeply $config->get('post_process'), ['bar','baz'], 'deserialize strings';
     {
diff --git a/xs/xsp/Config.xsp b/xs/xsp/Config.xsp
index 4d48a2c6f..c374880a1 100644
--- a/xs/xsp/Config.xsp
+++ b/xs/xsp/Config.xsp
@@ -33,7 +33,7 @@
         %code{% RETVAL = ConfigBase__set_deserialize(THIS, opt_key, str); %};
     void set_ifndef(t_config_option_key opt_key, SV* value, bool deserialize = false)
         %code{% ConfigBase__set_ifndef(THIS, opt_key, value, deserialize); %};
-    std::string serialize(t_config_option_key opt_key);
+    std::string opt_serialize(t_config_option_key opt_key);
     double get_abs_value(t_config_option_key opt_key);
     %name{get_abs_value_over}
         double get_abs_value(t_config_option_key opt_key, double ratio_over);
@@ -95,7 +95,7 @@
         %code{% RETVAL = ConfigBase__set_deserialize(THIS, opt_key, str); %};
     void set_ifndef(t_config_option_key opt_key, SV* value, bool deserialize = false)
         %code{% ConfigBase__set_ifndef(THIS, opt_key, value, deserialize); %};
-    std::string serialize(t_config_option_key opt_key);
+    std::string opt_serialize(t_config_option_key opt_key);
     double get_abs_value(t_config_option_key opt_key);
     %name{get_abs_value_over}
         double get_abs_value(t_config_option_key opt_key, double ratio_over);