diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-05-25 03:13:15 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-05-25 03:13:15 +0100 |
| commit | 3dd54ab58a1744c017a062305653e2e90811f04c (patch) | |
| tree | 1b4a3e6e96faa9a727af1bd512191ed4c75d02d2 /src | |
| parent | 46b75f89c0fd357285178c68209f663e3afa85c8 (diff) | |
a914ff2d9e06893328abee2fe40fb7b82ac89c02 from master; display DCP container size beside the choice in the DCP tab.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/dcp_panel.cc | 16 | ||||
| -rw-r--r-- | src/wx/dcp_panel.h | 1 |
2 files changed, 14 insertions, 3 deletions
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index ccfe5711c..5957dc9d0 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -299,6 +299,7 @@ DCPPanel::film_changed (int p) break; case Film::RESOLUTION: checked_set (_resolution, _film->resolution() == RESOLUTION_2K ? 0 : 1); + setup_container (); setup_dcp_name (); break; case Film::J2K_BANDWIDTH: @@ -375,8 +376,11 @@ DCPPanel::setup_container () if (i == ratios.end()) { checked_set (_container, -1); + checked_set (_container_size, wxT ("")); } else { checked_set (_container, n); + dcp::Size const size = fit_ratio_within (_film->container()->ratio(), _film->full_frame ()); + checked_set (_container_size, wxString::Format ("%dx%d", size.width, size.height)); } setup_dcp_name (); @@ -554,9 +558,15 @@ DCPPanel::make_video_panel () int r = 0; add_label_to_grid_bag_sizer (grid, panel, _("Container"), true, wxGBPosition (r, 0)); - _container = new wxChoice (panel, wxID_ANY); - grid->Add (_container, wxGBPosition (r, 1)); - ++r; + { + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _container = new wxChoice (panel, wxID_ANY); + s->Add (_container, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP); + _container_size = new wxStaticText (panel, wxID_ANY, wxT ("")); + s->Add (_container_size, 1, wxLEFT | wxALIGN_CENTER_VERTICAL); + grid->Add (s, wxGBPosition (r,1 ), wxDefaultSpan, wxEXPAND); + ++r; + } { add_label_to_grid_bag_sizer (grid, panel, _("Frame Rate"), true, wxGBPosition (r, 0)); diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h index 96786d8a1..d2f32cc21 100644 --- a/src/wx/dcp_panel.h +++ b/src/wx/dcp_panel.h @@ -87,6 +87,7 @@ private: wxStaticText* _dcp_name; wxCheckBox* _use_isdcf_name; wxChoice* _container; + wxStaticText* _container_size; wxButton* _edit_isdcf_button; wxButton* _copy_isdcf_name_button; wxSpinCtrl* _j2k_bandwidth; |