/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
- 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 <http://www.gnu.org/licenses/>.
*/
* @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 "gtk_util.h"
+#include "lib/compose.hpp"
+#include <iostream>
+
+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);
+ sizer->Add (_panel, 1, wxEXPAND);
+ SetSizer (sizer);
-using namespace std;
-using namespace boost;
+ _table = new wxFlexGridSizer (2, 6, 6);
+ _table->AddGrowableCol (0, 1);
+ _panel->SetSizer (_table);
-/** Must be called in the GUI thread */
-JobManagerView::JobManagerView ()
+ SetScrollRate (0, 32);
+ EnableScrolling (false, true);
+
+ 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));
+}
+
+void
+JobManagerView::job_added (weak_ptr<Job> j)
{
- _scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_ALWAYS);
-
- _store = Gtk::TreeStore::create (_columns);
- _view.set_model (_store);
- _view.append_column ("Name", _columns.name);
-
- Gtk::CellRendererProgress* r = Gtk::manage (new Gtk::CellRendererProgress ());
- int const n = _view.append_column ("Progress", *r);
- Gtk::TreeViewColumn* c = _view.get_column (n - 1);
- c->add_attribute (r->property_value(), _columns.progress);
- c->add_attribute (r->property_pulse(), _columns.progress_unknown);
- c->add_attribute (r->property_text(), _columns.text);
-
- _scroller.add (_view);
- _scroller.set_size_request (-1, 150);
-
- update ();
+ shared_ptr<Job> job = j.lock ();
+ if (job) {
+ shared_ptr<JobView> 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 jobs.
- * Must be called in the GUI thread.
- */
void
-JobManagerView::update ()
+JobManagerView::periodic ()
{
- list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
-
- for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i) {
- Gtk::ListStore::iterator j = _store->children().begin();
- while (j != _store->children().end()) {
- Gtk::TreeRow r = *j;
- shared_ptr<Job> job = r[_columns.job];
- if (job == *i) {
+ for (list<shared_ptr<JobView> >::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
+ (*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;
}
- ++j;
}
+ }
- Gtk::TreeRow r;
- if (j == _store->children().end ()) {
- j = _store->append ();
- r = *j;
- r[_columns.name] = (*i)->name ();
- r[_columns.job] = *i;
- r[_columns.progress_unknown] = -1;
- r[_columns.informed_of_finish] = false;
- } else {
- r = *j;
- }
+ for (auto i: _job_records) {
+ i->detach ();
+ }
- bool inform_of_finish = false;
- string const st = (*i)->status ();
-
- if (!(*i)->finished ()) {
- float const p = (*i)->overall_progress ();
- if (p >= 0) {
- r[_columns.text] = st;
- r[_columns.progress] = p * 100;
- } else {
- r[_columns.text] = "Running";
- r[_columns.progress_unknown] = r[_columns.progress_unknown] + 1;
- }
- }
-
- /* 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_ok ()) {
- bool i = r[_columns.informed_of_finish];
- if (!i) {
- r[_columns.progress_unknown] = -1;
- r[_columns.progress] = 100;
- r[_columns.text] = st;
- inform_of_finish = true;
- }
- } else if ((*i)->finished_in_error ()) {
- bool i = r[_columns.informed_of_finish];
- if (!i) {
- r[_columns.progress_unknown] = -1;
- r[_columns.progress] = 100;
- r[_columns.text] = st;
- inform_of_finish = true;
- }
- }
+ _job_records = new_job_records;
- if (inform_of_finish) {
- try {
- (*i)->emit_finished ();
- } catch (OpenFileError& e) {
- stringstream s;
- s << "Error: " << e.what();
- error_dialog (s.str ());
- }
- r[_columns.informed_of_finish] = true;
- }
+ 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 ();
}
}
projects / dcpomatic.git / blobdiff