From bde96c1542f94adc2c1e2cc5139611a0566d1832 Mon Sep 17 00:00:00 2001 From: Stone Li Date: Thu, 10 Nov 2022 11:22:21 +0800 Subject: [PATCH] FIX: several small fixs Change-Id: Iee10daeedae924fa829148841556e31eb5e9d225 Signed-off-by: Stone Li --- src/libslic3r/GCode/GCodeProcessor.cpp | 8 +++++++- src/slic3r/GUI/DeviceManager.hpp | 2 +- src/slic3r/GUI/DownloadProgressDialog.cpp | 2 +- src/slic3r/GUI/SelectMachine.cpp | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp index b2facc583..386bb1137 100644 --- a/src/libslic3r/GCode/GCodeProcessor.cpp +++ b/src/libslic3r/GCode/GCodeProcessor.cpp @@ -4039,7 +4039,7 @@ void GCodeProcessor::update_slice_warnings() if (!warning.params.empty()) { warning.msg = BED_TEMP_TOO_HIGH_THAN_FILAMENT; - warning.error_code = "10004001"; + warning.error_code = "1000C001"; m_result.warnings.push_back(warning); //bbs:HRC checker @@ -4057,6 +4057,12 @@ void GCodeProcessor::update_slice_warnings() } } + if (!warning.params.empty()) { + warning.msg = NOZZLE_HRC_CHECKER; + warning.error_code = "1000C002"; + m_result.warnings.push_back(warning); + } + m_result.warnings.shrink_to_fit(); } diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index 48b39ee9c..b07221bcd 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -439,7 +439,7 @@ public: /* upgrade */ bool upgrade_force_upgrade { false }; bool upgrade_new_version { false }; - bool upgrade_consistency_request; + bool upgrade_consistency_request { false }; int upgrade_display_state = 0; // 0 : upgrade unavailable, 1: upgrade idle, 2: upgrading, 3: upgrade_finished PrinterFirmwareType firmware_type; // engineer|production std::string upgrade_progress; diff --git a/src/slic3r/GUI/DownloadProgressDialog.cpp b/src/slic3r/GUI/DownloadProgressDialog.cpp index cf6a3892e..d84f31f8c 100644 --- a/src/slic3r/GUI/DownloadProgressDialog.cpp +++ b/src/slic3r/GUI/DownloadProgressDialog.cpp @@ -145,7 +145,7 @@ bool DownloadProgressDialog::Show(bool show) m_upgrade_job->set_event_handle(this); m_status_bar->set_progress(0); Bind(EVT_UPGRADE_NETWORK_SUCCESS, [this](wxCommandEvent& evt) { - m_status_bar->change_button_label(_L("Finish")); + m_status_bar->change_button_label(_L("Close")); on_finish(); m_status_bar->set_cancel_callback_fina( [this]() { diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 84d1c3c82..daf69e99c 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -1606,7 +1606,7 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector