From 3dd54ab58a1744c017a062305653e2e90811f04c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 25 May 2015 03:13:15 +0100 Subject: [PATCH] a914ff2d9e06893328abee2fe40fb7b82ac89c02 from master; display DCP container size beside the choice in the DCP tab. --- ChangeLog | 3 +++ TO_PORT | 1 - src/wx/dcp_panel.cc | 16 +++++++++++++--- src/wx/dcp_panel.h | 1 + 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 307068e5b..1472137f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-05-25 Carl Hetherington + * Display DCP container size beside the choice + in the DCP tab. + * Try to set up useful default colour conversions depending on the type and resolution of content (#565). diff --git a/TO_PORT b/TO_PORT index d153948fa..383230e8c 100644 --- a/TO_PORT +++ b/TO_PORT @@ -1,4 +1,3 @@ -ccb883a479cb341c686fc4237763f483d15e1ec5 8e5f3e2d989a119f41ba4c69434545c0929e92e0 468a7437c8ec82a8f74ae30197a2c5b04100b75d 2bf46f7c75c59e4cd3d91f1ddd322bdabb19b6f4 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; -- 2.30.2