/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
You should have received a copy of the GNU General Public License
along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
+
*/
+
/** @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 "lib/compose.hpp"
#include <iostream>
+
using std::string;
using std::list;
using std::map;
using std::min;
using std::cout;
-using boost::shared_ptr;
-using boost::weak_ptr;
+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.
, _batch (batch)
{
_panel = new wxPanel (this);
- wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+ auto sizer = new wxBoxSizer (wxVERTICAL);
sizer->Add (_panel, 1, wxEXPAND);
SetSizer (sizer);
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()->JobAdded.connect (bind(&JobManagerView::job_added, this, _1));
+ JobManager::instance()->JobsReordered.connect (bind(&JobManagerView::replace, this));
}
+
void
JobManagerView::job_added (weak_ptr<Job> j)
{
- shared_ptr<Job> job = j.lock ();
+ auto job = j.lock ();
if (job) {
shared_ptr<JobView> 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);
}
FitInside();
+ job_list_changed ();
}
+
void
JobManagerView::periodic ()
{
- for (list<shared_ptr<JobView> >::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<shared_ptr<JobView>> 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;
+ }
+ }
+ }
+
+ for (auto i: _job_records) {
+ i->detach ();
+ }
+
+ _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 ();
}
}