mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-07 23:17:35 -06:00
Add the rest of the param defs
Also added temperatures category to handle them
This commit is contained in:
parent
02258b4391
commit
ecd20184f9
5 changed files with 51 additions and 3 deletions
14
resources/images/custom-gcode_temperature.svg
Normal file
14
resources/images/custom-gcode_temperature.svg
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<g clip-path="url(#clip0_8076_36010)">
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M4.69269 2.49023C4.69269 1.29516 5.66149 0.326355 6.85657 0.326355C8.05165 0.326355 9.02044 1.29516 9.02044 2.49023V6.92898C9.96736 7.60117 10.5871 8.70725 10.5871 9.95952C10.5871 12.0108 8.92419 13.6737 6.87289 13.6737C4.8216 13.6737 3.15869 12.0108 3.15869 9.95952C3.15869 8.72168 3.76428 7.62665 4.69269 6.95241V2.49023ZM5.69269 7.51465V2.49023C5.69269 1.84744 6.21378 1.32635 6.85657 1.32635C7.49936 1.32635 8.02044 1.84744 8.02044 2.49023V7.49913C8.94588 7.9315 9.58709 8.87063 9.58709 9.95952C9.58709 11.4585 8.3719 12.6737 6.87289 12.6737C5.37388 12.6737 4.15869 11.4585 4.15869 9.95952C4.15869 8.88348 4.78486 7.95369 5.69269 7.51465Z" fill="#009688"/>
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.186 2.49249C10.186 2.21635 10.4099 1.99249 10.686 1.99249H11.8258C12.1019 1.99249 12.3258 2.21635 12.3258 2.49249C12.3258 2.76863 12.1019 2.99249 11.8258 2.99249H10.686C10.4099 2.99249 10.186 2.76863 10.186 2.49249Z" fill="#009688"/>
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.186 4.83203C10.186 4.55589 10.4099 4.33203 10.686 4.33203H11.8258C12.1019 4.33203 12.3258 4.55589 12.3258 4.83203C12.3258 5.10817 12.1019 5.33203 11.8258 5.33203H10.686C10.4099 5.33203 10.186 5.10817 10.186 4.83203Z" fill="#009688"/>
|
||||||
|
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.87305 2.49249C7.14919 2.49249 7.37305 2.71635 7.37305 2.99249V9.22844C7.37305 9.50458 7.14919 9.72844 6.87305 9.72844C6.5969 9.72844 6.37305 9.50458 6.37305 9.22844L6.37305 2.99249C6.37305 2.71635 6.5969 2.49249 6.87305 2.49249Z" fill="#009688"/>
|
||||||
|
<path d="M8.24858 9.90249C8.24858 10.6622 7.63274 11.278 6.87307 11.278C6.1134 11.278 5.49756 10.6622 5.49756 9.90249C5.49756 9.14281 6.1134 8.52698 6.87307 8.52698C7.63274 8.52698 8.24858 9.14281 8.24858 9.90249Z" fill="#009688"/>
|
||||||
|
</g>
|
||||||
|
<defs>
|
||||||
|
<clipPath id="clip0_8076_36010">
|
||||||
|
<rect width="14" height="14" fill="white" transform="translate(0 14) rotate(-90)"/>
|
||||||
|
</clipPath>
|
||||||
|
</defs>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 2.1 KiB |
|
@ -6577,6 +6577,9 @@ OtherSlicingStatesConfigDef::OtherSlicingStatesConfigDef()
|
||||||
// def = this->add("has_single_extruder_multi_material_priming", coBool);
|
// def = this->add("has_single_extruder_multi_material_priming", coBool);
|
||||||
// def->label = L("Has single extruder MM priming");
|
// def->label = L("Has single extruder MM priming");
|
||||||
// def->tooltip = L("Are the extra multi-material priming regions used in this print?");
|
// def->tooltip = L("Are the extra multi-material priming regions used in this print?");
|
||||||
|
|
||||||
|
new_def("initial_no_support_extruder", coInt, "Initial no support extruder", "Zero-based index of the first extruder used for printing without support. Same as initial_no_support_tool.");
|
||||||
|
new_def("in_head_wrap_detect_zone", coBool, "In head wrap detect zone", "Indicates if the first layer overlaps with the head wrap zone.");
|
||||||
}
|
}
|
||||||
|
|
||||||
PrintStatisticsConfigDef::PrintStatisticsConfigDef()
|
PrintStatisticsConfigDef::PrintStatisticsConfigDef()
|
||||||
|
@ -6671,9 +6674,8 @@ ObjectsInfoConfigDef::ObjectsInfoConfigDef()
|
||||||
def->label = L("Input filename without extension");
|
def->label = L("Input filename without extension");
|
||||||
def->tooltip = L("Source filename of the first object, without extension.");
|
def->tooltip = L("Source filename of the first object, without extension.");
|
||||||
|
|
||||||
def = this->add("input_filename", coString);
|
new_def("input_filename", coString, "Full input filename", "Source filename of the first object.");
|
||||||
def->label = L("Full input filename");
|
new_def("plate_name", coString, "Plate name", "Name of the plate sliced.");
|
||||||
def->tooltip = L("Source filename of the first object.");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
DimensionsConfigDef::DimensionsConfigDef()
|
DimensionsConfigDef::DimensionsConfigDef()
|
||||||
|
@ -6711,6 +6713,22 @@ DimensionsConfigDef::DimensionsConfigDef()
|
||||||
def = this->add("print_bed_size", coFloats);
|
def = this->add("print_bed_size", coFloats);
|
||||||
def->label = L("Size of the print bed bounding box");
|
def->label = L("Size of the print bed bounding box");
|
||||||
def->tooltip = bb_size_tooltip;
|
def->tooltip = bb_size_tooltip;
|
||||||
|
|
||||||
|
new_def("first_layer_center_no_wipe_tower", coFloats, "First layer center without wipe tower", point_tooltip);
|
||||||
|
new_def("first_layer_height", coFloat, "First layer height", "Height of the first layer.");
|
||||||
|
}
|
||||||
|
|
||||||
|
TemperaturesConfigDef::TemperaturesConfigDef()
|
||||||
|
{
|
||||||
|
ConfigOptionDef* def;
|
||||||
|
|
||||||
|
new_def("bed_temperature", coInts, "Bed temperature", "Vector of bed temperatures for each extruder/filament.")
|
||||||
|
new_def("bed_temperature_initial_layer", coInts, "Initial layer bed temperature", "Vector of initial layer bed temperatures for each extruder/filament. Provides the same value as first_layer_bed_temperature.")
|
||||||
|
new_def("bed_temperature_initial_layer_single", coInt, "Initial layer bed temperature (initial extruder)", "Initial layer bed temperature for the initial extruder. Same as bed_temperature_initial_layer[initial_extruder]")
|
||||||
|
new_def("chamber_temperature", coInts, "Chamber temperature", "Vector of chamber temperatures for each extruder/filament.")
|
||||||
|
new_def("overall_chamber_temperature", coInt, "Overall chamber temperature", "Overall chamber temperature. This value is the maximum chamber temperature of any extruder/filament used.")
|
||||||
|
new_def("first_layer_bed_temperature", coInts, "First layer bed temperature", "Vector of first layer bed temperatures for each extruder/filament. Provides the same value as bed_temperature_initial_layer.")
|
||||||
|
new_def("first_layer_temperature", coInts, "First layer temperature", "Vector of first layer temperatures for each extruder/filament.")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1480,6 +1480,12 @@ public:
|
||||||
DimensionsConfigDef();
|
DimensionsConfigDef();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class TemperaturesConfigDef : public ConfigDef
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
TemperaturesConfigDef();
|
||||||
|
};
|
||||||
|
|
||||||
class TimestampsConfigDef : public ConfigDef
|
class TimestampsConfigDef : public ConfigDef
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -176,6 +176,14 @@ void EditGCodeDialog::init_params_list(const std::string& custom_gcode_name)
|
||||||
m_params_list->AppendParam(dimensions, get_type(opt_key, def), opt_key);
|
m_params_list->AppendParam(dimensions, get_type(opt_key, def), opt_key);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add temperature subgroup
|
||||||
|
|
||||||
|
if (!cgp_temperatures_config_def.empty()) {
|
||||||
|
wxDataViewItem temperatures = m_params_list->AppendGroup(_L("Temperatures"), "custom-gcode_temperature");
|
||||||
|
for (const auto& [opt_key, def] : cgp_temperatures_config_def.options)
|
||||||
|
m_params_list->AppendParam(temperatures, get_type(opt_key, def), opt_key);
|
||||||
|
}
|
||||||
|
|
||||||
// Add timestamp subgroup
|
// Add timestamp subgroup
|
||||||
|
|
||||||
if (!cgp_timestamps_config_def.empty()) {
|
if (!cgp_timestamps_config_def.empty()) {
|
||||||
|
@ -296,6 +304,7 @@ void EditGCodeDialog::selection_changed(wxDataViewEvent& evt)
|
||||||
&cgp_print_statistics_config_def,
|
&cgp_print_statistics_config_def,
|
||||||
&cgp_objects_info_config_def,
|
&cgp_objects_info_config_def,
|
||||||
&cgp_dimensions_config_def,
|
&cgp_dimensions_config_def,
|
||||||
|
&cgp_temperatures_config_def,
|
||||||
&cgp_timestamps_config_def,
|
&cgp_timestamps_config_def,
|
||||||
&cgp_other_presets_config_def
|
&cgp_other_presets_config_def
|
||||||
}) {
|
}) {
|
||||||
|
|
|
@ -39,6 +39,7 @@ class EditGCodeDialog : public DPIDialog
|
||||||
PrintStatisticsConfigDef cgp_print_statistics_config_def;
|
PrintStatisticsConfigDef cgp_print_statistics_config_def;
|
||||||
ObjectsInfoConfigDef cgp_objects_info_config_def;
|
ObjectsInfoConfigDef cgp_objects_info_config_def;
|
||||||
DimensionsConfigDef cgp_dimensions_config_def;
|
DimensionsConfigDef cgp_dimensions_config_def;
|
||||||
|
TemperaturesConfigDef cgp_temperatures_config_def;
|
||||||
TimestampsConfigDef cgp_timestamps_config_def;
|
TimestampsConfigDef cgp_timestamps_config_def;
|
||||||
OtherPresetsConfigDef cgp_other_presets_config_def;
|
OtherPresetsConfigDef cgp_other_presets_config_def;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue