X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.cc;h=19243393c308dc174e7ee7bda14c1699f183df8d;hp=1d5c855eada8a990b0cf57dfbd2e89556738faf8;hb=7bc2134d658778e04f1756c255e604b4ab5a5831;hpb=98128670536a3f1d8670898b15700a8858145c73 diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index 1d5c855ea..19243393c 100644 --- a/src/wx/job_manager_view.cc +++ b/src/wx/job_manager_view.cc @@ -1,127 +1,149 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . + */ + /** @file src/job_manager_view.cc * @brief Class generating a GTK widget to show the progress of jobs. */ + +#include "job_manager_view.h" +#include "batch_job_view.h" +#include "normal_job_view.h" +#include "wx_util.h" #include "lib/job_manager.h" #include "lib/job.h" #include "lib/util.h" #include "lib/exceptions.h" -#include "job_manager_view.h" -#include "wx_util.h" - -using namespace std; -using namespace boost; - -/** Must be called in the GUI thread */ -JobManagerView::JobManagerView (wxWindow* parent) +#include "lib/compose.hpp" +#include + + +using std::string; +using std::list; +using std::map; +using std::min; +using std::cout; +using std::shared_ptr; +using std::weak_ptr; +using boost::bind; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + + +/** @param parent Parent window. + * @param batch true to use BatchJobView, false to use NormalJobView. + * + * Must be called in the GUI thread. + */ +JobManagerView::JobManagerView (wxWindow* parent, bool batch) : wxScrolledWindow (parent) + , _batch (batch) { _panel = new wxPanel (this); - wxSizer* sizer = new wxBoxSizer (wxVERTICAL); + auto sizer = new wxBoxSizer (wxVERTICAL); sizer->Add (_panel, 1, wxEXPAND); SetSizer (sizer); - - _table = new wxFlexGridSizer (3, 6, 6); - _table->AddGrowableCol (1, 1); + + _table = new wxFlexGridSizer (2, 6, 6); + _table->AddGrowableCol (0, 1); _panel->SetSizer (_table); SetScrollRate (0, 32); + EnableScrolling (false, true); - 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)); + JobManager::instance()->JobsReordered.connect (bind(&JobManagerView::replace, this)); } + void -JobManagerView::periodic (wxTimerEvent &) +JobManagerView::job_added (weak_ptr j) { - update (); + auto job = j.lock (); + if (job) { + shared_ptr v; + if (_batch) { + v.reset (new BatchJobView(job, this, _panel, _table)); + } else { + v.reset (new NormalJobView(job, this, _panel, _table)); + } + v->setup (); + _job_records.push_back (v); + } + + FitInside(); + job_list_changed (); } -/** 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; - } + for (auto i: _job_records) { + i->maybe_pulse (); + } +} - 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 ()); +void +JobManagerView::replace () +{ + /* Make a new version of _job_records which reflects the order in JobManager's job list */ + + list> new_job_records; + + for (auto i: JobManager::instance()->get()) { + /* Find this job's JobView */ + for (auto j: _job_records) { + if (j->job() == i) { + new_job_records.push_back (j); + break; } - - _job_records[*i].informed_of_finish = true; } + } - index += 3; + for (auto i: _job_records) { + i->detach (); } - _table->Layout (); - FitInside (); + _job_records = new_job_records; + + for (auto i: _job_records) { + i->insert (i->insert_position ()); + } + + job_list_changed (); +} + + +void +JobManagerView::job_list_changed () +{ + for (auto i: _job_records) { + i->job_list_changed (); + } }