diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 1326826..3b33bbe 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -1572,7 +1572,7 @@ void MainFrame::init_menubar_as_editor() auto calibrationMenu = new wxMenu(); if (m_plater) { - auto flowrateMenu = new wxMenu(); + auto flowrateMenu = new wxMenu(); append_menu_item(flowrateMenu, wxID_ANY, _L("Coarse"), _L("Flow Rate Coarse"), [this](wxCommandEvent &) { m_plater->calib_flowrate_coarse(); }, "", nullptr, [this]() { return m_plater->is_view3D_shown(); }, this); @@ -1585,7 +1585,8 @@ void MainFrame::init_menubar_as_editor() }, "", nullptr, [this]() { return m_plater->is_view3D_shown(); }, this); - calibrationMenu->AppendSubMenu(flowrateMenu, _L("Flow rate")); + //calibrationMenu->AppendSubMenu(flowrateMenu, _L("Flow rate")); + append_submenu(calibrationMenu, flowrateMenu, wxID_ANY, _L("Flow rate"), ""); append_menu_item(calibrationMenu, wxID_ANY, _L("Pressure advance"), _L("Pressure advance"), [this](wxCommandEvent &) { diff --git a/src/slic3r/GUI/calib_dlg.cpp b/src/slic3r/GUI/calib_dlg.cpp index 22b3d18..046563b 100644 --- a/src/slic3r/GUI/calib_dlg.cpp +++ b/src/slic3r/GUI/calib_dlg.cpp @@ -35,7 +35,7 @@ wxBoxSizer *create_item_checkbox(wxString title, wxWindow *parent, bool *value, } FRF_Calibration_Dlg::FRF_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plater* plater) - : DPIDialog(parent, id, _L("Flowrate-Fine Calibration"), wxDefaultPosition, parent->FromDIP(wxSize(-1, 280)), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER), m_plater(plater) + : DPIDialog(parent, id, _L("Flowrate Fine Calibration"), wxDefaultPosition, parent->FromDIP(wxSize(-1, 280)), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER), m_plater(plater) { wxBoxSizer* v_sizer = new wxBoxSizer(wxVERTICAL); SetSizer(v_sizer); @@ -73,7 +73,7 @@ FRF_Calibration_Dlg::FRF_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plater m_tiExtru->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); // desc - auto setting_desc = new wxStaticText(this, wxID_ANY, _u8L("Please note that modifying the extrusion multiplier parameter will affect different extrusion ratios.\nValid values area:0.9-1.1"), + auto setting_desc = new wxStaticText(this, wxID_ANY, _u8L("Please input the best value from the coarse calibration to further determine a more accurate extrusion multiplier."), wxDefaultPosition, desc_size, wxALIGN_LEFT); setting_desc->Wrap(setting_desc->GetClientSize().x);