3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 20:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

FIX: fix cali bug

Browse source 
Change-Id: I0c7c8d5ebad8139a0959ef9bd2c7991b52fde0c1
(cherry picked from commit 7c1340023a740dc7a8e7938354cd6130b367e03d)
This commit is contained in:
zhimin.zeng 2023-07-04 12:02:35 +08:00 • committed by Lane.Wei
parent 83ee1f2050
commit 289dec3997
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/slic3r/GUI/CalibrationWizard.cpp
View file

@ -826,6 +826,7 @@ void FlowRateWizard::on_cali_save()
if (!save_preset(old_preset_name, new_preset_name.ToStdString(), key_value_map, message)) { if (!save_preset(old_preset_name, new_preset_name.ToStdString(), key_value_map, message)) {
MessageDialog error_msg_dlg(nullptr, message, wxEmptyString, wxICON_WARNING | wxOK); MessageDialog error_msg_dlg(nullptr, message, wxEmptyString, wxICON_WARNING | wxOK);
error_msg_dlg.ShowModal(); error_msg_dlg.ShowModal();
return;
} }
MessageDialog msg_dlg(nullptr, _L("Flow rate calibration result has been saved to preset"), wxEmptyString, wxICON_WARNING | wxOK); MessageDialog msg_dlg(nullptr, _L("Flow rate calibration result has been saved to preset"), wxEmptyString, wxICON_WARNING | wxOK);
@ -1077,7 +1078,11 @@ void MaxVolumetricSpeedWizard::on_cali_save()
if (!save_preset(old_preset_name, new_preset_name, key_value_map, message)) { if (!save_preset(old_preset_name, new_preset_name, key_value_map, message)) {
MessageDialog error_msg_dlg(nullptr, message, wxEmptyString, wxICON_WARNING | wxOK); MessageDialog error_msg_dlg(nullptr, message, wxEmptyString, wxICON_WARNING | wxOK);
error_msg_dlg.ShowModal(); error_msg_dlg.ShowModal();
return;
} }
MessageDialog msg_dlg(nullptr, _L("Max volumetric speed calibration result has been saved to preset"), wxEmptyString, wxICON_WARNING | wxOK);
msg_dlg.ShowModal();
} }
void MaxVolumetricSpeedWizard::on_cali_job_finished(wxString evt_data) void MaxVolumetricSpeedWizard::on_cali_job_finished(wxString evt_data)

8
src/slic3r/GUI/CalibrationWizardPresetPage.cpp
View file

@ -1463,7 +1463,7 @@ void CalibrationPresetPage::select_default_compatible_filament()
Preset* preset = const_cast<Preset *>(fcb->GetComboBox()->get_selected_preset()); Preset* preset = const_cast<Preset *>(fcb->GetComboBox()->get_selected_preset());
if (m_cali_filament_mode == CalibrationFilamentMode::CALI_MODEL_SINGLE) { if (m_cali_filament_mode == CalibrationFilamentMode::CALI_MODEL_SINGLE) {
if (is_filaments_compatiable({preset})) { if (preset && is_filaments_compatiable({preset})) {
fcb->GetRadioBox()->SetValue(true); fcb->GetRadioBox()->SetValue(true);
wxCommandEvent event(wxEVT_RADIOBUTTON); wxCommandEvent event(wxEVT_RADIOBUTTON);
event.SetEventObject(this); event.SetEventObject(this);
@ -1473,6 +1473,10 @@ void CalibrationPresetPage::select_default_compatible_filament()
} else } else
fcb->GetRadioBox()->SetValue(false); fcb->GetRadioBox()->SetValue(false);
} else if (m_cali_filament_mode == CalibrationFilamentMode::CALI_MODEL_MULITI) { } else if (m_cali_filament_mode == CalibrationFilamentMode::CALI_MODEL_MULITI) {
if (!preset) {
fcb->GetCheckBox()->SetValue(false);
continue;
}
multi_select_filaments.push_back(preset); multi_select_filaments.push_back(preset);
if (!is_filaments_compatiable(multi_select_filaments)) { if (!is_filaments_compatiable(multi_select_filaments)) {
multi_select_filaments.pop_back(); multi_select_filaments.pop_back();
@ -1490,7 +1494,7 @@ void CalibrationPresetPage::select_default_compatible_filament()
} }
else if (m_ext_spool_radiobox->GetValue()){ else if (m_ext_spool_radiobox->GetValue()){
Preset *preset = const_cast<Preset *>(m_virtual_tray_comboBox->GetComboBox()->get_selected_preset()); Preset *preset = const_cast<Preset *>(m_virtual_tray_comboBox->GetComboBox()->get_selected_preset());
if (is_filaments_compatiable({preset})) { if (preset && is_filaments_compatiable({preset})) {
m_virtual_tray_comboBox->GetRadioBox()->SetValue(true); m_virtual_tray_comboBox->GetRadioBox()->SetValue(true);
} else } else
m_virtual_tray_comboBox->GetRadioBox()->SetValue(false); m_virtual_tray_comboBox->GetRadioBox()->SetValue(false);

2
src/slic3r/Utils/CalibUtils.cpp
View file

@ -826,7 +826,7 @@ void CalibUtils::send_to_print(const CalibInfo &calib_info, std::string &error_m
return; return;
} }
if (obj_->is_in_printing()) { if (obj_->is_in_upgrading()) {
error_message = L("Cannot send the print job when the printer is updating firmware"); error_message = L("Cannot send the print job when the printer is updating firmware");
return; return;
} }