X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.cc;h=cd6918b7268e730c7a93d4e8d1a796293c7cadf9;hp=75842a8d4e5569cc3746728032201169d5326ca2;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hpb=9b78074e1487ac263f84fd1132735fba83045719

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 75842a8d4..cd6918b72 100644
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -1,19 +1,20 @@
 /*
-    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
+    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/>.
 
 */
 
@@ -21,17 +22,23 @@
  *  @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 "wx_util.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;
 
 /** Must be called in the GUI thread */
 JobManagerView::JobManagerView (wxWindow* parent)
@@ -41,97 +48,34 @@ JobManagerView::JobManagerView (wxWindow* parent)
 	wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 	sizer->Add (_panel, 1, wxEXPAND);
 	SetSizer (sizer);
-	
-	_table = new wxFlexGridSizer (4, 6, 6);
-	_table->AddGrowableCol (1, 1);
+
+	_table = new wxFlexGridSizer (4, 4, 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));
 }
 
 void
-JobManagerView::periodic (wxTimerEvent &)
+JobManagerView::job_added (weak_ptr<Job> j)
 {
-	update ();
-}
-
-/** Update the view by examining the state of each job.
- *  Must be called in the GUI thread.
- */
-void
-JobManagerView::update ()
-{
-	list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
-
-	int index = 0;
-
-	for (list<shared_ptr<Job> >::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.finalised = false;
-			r.gauge = new wxGauge (_panel, wxID_ANY, 100);
-			_table->Insert (index + 1, r.gauge, 1, wxEXPAND | wxLEFT | wxRIGHT);
-			
-			r.message = new wxStaticText (_panel, wxID_ANY, std_to_wx (""));
-			_table->Insert (index + 2, r.message, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
-
-			r.details = new wxButton (_panel, wxID_ANY, _("Details..."));
-			r.details->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (JobManagerView::details_clicked), 0, this);
-			r.details->Enable (false);
-			_table->Insert (index + 3, r.details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
-			
-			_job_records[*i] = r;
-		}
-
-		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 (_("Running"));
-				_job_records[*i].gauge->Pulse ();
-			}
-		}
-		
-		if ((*i)->finished() && !_job_records[*i].finalised) {
-			_job_records[*i].gauge->SetValue (100);
-			_job_records[*i].message->SetLabel (std_to_wx (st));
-			_job_records[*i].finalised = true;
-			if (!(*i)->error_details().empty ()) {
-				_job_records[*i].details->Enable (true);
-			}
-		}
-
-		index += 3;
+	shared_ptr<Job> job = j.lock ();
+	if (job) {
+		_job_records.push_back (shared_ptr<JobView> (new JobView (job, this, _panel, _table)));
 	}
-
-	_table->Layout ();
-	FitInside ();
 }
 
 void
-JobManagerView::details_clicked (wxCommandEvent& ev)
+JobManagerView::periodic ()
 {
-	wxObject* o = ev.GetEventObject ();
-
-	for (map<boost::shared_ptr<Job>, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
-		if (i->second.details == o) {
-			string s = i->first->error_summary();
-			s[0] = toupper (s[0]);
-			error_dialog (this, String::compose ("%1.\n\n%2", s, i->first->error_details()));
-		}
+	for (list<shared_ptr<JobView> >::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
+		(*i)->maybe_pulse ();
 	}
 }