diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-11-05 13:52:01 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-11-05 13:52:01 +0000 |
| commit | d6c2a4a682d0d61d5be108106ab870d69b3fae8b (patch) | |
| tree | 4e9c56ba1cdb45705c5e2a69c642dbc570eaaf6c /src | |
| parent | a3c9e023a80acebd47eb551f1ca0f3b5ab542915 (diff) | |
Job progress tidy-ups.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/transcode_job.cc | 7 | ||||
| -rw-r--r-- | src/wx/job_manager_view.cc | 4 | ||||
| -rw-r--r-- | src/wx/job_manager_view.h | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index db4fb86e1..25581c8f5 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -98,7 +98,12 @@ TranscodeJob::status () const stringstream s; - s << Job::status () << "; " << fixed << setprecision (1) << fps << " frames per second"; + s << Job::status (); + + if (!finished ()) { + s << "; " << fixed << setprecision (1) << fps << " frames per second"; + } + return s.str (); } diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index bd2886231..9c7040584 100644 --- a/src/wx/job_manager_view.cc +++ b/src/wx/job_manager_view.cc @@ -77,6 +77,7 @@ JobManagerView::update () _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); @@ -99,9 +100,10 @@ JobManagerView::update () } } - if ((*i)->finished()) { + 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; } index += 3; diff --git a/src/wx/job_manager_view.h b/src/wx/job_manager_view.h index b10446cdd..5c10890ef 100644 --- a/src/wx/job_manager_view.h +++ b/src/wx/job_manager_view.h @@ -46,6 +46,7 @@ private: struct JobRecord { wxGauge* gauge; wxStaticText* message; + bool finalised; }; std::map<boost::shared_ptr<Job>, JobRecord> _job_records; |
