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

FIX: several small fixs

Browse source 
Change-Id: Iee10daeedae924fa829148841556e31eb5e9d225
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2022-11-10 11:22:21 +08:00 • committed by Lane.Wei
parent 0dd5057b4d
commit bde96c1542
4 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libslic3r/GCode/GCodeProcessor.cpp
View file

@ -4039,7 +4039,7 @@ void GCodeProcessor::update_slice_warnings()
if (!warning.params.empty()) { if (!warning.params.empty()) {
warning.msg = BED_TEMP_TOO_HIGH_THAN_FILAMENT; warning.msg = BED_TEMP_TOO_HIGH_THAN_FILAMENT;
warning.error_code = "10004001"; warning.error_code = "1000C001";
m_result.warnings.push_back(warning); m_result.warnings.push_back(warning);
//bbs:HRC checker //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(); m_result.warnings.shrink_to_fit();
} }

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

@ -439,7 +439,7 @@ public:
/* upgrade */ /* upgrade */
bool upgrade_force_upgrade { false }; bool upgrade_force_upgrade { false };
bool upgrade_new_version { 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 int upgrade_display_state = 0; // 0 : upgrade unavailable, 1: upgrade idle, 2: upgrading, 3: upgrade_finished
PrinterFirmwareType firmware_type; // engineer|production PrinterFirmwareType firmware_type; // engineer|production
std::string upgrade_progress; std::string upgrade_progress;

2
src/slic3r/GUI/DownloadProgressDialog.cpp
View file

@ -145,7 +145,7 @@ bool DownloadProgressDialog::Show(bool show)
m_upgrade_job->set_event_handle(this); m_upgrade_job->set_event_handle(this);
m_status_bar->set_progress(0); m_status_bar->set_progress(0);
Bind(EVT_UPGRADE_NETWORK_SUCCESS, [this](wxCommandEvent& evt) { 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(); on_finish();
m_status_bar->set_cancel_callback_fina( m_status_bar->set_cancel_callback_fina(
[this]() { [this]() {

2
src/slic3r/GUI/SelectMachine.cpp
View file

@ -1606,7 +1606,7 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector<wxSt
} else if (status == PrintDialogStatus::PrintStatusConnectingServer) { } else if (status == PrintDialogStatus::PrintStatusConnectingServer) {
wxString msg_text = _L("Connecting to server"); wxString msg_text = _L("Connecting to server");
update_print_status_msg(msg_text, true, true); update_print_status_msg(msg_text, true, true);
Enable_Send_Button(true); Enable_Send_Button(false);
Enable_Refresh_Button(true); Enable_Refresh_Button(true);
} else if (status == PrintDialogStatus::PrintStatusReading) { } else if (status == PrintDialogStatus::PrintStatusReading) {
wxString msg_text = _L("Synchronizing device information"); wxString msg_text = _L("Synchronizing device information");