mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NEW: fix blank issue of error tips 

Change-Id: Id4faa6d3edb7d8083000a6e752d059e25aab16a1
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2023-01-13 17:21:23 +08:00 committed by Lane.Wei
parent 81ee7bb99b
commit d0d54db3e4
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/slic3r/GUI/ExtrusionCalibration.cpp
View File

@ -383,22 +383,26 @@ void ExtrusionCalibration::show_info(bool show, bool is_error, wxString text)
{ {
if (show && is_error) { if (show && is_error) {
m_error_text->Show(); m_error_text->Show();
m_error_text->SetLabelText(text); if (m_error_text->GetLabelText().compare(text) != 0)
m_error_text->SetLabelText(text);
m_info_text->Hide(); m_info_text->Hide();
} }
else if (show && !is_error) { else if (show && !is_error) {
m_info_text->Show(); m_info_text->Show();
m_info_text->SetLabelText(text); if (m_info_text->GetLabelText().compare(text) != 0)
m_info_text->SetLabelText(text);
m_error_text->Hide(); m_error_text->Hide();
} }
else { else {
if (is_error) { if (is_error) {
m_info_text->Hide(); m_info_text->Hide();
m_error_text->Show(); m_error_text->Show();
m_error_text->SetLabelText(text); if (m_error_text->GetLabelText().compare(text) != 0)
m_error_text->SetLabelText(text);
} else { } else {
m_info_text->Show(); m_info_text->Show();
m_info_text->SetLabelText(text); if (m_info_text->GetLabelText().compare(text) != 0)
m_info_text->SetLabelText(text);
m_error_text->Hide(); m_error_text->Hide();
} }
} }
@ -414,12 +418,23 @@ void ExtrusionCalibration::update()
m_button_cali->Hide(); m_button_cali->Hide();
m_button_next_step->Hide(); m_button_next_step->Hide();
} else if (obj->is_extrusion_cali_finished()) { } else if (obj->is_extrusion_cali_finished()) {
show_info(true, false, _L("Calibration completed")); if (m_bed_temp->GetTextCtrl()->GetValue().compare("0") == 0) {
wxString tips = get_bed_type_incompatible(false);
show_info(true, true, tips);
}
else {
show_info(true, false, _L("Calibration completed"));
}
m_cali_cancel->Hide(); m_cali_cancel->Hide();
m_button_cali->Show(); m_button_cali->Show();
m_button_next_step->Show(); m_button_next_step->Show();
} else { } else {
show_info(false, false, wxEmptyString); if (m_bed_temp->GetTextCtrl()->GetValue().compare("0") == 0) {
wxString tips = get_bed_type_incompatible(false);
show_info(true, true, tips);
} else {
show_info(true, false, wxEmptyString);
}
m_cali_cancel->Hide(); m_cali_cancel->Hide();
m_button_cali->Show(); m_button_cali->Show();
m_button_next_step->Hide(); m_button_next_step->Hide();
@ -676,12 +691,14 @@ void ExtrusionCalibration::update_combobox_filaments()
m_button_cali->Enable(); m_button_cali->Enable();
} }
void ExtrusionCalibration::show_bed_type_incompatible(bool incompatible) wxString ExtrusionCalibration::get_bed_type_incompatible(bool incompatible)
{ {
if (incompatible) { if (incompatible) {
show_info(false, true, wxEmptyString);
m_button_cali->Enable(); m_button_cali->Enable();
} else { return wxEmptyString;
}
else {
m_button_cali->Disable();
std::string filament_alias = ""; std::string filament_alias = "";
PresetBundle* preset_bundle = wxGetApp().preset_bundle; PresetBundle* preset_bundle = wxGetApp().preset_bundle;
if (preset_bundle) { if (preset_bundle) {
@ -693,8 +710,7 @@ void ExtrusionCalibration::show_bed_type_incompatible(bool incompatible)
} }
} }
wxString tips = wxString::Format(_L("%s does not support %s"), m_comboBox_bed_type->GetValue(), filament_alias); wxString tips = wxString::Format(_L("%s does not support %s"), m_comboBox_bed_type->GetValue(), filament_alias);
show_info(true, true, tips); return tips;
m_button_cali->Disable();
} }
} }
@ -793,13 +809,6 @@ void ExtrusionCalibration::update_filament_info()
} }
} }
} }
// incompatible bed type and filament
if (bed_temp_int == 0) {
show_bed_type_incompatible(false);
} else {
show_bed_type_incompatible(true);
}
} }
int ExtrusionCalibration::get_bed_temp(DynamicPrintConfig* config) int ExtrusionCalibration::get_bed_temp(DynamicPrintConfig* config)

2
src/slic3r/GUI/ExtrusionCalibration.hpp
View File

@ -85,7 +85,7 @@ protected:
void update_filament_info(); void update_filament_info();
void update_combobox_filaments(); void update_combobox_filaments();
void show_bed_type_incompatible(bool incompatible); wxString get_bed_type_incompatible(bool incompatible);
void show_info(bool show, bool is_error, wxString text); void show_info(bool show, bool is_error, wxString text);
int get_bed_temp(DynamicPrintConfig* config); int get_bed_temp(DynamicPrintConfig* config);