3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FirmwareUpdater: Disable dialog close while flashing

Browse Source
This commit is contained in:
Vojtech Kral 2018-05-16 15:51:14 +02:00
parent fe21ca5510
commit c5f1acfbfb
1 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
xs/src/slic3r/GUI/FirmwareDialog.cpp
View File

@ -8,6 +8,7 @@
#include <wx/app.h> #include <wx/app.h>
#include <wx/event.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/settings.h> #include <wx/settings.h>
#include <wx/panel.h> #include <wx/panel.h>
@ -37,11 +38,18 @@ struct FirmwareDialog::priv
wxFilePickerCtrl *hex_picker; wxFilePickerCtrl *hex_picker;
wxStaticText *status; wxStaticText *status;
wxTextCtrl *txt_stdout; wxTextCtrl *txt_stdout;
wxButton *btn_close;
wxButton *btn_flash; wxButton *btn_flash;
bool flashing;
priv() : avrdude_config((fs::path(::Slic3r::resources_dir()) / "avrdude" / "avrdude.conf").string()) {} priv() :
avrdude_config((fs::path(::Slic3r::resources_dir()) / "avrdude" / "avrdude.conf").string()),
flashing(false)
{}
void find_serial_ports(); void find_serial_ports();
void set_flashing(bool flashing, int res = 0);
void perform_upload(); void perform_upload();
}; };
@ -57,12 +65,36 @@ void FirmwareDialog::priv::find_serial_ports()
} }
} }
void FirmwareDialog::priv::set_flashing(bool value, int res)
{
flashing = value;
if (value) {
txt_stdout->SetValue(wxEmptyString);
status->SetLabel(_(L("Flashing in progress. Please do not disconnect the printer!")));
// auto status_color_orig = status->GetForegroundColour();
status->SetForegroundColour(GUI::get_label_clr_modified());
btn_close->Disable();
btn_flash->Disable();
} else {
auto text_color = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
btn_close->Enable();
btn_flash->Enable();
status->SetForegroundColour(text_color);
status->SetLabel(
res == 0 ? _(L("Flashing succeeded!")) : _(L("Flashing failed. Please see the avrdude log below."))
);
}
}
void FirmwareDialog::priv::perform_upload() void FirmwareDialog::priv::perform_upload()
{ {
auto filename = hex_picker->GetPath(); auto filename = hex_picker->GetPath();
auto port = port_picker->GetValue(); auto port = port_picker->GetValue();
if (filename.IsEmpty() || port.IsEmpty()) { return; } if (filename.IsEmpty() || port.IsEmpty()) { return; }
set_flashing(true);
// Note: we're not using wxTextCtrl's ability to act as a std::ostream // Note: we're not using wxTextCtrl's ability to act as a std::ostream
// because its imeplementation doesn't handle conversion from local charset // because its imeplementation doesn't handle conversion from local charset
// which mangles error messages from perror(). // which mangles error messages from perror().
@ -73,12 +105,6 @@ void FirmwareDialog::priv::perform_upload()
wxTheApp->Yield(); wxTheApp->Yield();
}; };
txt_stdout->SetValue(wxEmptyString);
status->SetLabel(_(L("Flashing in progress. Please do not disconnect the printer!")));
auto status_color_orig = status->GetForegroundColour();
status->SetForegroundColour(GUI::get_label_clr_modified());
btn_flash->Disable();
std::vector<std::string> args {{ std::vector<std::string> args {{
"-v", "-v",
"-p", "atmega2560", "-p", "atmega2560",
@ -98,12 +124,7 @@ void FirmwareDialog::priv::perform_upload()
BOOST_LOG_TRIVIAL(info) << "avrdude exit code: " << res; BOOST_LOG_TRIVIAL(info) << "avrdude exit code: " << res;
btn_flash->Enable(); set_flashing(false, res);
status->SetForegroundColour(status_color_orig);
status->SetLabel(
res == 0 ? _(L("Flashing succeeded!")) : _(L("Flashing failed. Please see the avrdude log below."))
);
} }
@ -111,7 +132,6 @@ void FirmwareDialog::priv::perform_upload()
FirmwareDialog::FirmwareDialog(wxWindow *parent) : FirmwareDialog::FirmwareDialog(wxWindow *parent) :
wxDialog(parent, wxID_ANY, _(L("Firmware flasher"))), wxDialog(parent, wxID_ANY, _(L("Firmware flasher"))),
// p(new priv(this))
p(new priv()) p(new priv())
{ {
enum { enum {
@ -156,8 +176,10 @@ FirmwareDialog::FirmwareDialog(wxWindow *parent) :
p->txt_stdout->SetFont(mono_font); p->txt_stdout->SetFont(mono_font);
vsizer->Add(p->txt_stdout, 1, wxEXPAND | wxBOTTOM, SPACING); vsizer->Add(p->txt_stdout, 1, wxEXPAND | wxBOTTOM, SPACING);
p->btn_close = new wxButton(panel, wxID_CLOSE);
p->btn_flash = new wxButton(panel, wxID_ANY, _(L("Flash!"))); p->btn_flash = new wxButton(panel, wxID_ANY, _(L("Flash!")));
auto *bsizer = new wxBoxSizer(wxHORIZONTAL); auto *bsizer = new wxBoxSizer(wxHORIZONTAL);
bsizer->Add(p->btn_close);
bsizer->AddStretchSpacer(); bsizer->AddStretchSpacer();
bsizer->Add(p->btn_flash); bsizer->Add(p->btn_flash);
vsizer->Add(bsizer, 0, wxEXPAND); vsizer->Add(bsizer, 0, wxEXPAND);
@ -170,16 +192,17 @@ FirmwareDialog::FirmwareDialog(wxWindow *parent) :
p->find_serial_ports(); p->find_serial_ports();
p->btn_close->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { this->Close(); });
p->btn_flash->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { this->p->perform_upload(); }); p->btn_flash->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { this->p->perform_upload(); });
btn_rescan->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { this->p->find_serial_ports(); }); btn_rescan->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { this->p->find_serial_ports(); });
// Bind(EVT_BONJOUR_REPLY, &FirmwareDialog::on_reply, this); Bind(wxEVT_CLOSE_WINDOW, [this](wxCloseEvent &evt) {
if (evt.CanVeto() && this->p->flashing) {
// Bind(EVT_BONJOUR_COMPLETE, [this](wxCommandEvent &) { evt.Veto();
// this->timer_state = 0; } else {
// }); evt.Skip();
}
// Bind(wxEVT_TIMER, &FirmwareDialog::on_timer, this); });
} }
FirmwareDialog::~FirmwareDialog() FirmwareDialog::~FirmwareDialog()