3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Detection of XL printer is now based on printer_notes

Browse Source
This commit is contained in:
Lukas Matena 2023-06-09 10:54:25 +02:00
parent 6f5fcf611d
commit 8df907b3e3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libslic3r/PrintConfig.cpp
View File

@ -4982,21 +4982,21 @@ std::string get_sla_suptree_prefix(const DynamicPrintConfig &config)
return slatree; return slatree;
} }
static bool is_XL_printer(const std::string& printer_model) static bool is_XL_printer(const std::string& printer_notes)
{ {
static constexpr const char *ALIGN_ONLY_FOR = "XL"; return boost::algorithm::contains(printer_notes, "PRINTER_VENDOR_PRUSA3D")
return boost::algorithm::contains(printer_model, ALIGN_ONLY_FOR); && boost::algorithm::contains(printer_notes, "PRINTER_MODEL_XL");
} }
bool is_XL_printer(const DynamicPrintConfig &cfg) bool is_XL_printer(const DynamicPrintConfig &cfg)
{ {
auto *printer_model = cfg.opt<ConfigOptionString>("printer_model"); auto *printer_notes = cfg.opt<ConfigOptionString>("printer_notes");
return printer_model && is_XL_printer(printer_model->value); return printer_notes && is_XL_printer(printer_notes->value);
} }
bool is_XL_printer(const PrintConfig &cfg) bool is_XL_printer(const PrintConfig &cfg)
{ {
return is_XL_printer(cfg.printer_model.value); return is_XL_printer(cfg.printer_notes.value);
} }
} // namespace Slic3r } // namespace Slic3r

2
src/slic3r/GUI/Plater.cpp
View File

@ -2011,7 +2011,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
"bed_shape", "bed_custom_texture", "bed_custom_model", "complete_objects", "duplicate_distance", "extruder_clearance_radius", "skirts", "skirt_distance", "bed_shape", "bed_custom_texture", "bed_custom_model", "complete_objects", "duplicate_distance", "extruder_clearance_radius", "skirts", "skirt_distance",
"brim_width", "brim_separation", "brim_type", "variable_layer_height", "nozzle_diameter", "single_extruder_multi_material", "brim_width", "brim_separation", "brim_type", "variable_layer_height", "nozzle_diameter", "single_extruder_multi_material",
"wipe_tower", "wipe_tower_x", "wipe_tower_y", "wipe_tower_width", "wipe_tower_rotation_angle", "wipe_tower_brim_width", "wipe_tower_cone_angle", "wipe_tower_extra_spacing", "wipe_tower_extruder", "wipe_tower", "wipe_tower_x", "wipe_tower_y", "wipe_tower_width", "wipe_tower_rotation_angle", "wipe_tower_brim_width", "wipe_tower_cone_angle", "wipe_tower_extra_spacing", "wipe_tower_extruder",
"extruder_colour", "filament_colour", "material_colour", "max_print_height", "printer_model", "printer_technology", "extruder_colour", "filament_colour", "material_colour", "max_print_height", "printer_model", "printer_notes", "printer_technology",
// These values are necessary to construct SlicingParameters by the Canvas3D variable layer height editor. // These values are necessary to construct SlicingParameters by the Canvas3D variable layer height editor.
"layer_height", "first_layer_height", "min_layer_height", "max_layer_height", "layer_height", "first_layer_height", "min_layer_height", "max_layer_height",
"brim_width", "perimeters", "perimeter_extruder", "fill_density", "infill_extruder", "top_solid_layers", "brim_width", "perimeters", "perimeter_extruder", "fill_density", "infill_extruder", "top_solid_layers",