Merge branch 'merill-merge'

Author: remi durand

resources/ui_layout/print.ui

@@ -258,15 +258,40 @@ group:Autospeed (advanced)
 
 page:Width & Flow:width
 group:Extrusion width
-	setting:extrusion_width
-	setting:first_layer_extrusion_width
-	setting:perimeter_extrusion_width
-	setting:external_perimeter_extrusion_width
-	setting:infill_extrusion_width
-	setting:solid_infill_extrusion_width
-	setting:top_infill_extrusion_width
-	setting:support_material_extrusion_width
-	setting:skirt_extrusion_width
+	line:default
+		setting:sidetext_width$10:label$width:extrusion_width
+		setting:sidetext_width$10:label_width$15:label$spacing:extrusion_spacing
+	end_line
+	line:first layer
+		setting:sidetext_width$10:label$width:first_layer_extrusion_width
+		setting:sidetext_width$10:label_width$15:label$spacing:first_layer_extrusion_spacing
+	end_line
+	line:perimeter
+		setting:sidetext_width$10:label$width:perimeter_extrusion_width
+		setting:sidetext_width$10:label_width$15:label$spacing:perimeter_extrusion_spacing
+	end_line
+	line:external perimeter
+		setting:sidetext_width$10:label$width:external_perimeter_extrusion_width
+		setting:sidetext_width$10:label_width$15:label$width&spacing combo:external_perimeter_extrusion_spacing
+	end_line
+	line:infill
+		setting:sidetext_width$10:label$width:infill_extrusion_width
+		setting:sidetext_width$10:label_width$15:label$spacing:infill_extrusion_spacing
+	end_line
+	line:solid infill
+		setting:sidetext_width$10:label$width:solid_infill_extrusion_width
+		setting:sidetext_width$10:label_width$15:label$spacing:solid_infill_extrusion_spacing
+	end_line
+	line:top infill
+		setting:sidetext_width$10:label$width:top_infill_extrusion_width
+		setting:sidetext_width$10:label_width$15:label$spacing:top_infill_extrusion_spacing
+	end_line
+	line:support material
+		setting:sidetext_width$10:label$width:support_material_extrusion_width
+	end_line
+	line:skirt
+		setting:sidetext_width$10:label$width:skirt_extrusion_width
+	end_line
 	recommended_extrusion_width_description
 group:Overlap
 	line:Perimeter overlap

src/libslic3r/Config.cpp

@@ -473,7 +473,9 @@ t_config_option_keys ConfigBase::diff(const ConfigBase &other) const
     for (const t_config_option_key &opt_key : this->keys()) {
         const ConfigOption *this_opt  = this->option(opt_key);
         const ConfigOption *other_opt = other.option(opt_key);
-        if (this_opt != nullptr && other_opt != nullptr && *this_opt != *other_opt)
+        //dirty if both exist, they aren't both phony and value is different
+        if (this_opt != nullptr && other_opt != nullptr && !(this_opt->phony && other_opt->phony) 
+            && ((*this_opt != *other_opt) || (this_opt->phony != other_opt->phony)))
             diff.emplace_back(opt_key);
     }
     return diff;
@@ -495,6 +497,8 @@ std::string ConfigBase::opt_serialize(const t_config_option_key &opt_key) const
 {
     const ConfigOption* opt = this->option(opt_key);
     assert(opt != nullptr);
+    if (opt->phony)
+        return "";
     return opt->serialize();
 }
 
@@ -584,7 +588,19 @@ bool ConfigBase::set_deserialize_raw(const t_config_option_key &opt_key_src, con
     ConfigOption *opt = this->option(opt_key, true);
     if (opt == nullptr)
         throw new UnknownOptionException(opt_key);
-    bool ok= opt->deserialize(value, append);
+
+    bool ok = true;
+    if (!optdef->can_phony || value != "")
+        ok = opt->deserialize(value, append);
+    //set phony status
+    if (optdef->can_phony)
+        if(value == "")
+            opt->phony = true;
+        else
+            opt->phony = false;
+    else
+        opt->phony = false;
+
     return ok;
 }
 
@@ -798,13 +814,21 @@ size_t ConfigBase::load_from_gcode_string(const char* str)
 	return num_key_value_pairs;
 }
 
-void ConfigBase::save(const std::string &file) const
+void ConfigBase::save(const std::string &file, bool to_prusa) const
 {
     boost::nowide::ofstream c;
     c.open(file, std::ios::out | std::ios::trunc);
     c << "# " << Slic3r::header_slic3r_generated() << std::endl;
-    for (const std::string &opt_key : this->keys())
-        c << opt_key << " = " << this->opt_serialize(opt_key) << std::endl;
+    if (to_prusa)
+        for (std::string opt_key : this->keys()) {
+            std::string value = this->opt_serialize(opt_key);
+            this->to_prusa(opt_key, value);
+            if(!opt_key.empty())
+                c << opt_key << " = " << value << std::endl;
+        }
+    else
+        for (const std::string &opt_key : this->keys())
+            c << opt_key << " = " << this->opt_serialize(opt_key) << std::endl;
     c.close();
 }
 

src/libslic3r/Config.hpp

@@ -214,6 +214,12 @@ inline OutputFormat operator&=(OutputFormat& a, OutputFormat b) {
 // A generic value of a configuration option.
 class ConfigOption {
 public:
+    // if true, this option doesn't need to be saved, it's a computed value from an other configOption.
+    bool phony;
+
+    ConfigOption() : phony(false) {}
+    ConfigOption(bool phony) : phony(phony) {}
+
     virtual ~ConfigOption() {}
 
     virtual ConfigOptionType    type() const = 0;
@@ -258,6 +264,7 @@ class ConfigOptionSingle : public ConfigOption {
 public:
     T value;
     explicit ConfigOptionSingle(T value) : value(value) {}
+    explicit ConfigOptionSingle(T value, bool phony) : ConfigOption(phony), value(value) {}
     operator T() const { return this->value; }
 
     void set(const ConfigOption *rhs) override
@@ -266,6 +273,7 @@ class ConfigOptionSingle : public ConfigOption {
             throw Slic3r::RuntimeError("ConfigOptionSingle: Assigning an incompatible type");
         assert(dynamic_cast<const ConfigOptionSingle<T>*>(rhs));
         this->value = static_cast<const ConfigOptionSingle<T>*>(rhs)->value;
+        this->phony = rhs->phony;
     }
 
     bool operator==(const ConfigOption &rhs) const override
@@ -340,6 +348,7 @@ class ConfigOptionVector : public ConfigOptionVectorBase
             throw Slic3r::RuntimeError("ConfigOptionVector: Assigning an incompatible type");
         assert(dynamic_cast<const ConfigOptionVector<T>*>(rhs));
         this->values = static_cast<const ConfigOptionVector<T>*>(rhs)->values;
+        this->phony = rhs->phony;
     }
 
     // Set from a vector of ConfigOptions. 
@@ -504,6 +513,7 @@ class ConfigOptionFloat : public ConfigOptionSingle<double>
 public:
     ConfigOptionFloat() : ConfigOptionSingle<double>(0) {}
     explicit ConfigOptionFloat(double _value) : ConfigOptionSingle<double>(_value) {}
+    explicit ConfigOptionFloat(double _value, bool _phony) : ConfigOptionSingle<double>(_value, _phony) {}
 
     static ConfigOptionType static_type() { return coFloat; }
     ConfigOptionType        type()      const override { return static_type(); }
@@ -850,6 +860,7 @@ class ConfigOptionPercent : public ConfigOptionFloat
 public:
     ConfigOptionPercent() : ConfigOptionFloat(0) {}
     explicit ConfigOptionPercent(double _value) : ConfigOptionFloat(_value) {}
+    explicit ConfigOptionPercent(double _value, bool _phony) : ConfigOptionFloat(_value, _phony) {}
 
     static ConfigOptionType static_type() { return coPercent; }
     ConfigOptionType        type()  const override { return static_type(); }
@@ -943,6 +954,7 @@ class ConfigOptionFloatOrPercent : public ConfigOptionPercent
     bool percent;
     ConfigOptionFloatOrPercent() : ConfigOptionPercent(0), percent(false) {}
     explicit ConfigOptionFloatOrPercent(double _value, bool _percent) : ConfigOptionPercent(_value), percent(_percent) {}
+    explicit ConfigOptionFloatOrPercent(double _value, bool _percent, bool _phony) : ConfigOptionPercent(_value, _phony), percent(_percent) {}
 
     static ConfigOptionType     static_type() { return coFloatOrPercent; }
     ConfigOptionType            type()  const override { return static_type(); }
@@ -1427,6 +1439,7 @@ class ConfigOptionEnum : public ConfigOptionSingle<T>
             throw Slic3r::RuntimeError("ConfigOptionEnum<T>: Assigning an incompatible type");
         // rhs could be of the following type: ConfigOptionEnumGeneric or ConfigOptionEnum<T>
         this->value = (T)rhs->getInt();
+        this->phony = rhs->phony;
     }
 
     std::string serialize() const override
@@ -1511,6 +1524,7 @@ class ConfigOptionEnumGeneric : public ConfigOptionInt
             throw Slic3r::RuntimeError("ConfigOptionEnumGeneric: Assigning an incompatible type");
         // rhs could be of the following type: ConfigOptionEnumGeneric or ConfigOptionEnum<T>
         this->value = rhs->getInt();
+        this->phony = rhs->phony;
     }
 
     std::string serialize() const override
