X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fvideo_waveform_dialog.cc;h=bc68fa6c2efe95e6b51729988533efded801ae48;hb=f802565830bed9ec9e7ad6c16ccaa7b0700625d9;hp=1fd96ea0b2800e012478e478f3f0618c29d76d92;hpb=c3433d59c0d320f0451df18c9cb06bfd5fff40b0;p=dcpomatic.git

diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc
index 1fd96ea0b..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,14 +22,20 @@
 #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 boost::weak_ptr;
+using std::weak_ptr;
+using std::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
 
-VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film> film, FilmViewer* viewer)
+VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film> film, weak_ptr<FilmViewer> viewer)
 	: wxDialog (
 		parent,
 		wxID_ANY,
@@ -55,22 +61,22 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film>
 	_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);
 
 	wxBoxSizer* position = new wxBoxSizer (wxHORIZONTAL);
-	add_label_to_sizer (position, this, _("Image X position"), true);
-	_x_position = new wxStaticText (this, wxID_ANY, "");
+	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);
-	_value = new wxStaticText (this, wxID_ANY, "");
+	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);
@@ -90,7 +96,7 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film>
 	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));
 
@@ -106,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 ();
 	}
 }