X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.cc;h=b627edc2f31be8b7cc20b71a503bf90765f35787;hb=c911df5915b258ee47b0e8952c5e4573b1fbaa76;hp=a7788ddd01334cd0a8d2dba94afb3f3b8e489321;hpb=3429cf48ff2ce056413588be4151be82c8114861;p=dcpomatic.git diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index a7788ddd0..b627edc2f 100644 --- a/src/wx/job_manager_view.cc +++ b/src/wx/job_manager_view.cc @@ -31,127 +31,170 @@ using std::string; using std::list; using std::map; +using std::cout; using boost::shared_ptr; +using boost::weak_ptr; -/** Must be called in the GUI thread */ -JobManagerView::JobManagerView (wxWindow* parent) - : wxScrolledWindow (parent) +class JobRecord { - _panel = new wxPanel (this); - wxSizer* sizer = new wxBoxSizer (wxVERTICAL); - sizer->Add (_panel, 1, wxEXPAND); - SetSizer (sizer); +public: + JobRecord (shared_ptr job, wxScrolledWindow* window, wxPanel* panel, wxFlexGridSizer* table, bool pause) + : _job (job) + , _window (window) + , _panel (panel) + , _table (table) + { + 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; - _table = new wxFlexGridSizer (5, 6, 6); - _table->AddGrowableCol (1, 1); - _panel->SetSizer (_table); - - SetScrollRate (0, 32); - - Connect (wxID_ANY, wxEVT_TIMER, wxTimerEventHandler (JobManagerView::periodic), 0, this); - _timer.reset (new wxTimer (this)); - _timer->Start (1000); + _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 (); + } - update (); -} + void maybe_pulse () + { + if (_job->running() && _job->progress_unknown ()) { + _gauge->Pulse (); + } + } -void -JobManagerView::periodic (wxTimerEvent &) -{ - update (); -} +private: -/** Update the view by examining the state of each job. - * Must be called in the GUI thread. - */ -void -JobManagerView::update () -{ - list > jobs = JobManager::instance()->get (); + void progress () + { + float const p = _job->overall_progress (); + if (p >= 0) { + checked_set (_message, _job->status ()); + _gauge->SetValue (p * 100); + } - int index = 0; + _table->Layout (); + _window->FitInside (); + } - for (list >::iterator i = jobs.begin(); i != jobs.end(); ++i) { + void finished () + { + checked_set (_message, _job->status ()); + if (!_job->finished_cancelled ()) { + _gauge->SetValue (100); + } - 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.finalised = false; - r.gauge = new wxGauge (_panel, wxID_ANY, 100); - _table->Insert (index + 1, r.gauge, 1, wxEXPAND | wxLEFT | wxRIGHT); - - r.message = new wxStaticText (_panel, wxID_ANY, std_to_wx ("")); - _table->Insert (index + 2, r.message, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6); - - r.cancel = new wxButton (_panel, wxID_ANY, _("Cancel")); - r.cancel->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (JobManagerView::cancel_clicked), 0, this); - _table->Insert (index + 3, r.cancel, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6); - - r.details = new wxButton (_panel, wxID_ANY, _("Details...")); - r.details->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (JobManagerView::details_clicked), 0, this); - r.details->Enable (false); - _table->Insert (index + 4, r.details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6); - - _job_records[*i] = r; + _cancel->Enable (false); + if (!_job->error_details().empty ()) { + _details->Enable (true); } + + _table->Layout (); + _window->FitInside (); + } - string const st = (*i)->status (); - - if (!(*i)->finished ()) { - float const p = (*i)->overall_progress (); - if (p >= 0) { - checked_set (_job_records[*i].message, st); - _job_records[*i].gauge->SetValue (p * 100); - } else { - checked_set (_job_records[*i].message, wx_to_std (_("Running"))); - _job_records[*i].gauge->Pulse (); - } - } + 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 (); + } - if ((*i)->finished() && !_job_records[*i].finalised) { - checked_set (_job_records[*i].message, st); - if (!(*i)->finished_cancelled()) { - _job_records[*i].gauge->SetValue (100); - } - (*i)->Finished (); - _job_records[*i].finalised = true; - _job_records[*i].cancel->Enable (false); - if (!(*i)->error_details().empty ()) { - _job_records[*i].details->Enable (true); - } + 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; +}; - index += 5; +/** Must be called in the GUI thread */ +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 (N, 6, 6); + _table->AddGrowableCol (1, 1); + _panel->SetSizer (_table); + + SetScrollRate (0, 32); - _table->Layout (); - FitInside (); + Bind (wxEVT_TIMER, boost::bind (&JobManagerView::periodic, this)); + _timer.reset (new wxTimer (this)); + _timer->Start (1000); + + JobManager::instance()->JobAdded.connect (bind (&JobManagerView::job_added, this, _1)); } void -JobManagerView::details_clicked (wxCommandEvent& ev) +JobManagerView::job_added (weak_ptr j) { - wxObject* o = ev.GetEventObject (); - - for (map, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) { - if (i->second.details == o) { - string s = i->first->error_summary(); - s[0] = toupper (s[0]); - error_dialog (this, std_to_wx (String::compose ("%1.\n\n%2", s, i->first->error_details()))); - } + shared_ptr job = j.lock (); + if (job) { + _job_records.push_back (shared_ptr (new JobRecord (job, this, _panel, _table, _buttons & PAUSE))); } } void -JobManagerView::cancel_clicked (wxCommandEvent& ev) +JobManagerView::periodic () { - wxObject* o = ev.GetEventObject (); - - for (map, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) { - if (i->second.cancel == o) { - i->first->cancel (); - } + for (list >::iterator i = _job_records.begin(); i != _job_records.end(); ++i) { + (*i)->maybe_pulse (); } }