3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-21 13:47:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

FIX: wrong pop dialog when all results are failed

Browse source 
Change-Id: I50acb15ea7541b619472622a1715b99396fcad69
This commit is contained in:
liz.li 2023-07-07 19:40:01 +08:00 • committed by Lane.Wei
parent c46a689120
commit 6929e1ea45
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -321,7 +321,7 @@ void CaliPASaveAutoPanel::save_to_result_from_widgets(wxWindow* window, bool* ou
//operate //operate
auto input = dynamic_cast<GridTextInput*>(window); auto input = dynamic_cast<GridTextInput*>(window);
if (input) { if (input && input->IsShown()) {
int tray_id = input->get_col_idx(); int tray_id = input->get_col_idx();
if (input->get_type() == GridTextInputType::K) { if (input->get_type() == GridTextInputType::K) {
float k = 0.0f; float k = 0.0f;
@ -336,7 +336,7 @@ void CaliPASaveAutoPanel::save_to_result_from_widgets(wxWindow* window, bool* ou
} }
auto comboBox = dynamic_cast<GridComboBox*>(window); auto comboBox = dynamic_cast<GridComboBox*>(window);
if (comboBox) { if (comboBox && comboBox->IsShown()) {
int tray_id = comboBox->get_col_idx(); int tray_id = comboBox->get_col_idx();
wxString name = comboBox->GetTextCtrl()->GetValue().ToStdString(); wxString name = comboBox->GetTextCtrl()->GetValue().ToStdString();
if (name.IsEmpty()) { if (name.IsEmpty()) {
@ -881,6 +881,7 @@ void CalibrationFlowX1SavePage::sync_cali_result(const std::vector<FlowRatioCali
m_is_all_failed = true; m_is_all_failed = true;
bool part_failed = false; bool part_failed = false;
for (auto& item : cali_result) { for (auto& item : cali_result) {
bool result_failed = false; bool result_failed = false;
if (item.confidence != 0) { if (item.confidence != 0) {
@ -984,7 +985,7 @@ void CalibrationFlowX1SavePage::save_to_result_from_widgets(wxWindow* window, bo
//operate //operate
auto input = dynamic_cast<GridTextInput*>(window); auto input = dynamic_cast<GridTextInput*>(window);
if (input) { if (input && input->IsShown()) {
int tray_id = input->get_col_idx(); int tray_id = input->get_col_idx();
if (input->get_type() == GridTextInputType::FlowRatio) { if (input->get_type() == GridTextInputType::FlowRatio) {
float flow_ratio = 0.0f; float flow_ratio = 0.0f;

4
src/slic3r/GUI/CalibrationWizardSavePage.hpp
View file

@ -104,7 +104,7 @@ protected:
std::map<int, PACalibResult> m_calib_results;// map<tray_id, PACalibResult> std::map<int, PACalibResult> m_calib_results;// map<tray_id, PACalibResult>
std::vector<PACalibResult> m_history_results; std::vector<PACalibResult> m_history_results;
bool m_is_all_failed{ true }; bool m_is_all_failed{ true };
MachineObject* m_obj; MachineObject* m_obj{ nullptr };
}; };
class CaliPASaveManualPanel : public wxPanel class CaliPASaveManualPanel : public wxPanel
@ -134,7 +134,7 @@ protected:
::TextInput* m_k_val; ::TextInput* m_k_val;
::TextInput* m_n_val; ::TextInput* m_n_val;
MachineObject* m_obj; MachineObject* m_obj{ nullptr };
}; };
class CaliPASaveP1PPanel : public wxPanel class CaliPASaveP1PPanel : public wxPanel