juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-18 19:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: fix some calib dialog bug

Browse Source 
jira: STUDIO-12984 & STUDIO-12979 & STUDIO-12978
Change-Id: I29fadd20b29c76a288755122dd027820fed9252e
(cherry picked from commit 1739177f3cd10b81fd1924059f6da9ba4778ba5a)
This commit is contained in:
zhimin.zeng
2025-06-30 09:57:27 +08:00
committed by Noisyfox
parent 27943f7047
commit 885e905e76
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/slic3r/GUI/calib_dlg.cpp
View File

@@ -200,7 +200,7 @@ void PA_Calibration_Dlg::reset_params() {
if (!isDDE) { if (!isDDE) {
m_tiEndPA->GetTextCtrl()->SetValue(wxString::FromDouble(1.0)); m_tiEndPA->GetTextCtrl()->SetValue(wxString::FromDouble(1.0));
if (m_params.mode == CalibMode::Calib_PA_Pattern) { if (m_params.mode == CalibMode::Calib_PA_Pattern) {
m_tiPAStep->GetTextCtrl()->SetValue(wxString::FromDouble(0.05)); m_tiPAStep->GetTextCtrl()->SetValue(wxString::FromDouble(0.05));
} else { } 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; bool read_double = false;
read_double = m_tiStartPA->GetTextCtrl()->GetValue().ToDouble(&m_params.start); 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_tiEndPA->GetTextCtrl()->GetValue().ToDouble(&m_params.end);
read_double = read_double && m_tiPAStep->GetTextCtrl()->GetValue().ToDouble(&m_params.step); 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); 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(); msg_dlg.ShowModal();
return; return;
@@ -239,17 +239,17 @@ void PA_Calibration_Dlg::on_start(wxCommandEvent& event) {
EndModal(wxID_OK); 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(); 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(); PA_Calibration_Dlg::reset_params();
event.Skip(); event.Skip();
} }
void PA_Calibration_Dlg::on_dpi_changed(const wxRect& suggested_rect) { void PA_Calibration_Dlg::on_dpi_changed(const wxRect& suggested_rect) {
this->Refresh(); this->Refresh();
Fit(); Fit();
} }
@@ -266,6 +266,7 @@ enum FILAMENT_TYPE : int
tPETG, tPETG,
tPCTG, tPCTG,
tTPU, tTPU,
tTPU_AMS,
tPA_CF, tPA_CF,
tPET_CF, tPET_CF,
tCustom tCustom
@@ -376,7 +377,7 @@ Temp_Calibration_Dlg::Temp_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plat
e.Skip(); e.Skip();
}); });
} }
Temp_Calibration_Dlg::~Temp_Calibration_Dlg() { 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); read_long = read_long && m_tiEnd->GetTextCtrl()->GetValue().ToULong(&end);
if (!read_long || start > 350 || end < 170 || end > (start - 5)) { 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(); msg_dlg.ShowModal();
return; return;
} }
@@ -416,11 +417,12 @@ void Temp_Calibration_Dlg::on_filament_type_changed(wxCommandEvent& event) {
start = 250; start = 250;
end = 230; end = 230;
break; break;
case tPCTG: case tPCTG:
start = 280; start = 280;
end = 240; end = 240;
break; break;
case tTPU: case tTPU:
case tTPU_AMS:
start = 240; start = 240;
end = 210; end = 210;
break; break;
@@ -438,7 +440,7 @@ void Temp_Calibration_Dlg::on_filament_type_changed(wxCommandEvent& event) {
end = 190; end = 190;
break; break;
} }
m_tiEnd->GetTextCtrl()->SetValue(std::to_string(end)); m_tiEnd->GetTextCtrl()->SetValue(std::to_string(end));
m_tiStart->GetTextCtrl()->SetValue(std::to_string(start)); m_tiStart->GetTextCtrl()->SetValue(std::to_string(start));
event.Skip(); event.Skip();