/*
- Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
#include "video_waveform_dialog.h"
#include "video_waveform_plot.h"
#include "film_viewer.h"
#include "wx_util.h"
-#include <boost/bind.hpp>
-#include <iostream>
+#include "static_text.h"
+#include <boost/bind/bind.hpp>
+
-using std::cout;
using boost::bind;
+using std::weak_ptr;
+using std::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
-VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, FilmViewer* viewer)
+
+VideoWaveformDialog::VideoWaveformDialog(wxWindow* parent, weak_ptr<const Film> film, 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)
{
_component->Append (wxT ("X"));
_component->Append (wxT ("Y"));
_component->Append (wxT ("Z"));
- add_label_to_sizer (controls, this, _("Component"), true);
+ add_label_to_sizer (controls, this, _("Component"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
controls->Add (_component, 1, wxALL, DCPOMATIC_SIZER_X_GAP);
- add_label_to_sizer (controls, this, _("Contrast"), true);
+ add_label_to_sizer (controls, this, _("Contrast"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
_contrast = new wxSlider (this, wxID_ANY, 0, 0, 256);
controls->Add (_contrast, 1, wxALL, DCPOMATIC_SIZER_X_GAP);
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, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+ _x_position = new StaticText (this, "");
+ _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, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+ _value = new StaticText (this, "");
+ _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 ();
+ _viewer.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));
+ }
+}