/*
- Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-2018 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/>.
*/
#include "film_viewer.h"
#include "wx_util.h"
#include <boost/bind.hpp>
+#include <iostream>
using std::cout;
using boost::bind;
-
-VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, FilmViewer* viewer)
- : wxDialog (parent, wxID_ANY, _("Video Waveform"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE)
+using boost::weak_ptr;
+using boost::shared_ptr;
+
+VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film> film, weak_ptr<FilmViewer> viewer)
+ : wxDialog (
+ parent,
+ wxID_ANY,
+ _("Video Waveform"),
+ wxDefaultPosition,
+ wxSize (640, 512),
+#ifdef DCPOMATIC_OSX
+ /* I can't get wxFRAME_FLOAT_ON_PARENT to work on OS X, and although wxSTAY_ON_TOP keeps
+ the window above all others (and not just our own) it's better than nothing for now.
+ */
+ wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxSTAY_ON_TOP
+#else
+ wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT
+#endif
+ )
, _viewer (viewer)
{
wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
overall_sizer->Add (controls, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_X_GAP);
- _plot = new VideoWaveformPlot (this, _viewer);
+ wxBoxSizer* position = new wxBoxSizer (wxHORIZONTAL);
+ add_label_to_sizer (position, this, _("Image X position"), true);
+ _x_position = new wxStaticText (this, wxID_ANY, "");
+ _x_position->SetMinSize (wxSize (64, -1));
+ position->Add (_x_position, 0, wxALL, DCPOMATIC_SIZER_X_GAP);
+ add_label_to_sizer (position, this, _("component value"), true);
+ _value = new wxStaticText (this, wxID_ANY, "");
+ _value->SetMinSize (wxSize (64, -1));
+ position->Add (_value, 0, wxALL, DCPOMATIC_SIZER_X_GAP);
+ overall_sizer->Add (position, 0, wxEXPAND | wxALL, DCPOMATIC_SIZER_Y_GAP);
+
+ _plot = new VideoWaveformPlot (this, film, _viewer);
overall_sizer->Add (_plot, 1, wxALL | wxEXPAND, 12);
#ifdef DCPOMATIC_LINUX
overall_sizer->SetSizeHints (this);
Bind (wxEVT_SHOW, bind (&VideoWaveformDialog::shown, this, _1));
- _component->Bind (wxEVT_COMMAND_CHOICE_SELECTED, bind (&VideoWaveformDialog::component_changed, this));
+ _component->Bind (wxEVT_CHOICE, bind (&VideoWaveformDialog::component_changed, this));
_contrast->Bind (wxEVT_SCROLL_THUMBTRACK, bind (&VideoWaveformDialog::contrast_changed, this));
+ _plot->MouseMoved.connect (bind (&VideoWaveformDialog::mouse_moved, this, _1, _2, _3, _4));
_component->SetSelection (0);
_contrast->SetValue (32);
{
_plot->set_enabled (ev.IsShown ());
if (ev.IsShown ()) {
- _viewer->refresh ();
+ shared_ptr<FilmViewer> fv = _viewer.lock ();
+ DCPOMATIC_ASSERT (fv);
+ fv->slow_refresh ();
}
}
{
_plot->set_contrast (_contrast->GetValue ());
}
+
+void
+VideoWaveformDialog::mouse_moved (int x1, int x2, int y1, int y2)
+{
+ if (x1 != x2) {
+ _x_position->SetLabel (wxString::Format ("%d-%d", x1, x2));
+ } else {
+ _x_position->SetLabel (wxString::Format ("%d", x1));
+ }
+
+ if (y1 != y2) {
+ _value->SetLabel (wxString::Format ("%d-%d", y1, y2));
+ } else {
+ _value->SetLabel (wxString::Format ("%d", y1));
+ }
+}