diff --git a/src/slic3r/GUI/calib_dlg.cpp b/src/slic3r/GUI/calib_dlg.cpp index e36073ea45..448920a7bd 100644 --- a/src/slic3r/GUI/calib_dlg.cpp +++ b/src/slic3r/GUI/calib_dlg.cpp @@ -200,7 +200,7 @@ void PA_Calibration_Dlg::reset_params() { if (!isDDE) { m_tiEndPA->GetTextCtrl()->SetValue(wxString::FromDouble(1.0)); - + if (m_params.mode == CalibMode::Calib_PA_Pattern) { m_tiPAStep->GetTextCtrl()->SetValue(wxString::FromDouble(0.05)); } else { @@ -209,12 +209,12 @@ void PA_Calibration_Dlg::reset_params() { } } -void PA_Calibration_Dlg::on_start(wxCommandEvent& event) { +void PA_Calibration_Dlg::on_start(wxCommandEvent& event) { bool read_double = false; read_double = m_tiStartPA->GetTextCtrl()->GetValue().ToDouble(&m_params.start); read_double = read_double && m_tiEndPA->GetTextCtrl()->GetValue().ToDouble(&m_params.end); read_double = read_double && m_tiPAStep->GetTextCtrl()->GetValue().ToDouble(&m_params.step); - if (!read_double || m_params.start < 0 || m_params.step < EPSILON || m_params.end < m_params.start + m_params.step) { + if (!read_double || m_params.start < 0 || m_params.step < 10 * EPSILON || m_params.end < m_params.start + m_params.step) { MessageDialog msg_dlg(nullptr, _L("Please input valid values:\nStart PA: >= 0.0\nEnd PA: > Start PA\nPA step: >= 0.001"), wxEmptyString, wxICON_WARNING | wxOK); msg_dlg.ShowModal(); return; @@ -239,17 +239,17 @@ void PA_Calibration_Dlg::on_start(wxCommandEvent& event) { EndModal(wxID_OK); } -void PA_Calibration_Dlg::on_extruder_type_changed(wxCommandEvent& event) { +void PA_Calibration_Dlg::on_extruder_type_changed(wxCommandEvent& event) { PA_Calibration_Dlg::reset_params(); - event.Skip(); + event.Skip(); } -void PA_Calibration_Dlg::on_method_changed(wxCommandEvent& event) { +void PA_Calibration_Dlg::on_method_changed(wxCommandEvent& event) { PA_Calibration_Dlg::reset_params(); - event.Skip(); + event.Skip(); } void PA_Calibration_Dlg::on_dpi_changed(const wxRect& suggested_rect) { - this->Refresh(); + this->Refresh(); Fit(); } @@ -266,6 +266,7 @@ enum FILAMENT_TYPE : int tPETG, tPCTG, tTPU, + tTPU_AMS, tPA_CF, tPET_CF, tCustom @@ -376,7 +377,7 @@ Temp_Calibration_Dlg::Temp_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plat e.Skip(); }); - + } Temp_Calibration_Dlg::~Temp_Calibration_Dlg() { @@ -391,7 +392,7 @@ void Temp_Calibration_Dlg::on_start(wxCommandEvent& event) { read_long = read_long && m_tiEnd->GetTextCtrl()->GetValue().ToULong(&end); if (!read_long || start > 350 || end < 170 || end > (start - 5)) { - MessageDialog msg_dlg(nullptr, _L("Please input valid values:\nStart temp: <= 350\nEnd temp: >= 170\nStart temp > End temp + 5"), wxEmptyString, wxICON_WARNING | wxOK); + MessageDialog msg_dlg(nullptr, _L("Please input valid values:\nStart temp: <= 350\nEnd temp: >= 170\nStart temp >= End temp + 5"), wxEmptyString, wxICON_WARNING | wxOK); msg_dlg.ShowModal(); return; } @@ -416,11 +417,12 @@ void Temp_Calibration_Dlg::on_filament_type_changed(wxCommandEvent& event) { start = 250; end = 230; break; - case tPCTG: + case tPCTG: start = 280; end = 240; break; case tTPU: + case tTPU_AMS: start = 240; end = 210; break; @@ -438,7 +440,7 @@ void Temp_Calibration_Dlg::on_filament_type_changed(wxCommandEvent& event) { end = 190; break; } - + m_tiEnd->GetTextCtrl()->SetValue(std::to_string(end)); m_tiStart->GetTextCtrl()->SetValue(std::to_string(start)); event.Skip();