X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_waveform_dialog.cc;h=bc68fa6c2efe95e6b51729988533efded801ae48;hb=23aa3071850761144798112a5aaea61304de8586;hp=e4b09b8eec0b2f9ecb24ddf012fbf3e0d143f81b;hpb=585de1d31ceb8c42c34552509d9372068a9b45b5;p=dcpomatic.git

diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc
index e4b09b8ee..bc68fa6c2 100644
--- a/src/wx/video_waveform_dialog.cc
+++ b/src/wx/video_waveform_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    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.
 
@@ -22,20 +22,34 @@
 #include "video_waveform_plot.h"
 #include "film_viewer.h"
 #include "wx_util.h"
-#include <boost/bind.hpp>
+#include "static_text.h"
+#include <boost/bind/bind.hpp>
 #include <iostream>
 
 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, 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)
 {
@@ -47,16 +61,27 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, FilmViewer* 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
@@ -71,8 +96,9 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, FilmViewer* viewer)
 	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);
@@ -86,7 +112,9 @@ VideoWaveformDialog::shown (wxShowEvent& ev)
 {
 	_plot->set_enabled (ev.IsShown ());
 	if (ev.IsShown ()) {
-		_viewer->refresh ();
+		shared_ptr<FilmViewer> fv = _viewer.lock ();
+		DCPOMATIC_ASSERT (fv);
+		fv->slow_refresh ();
 	}
 }
 
@@ -101,3 +129,19 @@ VideoWaveformDialog::contrast_changed ()
 {
 	_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));
+	}
+}