X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.cc;h=24cacf6b01ec88bd43b91745416e035220b3f6b0;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=16a3e4afe5e88e12c5297c9ac567330d45a53dee;hpb=36d44180863cdbb5ef0e7e2f45794963047d07d4;p=dcpomatic.git diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index 16a3e4afe..24cacf6b0 100644 --- a/src/wx/job_manager_view.cc +++ b/src/wx/job_manager_view.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,84 +28,169 @@ #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::min; +using std::cout; +using boost::shared_ptr; +using boost::weak_ptr; + +class JobRecord : public boost::noncopyable +{ +public: + JobRecord (shared_ptr job, wxScrolledWindow* window, wxPanel* panel, wxFlexGridSizer* table) + : _job (job) + , _window (window) + , _panel (panel) + { + int n = 0; + + wxBoxSizer* gauge_message = new wxBoxSizer (wxVERTICAL); + _gauge = new wxGauge (panel, wxID_ANY, 100); + /* This seems to be required to allow the gauge to shrink under OS X */ + _gauge->SetMinSize (wxSize (0, -1)); + gauge_message->Add (_gauge, 0, wxEXPAND | wxLEFT | wxRIGHT); + _message = new wxStaticText (panel, wxID_ANY, wxT (" \n "), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END); + gauge_message->Add (_message, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6); + table->Insert (n, gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT); + ++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, 3); + ++n; + + _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, 3); + ++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, 3); + ++n; + + _progress_connection = job->Progress.connect (boost::bind (&JobRecord::progress, this)); + _finished_connection = job->Finished.connect (boost::bind (&JobRecord::finished, this)); + + table->Layout (); + } + + void maybe_pulse () + { + if (_job->running() && !_job->progress ()) { + _gauge->Pulse (); + } + } + +private: + + void progress () + { + string whole = "" + _job->name () + "\n"; + if (!_job->sub_name().empty ()) { + whole += _job->sub_name() + " "; + } + whole += _job->status (); + if (whole != _last_message) { + _message->SetLabelMarkup (whole); + _last_message = whole; + } + if (_job->progress ()) { + _gauge->SetValue (min (100.0f, _job->progress().get() * 100)); + } + } + + void finished () + { + progress (); + + if (!_job->finished_cancelled ()) { + _gauge->SetValue (100); + } + + _cancel->Enable (false); + _pause->Enable (false); + if (!_job->error_details().empty ()) { + _details->Enable (true); + } + } + + 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; + wxGauge* _gauge; + wxStaticText* _message; + wxButton* _cancel; + wxButton* _pause; + wxButton* _details; + std::string _last_message; + + boost::signals2::scoped_connection _progress_connection; + boost::signals2::scoped_connection _finished_connection; +}; /** Must be called in the GUI thread */ JobManagerView::JobManagerView (wxWindow* parent) - : wxPanel (parent) + : wxScrolledWindow (parent) { - _sizer = new wxFlexGridSizer (3, 6, 6); - _sizer->AddGrowableCol (1, 1); - SetSizer (_sizer); + _panel = new wxPanel (this); + wxSizer* sizer = new wxBoxSizer (wxVERTICAL); + sizer->Add (_panel, 1, wxEXPAND); + SetSizer (sizer); - Connect (wxID_ANY, wxEVT_TIMER, wxTimerEventHandler (JobManagerView::periodic), 0, this); + _table = new wxFlexGridSizer (4, 4, 6); + _table->AddGrowableCol (0, 1); + _panel->SetSizer (_table); + + SetScrollRate (0, 32); + EnableScrolling (false, true); + + 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))); + } } -/** 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 (); - - for (list >::iterator i = jobs.begin(); i != jobs.end(); ++i) { - - if (_job_records.find (*i) == _job_records.end ()) { - add_label_to_sizer (_sizer, this, (*i)->name ()); - - JobRecord r; - r.gauge = new wxGauge (this, wxID_ANY, 100); - _sizer->Add (r.gauge, 1, wxEXPAND); - r.informed_of_finish = false; - r.message = add_label_to_sizer (_sizer, this, ""); - - _job_records[*i] = r; - _sizer->Layout (); - } - - 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) { - stringstream s; - s << "Error: " << e.what(); - error_dialog (this, s.str ()); - } - - _job_records[*i].informed_of_finish = true; - } + for (list >::iterator i = _job_records.begin(); i != _job_records.end(); ++i) { + (*i)->maybe_pulse (); } }