Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc
index fc2caf0f7865efd8e9d9a4b0c68eba7e5d9e22ac..407abb503b801173565571936d47b32afe2c641c 100644 (file)
--- a/src/wx/audio_mapping_view.cc
+++ b/src/wx/audio_mapping_view.cc
@@ -32,6 +32,7 @@
 #include <wx/renderer.h>
 #include <wx/grid.h>
 #include <boost/lexical_cast.hpp>
+#include <iostream>
 
 using std::cout;
 using std::list;
@@ -79,7 +80,7 @@ public:
                dc.SetBrush (*wxTheBrushList->FindOrCreateBrush (wxColour (255, 255, 255), wxBRUSHSTYLE_SOLID));
                dc.DrawRectangle (wxRect (rect.GetLeft() + xo, rect.GetTop() + yo, INDICATOR_SIZE, INDICATOR_SIZE));
 
-               float const value = lexical_cast<float> (wx_to_std (grid.GetCellValue (row, col)));
+               float const value = raw_convert<float> (wx_to_std (grid.GetCellValue (row, col)));
                float const value_dB = 20 * log10 (value);
                int const range = 18;
                int height = 0;
@@ -88,7 +89,7 @@ public:
                }
 
                height = max (0, height);
-               
+
                if (value > 0) {
                        /* Make sure we get a little bit of the marker if there is any gain */
                        height = max (3, height);
@@ -102,7 +103,7 @@ public:
        {
                return wxSize (INDICATOR_SIZE + 4, INDICATOR_SIZE + 4);
        }
-       
+
        wxGridCellRenderer* Clone () const
        {
                return new ValueRenderer;
@@ -135,6 +136,7 @@ AudioMappingView::AudioMappingView (wxWindow* parent)
        Bind (wxEVT_GRID_CELL_LEFT_CLICK, boost::bind (&AudioMappingView::left_click, this, _1));
        Bind (wxEVT_GRID_CELL_RIGHT_CLICK, boost::bind (&AudioMappingView::right_click, this, _1));
        _grid->GetGridWindow()->Bind (wxEVT_MOTION, boost::bind (&AudioMappingView::mouse_moved, this, _1));
+       Bind (wxEVT_SIZE, boost::bind (&AudioMappingView::sized, this, _1));
 
        _menu = new wxMenu;
        _menu->Append (ID_off, _("Off"));
@@ -155,7 +157,7 @@ AudioMappingView::map_values_changed ()
        update_cells ();
        Changed (_map);
        _last_tooltip_column = -1;
-}      
+}
 
 void
 AudioMappingView::left_click (wxGridEvent& ev)
@@ -165,7 +167,7 @@ AudioMappingView::left_click (wxGridEvent& ev)
        }
 
        int const d = ev.GetCol() - 1;
-       
+
        if (_map.get (ev.GetRow(), d) > 0) {
                _map.set (ev.GetRow(), d, 0);
        } else {
@@ -212,13 +214,13 @@ void
 AudioMappingView::edit ()
 {
        int const d = _menu_column - 1;
-       
+
        AudioGainDialog* dialog = new AudioGainDialog (this, _menu_row, _menu_column - 1, _map.get (_menu_row, d));
        if (dialog->ShowModal () == wxID_OK) {
                _map.set (_menu_row, d, dialog->value ());
                map_values_changed ();
        }
-       
+
        dialog->Destroy ();
 }
 
@@ -247,7 +249,7 @@ AudioMappingView::set_output_channels (vector<string> const & names)
                _grid->InsertCols (_grid->GetNumberCols(), o - _grid->GetNumberCols());
        }
 
-       _grid->SetColLabelValue (0, _("Content"));
+       _grid->SetColLabelValue (0, wxT (""));
 
        for (size_t i = 0; i < names.size(); ++i) {
                _grid->SetColLabelValue (i + 1, std_to_wx (names[i]));
@@ -263,7 +265,7 @@ AudioMappingView::update_cells ()
        for (int i = 0; i < _grid->GetNumberRows (); ++i) {
                row_names.push_back (wx_to_std (_grid->GetCellValue (i, 0)));
        }
-       
+
        if (_grid->GetNumberRows ()) {
                _grid->DeleteRows (0, _grid->GetNumberRows ());
        }
@@ -275,7 +277,7 @@ AudioMappingView::update_cells ()
                        _grid->SetCellRenderer (i, j + 1, new ValueRenderer);
                }
        }
-       
+
        for (int i = 0; i < _map.input_channels(); ++i) {
                if (i < int (row_names.size ())) {
                        _grid->SetCellValue (i, 0, std_to_wx (row_names[i]));
@@ -316,7 +318,7 @@ AudioMappingView::mouse_moved (wxMouseEvent& ev)
                        float const dB = 20 * log10 (gain);
                        s = wxString::Format (_("Audio will be passed from content channel %d to DCP channel %d with gain %.1fdB."), row + 1, column, dB);
                }
-               
+
                _grid->GetGridWindow()->SetToolTip (s + " " + _("Right click to change gain."));
                _last_tooltip_row = row;
                _last_tooltip_column = column;
@@ -324,3 +326,10 @@ AudioMappingView::mouse_moved (wxMouseEvent& ev)
 
         ev.Skip ();
 }
+
+void
+AudioMappingView::sized (wxSizeEvent& ev)
+{
+       _grid->AutoSize ();
+       ev.Skip ();
+}