/*
- 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_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, ControlFilmViewer* viewer)
+VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film> film, weak_ptr<FilmViewer> viewer)
: wxDialog (
parent,
wxID_ANY,
_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);
{
_plot->set_enabled (ev.IsShown ());
if (ev.IsShown ()) {
- _viewer->slow_refresh ();
+ shared_ptr<FilmViewer> fv = _viewer.lock ();
+ DCPOMATIC_ASSERT (fv);
+ fv->slow_refresh ();
}
}