From f13fbf3cee7caa15adf9c14750805ffd73f68f2e Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Wed, 13 Jun 2018 21:31:42 -0500 Subject: [PATCH] Moved to C++14 syntax with string literals. --- src/GUI/Dialogs/PresetEditor.hpp | 183 ++++++++++++++++--------------- 1 file changed, 93 insertions(+), 90 deletions(-) diff --git a/src/GUI/Dialogs/PresetEditor.hpp b/src/GUI/Dialogs/PresetEditor.hpp index 2c6544d92..59051dd09 100644 --- a/src/GUI/Dialogs/PresetEditor.hpp +++ b/src/GUI/Dialogs/PresetEditor.hpp @@ -18,14 +18,7 @@ #include #include -#if SLIC3R_CPPVER==11 - #define st(A) (std::string(#A)) -#elif SLIC3R_CPPVER==14 - #define st(A) ((#A)s) -#endif - -// TODO for C++14 find/replace st([A-z_]*) with "\1"s - +using namespace std::string_literals; namespace Slic3r { namespace GUI { class PresetEditor : public wxPanel { @@ -88,51 +81,51 @@ public: PrintEditor() : PrintEditor(nullptr, {}) {}; wxString title() override { return _("Print Settings"); } - std::string name() override { return st("print"); } + std::string name() override { return "print"s; } /// Static method to retrieve list of options that this preset governs. static t_config_option_keys options() { return t_config_option_keys { - st(layer_height), st(first_layer_height), - st(adaptive_slicing), st(adaptive_slicing_quality), st(match_horizontal_surfaces), - st(perimeters), st(spiral_vase), - st(top_solid_layers), st(bottom_solid_layers), - st(extra_perimeters), st(avoid_crossing_perimeters), st(thin_walls), st(overhangs), - st(seam_position), st(external_perimeters_first), - st(fill_density), st(fill_pattern), st(top_infill_pattern), st(bottom_infill_pattern), st(fill_gaps), - st(infill_every_layers), st(infill_only_where_needed), - st(solid_infill_every_layers), st(fill_angle), st(solid_infill_below_area), st(), - st(only_retract_when_crossing_perimeters), st(infill_first), - st(max_print_speed), st(max_volumetric_speed), - st(perimeter_speed), st(small_perimeter_speed), st(external_perimeter_speed), st(infill_speed), st(), - st(solid_infill_speed), st(top_solid_infill_speed), st(support_material_speed), - st(support_material_interface_speed), st(bridge_speed), st(gap_fill_speed), - st(travel_speed), - st(first_layer_speed), - st(perimeter_acceleration), st(infill_acceleration), st(bridge_acceleration), - st(first_layer_acceleration), st(default_acceleration), - st(skirts), st(skirt_distance), st(skirt_height), st(min_skirt_length), - st(brim_connections_width), st(brim_width), st(interior_brim_width), - st(support_material), st(support_material_threshold), st(support_material_max_layers), st(support_material_enforce_layers), - st(raft_layers), - st(support_material_pattern), st(support_material_spacing), st(support_material_angle), st(), - st(support_material_interface_layers), st(support_material_interface_spacing), - st(support_material_contact_distance), st(support_material_buildplate_only), st(dont_support_bridges), - st(notes), - st(complete_objects), st(extruder_clearance_radius), st(extruder_clearance_height), - st(gcode_comments), st(output_filename_format), - st(post_process), - st(perimeter_extruder), st(infill_extruder), st(solid_infill_extruder), - st(support_material_extruder), st(support_material_interface_extruder), - st(ooze_prevention), st(standby_temperature_delta), - st(interface_shells), st(regions_overlap), - st(extrusion_width), st(first_layer_extrusion_width), st(perimeter_extrusion_width), st(), - st(external_perimeter_extrusion_width), st(infill_extrusion_width), st(solid_infill_extrusion_width), - st(top_infill_extrusion_width), st(support_material_extrusion_width), - st(support_material_interface_extrusion_width), st(infill_overlap), st(bridge_flow_ratio), - st(xy_size_compensation), st(resolution), st(shortcuts), st(compatible_printers), - st(print_settings_id) + "layer_height"s, "first_layer_height"s, + "adaptive_slicing"s, "adaptive_slicing_quality"s, "match_horizontal_surfaces"s, + "perimeters"s, "spiral_vase"s, + "top_solid_layers"s, "bottom_solid_layers"s, + "extra_perimeters"s, "avoid_crossing_perimeters"s, "thin_walls"s, "overhangs"s, + "seam_position"s, "external_perimeters_first"s, + "fill_density"s, "fill_pattern"s, "top_infill_pattern"s, "bottom_infill_pattern"s, "fill_gaps"s, + "infill_every_layers"s, "infill_only_where_needed"s, + "solid_infill_every_layers"s, "fill_angle"s, "solid_infill_below_area"s, ""s, + "only_retract_when_crossing_perimeters"s, "infill_first"s, + "max_print_speed"s, "max_volumetric_speed"s, + "perimeter_speed"s, "small_perimeter_speed"s, "external_perimeter_speed"s, "infill_speed"s, ""s, + "solid_infill_speed"s, "top_solid_infill_speed"s, "support_material_speed"s, + "support_material_interface_speed"s, "bridge_speed"s, "gap_fill_speed"s, + "travel_speed"s, + "first_layer_speed"s, + "perimeter_acceleration"s, "infill_acceleration"s, "bridge_acceleration"s, + "first_layer_acceleration"s, "default_acceleration"s, + "skirts"s, "skirt_distance"s, "skirt_height"s, "min_skirt_length"s, + "brim_connections_width"s, "brim_width"s, "interior_brim_width"s, + "support_material"s, "support_material_threshold"s, "support_material_max_layers"s, "support_material_enforce_layers"s, + "raft_layers"s, + "support_material_pattern"s, "support_material_spacing"s, "support_material_angle"s, ""s, + "support_material_interface_layers"s, "support_material_interface_spacing"s, + "support_material_contact_distance"s, "support_material_buildplate_only"s, "dont_support_bridges"s, + "notes"s, + "complete_objects"s, "extruder_clearance_radius"s, "extruder_clearance_height"s, + "gcode_comments"s, "output_filename_format"s, + "post_process"s, + "perimeter_extruder"s, "infill_extruder"s, "solid_infill_extruder"s, + "support_material_extruder"s, "support_material_interface_extruder"s, + "ooze_prevention"s, "standby_temperature_delta"s, + "interface_shells"s, "regions_overlap"s, + "extrusion_width"s, "first_layer_extrusion_width"s, "perimeter_extrusion_width"s, ""s, + "external_perimeter_extrusion_width"s, "infill_extrusion_width"s, "solid_infill_extrusion_width"s, + "top_infill_extrusion_width"s, "support_material_extrusion_width"s, + "support_material_interface_extrusion_width"s, "infill_overlap"s, "bridge_flow_ratio"s, + "xy_size_compensation"s, "resolution"s, "shortcuts"s, "compatible_printers"s, + "print_settings_id"s }; } @@ -143,57 +136,36 @@ protected: void _build() override; }; -class MaterialEditor : public PresetEditor { -public: - - wxString title() override { return _("Material Settings"); } - std::string name() override { return st("material"); } - MaterialEditor(wxWindow* parent, t_config_option_keys options = {}); - MaterialEditor() : MaterialEditor(nullptr, {}) {}; - - static t_config_option_keys options() { - return t_config_option_keys - { - st(filament_colour), st(filament_diameter), st(filament_notes), st(filament_max_volumetric_speed), st(extrusion_multiplier), st(filament_density), st(filament_cost), - st(temperature), st(first_layer_temperature), st(bed_temperature), st(first_layer_bed_temperature), - st(fan_always_on), st(cooling), st(compatible_printers), - st(min_fan_speed), st(max_fan_speed), st(bridge_fan_speed), st(disable_fan_first_layers), - st(fan_below_layer_time), st(slowdown_below_layer_time), st(min_print_speed), - st(start_filament_gcode), st(end_filament_gcode), - st(filament_settings_id) - }; - } - - t_config_option_keys my_options() override { return MaterialEditor::options(); } -protected: - void _update() override; - void _build() override; -}; - class PrinterEditor : public PresetEditor { public: PrinterEditor(wxWindow* parent, t_config_option_keys options = {}); PrinterEditor() : PrinterEditor(nullptr, {}) {}; wxString title() override { return _("Printer Settings"); } - std::string name() override { return st("printer"); } - + std::string name() override { return "printer"s; } + static t_config_option_keys overridable_options() { return t_config_option_keys + { + "pressure_advance"s, + "retract_length"s, "retract_lift"s, "retract_speed"s, "retract_restart_extra"s, + "retract_before_travel"s, "retract_layer_change"s, "wipe"s + }; }; + static t_config_option_keys options() { return t_config_option_keys { - st(bed_shape), st(z_offset), st(z_steps_per_mm), st(has_heatbed), - st(gcode_flavor), st(use_relative_e_distances), - st(serial_port), st(serial_speed), - st(host_type), st(print_host), st(octoprint_apikey), - st(use_firmware_retraction), st(pressure_advance), st(vibration_limit), - st(use_volumetric_e), - st(start_gcode), st(end_gcode), st(before_layer_gcode), st(layer_gcode), st(toolchange_gcode), st(between_objects_gcode), - st(nozzle_diameter), st(extruder_offset), st(min_layer_height), st(max_layer_height), - st(retract_length), st(retract_lift), st(retract_speed), st(retract_restart_extra), st(retract_before_travel), st(retract_layer_change), st(wipe), - st(retract_length_toolchange), st(retract_restart_extra_toolchange), st(retract_lift_above), st(retract_lift_below), - st(printer_settings_id), - st(printer_notes), - st(use_set_and_wait_bed), st(use_set_and_wait_extruder) + "bed_shape"s, "z_offset"s, "z_steps_per_mm"s, "has_heatbed"s, + "gcode_flavor"s, "use_relative_e_distances"s, + "serial_port"s, "serial_speed"s, + "host_type"s, "print_host"s, "octoprint_apikey"s, + "use_firmware_retraction"s, "pressure_advance"s, "vibration_limit"s, + "use_volumetric_e"s, + "start_gcode"s, "end_gcode"s, "before_layer_gcode"s, "layer_gcode"s, "toolchange_gcode"s, "between_objects_gcode"s, + "nozzle_diameter"s, "extruder_offset"s, "min_layer_height"s, "max_layer_height"s, + "retract_length"s, "retract_lift"s, "retract_speed"s, "retract_restart_extra"s, "retract_before_travel"s, "retract_layer_change"s, "wipe"s, + "retract_length_toolchange"s, "retract_restart_extra_toolchange"s, "retract_lift_above"s, "retract_lift_below"s, + "printer_settings_id"s, + "printer_notes"s, + "use_set_and_wait_bed"s, "use_set_and_wait_extruder"s }; } @@ -201,6 +173,37 @@ public: protected: void _update() override; void _build() override; + const std::string LogChannel() override {return "PrinterEditor"s;} //< Which log these messages should go to. +}; + +class MaterialEditor : public PresetEditor { +public: + + wxString title() override { return _("Material Settings"); } + std::string name() override { return "material"s; } + preset_t type() override { return preset_t::Material; }; + int typeId() override { return static_cast(preset_t::Material); }; + MaterialEditor(wxWindow* parent, t_config_option_keys options = {}); + MaterialEditor() : MaterialEditor(nullptr, {}) {}; + + static t_config_option_keys options() { + return t_config_option_keys + { + "filament_colour"s, "filament_diameter"s, "filament_notes"s, "filament_max_volumetric_speed"s, "extrusion_multiplier"s, "filament_density"s, "filament_cost"s, + "temperature"s, "first_layer_temperature"s, "bed_temperature"s, "first_layer_bed_temperature"s, + "fan_always_on"s, "cooling"s, "compatible_printers"s, + "min_fan_speed"s, "max_fan_speed"s, "bridge_fan_speed"s, "disable_fan_first_layers"s, + "fan_below_layer_time"s, "slowdown_below_layer_time"s, "min_print_speed"s, + "start_filament_gcode"s, "end_filament_gcode"s, + "filament_settings_id"s + }; + } + + t_config_option_keys my_options() override { return MaterialEditor::options(); } +protected: + void _update() override; + void _build() override; + const std::string LogChannel() override {return "MaterialEditor"s;} //< Which log these messages should go to. };