X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fjob_manager_view.cc;h=19243393c308dc174e7ee7bda14c1699f183df8d;hb=6e3e984162ca7a181bc7c98d90c295e88e4e7f6c;hp=dffe3a90a3e7d4b9f74cdab9c67c3f57429a546d;hpb=69812a7d02f5714a80a0a131b96f5f76a8f3c3a3;p=dcpomatic.git diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index dffe3a90a..19243393c 100644 --- a/src/wx/job_manager_view.cc +++ b/src/wx/job_manager_view.cc @@ -1,210 +1,149 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington - 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 . + */ + /** @file src/job_manager_view.cc * @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 "wx_util.h" +#include "lib/compose.hpp" +#include + using std::string; using std::list; using std::map; -using boost::shared_ptr; -using boost::weak_ptr; - -/** Must be called in the GUI thread */ -JobManagerView::JobManagerView (wxWindow* parent, Buttons buttons) +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) - , _buttons (buttons) + , _batch (batch) { _panel = new wxPanel (this); - wxSizer* sizer = new wxBoxSizer (wxVERTICAL); + auto sizer = new wxBoxSizer (wxVERTICAL); sizer->Add (_panel, 1, wxEXPAND); SetSizer (sizer); - int N = 5; - if (buttons & PAUSE) { - ++N; - } - - _table = new wxFlexGridSizer (N, 6, 6); - _table->AddGrowableCol (1, 1); + _table = new wxFlexGridSizer (2, 6, 6); + _table->AddGrowableCol (0, 1); _panel->SetSizer (_table); SetScrollRate (0, 32); + EnableScrolling (false, true); - JobManager::instance()->JobAdded.connect (bind (&JobManagerView::job_added, this, _1)); -} - -void -JobManagerView::job_added (weak_ptr j) -{ - shared_ptr job = j.lock (); - if (!job) { - return; - } + Bind (wxEVT_TIMER, boost::bind(&JobManagerView::periodic, this)); + _timer.reset (new wxTimer (this)); + _timer->Start (1000); - wxStaticText* m = new wxStaticText (_panel, wxID_ANY, std_to_wx (job->name ())); - _table->Insert (0, m, 0, wxALIGN_CENTER_VERTICAL | wxALL, 6); - - JobRecord r; - int n = 1; - r.scroll_nudged = false; - r.gauge = new wxGauge (_panel, wxID_ANY, 100); - _table->Insert (n, r.gauge, 1, wxEXPAND | wxLEFT | wxRIGHT); - ++n; - - r.message = new wxStaticText (_panel, wxID_ANY, std_to_wx ("")); - _table->Insert (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 (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 (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 (n, r.details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6); - ++n; - - _job_records[job] = r; - - job->Progress.connect (bind (&JobManagerView::progress, this, j)); - job->Progress.connect (bind (&JobManagerView::finished, this, j)); - - _table->Layout (); - FitInside (); + JobManager::instance()->JobAdded.connect (bind(&JobManagerView::job_added, this, _1)); + JobManager::instance()->JobsReordered.connect (bind(&JobManagerView::replace, this)); } + void -JobManagerView::progress (weak_ptr j) +JobManagerView::job_added (weak_ptr j) { - shared_ptr job = j.lock (); - if (!job) { - return; - } - - float const p = job->overall_progress (); - if (p >= 0) { - checked_set (_job_records[job].message, job->status ()); - _job_records[job].gauge->SetValue (p * 100); - } else { - checked_set (_job_records[job].message, wx_to_std (_("Running"))); - _job_records[job].gauge->Pulse (); - } - - if (!_job_records[job].scroll_nudged && (job->running () || job->finished())) { - int x, y; - _job_records[job].gauge->GetPosition (&x, &y); - int px, py; - GetScrollPixelsPerUnit (&px, &py); - int vx, vy; - GetViewStart (&vx, &vy); - int sx, sy; - GetClientSize (&sx, &sy); - - if (y > (vy * py + sy / 2)) { - Scroll (-1, y / py); - _job_records[job].scroll_nudged = true; + auto job = j.lock (); + if (job) { + shared_ptr 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); } - _table->Layout (); - FitInside (); + FitInside(); + job_list_changed (); } + void -JobManagerView::finished (weak_ptr j) +JobManagerView::periodic () { - shared_ptr job = j.lock (); - if (!job) { - return; - } - - checked_set (_job_records[job].message, job->status ()); - if (!job->finished_cancelled ()) { - _job_records[job].gauge->SetValue (100); + for (auto i: _job_records) { + i->maybe_pulse (); } - _job_records[job].cancel->Enable (false); - if (!job->error_details().empty ()) { - _job_records[job].details->Enable (true); - } - - _table->Layout (); - FitInside (); } + void -JobManagerView::details_clicked (wxCommandEvent& ev) +JobManagerView::replace () { - wxObject* o = ev.GetEventObject (); + /* Make a new version of _job_records which reflects the order in JobManager's job list */ - for (map, 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()))); + list> 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; + } } } -} -void -JobManagerView::cancel_clicked (wxCommandEvent& ev) -{ - wxObject* o = ev.GetEventObject (); + for (auto i: _job_records) { + i->detach (); + } - for (map, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) { - if (i->second.cancel == o) { - i->first->cancel (); - } + _job_records = new_job_records; + + for (auto i: _job_records) { + i->insert (i->insert_position ()); } + + job_list_changed (); } + void -JobManagerView::pause_clicked (wxCommandEvent& ev) +JobManagerView::job_list_changed () { - wxObject* o = ev.GetEventObject (); - for (map, 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 (auto i: _job_records) { + i->job_list_changed (); } } -