From d208272695a7961c0a3a35c590ada166eca8eb0e Mon Sep 17 00:00:00 2001 From: "liz.li" Date: Tue, 4 Jul 2023 11:42:57 +0800 Subject: [PATCH] ENH: adjust layout of preset page Change-Id: I4b58b905071586f1d639adebed080c90e75b4553 --- src/slic3r/GUI/CaliHistoryDialog.cpp | 6 +-- src/slic3r/GUI/CalibrationPanel.cpp | 2 +- src/slic3r/GUI/CalibrationWizard.cpp | 2 +- src/slic3r/GUI/CalibrationWizardPage.cpp | 4 +- .../GUI/CalibrationWizardPresetPage.cpp | 43 +++++++++---------- .../GUI/CalibrationWizardPresetPage.hpp | 1 + src/slic3r/GUI/CalibrationWizardSavePage.cpp | 2 +- src/slic3r/GUI/CalibrationWizardStartPage.cpp | 2 +- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/slic3r/GUI/CaliHistoryDialog.cpp b/src/slic3r/GUI/CaliHistoryDialog.cpp index cc3b8ca5a..0152a88e0 100644 --- a/src/slic3r/GUI/CaliHistoryDialog.cpp +++ b/src/slic3r/GUI/CaliHistoryDialog.cpp @@ -17,7 +17,7 @@ namespace GUI { #define HISTORY_WINDOW_ITEMS_COUNT 4 HistoryWindow::HistoryWindow(wxWindow* parent, const std::vector& calib_results_history) - : DPIDialog(parent, wxID_ANY, _L("Pressure Advance Calibration Result"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE) + : DPIDialog(parent, wxID_ANY, _L("Dynamic Pressure Control Calibration Result"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE) , m_calib_results_history(calib_results_history) { this->SetBackgroundColour(*wxWHITE); @@ -183,7 +183,7 @@ void HistoryWindow::reqeust_history_result(MachineObject* obj) float nozzle_value = get_nozzle_value(); if (nozzle_value > 0) { CalibUtils::emit_get_PA_calib_infos(nozzle_value); - m_tips->SetLabel("Refreshing the historical pressure advance records"); + m_tips->SetLabel("Refreshing the historical Dynamic Pressure Control records"); BOOST_LOG_TRIVIAL(info) << "request calib history"; } } @@ -299,7 +299,7 @@ float HistoryWindow::get_nozzle_value() EditCalibrationHistoryDialog::EditCalibrationHistoryDialog(wxWindow* parent, const PACalibResult& result) - : DPIDialog(parent, wxID_ANY, _L("Edit Pressure Advance"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE) + : DPIDialog(parent, wxID_ANY, _L("Edit Dynamic Pressure Control"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE) , m_new_result(result) { this->SetBackgroundColour(*wxWHITE); diff --git a/src/slic3r/GUI/CalibrationPanel.cpp b/src/slic3r/GUI/CalibrationPanel.cpp index 4cf6ea509..745cf2205 100644 --- a/src/slic3r/GUI/CalibrationPanel.cpp +++ b/src/slic3r/GUI/CalibrationPanel.cpp @@ -19,7 +19,7 @@ wxString get_calibration_type_name(CalibMode cali_mode) { switch (cali_mode) { case CalibMode::Calib_PA_Line: - return _L("Pressure Adavance"); + return _L("Dynamic Pressure Control"); case CalibMode::Calib_Flow_Rate: return _L("Flow Rate"); case CalibMode::Calib_Vol_speed_Tower: diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp index deed4b9fe..19681ac8a 100644 --- a/src/slic3r/GUI/CalibrationWizard.cpp +++ b/src/slic3r/GUI/CalibrationWizard.cpp @@ -514,7 +514,7 @@ void PressureAdvanceWizard::on_cali_save() else { assert(false); } - MessageDialog msg_dlg(nullptr, _L("Pressure advance calibration result has been saved to the printer"), wxEmptyString, wxICON_WARNING | wxOK); + MessageDialog msg_dlg(nullptr, _L("Dynamic Pressure Control calibration result has been saved to the printer"), wxEmptyString, wxICON_WARNING | wxOK); msg_dlg.ShowModal(); } show_step(start_step); diff --git a/src/slic3r/GUI/CalibrationWizardPage.cpp b/src/slic3r/GUI/CalibrationWizardPage.cpp index d001b8379..5483f2f3a 100644 --- a/src/slic3r/GUI/CalibrationWizardPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPage.cpp @@ -24,11 +24,11 @@ CalibrationStyle get_cali_style(MachineObject* obj) wxString get_cali_mode_caption_string(CalibMode mode) { if (mode == CalibMode::Calib_PA_Line) - return _L("Pressure Advance Calibration"); + return _L("Dynamic Pressure Control Calibration"); if (mode == CalibMode::Calib_Flow_Rate) return _L("Flow Rate Calibration"); if (mode == CalibMode::Calib_Vol_speed_Tower) - return _L("Max Volumetric Speed"); + return _L("Max Volumetric Speed Calibration"); return "no cali_mode_caption"; } diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp index 8c745fc7f..b1ebbb0e9 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp @@ -147,7 +147,7 @@ void CaliPresetWarningPanel::create_panel(wxWindow* parent) m_warning_text->SetFont(Label::Body_13); m_warning_text->SetForegroundColour(wxColour(230, 92, 92)); m_warning_text->Wrap(CALIBRATION_TEXT_MAX_LENGTH); - m_top_sizer->Add(m_warning_text, 0, wxEXPAND); + m_top_sizer->Add(m_warning_text, 0, wxEXPAND | wxTOP | wxBOTTOM, FromDIP(5)); } void CaliPresetWarningPanel::set_warning(wxString text) @@ -366,24 +366,27 @@ void CalibrationPresetPage::create_selection_panel(wxWindow* parent) auto panel_sizer = new wxBoxSizer(wxVERTICAL); auto nozzle_combo_text = new wxStaticText(parent, wxID_ANY, _L("Please select the nozzle diameter of your printer"), wxDefaultPosition, wxDefaultSize, 0); - nozzle_combo_text->Wrap(-1); nozzle_combo_text->SetFont(Label::Head_14); + nozzle_combo_text->Wrap(-1); panel_sizer->Add(nozzle_combo_text, 0, wxALL, 0); + panel_sizer->AddSpacer(FromDIP(10)); m_comboBox_nozzle_dia = new ComboBox(parent, wxID_ANY, "", wxDefaultPosition, CALIBRATION_COMBOX_SIZE, 0, nullptr, wxCB_READONLY); panel_sizer->Add(m_comboBox_nozzle_dia, 0, wxALL, 0); panel_sizer->AddSpacer(PRESET_GAP); auto plate_type_combo_text = new wxStaticText(parent, wxID_ANY, _L("Please select the plate type of your printer"), wxDefaultPosition, wxDefaultSize, 0); - plate_type_combo_text->Wrap(-1); plate_type_combo_text->SetFont(Label::Head_14); + plate_type_combo_text->Wrap(-1); panel_sizer->Add(plate_type_combo_text, 0, wxALL, 0); + panel_sizer->AddSpacer(FromDIP(10)); m_comboBox_bed_type = new ComboBox(parent, wxID_ANY, "", wxDefaultPosition, CALIBRATION_COMBOX_SIZE, 0, nullptr, wxCB_READONLY); panel_sizer->Add(m_comboBox_bed_type, 0, wxALL, 0); panel_sizer->AddSpacer(PRESET_GAP); m_filament_from_panel = new wxPanel(parent); + m_filament_from_panel->Hide(); auto filament_from_sizer = new wxBoxSizer(wxVERTICAL); auto filament_from_text = new wxStaticText(m_filament_from_panel, wxID_ANY, _L("filament position")); filament_from_text->SetFont(Label::Head_14); @@ -391,18 +394,13 @@ void CalibrationPresetPage::create_selection_panel(wxWindow* parent) auto raioBox_sizer = new wxFlexGridSizer(2, 1, 0, FromDIP(10)); m_ams_radiobox = new wxRadioButton(m_filament_from_panel, wxID_ANY, _L("AMS")); m_ams_radiobox->SetValue(true); - filament_from_text->Hide(); - m_ams_radiobox->Hide(); raioBox_sizer->Add(m_ams_radiobox, 0); m_ext_spool_radiobox = new wxRadioButton(m_filament_from_panel, wxID_ANY, _L("External Spool")); - m_ext_spool_radiobox->Hide(); raioBox_sizer->Add(m_ext_spool_radiobox, 0); filament_from_sizer->Add(raioBox_sizer, 0); m_filament_from_panel->SetSizer(filament_from_sizer); - panel_sizer->Add(m_filament_from_panel, 0); - - panel_sizer->AddSpacer(PRESET_GAP); + panel_sizer->Add(m_filament_from_panel, 0, wxBOTTOM, PRESET_GAP); auto filament_for_title_sizer = new wxBoxSizer(wxHORIZONTAL); auto filament_for_text = new wxStaticText(parent, wxID_ANY, _L("Filament For Calibration"), wxDefaultPosition, wxDefaultSize, 0); @@ -456,13 +454,12 @@ void CalibrationPresetPage::create_filament_list_panel(wxWindow* parent) { auto panel_sizer = new wxBoxSizer(wxVERTICAL); - auto filament_list_tips = new wxStaticText(parent, wxID_ANY, _L("Please select same type of material, because plate temperature might not be compatible with different type of material"), wxDefaultPosition, wxDefaultSize, 0); - filament_list_tips->Hide(); - filament_list_tips->SetFont(Label::Body_13); - filament_list_tips->SetForegroundColour(wxColour(145, 145, 145)); - filament_list_tips->Wrap(CALIBRATION_TEXT_MAX_LENGTH); - panel_sizer->Add(filament_list_tips); - panel_sizer->AddSpacer(FromDIP(10)); + m_filament_list_tips = new wxStaticText(parent, wxID_ANY, _L("Tips for calibration material: \n- Materials that can share same hot bed temperature\n- Different filament brand and family(Brand = Bambu, Family = Basic, Matte)"), wxDefaultPosition, wxDefaultSize, 0); + m_filament_list_tips->Hide(); + m_filament_list_tips->SetFont(Label::Body_13); + m_filament_list_tips->SetForegroundColour(wxColour(145, 145, 145)); + m_filament_list_tips->Wrap(CALIBRATION_TEXT_MAX_LENGTH); + panel_sizer->Add(m_filament_list_tips, 0, wxBOTTOM, FromDIP(10)); // ams panel m_multi_ams_panel = new wxPanel(parent); @@ -716,7 +713,7 @@ void CalibrationPresetPage::create_page(wxWindow* parent) m_top_sizer->Add(m_warning_panel, 0); if (m_show_custom_range) { m_top_sizer->Add(m_custom_range_panel, 0); - m_top_sizer->AddSpacer(PRESET_GAP); + m_top_sizer->AddSpacer(FromDIP(15)); } m_top_sizer->Add(m_tips_panel, 0); m_top_sizer->Add(m_sending_panel, 0); @@ -918,11 +915,9 @@ void CalibrationPresetPage::check_filament_compatible() wxString tips = wxString::Format(_L("%s is not compatible with %s"), m_comboBox_bed_type->GetValue(), incompatiable_filament_name); m_warning_panel->set_warning(tips); } - m_warning_panel->Show(); } else { m_tips_panel->set_params(0, bed_temp, 0); m_warning_panel->set_warning(""); - m_warning_panel->Hide(); } Layout(); @@ -1311,6 +1306,13 @@ void CalibrationPresetPage::set_cali_filament_mode(CalibrationFilamentMode mode) for (int i = 0; i < m_filament_comboBox_list.size(); i++) { m_filament_comboBox_list[i]->set_select_mode(mode); } + + if (mode == CALI_MODEL_MULITI) { + m_filament_list_tips->Show(); + } + else { + m_filament_list_tips->Hide(); + } } void CalibrationPresetPage::set_cali_method(CalibrationMethod method) @@ -1428,8 +1430,6 @@ void CalibrationPresetPage::sync_ams_info(MachineObject* obj) // update filament from panel, display only obj has ams // update multi ams panel, display only obj has multi ams if (obj->has_ams()) { - m_filament_from_panel->Show(); - if (obj->amsList.size() > 1) { m_multi_ams_panel->Show(); on_switch_ams(obj->amsList.begin()->first); @@ -1440,7 +1440,6 @@ void CalibrationPresetPage::sync_ams_info(MachineObject* obj) } else { m_multi_ams_panel->Hide(); - m_filament_from_panel->Hide(); } std::vector ams_info; diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.hpp b/src/slic3r/GUI/CalibrationWizardPresetPage.hpp index 8ca183cdb..964ac0574 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.hpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.hpp @@ -221,6 +221,7 @@ protected: CaliPresetCaliStagePanel* m_cali_stage_panel { nullptr }; wxPanel* m_selection_panel { nullptr }; wxPanel* m_filament_from_panel { nullptr }; + wxStaticText* m_filament_list_tips{ nullptr }; wxPanel* m_multi_ams_panel { nullptr }; wxPanel* m_filament_list_panel { nullptr }; wxPanel* m_ext_spool_panel { nullptr }; diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.cpp b/src/slic3r/GUI/CalibrationWizardSavePage.cpp index 69bcf10e0..11877b27d 100644 --- a/src/slic3r/GUI/CalibrationWizardSavePage.cpp +++ b/src/slic3r/GUI/CalibrationWizardSavePage.cpp @@ -108,7 +108,7 @@ void CaliPASaveAutoPanel::create_panel(wxWindow* parent) { auto complete_text_panel = new wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); wxBoxSizer* complete_text_sizer = new wxBoxSizer(wxVERTICAL); - auto complete_text = new wxStaticText(complete_text_panel, wxID_ANY, _L("We found the best Pressure Advance Factor")); + auto complete_text = new wxStaticText(complete_text_panel, wxID_ANY, _L("We found the best Dynamic Pressure Control Factor")); complete_text->SetFont(Label::Head_14); complete_text->Wrap(CALIBRATION_TEXT_MAX_LENGTH); complete_text_sizer->Add(complete_text, 0, wxALIGN_CENTER); diff --git a/src/slic3r/GUI/CalibrationWizardStartPage.cpp b/src/slic3r/GUI/CalibrationWizardStartPage.cpp index 3b340fc8f..8216244f4 100644 --- a/src/slic3r/GUI/CalibrationWizardStartPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardStartPage.cpp @@ -81,7 +81,7 @@ void CalibrationPAStartPage::create_page(wxWindow* parent) m_page_caption->show_prev_btn(false); m_top_sizer->Add(m_page_caption, 0, wxEXPAND, 0); create_when(parent, - _L("When you need Pressure Advance Calibration"), + _L("When you need Dynamic Pressure Control Calibration"), _L("uneven extrusion")); m_top_sizer->Add(m_when_title);