mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-09 07:56:24 -06:00
Merge branch 'main' into enh-port-edit-gcode-dlg
This commit is contained in:
commit
22302a0f10
4 changed files with 14 additions and 4 deletions
|
@ -295,7 +295,7 @@ static std::vector<Vec2d> get_path_of_change_filament(const Print& print)
|
||||||
: gcodegen.config().nozzle_temperature.get_at(gcodegen.writer().extruder()->id());
|
: gcodegen.config().nozzle_temperature.get_at(gcodegen.writer().extruder()->id());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ioannis Giannakas:
|
// Orca:
|
||||||
// Function to calculate the excess retraction length that should be retracted either before or after wiping
|
// Function to calculate the excess retraction length that should be retracted either before or after wiping
|
||||||
// in order for the wipe operation to respect the filament retraction speed
|
// in order for the wipe operation to respect the filament retraction speed
|
||||||
Wipe::RetractionValues Wipe::calculateWipeRetractionLengths(GCode& gcodegen, bool toolchange) {
|
Wipe::RetractionValues Wipe::calculateWipeRetractionLengths(GCode& gcodegen, bool toolchange) {
|
||||||
|
|
|
@ -572,6 +572,7 @@ void CalibPressureAdvancePattern::generate_custom_gcodes(const DynamicPrintConfi
|
||||||
gcode << "; start pressure advance pattern for layer\n";
|
gcode << "; start pressure advance pattern for layer\n";
|
||||||
|
|
||||||
gcode << m_writer.travel_to_z(layer_height, "Move to layer height");
|
gcode << m_writer.travel_to_z(layer_height, "Move to layer height");
|
||||||
|
gcode << m_writer.reset_e();
|
||||||
}
|
}
|
||||||
|
|
||||||
// line numbering
|
// line numbering
|
||||||
|
@ -650,6 +651,7 @@ void CalibPressureAdvancePattern::generate_custom_gcodes(const DynamicPrintConfi
|
||||||
gcode << m_writer.travel_to_z(zhop_height, "z-hop before move");
|
gcode << m_writer.travel_to_z(zhop_height, "z-hop before move");
|
||||||
gcode << move_to(Vec2d(to_x, to_y), m_writer, "Move back to start position");
|
gcode << move_to(Vec2d(to_x, to_y), m_writer, "Move back to start position");
|
||||||
gcode << m_writer.travel_to_z(layer_height, "undo z-hop");
|
gcode << m_writer.travel_to_z(layer_height, "undo z-hop");
|
||||||
|
gcode << m_writer.reset_e(); // reset extruder before printing placeholder cube to avoid
|
||||||
} else {
|
} else {
|
||||||
// everything done
|
// everything done
|
||||||
}
|
}
|
||||||
|
|
|
@ -990,8 +990,7 @@ boost::any ConfigOptionsGroup::get_config_value(const DynamicPrintConfig& config
|
||||||
}
|
}
|
||||||
case coPercent:{
|
case coPercent:{
|
||||||
double val = config.option<ConfigOptionPercent>(opt_key)->value;
|
double val = config.option<ConfigOptionPercent>(opt_key)->value;
|
||||||
text_value = wxString::Format(_T("%i"), int(val));
|
ret = double_to_string(val);// += "%";
|
||||||
ret = text_value;// += "%";
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case coPercents:
|
case coPercents:
|
||||||
|
|
|
@ -8843,9 +8843,14 @@ void Plater::_calib_pa_pattern(const Calib_Params& params)
|
||||||
changed_objects({ 0 });
|
changed_objects({ 0 });
|
||||||
_calib_pa_select_added_objects();
|
_calib_pa_select_added_objects();
|
||||||
|
|
||||||
const DynamicPrintConfig& printer_config = wxGetApp().preset_bundle->printers.get_edited_preset().config;
|
DynamicPrintConfig& printer_config = wxGetApp().preset_bundle->printers.get_edited_preset().config;
|
||||||
DynamicPrintConfig& print_config = wxGetApp().preset_bundle->prints.get_edited_preset().config;
|
DynamicPrintConfig& print_config = wxGetApp().preset_bundle->prints.get_edited_preset().config;
|
||||||
|
auto filament_config = &wxGetApp().preset_bundle->filaments.get_edited_preset().config;
|
||||||
double nozzle_diameter = printer_config.option<ConfigOptionFloats>("nozzle_diameter")->get_at(0);
|
double nozzle_diameter = printer_config.option<ConfigOptionFloats>("nozzle_diameter")->get_at(0);
|
||||||
|
filament_config->set_key_value("filament_retract_when_changing_layer", new ConfigOptionBoolsNullable{false});
|
||||||
|
filament_config->set_key_value("filament_wipe", new ConfigOptionBoolsNullable{false});
|
||||||
|
printer_config.set_key_value("wipe", new ConfigOptionBools{false});
|
||||||
|
printer_config.set_key_value("retract_when_changing_layer", new ConfigOptionBools{false});
|
||||||
|
|
||||||
for (const auto opt : SuggestedConfigCalibPAPattern().float_pairs) {
|
for (const auto opt : SuggestedConfigCalibPAPattern().float_pairs) {
|
||||||
print_config.set_key_value(
|
print_config.set_key_value(
|
||||||
|
@ -8879,7 +8884,11 @@ void Plater::_calib_pa_pattern(const Calib_Params& params)
|
||||||
);
|
);
|
||||||
|
|
||||||
wxGetApp().get_tab(Preset::TYPE_PRINT)->update_dirty();
|
wxGetApp().get_tab(Preset::TYPE_PRINT)->update_dirty();
|
||||||
|
wxGetApp().get_tab(Preset::TYPE_FILAMENT)->update_dirty();
|
||||||
|
wxGetApp().get_tab(Preset::TYPE_PRINTER)->update_dirty();
|
||||||
wxGetApp().get_tab(Preset::TYPE_PRINT)->reload_config();
|
wxGetApp().get_tab(Preset::TYPE_PRINT)->reload_config();
|
||||||
|
wxGetApp().get_tab(Preset::TYPE_FILAMENT)->reload_config();
|
||||||
|
wxGetApp().get_tab(Preset::TYPE_PRINTER)->reload_config();
|
||||||
|
|
||||||
const DynamicPrintConfig full_config = wxGetApp().preset_bundle->full_config();
|
const DynamicPrintConfig full_config = wxGetApp().preset_bundle->full_config();
|
||||||
PresetBundle* preset_bundle = wxGetApp().preset_bundle;
|
PresetBundle* preset_bundle = wxGetApp().preset_bundle;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue