X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.cc;h=19243393c308dc174e7ee7bda14c1699f183df8d;hb=487cb0c6d7ebe705f015176b0d7e98e23c8c5d28;hp=3c0f44675286a8c556af51099c60f2beb95841ec;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index 3c0f44675..19243393c 100644 --- a/src/wx/job_manager_view.cc +++ b/src/wx/job_manager_view.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -16,12 +16,15 @@ You should have received a copy of the GNU General Public License 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" @@ -31,9 +34,9 @@ #include "lib/util.h" #include "lib/exceptions.h" #include "lib/compose.hpp" -#include #include + using std::string; using std::list; using std::map; @@ -46,6 +49,7 @@ using boost::bind; using namespace boost::placeholders; #endif + /** @param parent Parent window. * @param batch true to use BatchJobView, false to use NormalJobView. * @@ -56,7 +60,7 @@ JobManagerView::JobManagerView (wxWindow* parent, bool batch) , _batch (batch) { _panel = new wxPanel (this); - wxSizer* sizer = new wxBoxSizer (wxVERTICAL); + auto sizer = new wxBoxSizer (wxVERTICAL); sizer->Add (_panel, 1, wxEXPAND); SetSizer (sizer); @@ -67,24 +71,25 @@ JobManagerView::JobManagerView (wxWindow* parent, bool batch) SetScrollRate (0, 32); EnableScrolling (false, true); - Bind (wxEVT_TIMER, boost::bind (&JobManagerView::periodic, this)); + 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)); - JobManager::instance()->JobsReordered.connect (bind (&JobManagerView::replace, this)); + JobManager::instance()->JobAdded.connect (bind(&JobManagerView::job_added, this, _1)); + JobManager::instance()->JobsReordered.connect (bind(&JobManagerView::replace, this)); } + void JobManagerView::job_added (weak_ptr j) { - shared_ptr job = j.lock (); + auto job = j.lock (); if (job) { shared_ptr v; if (_batch) { - v.reset (new BatchJobView (job, this, _panel, _table)); + v.reset (new BatchJobView(job, this, _panel, _table)); } else { - v.reset (new NormalJobView (job, this, _panel, _table)); + v.reset (new NormalJobView(job, this, _panel, _table)); } v->setup (); _job_records.push_back (v); @@ -94,24 +99,26 @@ JobManagerView::job_added (weak_ptr j) job_list_changed (); } + void JobManagerView::periodic () { - for (list >::iterator i = _job_records.begin(); i != _job_records.end(); ++i) { - (*i)->maybe_pulse (); + for (auto i: _job_records) { + i->maybe_pulse (); } } + void JobManagerView::replace () { /* Make a new version of _job_records which reflects the order in JobManager's job list */ - list > new_job_records; + list> new_job_records; - BOOST_FOREACH (shared_ptr i, JobManager::instance()->get()) { + for (auto i: JobManager::instance()->get()) { /* Find this job's JobView */ - BOOST_FOREACH (shared_ptr j, _job_records) { + for (auto j: _job_records) { if (j->job() == i) { new_job_records.push_back (j); break; @@ -119,23 +126,24 @@ JobManagerView::replace () } } - BOOST_FOREACH (shared_ptr i, _job_records) { + for (auto i: _job_records) { i->detach (); } _job_records = new_job_records; - BOOST_FOREACH (shared_ptr i, _job_records) { + for (auto i: _job_records) { i->insert (i->insert_position ()); } job_list_changed (); } + void JobManagerView::job_list_changed () { - BOOST_FOREACH (shared_ptr i, _job_records) { + for (auto i: _job_records) { i->job_list_changed (); } }