mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-20 11:53:48 +00:00
FIX:Modify the calibration interface display issue
jira:[STUDIO-12708] Change-Id: Ifd10db6df9f7ad3263d33817ec8f4c23abc16bab (cherry picked from commit 25741d8baefb44e643eeb184e3922650a288def0)
This commit is contained in:
@@ -116,7 +116,7 @@ CalibrationDialog::CalibrationDialog(Plater *plater)
|
|||||||
wxBoxSizer *cali_right_sizer_h = new wxBoxSizer(wxHORIZONTAL);
|
wxBoxSizer *cali_right_sizer_h = new wxBoxSizer(wxHORIZONTAL);
|
||||||
wxBoxSizer *cali_right_sizer_v = new wxBoxSizer(wxVERTICAL);
|
wxBoxSizer *cali_right_sizer_v = new wxBoxSizer(wxVERTICAL);
|
||||||
|
|
||||||
auto cali_right_panel = new StaticBox(body_panel, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(182), FromDIP(160)));
|
auto cali_right_panel = new StaticBox(body_panel, wxID_ANY, wxDefaultPosition, wxSize(FromDIP(182), FromDIP(200)));
|
||||||
cali_right_panel->SetBackgroundColor(BG_COLOR);
|
cali_right_panel->SetBackgroundColor(BG_COLOR);
|
||||||
cali_right_panel->SetBorderColor(BG_COLOR);
|
cali_right_panel->SetBorderColor(BG_COLOR);
|
||||||
|
|
||||||
@@ -256,12 +256,14 @@ void CalibrationDialog::update_cali(MachineObject *obj)
|
|||||||
if (obj->is_calibration_done()) {
|
if (obj->is_calibration_done()) {
|
||||||
m_calibration_btn->Enable();
|
m_calibration_btn->Enable();
|
||||||
m_calibration_btn->SetLabel(_L("Completed"));
|
m_calibration_btn->SetLabel(_L("Completed"));
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
// RUNNING && IDLE
|
// RUNNING && IDLE
|
||||||
m_calibration_btn->Disable();
|
m_calibration_btn->Disable();
|
||||||
m_calibration_btn->SetLabel(_L("Calibrating"));
|
m_calibration_btn->SetLabel(_L("Calibrating"));
|
||||||
|
|
||||||
}
|
}
|
||||||
auto size = wxSize(CALI_FLOW_CONTENT_WIDTH, obj->stage_list_info.size() * FromDIP(44));
|
auto size = wxSize(CALI_FLOW_CONTENT_WIDTH, obj->stage_list_info.size() * FromDIP(35));
|
||||||
if (m_calibration_flow->GetSize().y != size.y) {
|
if (m_calibration_flow->GetSize().y != size.y) {
|
||||||
m_calibration_flow->SetSize(size);
|
m_calibration_flow->SetSize(size);
|
||||||
m_calibration_flow->SetMinSize(size);
|
m_calibration_flow->SetMinSize(size);
|
||||||
@@ -269,6 +271,7 @@ void CalibrationDialog::update_cali(MachineObject *obj)
|
|||||||
m_calibration_flow->Refresh();
|
m_calibration_flow->Refresh();
|
||||||
|
|
||||||
Layout();
|
Layout();
|
||||||
|
|
||||||
}
|
}
|
||||||
if (is_stage_list_info_changed(obj)) {
|
if (is_stage_list_info_changed(obj)) {
|
||||||
// change items if stage_list_info changed
|
// change items if stage_list_info changed
|
||||||
|
|||||||
Reference in New Issue
Block a user