Basics of job view when sending KDM emails from dcpomatic_kdm.

[dcpomatic.git] / src / wx / job_manager_view.cc

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 22c18fd93f4624e733d909d481c84844b3ef94a0..b32c695a907fa7e9b77c5bb0c4a0607a90a1bd70 100644 (file)
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     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
@@ -21,115 +21,60 @@
  *  @brief Class generating a GTK widget to show the progress of jobs.
  */
 
+#include "job_manager_view.h"
+#include "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 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;
 
 /** Must be called in the GUI thread */
-JobManagerView::JobManagerView ()
+JobManagerView::JobManagerView (wxWindow* parent)
+       : wxScrolledWindow (parent)
 {
-       _scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_ALWAYS);
-       
-       _store = Gtk::TreeStore::create (_columns);
-       _view.set_model (_store);
-       _view.append_column ("Name", _columns.name);
+       _panel = new wxPanel (this);
+       wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+       sizer->Add (_panel, 1, wxEXPAND);
+       SetSizer (sizer);
+
+       _table = new wxFlexGridSizer (4, 4, 6);
+       _table->AddGrowableCol (0, 1);
+       _panel->SetSizer (_table);
+
+       SetScrollRate (0, 32);
+       EnableScrolling (false, true);
 
-       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);
+       Bind (wxEVT_TIMER, boost::bind (&JobManagerView::periodic, this));
+       _timer.reset (new wxTimer (this));
+       _timer->Start (1000);
 
-       _scroller.add (_view);
-       _scroller.set_size_request (-1, 150);
-       
-       update ();
+       JobManager::instance()->JobAdded.connect (bind (&JobManagerView::job_added, this, _1));
 }
 
-/** Update the view by examining the state of each jobs.
- *  Must be called in the GUI thread.
- */
 void
-JobManagerView::update ()
+JobManagerView::job_added (weak_ptr<Job> j)
 {
-       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) {
-                               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;
-               }
-
-               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;
-                       }
-               }
+       shared_ptr<Job> job = j.lock ();
+       if (job) {
+               _job_records.push_back (shared_ptr<JobView> (new JobView (job, this, _panel, _table)));
+       }
+}
 
-               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;
-               }
+void
+JobManagerView::periodic ()
+{
+       for (list<shared_ptr<JobView> >::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
+               (*i)->maybe_pulse ();
        }
 }