juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: the calibration dialog fault

Browse Source 
jira: [none]
Change-Id: I775ae45aa992fec281c6c5452c2ce9454b80aa4b
(cherry picked from commit 44e056932fcdf7c88e2ea55c78508c9bc9552b40)
This commit is contained in:
xin.zhang
2025-01-13 21:56:42 +08:00
committed by Noisyfox
parent 0803186472
commit ff21ff5618
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/slic3r/GUI/Calibration.cpp
View File

@@ -125,7 +125,7 @@ CalibrationDialog::CalibrationDialog(Plater *plater)
auto calibration_sizer = new wxBoxSizer(wxVERTICAL); auto calibration_sizer = new wxBoxSizer(wxVERTICAL);
calibration_panel->SetMinSize(wxSize(FromDIP(170), FromDIP(160))); calibration_panel->SetMinSize(wxSize(FromDIP(170), FromDIP(160)));
calibration_panel->SetSize(wxSize(FromDIP(170), FromDIP(160))); calibration_panel->SetSize(wxSize(FromDIP(170), FromDIP(160)));
m_calibration_flow = new StepIndicator(calibration_panel, wxID_ANY); m_calibration_flow = new StepIndicator(calibration_panel, wxID_ANY);
StateColor bg_color(std::pair<wxColour, int>(BG_COLOR, StateColor::Normal)); StateColor bg_color(std::pair<wxColour, int>(BG_COLOR, StateColor::Normal));
m_calibration_flow->SetBackgroundColor(bg_color); m_calibration_flow->SetBackgroundColor(bg_color);
@@ -133,7 +133,7 @@ CalibrationDialog::CalibrationDialog(Plater *plater)
m_calibration_flow->SetMinSize(wxSize(FromDIP(170), FromDIP(160))); m_calibration_flow->SetMinSize(wxSize(FromDIP(170), FromDIP(160)));
m_calibration_flow->SetSize(wxSize(FromDIP(170), FromDIP(160))); m_calibration_flow->SetSize(wxSize(FromDIP(170), FromDIP(160)));
calibration_panel->SetSizer(calibration_sizer); calibration_panel->SetSizer(calibration_sizer);
calibration_panel->Layout(); calibration_panel->Layout();
calibration_sizer->Add(m_calibration_flow, 0, wxEXPAND, 0); calibration_sizer->Add(m_calibration_flow, 0, wxEXPAND, 0);
@@ -221,7 +221,7 @@ void CalibrationDialog::update_cali(MachineObject *obj)
select_xcam_cali->Hide(); select_xcam_cali->Hide();
m_checkbox_list["xcam_cali"]->SetValue(false); m_checkbox_list["xcam_cali"]->SetValue(false);
} }
if(obj->is_support_auto_leveling){ if(obj->is_support_auto_leveling){
select_bed_leveling->Show(); select_bed_leveling->Show();
}else{ }else{
@@ -299,14 +299,6 @@ void CalibrationDialog::update_cali(MachineObject *obj)
m_calibration_btn->Enable(); m_calibration_btn->Enable();
} }
} }
if (!obj->is_calibration_running() && !m_checkbox_list["vibration"]->GetValue() && !m_checkbox_list["bed_leveling"]->GetValue() &&
!m_checkbox_list["xcam_cali"]->GetValue() && !m_checkbox_list["motor_noise"]->GetValue()) {
m_calibration_btn->Disable();
m_calibration_btn->SetLabel(_L("No step selected"));
}
else if(!obj->is_calibration_running()){
m_calibration_btn->Enable();
}
} }
bool CalibrationDialog::is_stage_list_info_changed(MachineObject *obj) bool CalibrationDialog::is_stage_list_info_changed(MachineObject *obj)
@@ -345,11 +337,11 @@ void CalibrationDialog::on_start_calibration(wxMouseEvent &event)
void CalibrationDialog::update_machine_obj(MachineObject *obj) { m_obj = obj; } void CalibrationDialog::update_machine_obj(MachineObject *obj) { m_obj = obj; }
bool CalibrationDialog::Show(bool show) bool CalibrationDialog::Show(bool show)
{ {
if (show) { if (show) {
wxGetApp().UpdateDlgDarkUI(this); wxGetApp().UpdateDlgDarkUI(this);
CentreOnParent(); CentreOnParent();
} }
return DPIDialog::Show(show); return DPIDialog::Show(show);
} }