Merge branch 'master' into fs_QuadricEdgeCollapse

9 files changed, 31 insertions, 27 deletions

diff --git a/tests/fff_print/test_data.cpp b/tests/fff_print/test_data.cpp
index d55f9f061..f5424dfd9 100644
--- a/tests/fff_print/test_data.cpp
+++ b/tests/fff_print/test_data.cpp
@@ -200,14 +200,14 @@ void init_print(std::initializer_list<TriangleMesh> input_meshes, Slic3r::Print
 void init_print(std::initializer_list<TestMesh> meshes, Slic3r::Print &print, Slic3r::Model &model, std::initializer_list<Slic3r::ConfigBase::SetDeserializeItem> config_items, bool comments)
 {
 	Slic3r::DynamicPrintConfig config = Slic3r::DynamicPrintConfig::full_print_config();
-	config.set_deserialize(config_items);
+	config.set_deserialize_strict(config_items);
 	init_print(meshes, print, model, config, comments);
 }
 
 void init_print(std::initializer_list<TriangleMesh> meshes, Slic3r::Print &print, Slic3r::Model &model, std::initializer_list<Slic3r::ConfigBase::SetDeserializeItem> config_items, bool comments)
 {
 	Slic3r::DynamicPrintConfig config = Slic3r::DynamicPrintConfig::full_print_config();
-	config.set_deserialize(config_items);
+	config.set_deserialize_strict(config_items);
 	init_print(meshes, print, model, config, comments);
 }
 
diff --git a/tests/fff_print/test_flow.cpp b/tests/fff_print/test_flow.cpp
index dc73f4b6e..81f748e19 100644
--- a/tests/fff_print/test_flow.cpp
+++ b/tests/fff_print/test_flow.cpp
@@ -19,7 +19,7 @@ SCENARIO("Extrusion width specifics", "[Flow]") {
     GIVEN("A config with a skirt, brim, some fill density, 3 perimeters, and 1 bottom solid layer and a 20mm cube mesh") {
         // this is a sharedptr
         DynamicPrintConfig config = Slic3r::DynamicPrintConfig::full_print_config();
-		config.set_deserialize({
+		config.set_deserialize_strict({
 			{ "brim_width",			2 },
 			{ "skirts",				1 },
 			{ "perimeters",			3 },
diff --git a/tests/fff_print/test_gcodewriter.cpp b/tests/fff_print/test_gcodewriter.cpp
index 9ee319c94..a4c8aa09a 100644
--- a/tests/fff_print/test_gcodewriter.cpp
+++ b/tests/fff_print/test_gcodewriter.cpp
@@ -10,7 +10,7 @@ SCENARIO("lift() is not ignored after unlift() at normal values of Z", "[GCodeWr
     GIVEN("A config from a file and a single extruder.") {
         GCodeWriter writer;
         GCodeConfig &config = writer.config;
-        config.load(std::string(TEST_DATA_DIR) + "/fff_print_tests/test_gcodewriter/config_lift_unlift.ini");
+        config.load(std::string(TEST_DATA_DIR) + "/fff_print_tests/test_gcodewriter/config_lift_unlift.ini", ForwardCompatibilitySubstitutionRule::Disable);
 
         std::vector<unsigned int> extruder_ids {0};
         writer.set_extruders(extruder_ids);
diff --git a/tests/fff_print/test_print.cpp b/tests/fff_print/test_print.cpp
index fc2ac3dee..a139e4c2b 100644
--- a/tests/fff_print/test_print.cpp
+++ b/tests/fff_print/test_print.cpp
@@ -50,7 +50,7 @@ SCENARIO("Print: Skirt generation", "[Print]") {
 SCENARIO("Print: Changing number of solid surfaces does not cause all surfaces to become internal.", "[Print]") {
     GIVEN("sliced 20mm cube and config with top_solid_surfaces = 2 and bottom_solid_surfaces = 1") {
         Slic3r::DynamicPrintConfig config = Slic3r::DynamicPrintConfig::full_print_config();
-		config.set_deserialize({
+		config.set_deserialize_strict({
 			{ "top_solid_layers",		2 },
 			{ "bottom_solid_layers",	1 },
 			{ "layer_height",			0.25 }, // get a known number of layers
diff --git a/tests/fff_print/test_printgcode.cpp b/tests/fff_print/test_printgcode.cpp
index d6f6eca58..2a45bd200 100644
--- a/tests/fff_print/test_printgcode.cpp
+++ b/tests/fff_print/test_printgcode.cpp
@@ -224,7 +224,7 @@ SCENARIO( "PrintGCode basic functionality", "[PrintGCode]") {
 			{
                 DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
                 config.set_num_extruders(4);
-                config.set_deserialize({ 
+                config.set_deserialize_strict({
                     { "start_gcode",                    "; Extruder [current_extruder]" },
                     { "infill_extruder",                2 },
                     { "solid_infill_extruder",          2 },
diff --git a/tests/fff_print/test_skirt_brim.cpp b/tests/fff_print/test_skirt_brim.cpp
index 097f72dcc..8f508f323 100644
--- a/tests/fff_print/test_skirt_brim.cpp
+++ b/tests/fff_print/test_skirt_brim.cpp
@@ -31,7 +31,7 @@ static int get_brim_tool(const std::string &gcode)
 
 TEST_CASE("Skirt height is honored", "[Skirt]") {
     DynamicPrintConfig config = Slic3r::DynamicPrintConfig::full_print_config();
-    config.set_deserialize({
+    config.set_deserialize_strict({
     	{ "skirts",					1 },
     	{ "skirt_height", 			5 },
     	{ "perimeters", 			0 },
@@ -64,7 +64,7 @@ SCENARIO("Original Slic3r Skirt/Brim tests", "[SkirtBrim]") {
     GIVEN("A default configuration") {
 	    DynamicPrintConfig config = Slic3r::DynamicPrintConfig::full_print_config();
 		config.set_num_extruders(4);
-		config.set_deserialize({ 
+		config.set_deserialize_strict({
 			{ "support_material_speed", 		99 },
 			{ "first_layer_height", 			0.3 },
         	{ "gcode_comments", 				true },
@@ -78,7 +78,7 @@ SCENARIO("Original Slic3r Skirt/Brim tests", "[SkirtBrim]") {
         });
 
         WHEN("Brim width is set to 5") {
-        	config.set_deserialize({
+        	config.set_deserialize_strict({
 				{ "perimeters", 		0 },
 				{ "skirts", 			0 },
 				{ "brim_width", 		5 }
@@ -100,7 +100,7 @@ SCENARIO("Original Slic3r Skirt/Brim tests", "[SkirtBrim]") {
         }
 
         WHEN("Skirt area is smaller than the brim") {
-            config.set_deserialize({
+            config.set_deserialize_strict({
             	{ "skirts", 	1 },
             	{ "brim_width", 10}
             });
@@ -110,7 +110,7 @@ SCENARIO("Original Slic3r Skirt/Brim tests", "[SkirtBrim]") {
         }
 
         WHEN("Skirt height is 0 and skirts > 0") {
-            config.set_deserialize({
+            config.set_deserialize_strict({
             	{ "skirts", 	  2 },
             	{ "skirt_height", 0 }
             });
@@ -123,7 +123,7 @@ SCENARIO("Original Slic3r Skirt/Brim tests", "[SkirtBrim]") {
 		// This is a real error! One shall print the brim with the external perimeter extruder!
         WHEN("Perimeter extruder = 2 and support extruders = 3") {
             THEN("Brim is printed with the extruder used for the perimeters of first object") {
-				config.set_deserialize({
+				config.set_deserialize_strict({
 					{ "skirts", 					0 },
 					{ "brim_width", 				5 },
 					{ "perimeter_extruder", 		2 },
@@ -137,7 +137,7 @@ SCENARIO("Original Slic3r Skirt/Brim tests", "[SkirtBrim]") {
         }
         WHEN("Perimeter extruder = 2, support extruders = 3, raft is enabled") {
             THEN("brim is printed with same extruder as skirt") {
-				config.set_deserialize({
+				config.set_deserialize_strict({
 					{ "skirts",						0 },
 					{ "brim_width", 				5 },
 					{ "perimeter_extruder", 		2 },
@@ -153,7 +153,7 @@ SCENARIO("Original Slic3r Skirt/Brim tests", "[SkirtBrim]") {
 #endif
 
         WHEN("brim width to 1 with layer_width of 0.5") {
-        	config.set_deserialize({
+        	config.set_deserialize_strict({
 				{ "skirts", 						0 },
 				{ "first_layer_extrusion_width", 	0.5 },
 				{ "brim_width", 					1 }
@@ -167,7 +167,7 @@ SCENARIO("Original Slic3r Skirt/Brim tests", "[SkirtBrim]") {
 
 #if 0
         WHEN("brim ears on a square") {
-			config.set_deserialize({
+			config.set_deserialize_strict({
 				{ "skirts",							0 },
 				{ "first_layer_extrusion_width",	0.5 },
 				{ "brim_width",						1 },
@@ -182,7 +182,7 @@ SCENARIO("Original Slic3r Skirt/Brim tests", "[SkirtBrim]") {
         }
 
         WHEN("brim ears on a square but with a too small max angle") {
-			config.set_deserialize({
+			config.set_deserialize_strict({
 				{ "skirts",							0 },
 				{ "first_layer_extrusion_width",	0.5 },
 				{ "brim_width",						1 },
@@ -198,7 +198,7 @@ SCENARIO("Original Slic3r Skirt/Brim tests", "[SkirtBrim]") {
 #endif
 
         WHEN("Object is plated with overhang support and a brim") {
-        	config.set_deserialize({
+        	config.set_deserialize_strict({
 	            { "layer_height", 				0.4 },
 	            { "first_layer_height", 		0.4 },
 	            { "skirts", 					1 },
diff --git a/tests/libslic3r/test_3mf.cpp b/tests/libslic3r/test_3mf.cpp
index d0f459e4d..5ab000d04 100644
--- a/tests/libslic3r/test_3mf.cpp
+++ b/tests/libslic3r/test_3mf.cpp
@@ -14,7 +14,8 @@ SCENARIO("Reading 3mf file", "[3mf]") {
         WHEN("3mf model is read") {
         	std::string path = std::string(TEST_DATA_DIR) + "/test_3mf/Geräte/Büchse.3mf";
         	DynamicPrintConfig config;
-            bool ret = load_3mf(path.c_str(), &config, &model, false);
+            ConfigSubstitutionContext ctxt{ ForwardCompatibilitySubstitutionRule::Disable };
+            bool ret = load_3mf(path.c_str(), config, ctxt, &model, false);
             THEN("load should succeed") {
                 REQUIRE(ret);
             }
@@ -56,7 +57,10 @@ SCENARIO("Export+Import geometry to/from 3mf file cycle", "[3mf]") {
             // load back the model from the 3mf file
             Model dst_model;
             DynamicPrintConfig dst_config;
-            load_3mf(test_file.c_str(), &dst_config, &dst_model, false);
+            {
+                ConfigSubstitutionContext ctxt{ ForwardCompatibilitySubstitutionRule::Disable };
+                load_3mf(test_file.c_str(), dst_config, ctxt, &dst_model, false);
+            }
             boost::filesystem::remove(test_file);
 
             // compare meshes
diff --git a/tests/libslic3r/test_config.cpp b/tests/libslic3r/test_config.cpp
index 417a29dca..7fbf31b11 100644
--- a/tests/libslic3r/test_config.cpp
+++ b/tests/libslic3r/test_config.cpp
@@ -9,7 +9,7 @@ SCENARIO("Generic config validation performs as expected.", "[Config]") {
     GIVEN("A config generated from default options") {
         Slic3r::DynamicPrintConfig config = Slic3r::DynamicPrintConfig::full_print_config();
         WHEN( "perimeter_extrusion_width is set to 250%, a valid value") {
-            config.set_deserialize("perimeter_extrusion_width", "250%");
+            config.set_deserialize_strict("perimeter_extrusion_width", "250%");
             THEN( "The config is read as valid.") {
                 REQUIRE(config.validate().empty());
             }
@@ -40,7 +40,7 @@ SCENARIO("Config accessor functions perform as expected.", "[Config]") {
             }
         }
         WHEN("A boolean option is set to a string value representing a 0 or 1") {
-            CHECK_NOTHROW(config.set_deserialize("gcode_comments", "1"));
+            CHECK_NOTHROW(config.set_deserialize_strict("gcode_comments", "1"));
             THEN("The underlying value is set correctly.") {
                 REQUIRE(config.opt<ConfigOptionBool>("gcode_comments")->getBool() == true);
             }
@@ -59,7 +59,7 @@ SCENARIO("Config accessor functions perform as expected.", "[Config]") {
             }
         }
         WHEN("A numeric option is set from serialized string") {
-            config.set_deserialize("bed_temperature", "100");
+            config.set_deserialize_strict("bed_temperature", "100");
             THEN("The underlying value is set correctly.") {
                 REQUIRE(config.opt<ConfigOptionInts>("bed_temperature")->get_at(0) == 100);
             }
@@ -92,7 +92,7 @@ SCENARIO("Config accessor functions perform as expected.", "[Config]") {
         }
         WHEN("A numeric option is set to a non-numeric value.") {
             THEN("A BadOptionTypeException exception is thown.") {
-                REQUIRE_THROWS_AS(config.set_deserialize("perimeter_speed", "zzzz"), BadOptionTypeException);
+                REQUIRE_THROWS_AS(config.set_deserialize_strict("perimeter_speed", "zzzz"), BadOptionTypeException);
             }
             THEN("The value does not change.") {
                 REQUIRE(config.opt<ConfigOptionFloat>("perimeter_speed")->getFloat() == 60.0);
@@ -117,7 +117,7 @@ SCENARIO("Config accessor functions perform as expected.", "[Config]") {
             }
         }
         WHEN("A float or percent is set as a percent through the string interface.") {
-            config.set_deserialize("first_layer_extrusion_width", "100%");
+            config.set_deserialize_strict("first_layer_extrusion_width", "100%");
             THEN("Value and percent flag are 100/true") {
                 auto tmp = config.opt<ConfigOptionFloatOrPercent>("first_layer_extrusion_width");
                 REQUIRE(tmp->percent == true);
@@ -125,7 +125,7 @@ SCENARIO("Config accessor functions perform as expected.", "[Config]") {
             }
         }
         WHEN("A float or percent is set as a float through the string interface.") {
-            config.set_deserialize("first_layer_extrusion_width", "100");
+            config.set_deserialize_strict("first_layer_extrusion_width", "100");
             THEN("Value and percent flag are 100/false") {
                 auto tmp = config.opt<ConfigOptionFloatOrPercent>("first_layer_extrusion_width");
                 REQUIRE(tmp->percent == false);
@@ -195,7 +195,7 @@ SCENARIO("Config ini load/save interface", "[Config]") {
     WHEN("new_from_ini is called") {
 		Slic3r::DynamicPrintConfig config;
 		std::string path = std::string(TEST_DATA_DIR) + "/test_config/new_from_ini.ini";
-		config.load_from_ini(path);
+		config.load_from_ini(path, ForwardCompatibilitySubstitutionRule::Disable);
         THEN("Config object contains ini file options.") {
 			REQUIRE(config.option_throw<ConfigOptionStrings>("filament_colour", false)->values.size() == 1);
 			REQUIRE(config.option_throw<ConfigOptionStrings>("filament_colour", false)->values.front() == "#ABCD");
diff --git a/tests/libslic3r/test_placeholder_parser.cpp b/tests/libslic3r/test_placeholder_parser.cpp
index 8c56afc6d..59784e940 100644
--- a/tests/libslic3r/test_placeholder_parser.cpp
+++ b/tests/libslic3r/test_placeholder_parser.cpp
@@ -9,7 +9,7 @@ SCENARIO("Placeholder parser scripting", "[PlaceholderParser]") {
 	PlaceholderParser 	parser;
 	auto 				config = DynamicPrintConfig::full_print_config();
 
-	config.set_deserialize( {
+	config.set_deserialize_strict( {
 		{ "printer_notes", "  PRINTER_VENDOR_PRUSA3D  PRINTER_MODEL_MK2  " },
 	    { "nozzle_diameter", "0.6;0.6;0.6;0.6" },
 	    { "temperature", "357;359;363;378" }