3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-14 10:17:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIX: fix p1p pa cali bug and go back home after save

Browse source 
Change-Id: I842d38b5dcefe9493ef4685684c3cc57de489c0b
This commit is contained in:
zhimin.zeng 2023-07-04 15:45:39 +08:00 • committed by Lane.Wei
parent cc2536e719
commit d3b9d5dcdc
3 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -523,6 +523,7 @@ void PressureAdvanceWizard::on_cali_save()
MessageDialog msg_dlg(nullptr, _L("Pressure advance calibration result has been saved to the printer"), wxEmptyString, wxICON_WARNING | wxOK); MessageDialog msg_dlg(nullptr, _L("Pressure advance calibration result has been saved to the printer"), wxEmptyString, wxICON_WARNING | wxOK);
msg_dlg.ShowModal(); msg_dlg.ShowModal();
} }
show_step(start_step);
} }
FlowRateWizard::FlowRateWizard(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style) FlowRateWizard::FlowRateWizard(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style)
@ -787,6 +788,7 @@ void FlowRateWizard::on_cali_save()
if (!save_preset(old_preset_name, new_results[i].first.ToStdString(), key_value_map, message)) { if (!save_preset(old_preset_name, new_results[i].first.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;
} }
} }
@ -835,6 +837,7 @@ void FlowRateWizard::on_cali_save()
assert(false); assert(false);
} }
} }
show_step(start_step);
} }
void FlowRateWizard::update(MachineObject* obj) void FlowRateWizard::update(MachineObject* obj)
@ -1082,6 +1085,7 @@ void MaxVolumetricSpeedWizard::on_cali_save()
MessageDialog msg_dlg(nullptr, _L("Max volumetric speed calibration result has been saved to preset"), wxEmptyString, wxICON_WARNING | wxOK); MessageDialog msg_dlg(nullptr, _L("Max volumetric speed calibration result has been saved to preset"), wxEmptyString, wxICON_WARNING | wxOK);
msg_dlg.ShowModal(); msg_dlg.ShowModal();
show_step(start_step);
} }
void MaxVolumetricSpeedWizard::on_cali_job_finished(wxString evt_data) void MaxVolumetricSpeedWizard::on_cali_job_finished(wxString evt_data)

20
src/slic3r/GUI/CalibrationWizardPage.cpp
View file

@ -109,6 +109,26 @@ CalibMode get_obj_calibration_mode(const MachineObject* obj, CalibrationMethod&
return CalibMode::Calib_Flow_Rate; return CalibMode::Calib_Flow_Rate;
} }
if (obj->printer_type == "C11" || obj->printer_type == "C12") {
if (boost::contains(obj->subtask_name, "auto_filament_cali")) {
method = CalibrationMethod::CALI_METHOD_AUTO;
return CalibMode::Calib_PA_Line;
}
if (boost::contains(obj->subtask_name, "user_cali_manual_pa")) {
method = CalibrationMethod::CALI_METHOD_MANUAL;
return CalibMode::Calib_PA_Line;
}
if (boost::contains(obj->subtask_name, "extrusion_cali")) {
method == CalibrationMethod::CALI_METHOD_MANUAL;
return CalibMode::Calib_PA_Line;
}
if (boost::contains(obj->subtask_name, "abs_flowcalib_cali")) {
method = CalibrationMethod::CALI_METHOD_AUTO;
return CalibMode::Calib_Flow_Rate;
}
}
CalibMode cali_mode = CalibUtils::get_calib_mode_by_name(obj->subtask_name, cali_stage); CalibMode cali_mode = CalibUtils::get_calib_mode_by_name(obj->subtask_name, cali_stage);
if (cali_mode != CalibMode::Calib_None) { if (cali_mode != CalibMode::Calib_None) {
method = CalibrationMethod::CALI_METHOD_MANUAL; method = CalibrationMethod::CALI_METHOD_MANUAL;

2
src/slic3r/GUI/DeviceManager.hpp
View file

@ -347,7 +347,7 @@ public:
CALI_RESULT_FAILED = 2, CALI_RESULT_FAILED = 2,
}; };
int tray_id; int tray_id;
int cali_idx; int cali_idx = -1;
float nozzle_diameter; float nozzle_diameter;
std::string filament_id; std::string filament_id;
std::string setting_id; std::string setting_id;