X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.cc;h=24cacf6b01ec88bd43b91745416e035220b3f6b0;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=5cd9f2e15486904a28b7fc4add7588e182709bf0;hpb=8747970bc94161787d84d00835282ba8d3dc1135;p=dcpomatic.git

diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 5cd9f2e15..24cacf6b0 100644
--- 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
@@ -31,166 +31,166 @@
 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, Buttons buttons)
-	: wxScrolledWindow (parent)
-	, _buttons (buttons)
+class JobRecord : public boost::noncopyable
 {
-	_panel = new wxPanel (this);
-	wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
-	sizer->Add (_panel, 1, wxEXPAND);
-	SetSizer (sizer);
-
-	int N = 5;
-	if (buttons & PAUSE) {
-		++N;
+public:
+	JobRecord (shared_ptr<Job> job, wxScrolledWindow* window, wxPanel* panel, wxFlexGridSizer* table)
+		: _job (job)
+		, _window (window)
+		, _panel (panel)
+	{
+		int n = 0;
+
+		wxBoxSizer* gauge_message = new wxBoxSizer (wxVERTICAL);
+		_gauge = new wxGauge (panel, wxID_ANY, 100);
+		/* This seems to be required to allow the gauge to shrink under OS X */
+		_gauge->SetMinSize (wxSize (0, -1));
+		gauge_message->Add (_gauge, 0, wxEXPAND | wxLEFT | wxRIGHT);
+		_message = new wxStaticText (panel, wxID_ANY, wxT (" \n "), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
+		gauge_message->Add (_message, 1, wxEXPAND | wxALIGN_CENTER_VERTICAL | wxALL, 6);
+		table->Insert (n, gauge_message, 1, wxEXPAND | wxLEFT | wxRIGHT);
+		++n;
+
+		_cancel = new wxButton (panel, wxID_ANY, _("Cancel"));
+		_cancel->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::cancel_clicked, this);
+		table->Insert (n, _cancel, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
+		++n;
+
+		_pause = new wxButton (_panel, wxID_ANY, _("Pause"));
+		_pause->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::pause_clicked, this);
+		table->Insert (n, _pause, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
+		++n;
+
+		_details = new wxButton (_panel, wxID_ANY, _("Details..."));
+		_details->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::details_clicked, this);
+		_details->Enable (false);
+		table->Insert (n, _details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 3);
+		++n;
+
+		_progress_connection = job->Progress.connect (boost::bind (&JobRecord::progress, this));
+		_finished_connection = job->Finished.connect (boost::bind (&JobRecord::finished, this));
+
+		table->Layout ();
 	}
-	
-	_table = new wxFlexGridSizer (N, 6, 6);
-	_table->AddGrowableCol (1, 1);
-	_panel->SetSizer (_table);
 
-	SetScrollRate (0, 32);
+	void maybe_pulse ()
+	{
+		if (_job->running() && !_job->progress ()) {
+			_gauge->Pulse ();
+		}
+	}
 
-	Connect (wxID_ANY, wxEVT_TIMER, wxTimerEventHandler (JobManagerView::periodic), 0, this);
-	_timer.reset (new wxTimer (this));
-	_timer->Start (1000);
+private:
 
-	update ();
-}
+	void progress ()
+	{
+		string whole = "<b>" + _job->name () + "</b>\n";
+		if (!_job->sub_name().empty ()) {
+			whole += _job->sub_name() + " ";
+		}
+		whole += _job->status ();
+		if (whole != _last_message) {
+			_message->SetLabelMarkup (whole);
+			_last_message = whole;
+		}
+		if (_job->progress ()) {
+			_gauge->SetValue (min (100.0f, _job->progress().get() * 100));
+		}
+	}
 
-void
-JobManagerView::periodic (wxTimerEvent &)
-{
-	update ();
-}
+	void finished ()
+	{
+		progress ();
 
-/** 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;
-			int n = 1;
-			r.finalised = false;
-			r.gauge = new wxGauge (_panel, wxID_ANY, 100);
-			_table->Insert (index + n, r.gauge, 1, wxEXPAND | wxLEFT | wxRIGHT);
-			++n;
-			
-			r.message = new wxStaticText (_panel, wxID_ANY, std_to_wx (""));
-			_table->Insert (index + n, r.message, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
-			++n;
-
-			r.cancel = new wxButton (_panel, wxID_ANY, _("Cancel"));
-			r.cancel->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (JobManagerView::cancel_clicked), 0, this);
-			_table->Insert (index + n, r.cancel, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
-			++n;
-
-			if (_buttons & PAUSE) {
-				r.pause = new wxButton (_panel, wxID_ANY, _("Pause"));
-				r.pause->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (JobManagerView::pause_clicked), 0, this);
-				_table->Insert (index + n, r.pause, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
-				++n;
-			}
-			
-			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 + n, r.details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
-			++n;
-			
-			_job_records[*i] = r;
+		if (!_job->finished_cancelled ()) {
+			_gauge->SetValue (100);
 		}
 
-		string const st = (*i)->status ();
-
-		if (!(*i)->finished ()) {
-			float const p = (*i)->overall_progress ();
-			if (p >= 0) {
-				checked_set (_job_records[*i].message, st);
-				_job_records[*i].gauge->SetValue (p * 100);
-			} else {
-				checked_set (_job_records[*i].message, wx_to_std (_("Running")));
-				_job_records[*i].gauge->Pulse ();
-			}
+		_cancel->Enable (false);
+		_pause->Enable (false);
+		if (!_job->error_details().empty ()) {
+			_details->Enable (true);
 		}
+	}
 
-		if ((*i)->finished() && !_job_records[*i].finalised) {
-			checked_set (_job_records[*i].message, st);
-			if (!(*i)->finished_cancelled()) {
-				_job_records[*i].gauge->SetValue (100);
-			}
-			(*i)->Finished ();
-			_job_records[*i].finalised = true;
-			_job_records[*i].cancel->Enable (false);
-			if (!(*i)->error_details().empty ()) {
-				_job_records[*i].details->Enable (true);
-			}
-		}
+	void details_clicked (wxCommandEvent &)
+	{
+		string s = _job->error_summary();
+		s[0] = toupper (s[0]);
+		error_dialog (_window, std_to_wx (String::compose ("%1.\n\n%2", s, _job->error_details())));
+	}
+
+	void cancel_clicked (wxCommandEvent &)
+	{
+		_job->cancel ();
+	}
 
-		index += 5;
-		if (_buttons & PAUSE) {
-			++index;
+	void pause_clicked (wxCommandEvent &)
+	{
+		if (_job->paused()) {
+			_job->resume ();
+			_pause->SetLabel (_("Pause"));
+		} else {
+			_job->pause ();
+			_pause->SetLabel (_("Resume"));
 		}
 	}
 
-	_table->Layout ();
-	FitInside ();
-}
+	boost::shared_ptr<Job> _job;
+	wxScrolledWindow* _window;
+	wxPanel* _panel;
+	wxGauge* _gauge;
+	wxStaticText* _message;
+	wxButton* _cancel;
+	wxButton* _pause;
+	wxButton* _details;
+	std::string _last_message;
 
-void
-JobManagerView::details_clicked (wxCommandEvent& ev)
+	boost::signals2::scoped_connection _progress_connection;
+	boost::signals2::scoped_connection _finished_connection;
+};
+
+/** Must be called in the GUI thread */
+JobManagerView::JobManagerView (wxWindow* parent)
+	: wxScrolledWindow (parent)
 {
-	wxObject* o = ev.GetEventObject ();
+	_panel = new wxPanel (this);
+	wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+	sizer->Add (_panel, 1, wxEXPAND);
+	SetSizer (sizer);
 
-	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, std_to_wx (String::compose ("%1.\n\n%2", s, i->first->error_details())));
-		}
-	}
+	_table = new wxFlexGridSizer (4, 4, 6);
+	_table->AddGrowableCol (0, 1);
+	_panel->SetSizer (_table);
+
+	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));
 }
 
 void
-JobManagerView::cancel_clicked (wxCommandEvent& ev)
+JobManagerView::job_added (weak_ptr<Job> j)
 {
-	wxObject* o = ev.GetEventObject ();
-
-	for (map<boost::shared_ptr<Job>, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
-		if (i->second.cancel == o) {
-			i->first->cancel ();
-		}
+	shared_ptr<Job> job = j.lock ();
+	if (job) {
+		_job_records.push_back (shared_ptr<JobRecord> (new JobRecord (job, this, _panel, _table)));
 	}
 }
 
 void
-JobManagerView::pause_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.pause == o) {
-			if (i->first->paused()) {
-				i->first->resume ();
-				i->second.pause->SetLabel (_("Pause"));
-			} else {
-				i->first->pause ();
-				i->second.pause->SetLabel (_("Resume"));
-			}
-		}
+	for (list<shared_ptr<JobRecord> >::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
+		(*i)->maybe_pulse ();
 	}
 }
-