@@ -1658,7 +1672,9 @@ class ConfigOptionDef
     // For text input: If true, the GUI formats text as code (fixed-width)
     bool                                is_code         = false;
     // Not editable. Currently only used for the display of the number of threads.
-    bool                                readonly        = false;
+    bool                                readonly = false;
+    // Can be phony. if not present at laoding, mark it as phony. Also adapt the gui to look for phony status.
+    bool                                can_phony = false;
     // Height of a multiline GUI text box.
     int                                 height          = -1;
     // Optional width of an input field.
@@ -1907,7 +1923,7 @@ class ConfigBase : public ConfigOptionResolver
     // Returns number of key/value pairs extracted.
     size_t load_from_gcode_string(const char* str);
     void load(const boost::property_tree::ptree &tree);
-    void save(const std::string &file) const;
+    void save(const std::string &file, bool to_prusa = false) const;
 
 	// Set all the nullable values to nils.
     void null_nullables();

src/libslic3r/Fill/FillAdaptive.cpp

@@ -299,8 +299,8 @@ std::pair<double, double> adaptive_fill_line_spacing(const PrintObject &print_ob
     for (const PrintRegion *region : print_object.print()->regions()) {
         const PrintRegionConfig &config                 = region->config();
         bool                     nonempty               = config.fill_density > 0;
-        bool                     has_adaptive_infill    = nonempty && config.fill_pattern == ipAdaptiveCubic;
-        bool                     has_support_infill     = nonempty && config.fill_pattern == ipSupportCubic;
+        bool                     has_adaptive_infill    = nonempty && config.fill_pattern.value == ipAdaptiveCubic;
+        bool                     has_support_infill     = nonempty && config.fill_pattern.value == ipSupportCubic;
         double                   infill_extrusion_width = config.infill_extrusion_width.get_abs_value(max_nozzle_diameter);
         region_fill_data.push_back(RegionFillData({
             has_adaptive_infill ? Tristate::Maybe : Tristate::No,

src/libslic3r/GCode.cpp

@@ -743,7 +743,7 @@ void GCode::do_export(Print* print, const char* path, GCodeProcessor::Result* re
 namespace DoExport {
     static void init_gcode_processor(const PrintConfig& config, GCodeProcessor& processor, bool& silent_time_estimator_enabled)
     {
-        silent_time_estimator_enabled = (config.gcode_flavor == gcfMarlin) && config.silent_mode;
+        silent_time_estimator_enabled = (config.gcode_flavor.value == gcfMarlin) && config.silent_mode;
         processor.reset();
         processor.apply_config(config);
         processor.enable_stealth_time_estimator(silent_time_estimator_enabled);
@@ -1490,7 +1490,7 @@ void GCode::_do_export(Print& print, FILE* file, ThumbnailsGeneratorCallback thu
                 bbox_prime.offset(0.5f);
                 bool overlap = bbox_prime.overlap(bbox_print);
 
-                if (print.config().gcode_flavor == gcfMarlin) {
+                if (print.config().gcode_flavor.value == gcfMarlin) {
                     _write(file, this->retract());
                     _write(file, "M300 S800 P500\n"); // Beep for 500ms, tone 800Hz.
                     if (overlap) {
@@ -1727,14 +1727,14 @@ void GCode::print_machine_envelope(FILE *file, Print &print)
                 int(print.config().machine_max_acceleration_travel.values.front() + 0.5),
                 int(print.config().machine_max_acceleration_travel.values.front() + 0.5));
         if (std::set<uint8_t>{gcfMarlin, gcfLerdge, gcfRepetier, gcfSmoothie, gcfSprinter}.count(print.config().gcode_flavor.value) > 0)
-            fprintf(file, (print.config().gcode_flavor == gcfMarlin || print.config().gcode_flavor == gcfSmoothie) 
+            fprintf(file, (print.config().gcode_flavor.value == gcfMarlin || print.config().gcode_flavor.value == gcfSmoothie) 
                 ? "M203 X%d Y%d Z%d E%d ; sets maximum feedrates, mm/sec\n"
                 : "M203 X%d Y%d Z%d E%d ; sets maximum feedrates, mm/min\n",
                 int(print.config().machine_max_feedrate_x.values.front() + 0.5),
                 int(print.config().machine_max_feedrate_y.values.front() + 0.5),
                 int(print.config().machine_max_feedrate_z.values.front() + 0.5),
                 int(print.config().machine_max_feedrate_e.values.front() + 0.5));
-        if (print.config().gcode_flavor == gcfRepRap) {
+        if (print.config().gcode_flavor.value == gcfRepRap) {
             fprintf(file, "M203 X%d Y%d Z%d E%d I%d; sets maximum feedrates, mm/min\n",
                 int(print.config().machine_max_feedrate_x.values.front() + 0.5),
                 int(print.config().machine_max_feedrate_y.values.front() + 0.5),
@@ -1806,7 +1806,7 @@ void GCode::_print_first_layer_extruder_temperatures(FILE *file, Print &print, c
 {
     // Is the bed temperature set by the provided custom G-code?
     int  temp_by_gcode     = -1;
-    bool include_g10   = print.config().gcode_flavor == gcfRepRap;
+    bool include_g10   = print.config().gcode_flavor.value == gcfRepRap;
     if (custom_gcode_sets_temperature(gcode, 104, 109, include_g10, temp_by_gcode)) {
         // Set the extruder temperature at m_writer, but throw away the generated G-code as it will be written with the custom G-code.
         int temp = print.config().first_layer_temperature.get_at(first_printing_extruder_id);
@@ -1819,14 +1819,14 @@ void GCode::_print_first_layer_extruder_temperatures(FILE *file, Print &print, c
         // Custom G-code does not set the extruder temperature. Do it now.
         if (!print.config().single_extruder_multi_material.value) {
             // Set temperatures of all the printing extruders.
-            for (unsigned int tool_id : print.extruders()) {
-                int temp = print.config().first_layer_temperature.get_at(tool_id);
+            for (const Extruder& tool : m_writer.extruders()) {
+                int temp = print.config().first_layer_temperature.get_at(tool.id());
                 if (temp == 0)
-                    temp = print.config().temperature.get_at(tool_id);
+                    temp = print.config().temperature.get_at(tool.id());
                 if (print.config().ooze_prevention.value)
                     temp += print.config().standby_temperature_delta.value;
                 if (temp > 0)
-                    _write(file, m_writer.set_temperature(temp, false, tool_id));
+                    _write(file, m_writer.set_temperature(temp, false, tool.id()));
             }
         }
         if (wait || print.config().single_extruder_multi_material.value) {

src/libslic3r/GCodeWriter.cpp

@@ -6,9 +6,9 @@
 #include <map>
 #include <assert.h>
 
-#define FLAVOR_IS(val) this->config.gcode_flavor == val
-#define FLAVOR_IS_NOT(val) this->config.gcode_flavor != val
-#define COMMENT(comment) if (this->config.gcode_comments && !comment.empty()) gcode << " ; " << comment;
+#define FLAVOR_IS(val) this->config.gcode_flavor.value == val
+#define FLAVOR_IS_NOT(val) this->config.gcode_flavor.value != val
+#define COMMENT(comment) if (this->config.gcode_comments.value && !comment.empty()) gcode << " ; " << comment;
 #define PRECISION(val, precision) std::fixed << std::setprecision(precision) << (val)
 #define XYZF_NUM(val) PRECISION(val, this->config.gcode_precision_xyz.value)
 #define E_NUM(val) PRECISION(val, this->config.gcode_precision_e.get_at(m_tool->id()))

src/libslic3r/PerimeterGenerator.cpp

@@ -156,7 +156,7 @@ void PerimeterGenerator::process()
                             ExPolygons bridgeable = union_ex(detector.coverage(-1, true));
                             if (!bridgeable.empty()) {
                                 //check if we get everything or just the bridgeable area
-                                if (this->config->no_perimeter_unsupported_algo == npuaNoPeri || this->config->no_perimeter_unsupported_algo == npuaFilled) {
+                                if (this->config->no_perimeter_unsupported_algo.value == npuaNoPeri || this->config->no_perimeter_unsupported_algo.value == npuaFilled) {
                                     //we bridge everything, even the not-bridgeable bits
                                     for (size_t i = 0; i < unsupported_filtered.size();) {
                                         ExPolygon &poly_unsupp = *(unsupported_filtered.begin() + i);
@@ -177,7 +177,7 @@ void PerimeterGenerator::process()
                                     }
                                     unsupported_filtered = intersection_ex(last,
                                         offset2_ex(unsupported_filtered, double(-perimeter_spacing / 2), double(perimeter_spacing * 3 / 2)));
-                                    if (this->config->no_perimeter_unsupported_algo == npuaFilled) {
+                                    if (this->config->no_perimeter_unsupported_algo.value == npuaFilled) {
                                         for (ExPolygon &expol : unsupported_filtered) {
                                             //check if the holes won't be covered by the upper layer
                                             //TODO: if we want to do that, we must modify the geometry before making perimeters.
@@ -227,7 +227,7 @@ void PerimeterGenerator::process()
 
                                     }
                                     //TODO: add other polys as holes inside this one (-margin)
-                                } else if (this->config->no_perimeter_unsupported_algo == npuaBridgesOverhangs || this->config->no_perimeter_unsupported_algo == npuaBridges){
+                                } else if (this->config->no_perimeter_unsupported_algo.value == npuaBridgesOverhangs || this->config->no_perimeter_unsupported_algo.value == npuaBridges){
                                     //simplify to avoid most of artefacts from printing lines.
                                     ExPolygons bridgeable_simplified;
                                     for (ExPolygon &poly : bridgeable) {
@@ -246,7 +246,7 @@ void PerimeterGenerator::process()
                                     //unbridgeable = offset2_ex(unbridgeable, -ext_perimeter_width, ext_perimeter_width);
 
 
-                                    if (this->config->no_perimeter_unsupported_algo == npuaBridges) {
+                                    if (this->config->no_perimeter_unsupported_algo.value == npuaBridges) {
                                         ExPolygons unbridgeable = unsupported_filtered;
                                         for (ExPolygon &expol : unbridgeable)
                                             expol.holes.clear();