juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-27 04:42:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: sync some differences from master

Browse Source 
and cherry pick I6d6b337176bb1dd9e99b51b67065e103d054201d
jira: none

Change-Id: I0902ab2986ec1b604eeb67062e886f9fe2151b6a
(cherry picked from commit 90291d550b96de31c9c50814b19d88a453c57290)
This commit is contained in:
zhimin.zeng
2025-09-10 14:28:45 +08:00
committed by Noisyfox
parent 1cf60311aa
commit b07046460d
4 changed files with 92 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/slic3r/GUI/CalibrationWizard.cpp
View File

@@ -970,6 +970,7 @@ void PressureAdvanceWizard::on_cali_save()
if (save_page->is_all_failed()) {
MessageDialog msg_dlg(nullptr, _L("The failed test result has been dropped."), wxEmptyString, wxOK);
msg_dlg.ShowModal();
back_preset_info(curr_obj, true);
show_step(start_step);
return;
}
@@ -1383,6 +1384,7 @@ void FlowRateWizard::on_cali_save()
if (save_page->is_all_failed()) {
MessageDialog msg_dlg(nullptr, _L("The failed test result has been dropped."), wxEmptyString, wxOK);
msg_dlg.ShowModal();
back_preset_info(curr_obj, true);
show_step(start_step);
return;
}
@@ -1762,6 +1764,7 @@ void MaxVolumetricSpeedWizard::on_cali_save()
MessageDialog msg_dlg(nullptr, _L("Max volumetric speed calibration result has been saved to preset."), wxEmptyString, wxOK);
msg_dlg.ShowModal();
back_preset_info(curr_obj, true);
show_step(start_step);
}

2
src/slic3r/GUI/CalibrationWizardCaliPage.cpp
View File

@@ -270,7 +270,7 @@ void CalibrationCaliPage::update(MachineObject* obj)
enable_cali = false;
}
} else {
assert(false);
//assert(false);
}
m_action_panel->enable_button(CaliPageActionType::CALI_ACTION_CALI_NEXT, enable_cali);
}

7
src/slic3r/GUI/CalibrationWizardSavePage.cpp
View File

@@ -260,7 +260,12 @@ void CaliPASaveAutoPanel::sync_cali_result(const std::vector<PACalibResult>& cal
}
preset_names = default_naming(preset_names);
for (auto& item : cali_result) {
std::vector<PACalibResult> sorted_cali_result = cali_result;
std::sort(sorted_cali_result.begin(), sorted_cali_result.end(), [this](const PACalibResult &left, const PACalibResult& right) {
return left.tray_id < right.tray_id;
});
for (auto &item : sorted_cali_result) {
bool result_failed = false;
if (item.confidence != 0) {
result_failed = true;