Extract common code out into kdm_for_screen()

[dcpomatic.git] / src / wx / video_waveform_dialog.cc

diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc
index 3e9a1714a086b19e8811d4f4253e8f73a7dac450..f3d4a7aa527330d9d09718cfc6e8200295c0a5e8 100644 (file)
--- 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,31 @@
 #include "video_waveform_plot.h"
 #include "film_viewer.h"
 #include "wx_util.h"
+#include "static_text.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);
@@ -49,7 +66,18 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, FilmViewer* viewer)
 
        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 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 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
@@ -64,8 +92,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);
@@ -79,7 +108,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 ();
        }
 }
 
@@ -94,3 +125,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));
+       }
+}