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

NEW:calibration page will pop up with printing errors

Browse source 
Change-Id: Ib9c0b4b09c3f5bce3a2a4e5c337e0965cb998fd7
This commit is contained in:
tao wang 2023-07-06 15:50:13 +08:00 • committed by Lane.Wei
parent 63eaadb355
commit 40afcf232d
3 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,5 @@
#include "CalibrationWizardCaliPage.hpp" #include "CalibrationWizardCaliPage.hpp"
#include "MainFrame.hpp"
#include "I18N.hpp" #include "I18N.hpp"
#include "Widgets/Label.hpp" #include "Widgets/Label.hpp"
@ -126,6 +127,12 @@ void CalibrationCaliPage::update(MachineObject* obj)
// enable calibration when finished // enable calibration when finished
bool enable_cali = false; bool enable_cali = false;
if (obj) { if (obj) {
if (obj->print_error > 0) {
StatusPanel* status_panel = Slic3r::GUI::wxGetApp().mainframe->m_monitor->get_status_panel();
status_panel->obj = obj;
status_panel->update_error_message();
}
if (obj->print_status == "RUNNING") if (obj->print_status == "RUNNING")
m_is_between_start_and_running = false; m_is_between_start_and_running = false;
if (m_is_between_start_and_running) { if (m_is_between_start_and_running) {

1
src/slic3r/GUI/Monitor.hpp
View file

@ -129,6 +129,7 @@ public:
void on_sys_color_changed(); void on_sys_color_changed();
void msw_rescale(); void msw_rescale();
StatusPanel* get_status_panel() {return m_status_info_panel;};
void select_machine(std::string machine_sn); void select_machine(std::string machine_sn);
void on_update_all(wxMouseEvent &event); void on_update_all(wxMouseEvent &event);
void on_timer(wxTimerEvent& event); void on_timer(wxTimerEvent& event);

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

@ -371,7 +371,6 @@ protected:
std::vector<Button *> m_buttons; std::vector<Button *> m_buttons;
int last_status; int last_status;
void init_scaled_buttons(); void init_scaled_buttons();
void update_error_message();
void create_tasklist_info(); void create_tasklist_info();
void show_task_list_info(bool show = true); void show_task_list_info(bool show = true);
void update_tasklist_info(); void update_tasklist_info();
@ -465,6 +464,9 @@ protected:
void update_camera_state(MachineObject* obj); void update_camera_state(MachineObject* obj);
bool show_vcamera = false; bool show_vcamera = false;
public:
void update_error_message();
public: public:
StatusPanel(wxWindow * parent, StatusPanel(wxWindow * parent,
wxWindowID id = wxID_ANY, wxWindowID id = wxID_ANY,