X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.cc;h=20f885a9b284cf7b8b0b12256413bf1ea3f618f3;hb=ec7c27b80a07bffcdb175512fa6d3811c277d959;hp=97da3936fdd4b96e1e4ba547fe7bdcd407aacfbd;hpb=5d48e36440d6b4ebf4c04a413bd340b214ba8c42;p=dcpomatic.git diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index 97da3936f..20f885a9b 100644 --- a/src/wx/job_manager_view.cc +++ b/src/wx/job_manager_view.cc @@ -28,98 +28,178 @@ #include "job_manager_view.h" #include "wx_util.h" -using namespace std; -using namespace boost; +using std::string; +using std::list; +using std::map; +using std::cout; +using boost::shared_ptr; +using boost::weak_ptr; + +class JobRecord +{ +public: + JobRecord (shared_ptr job, wxScrolledWindow* window, wxPanel* panel, wxFlexGridSizer* table, bool pause) + : _job (job) + , _window (window) + , _panel (panel) + , _table (table) + , _needs_pulse (false) + { + int n = 0; + + wxStaticText* m = new wxStaticText (panel, wxID_ANY, std_to_wx (_job->name ())); + table->Insert (n, m, 0, wxALIGN_CENTER_VERTICAL | wxALL, 6); + ++n; + + _gauge = new wxGauge (panel, wxID_ANY, 100); + table->Insert (n, _gauge, 1, wxEXPAND | wxLEFT | wxRIGHT); + ++n; + + _message = new wxStaticText (panel, wxID_ANY, std_to_wx ("")); + table->Insert (n, _message, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6); + ++n; + + _cancel = new wxButton (panel, wxID_ANY, _("Cancel")); + _cancel->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::cancel_clicked, this); + table->Insert (n, _cancel, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6); + ++n; + + if (pause) { + _pause = new wxButton (_panel, wxID_ANY, _("Pause")); + _pause->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::pause_clicked, this); + table->Insert (n, _pause, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6); + ++n; + } + + _details = new wxButton (_panel, wxID_ANY, _("Details...")); + _details->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::details_clicked, this); + _details->Enable (false); + table->Insert (n, _details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6); + ++n; + + job->Progress.connect (boost::bind (&JobRecord::progress, this)); + job->Finished.connect (boost::bind (&JobRecord::finished, this)); + + table->Layout (); + panel->FitInside (); + } + + void maybe_pulse () + { + if (_job->running() && _needs_pulse) { + _gauge->Pulse (); + } + + _needs_pulse = true; + } + +private: + + void progress () + { + float const p = _job->overall_progress (); + if (p >= 0) { + checked_set (_message, _job->status ()); + _gauge->SetValue (p * 100); + _needs_pulse = false; + } + + _table->Layout (); + _window->FitInside (); + } + + void finished () + { + checked_set (_message, _job->status ()); + if (!_job->finished_cancelled ()) { + _gauge->SetValue (100); + } + + _cancel->Enable (false); + if (!_job->error_details().empty ()) { + _details->Enable (true); + } + + _table->Layout (); + _window->FitInside (); + } + + void details_clicked (wxCommandEvent &) + { + string s = _job->error_summary(); + s[0] = toupper (s[0]); + error_dialog (_window, std_to_wx (String::compose ("%1.\n\n%2", s, _job->error_details()))); + } + + void cancel_clicked (wxCommandEvent &) + { + _job->cancel (); + } + + void pause_clicked (wxCommandEvent &) + { + if (_job->paused()) { + _job->resume (); + _pause->SetLabel (_("Pause")); + } else { + _job->pause (); + _pause->SetLabel (_("Resume")); + } + } + + boost::shared_ptr _job; + wxScrolledWindow* _window; + wxPanel* _panel; + wxFlexGridSizer* _table; + wxGauge* _gauge; + wxStaticText* _message; + wxButton* _cancel; + wxButton* _pause; + wxButton* _details; + bool _needs_pulse; +}; /** Must be called in the GUI thread */ -JobManagerView::JobManagerView (wxWindow* parent) +JobManagerView::JobManagerView (wxWindow* parent, Buttons buttons) : wxScrolledWindow (parent) + , _buttons (buttons) { _panel = new wxPanel (this); wxSizer* sizer = new wxBoxSizer (wxVERTICAL); sizer->Add (_panel, 1, wxEXPAND); SetSizer (sizer); + + int N = 5; + if (buttons & PAUSE) { + ++N; + } - _table = new wxFlexGridSizer (3, 6, 6); + _table = new wxFlexGridSizer (N, 6, 6); _table->AddGrowableCol (1, 1); _panel->SetSizer (_table); SetScrollRate (0, 32); - Connect (wxID_ANY, wxEVT_TIMER, wxTimerEventHandler (JobManagerView::periodic), 0, this); + Bind (wxEVT_TIMER, boost::bind (&JobManagerView::periodic, this)); _timer.reset (new wxTimer (this)); _timer->Start (1000); - - update (); + + JobManager::instance()->JobAdded.connect (bind (&JobManagerView::job_added, this, _1)); } void -JobManagerView::periodic (wxTimerEvent &) +JobManagerView::job_added (weak_ptr j) { - update (); + shared_ptr job = j.lock (); + if (job) { + _job_records.push_back (shared_ptr (new JobRecord (job, this, _panel, _table, _buttons & PAUSE))); + } } -/** Update the view by examining the state of each job. - * Must be called in the GUI thread. - */ void -JobManagerView::update () +JobManagerView::periodic () { - list > jobs = JobManager::instance()->get (); - - int index = 0; - - for (list >::iterator i = jobs.begin(); i != jobs.end(); ++i) { - - if (_job_records.find (*i) == _job_records.end ()) { - wxStaticText* m = new wxStaticText (_panel, wxID_ANY, std_to_wx ((*i)->name ())); - _table->Insert (index, m, 0, wxALIGN_CENTER_VERTICAL | wxALL, 6); - - JobRecord r; - r.gauge = new wxGauge (_panel, wxID_ANY, 100); - _table->Insert (index + 1, r.gauge, 1, wxEXPAND | wxLEFT | wxRIGHT); - - r.informed_of_finish = false; - r.message = new wxStaticText (_panel, wxID_ANY, std_to_wx ("")); - _table->Insert (index + 2, r.message, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6); - - _job_records[*i] = r; - } - - string const st = (*i)->status (); - - if (!(*i)->finished ()) { - float const p = (*i)->overall_progress (); - if (p >= 0) { - _job_records[*i].message->SetLabel (std_to_wx (st)); - _job_records[*i].gauge->SetValue (p * 100); - } else { - _job_records[*i].message->SetLabel (wxT ("Running")); - _job_records[*i].gauge->Pulse (); - } - } - - /* Hack to work around our lack of cross-thread - signalling; we tell the job to emit_finished() - from here (the GUI thread). - */ - - if ((*i)->finished () && !_job_records[*i].informed_of_finish) { - _job_records[*i].gauge->SetValue (100); - _job_records[*i].message->SetLabel (std_to_wx (st)); - - try { - (*i)->emit_finished (); - } catch (OpenFileError& e) { - error_dialog (this, String::compose ("Error: %1", e.what ())); - } - - _job_records[*i].informed_of_finish = true; - } - - index += 3; + for (list >::iterator i = _job_records.begin(); i != _job_records.end(); ++i) { + (*i)->maybe_pulse (); } - - _table->Layout (); - FitInside (); }