NEW:calibration page will pop up with printing errors
Change-Id: Ib9c0b4b09c3f5bce3a2a4e5c337e0965cb998fd7
This commit is contained in:
parent
63eaadb355
commit
40afcf232d
3 changed files with 11 additions and 1 deletions
|
@ -1,4 +1,5 @@
|
|||
#include "CalibrationWizardCaliPage.hpp"
|
||||
#include "MainFrame.hpp"
|
||||
#include "I18N.hpp"
|
||||
#include "Widgets/Label.hpp"
|
||||
|
||||
|
@ -126,6 +127,12 @@ void CalibrationCaliPage::update(MachineObject* obj)
|
|||
// enable calibration when finished
|
||||
bool enable_cali = false;
|
||||
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")
|
||||
m_is_between_start_and_running = false;
|
||||
if (m_is_between_start_and_running) {
|
||||
|
|
|
@ -129,6 +129,7 @@ public:
|
|||
void on_sys_color_changed();
|
||||
void msw_rescale();
|
||||
|
||||
StatusPanel* get_status_panel() {return m_status_info_panel;};
|
||||
void select_machine(std::string machine_sn);
|
||||
void on_update_all(wxMouseEvent &event);
|
||||
void on_timer(wxTimerEvent& event);
|
||||
|
|
|
@ -371,7 +371,6 @@ protected:
|
|||
std::vector<Button *> m_buttons;
|
||||
int last_status;
|
||||
void init_scaled_buttons();
|
||||
void update_error_message();
|
||||
void create_tasklist_info();
|
||||
void show_task_list_info(bool show = true);
|
||||
void update_tasklist_info();
|
||||
|
@ -465,6 +464,9 @@ protected:
|
|||
void update_camera_state(MachineObject* obj);
|
||||
bool show_vcamera = false;
|
||||
|
||||
public:
|
||||
void update_error_message();
|
||||
|
||||
public:
|
||||
StatusPanel(wxWindow * parent,
|
||||
wxWindowID id = wxID_ANY,
|
||||
|
|
Loading…
Reference in a new issue