viewit/OrcaSlicer-KX
5
4
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'main' into feature/orca_network_refactor

Browse Source
This commit is contained in:
SoftFever
2026-01-26 19:34:20 +08:00
parent e39aa183b3 d835efbdd9
commit 79cd76d4a1
5 changed files with 204 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12119,6 +12119,10 @@ void Plater::calib_pa(const Calib_Params& params)
const auto calib_pa_name = wxString::Format(L"Pressure Advance Test");
new_project(false, false, calib_pa_name);
wxGetApp().mainframe->select_tab(size_t(MainFrame::tp3DEditor));
auto print_config = &wxGetApp().preset_bundle->prints.get_edited_preset().config;
auto printer_config = &wxGetApp().preset_bundle->printers.get_edited_preset().config;
print_config->set_key_value("overhang_reverse", new ConfigOptionBool(false));
printer_config->set_key_value("resonance_avoidance", new ConfigOptionBool{false});
switch (params.mode) {
case CalibMode::Calib_PA_Line:
add_model(false, Slic3r::resources_dir() + "/calib/pressure_advance/pressure_advance_test.stl");
@@ -12131,8 +12135,6 @@ void Plater::calib_pa(const Calib_Params& params)
break;
default: break;
}
auto printer_config = &wxGetApp().preset_bundle->printers.get_edited_preset().config;
printer_config->set_key_value("resonance_avoidance", new ConfigOptionBool{false});
p->background_process.fff_print()->set_calib_params(params);
}
@@ -12642,6 +12644,7 @@ void Plater::calib_temp(const Calib_Params& params) {
model().objects[0]->config.set_key_value("brim_object_gap", new ConfigOptionFloat(0.0));
model().objects[0]->config.set_key_value("alternate_extra_wall", new ConfigOptionBool(false));
model().objects[0]->config.set_key_value("seam_slope_type", new ConfigOptionEnum<SeamScarfType>(SeamScarfType::None));
model().objects[0]->config.set_key_value("overhang_reverse", new ConfigOptionBool(false));
auto print_config = &wxGetApp().preset_bundle->prints.get_edited_preset().config;
print_config->set_key_value("enable_wrapping_detection", new ConfigOptionBool(false));
@@ -12716,7 +12719,6 @@ void Plater::calib_max_vol_speed(const Calib_Params& params)
obj_cfg.set_key_value("top_shell_layers", new ConfigOptionInt(0));
obj_cfg.set_key_value("bottom_shell_layers", new ConfigOptionInt(0));
obj_cfg.set_key_value("sparse_infill_density", new ConfigOptionPercent(0));
obj_cfg.set_key_value("overhang_reverse", new ConfigOptionBool(false));
obj_cfg.set_key_value("outer_wall_line_width", new ConfigOptionFloatOrPercent(line_width, false));
obj_cfg.set_key_value("layer_height", new ConfigOptionFloat(layer_height));
obj_cfg.set_key_value("brim_type", new ConfigOptionEnum<BrimType>(btOuterAndInner));
@@ -12785,6 +12787,8 @@ void Plater::calib_retraction(const Calib_Params& params)
obj->config.set_key_value("alternate_extra_wall", new ConfigOptionBool(false));
obj->config.set_key_value("seam_position", new ConfigOptionEnum<SeamPosition>(spAligned));
obj->config.set_key_value("wall_sequence", new ConfigOptionEnum<WallSequence>(WallSequence::InnerOuter));
obj->config.set_key_value("overhang_reverse", new ConfigOptionBool(false));
changed_objects({ 0 });
@@ -12819,7 +12823,6 @@ void Plater::calib_VFA(const Calib_Params& params)
print_config->set_key_value("top_shell_layers", new ConfigOptionInt(0));
print_config->set_key_value("bottom_shell_layers", new ConfigOptionInt(1));
print_config->set_key_value("sparse_infill_density", new ConfigOptionPercent(0));
print_config->set_key_value("overhang_reverse", new ConfigOptionBool(false));
print_config->set_key_value("detect_thin_wall", new ConfigOptionBool(false));
print_config->set_key_value("spiral_mode", new ConfigOptionBool(true));
print_config->set_key_value("enable_wrapping_detection", new ConfigOptionBool(false));