Stubbed out more of PresetEditor and Preset

This commit is contained in:
Joseph Lenox 2018-05-21 20:56:55 -05:00 committed by Joseph Lenox
parent 0c3868d0cb
commit 866e9b841c
3 changed files with 137 additions and 5 deletions

View File

@ -251,7 +251,7 @@ private:
wxFlexGridSizer* presets_sizer {};
std::vector<wxBitmapComboBox*> preset_choosers {preset_count, nullptr};
std::vector<wxBitmapComboBox*> preset_choosers {preset_types, nullptr};
void _on_change_combobox(preset_t preset, wxBitmapComboBox* choice);
void show_preset_editor(preset_t preset, unsigned int idx) { };

View File

@ -2,6 +2,7 @@
#define PRESET_HPP
#include "PrintConfig.hpp"
#include "Config.hpp"
namespace Slic3r { namespace GUI {
@ -12,24 +13,69 @@ enum class preset_t : uint8_t {
};
/// Convenience counter to determine how many preset tabs exist.
constexpr size_t preset_types = static_cast<uint8_t>(preset_t::Last);
constexpr uint8_t preset(preset_t preset) { return static_cast<uint8_t>(preset); }
constexpr size_t preset_types = preset(preset_t::Last);
class Preset;
using Presets = std::vector<Preset>;
class Preset {
preset_t type;
preset_t group;
std::string name {""};
/// Preset
bool default_preset {false};
/// Search the compatible_printers config option list for this preset name.
/// Assume that Printer configs are compatible with other Printer configs
bool compatible(std::string printer_name) { return true; }
bool compatible(const Preset& other) {return (this->type == preset_t::Printer || (compatible(other.name) && other.type == preset_t::Printer));}
bool compatible(const Preset& other) {return (this->group == preset_t::Printer || (compatible(other.name) && other.group == preset_t::Printer));}
/// Format the name appropriately.
wxString dropdown_name() { return (this->dirty() ? wxString(this->name) << " " << _("(modified)") : this->name); }
bool file_exists(wxString name);
bool prompt_unsaved_changes(wxWindow* parent);
/// Apply dirty config to config and save.
bool save(t_config_option_keys opt_keys);
/// Apply dirty config to config and save with an alternate name.
bool save_as(wxString name, t_config_option_keys opt_keys);
/// Delete this preset from the system.
void delete_preset();
/// Returns list of options that have been modified from the config.
t_config_option_keys dirty_options();
/// Returns whether or not this config is different from its modified state.
bool dirty();
/// Loads the selected config from file and return a reference.
Slic3r::Config& load_config();
/// Pass-through to Slic3r::Config, returns whether or not a config was loaded.
bool loaded() { return !this->config.empty(); }
/// Clear the dirty config.
void dismiss_changes();
private:
bool external {false};
/// store to keep config options for this preset
Slic3r::DynamicPrintConfig config { Slic3r::DynamicPrintConfig() };
Slic3r::Config config { Slic3r::Config() };
/// Alternative config store for a modified configuration.
Slic3r::Config dirty_config {Slic3r::Config()};
std::string file {""};
/// reach through to the appropriate material type
t_config_option_keys _group_class();
};

View File

@ -1,11 +1,97 @@
#ifndef PRESETEDITOR_HPP
#define PRESETEDITOR_HPP
#include <string>
namespace Slic3r { namespace GUI {
using namespace std::string_literals;
class PresetEditor : public wxPanel {
/// Member function to retrieve a list of options
/// that this preset governs. Subclasses should
/// call their own static method.
virtual t_config_option_keys my_options() = 0;
static t_config_option_keys options() { return t_config_option_keys {}; }
};
class PrintEditor : public PresetEditor {
public:
/// Static method to retrieve list of options that this preset governs.
static t_config_option_keys options() {
return t_config_option_keys
{
"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, ""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, ""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
};
}
t_config_option_keys my_options() override { return PrintEditor::options(); }
};
class PrinterEditor : public PresetEditor {
static t_config_option_keys options() {
return t_config_option_keys
{
"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
};
}
t_config_option_keys my_options() override { return PrinterEditor::options(); }
};
}} // namespace Slic3r::GUI
#endif // PRESETEDITOR_HPP