summaryrefslogtreecommitdiff
path: root/src/wx
diff options
context:
space:
mode:
Diffstat (limited to 'src/wx')
-rw-r--r--src/wx/custom_scale_dialog.cc142
-rw-r--r--src/wx/custom_scale_dialog.h51
-rw-r--r--src/wx/video_panel.cc132
-rw-r--r--src/wx/video_panel.h10
-rw-r--r--src/wx/wscript3
5 files changed, 286 insertions, 52 deletions
diff --git a/src/wx/custom_scale_dialog.cc b/src/wx/custom_scale_dialog.cc
new file mode 100644
index 000000000..5725d2378
--- /dev/null
+++ b/src/wx/custom_scale_dialog.cc
@@ -0,0 +1,142 @@
+/*
+ Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ DCP-o-matic is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include "custom_scale_dialog.h"
+#include "wx_util.h"
+#include "lib/util.h"
+#include <dcp/raw_convert.h>
+#include <wx/wx.h>
+#include <wx/propgrid/property.h>
+#include <wx/propgrid/props.h>
+
+
+using boost::optional;
+using namespace dcp;
+
+
+CustomScaleDialog::CustomScaleDialog (wxWindow* parent, dcp::Size initial, dcp::Size film_container, optional<float> custom_ratio, optional<dcp::Size> custom_size)
+ : TableDialog (parent, _("Custom scale"), 3, 1, true)
+ , _film_container (film_container)
+{
+ _ratio_to_fit = new wxRadioButton (this, wxID_ANY, _("Set ratio and fit to DCP container"));
+ add (_ratio_to_fit);
+ wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ _ratio = new wxTextCtrl (this, wxID_ANY, _(""), wxDefaultPosition, wxDefaultSize, 0, wxNumericPropertyValidator(wxNumericPropertyValidator::Float));
+ s->Add (_ratio, 1, wxRIGHT, 4);
+ add_label_to_sizer (s, this, wxT(":1"), false);
+ add (s);
+ _size_from_ratio = new wxStaticText (this, wxID_ANY, wxT(""));
+ add (_size_from_ratio, 1, wxALIGN_CENTER_VERTICAL);
+
+ _size = new wxRadioButton (this, wxID_ANY, _("Set size"));
+ add (_size);
+ s = new wxBoxSizer (wxHORIZONTAL);
+ _width = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1), wxSP_ARROW_KEYS, 1, film_container.width);
+ s->Add (_width, 1, wxRIGHT, 4);
+ add_label_to_sizer (s, this, wxT("x"), false);
+ _height = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1), wxSP_ARROW_KEYS, 1, film_container.height);
+ s->Add (_height, 1, wxRIGHT, 4);
+ add (s);
+ _ratio_from_size = new wxStaticText (this, wxID_ANY, wxT(""));
+ add (_ratio_from_size, 1, wxALIGN_CENTER_VERTICAL);
+
+ if (custom_ratio) {
+ _ratio_to_fit->SetValue (true);
+ _size->SetValue (false);
+ _ratio->SetValue (wxString::Format("%.2f", *custom_ratio));
+ _width->SetValue (initial.width);
+ _height->SetValue (initial.height);
+ } else if (custom_size) {
+ _ratio_to_fit->SetValue (false);
+ _size->SetValue (true);
+ _ratio->SetValue (wxString::Format("%.2f", initial.ratio()));
+ _width->SetValue (custom_size->width);
+ _height->SetValue (custom_size->height);
+ } else {
+ _ratio_to_fit->SetValue (true);
+ _size->SetValue (false);
+ _ratio->SetValue (wxString::Format("%.2f", initial.ratio()));
+ _width->SetValue (initial.width);
+ _height->SetValue (initial.height);
+ }
+
+ setup_sensitivity ();
+ update_size_from_ratio ();
+ update_ratio_from_size ();
+
+ layout ();
+
+ _ratio_to_fit->Bind (wxEVT_RADIOBUTTON, boost::bind(&CustomScaleDialog::setup_sensitivity, this));
+ _ratio->Bind (wxEVT_TEXT, boost::bind(&CustomScaleDialog::update_size_from_ratio, this));
+ _size->Bind (wxEVT_RADIOBUTTON, boost::bind(&CustomScaleDialog::setup_sensitivity, this));
+ _width->Bind (wxEVT_TEXT, boost::bind(&CustomScaleDialog::update_ratio_from_size, this));
+ _height->Bind (wxEVT_TEXT, boost::bind(&CustomScaleDialog::update_ratio_from_size, this));
+}
+
+
+void
+CustomScaleDialog::update_size_from_ratio ()
+{
+ dcp::Size const s = fit_ratio_within (raw_convert<float>(wx_to_std(_ratio->GetValue())), _film_container);
+ _size_from_ratio->SetLabelMarkup (wxString::Format("<i>%dx%d</i>", s.width, s.height));
+}
+
+
+void
+CustomScaleDialog::update_ratio_from_size ()
+{
+ float const ratio = _height->GetValue() > 0 ? (float(_width->GetValue()) / _height->GetValue()) : 2;
+ _ratio_from_size->SetLabelMarkup (wxString::Format("<i>%.2f:1</i>", ratio));
+}
+
+
+void
+CustomScaleDialog::setup_sensitivity ()
+{
+ _ratio->Enable (_ratio_to_fit->GetValue());
+ _size_from_ratio->Enable (_ratio_to_fit->GetValue());
+ _width->Enable (_size->GetValue());
+ _height->Enable (_size->GetValue());
+ _ratio_from_size->Enable (_size->GetValue());
+}
+
+
+optional<float>
+CustomScaleDialog::custom_ratio () const
+{
+ if (!_ratio_to_fit->GetValue()) {
+ return optional<float>();
+ }
+
+ return raw_convert<float>(wx_to_std(_ratio->GetValue()));
+}
+
+
+optional<dcp::Size>
+CustomScaleDialog::custom_size () const
+{
+ if (!_size->GetValue()) {
+ return optional<dcp::Size>();
+ }
+
+ return dcp::Size (_width->GetValue(), _height->GetValue());
+}
+
diff --git a/src/wx/custom_scale_dialog.h b/src/wx/custom_scale_dialog.h
new file mode 100644
index 000000000..4c9ccf388
--- /dev/null
+++ b/src/wx/custom_scale_dialog.h
@@ -0,0 +1,51 @@
+/*
+ Copyright (C) 2020 Carl Hetherington <cth@carlh.net>
+
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ DCP-o-matic is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include "table_dialog.h"
+#include <dcp/types.h>
+#include <wx/wx.h>
+#include <wx/spinctrl.h>
+
+
+class CustomScaleDialog : public TableDialog
+{
+public:
+ CustomScaleDialog (wxWindow* parent, dcp::Size initial, dcp::Size film_container, boost::optional<float> custom_ratio, boost::optional<dcp::Size> custom_size);
+
+ boost::optional<float> custom_ratio () const;
+ boost::optional<dcp::Size> custom_size () const;
+
+private:
+ void update_size_from_ratio ();
+ void update_ratio_from_size ();
+ void setup_sensitivity ();
+
+ wxRadioButton* _ratio_to_fit;
+ wxTextCtrl* _ratio;
+ wxStaticText* _size_from_ratio;
+ wxRadioButton* _size;
+ wxSpinCtrl* _width;
+ wxSpinCtrl* _height;
+ wxStaticText* _ratio_from_size;
+
+ dcp::Size _film_container;
+};
+
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index b01e9b8aa..8a9136008 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -26,6 +26,7 @@
#include "content_panel.h"
#include "static_text.h"
#include "check_box.h"
+#include "custom_scale_dialog.h"
#include "dcpomatic_button.h"
#include "lib/filter.h"
#include "lib/ffmpeg_content.h"
@@ -55,27 +56,6 @@ using boost::bind;
using boost::optional;
using namespace dcpomatic;
-static VideoContentScale
-index_to_scale (int n)
-{
- vector<VideoContentScale> scales = VideoContentScale::all ();
- DCPOMATIC_ASSERT (n >= 0);
- DCPOMATIC_ASSERT (n < int (scales.size ()));
- return scales[n];
-}
-
-static int
-scale_to_index (VideoContentScale scale)
-{
- vector<VideoContentScale> scales = VideoContentScale::all ();
- for (size_t i = 0; i < scales.size(); ++i) {
- if (scales[i] == scale) {
- return i;
- }
- }
-
- DCPOMATIC_ASSERT (false);
-}
VideoPanel::VideoPanel (ContentPanel* p)
: ContentSubPanel (p, _("Video"))
@@ -150,22 +130,15 @@ VideoPanel::VideoPanel (ContentPanel* p)
_fade_out_label = create_label (this, _("Fade out"), true);
_fade_out = new Timecode<ContentTime> (this);
- _scale_to_label = create_label (this, _("Scale to"), true);
- _scale = new ContentChoice<VideoContent, VideoContentScale> (
- this,
- new wxChoice (this, wxID_ANY),
- VideoContentProperty::SCALE,
- &Content::video,
- boost::mem_fn (&VideoContent::scale),
- boost::mem_fn (&VideoContent::set_scale),
- &index_to_scale,
- &scale_to_index
- );
-
wxClientDC dc (this);
wxSize size = dc.GetTextExtent (wxT ("A quite long name"));
size.SetHeight (-1);
+ _scale_label = create_label (this, _("Scale"), true);
+ _scale_fit = new wxRadioButton (this, wxID_ANY, _("to fit DCP"));
+ _scale_custom = new wxRadioButton (this, wxID_ANY, _("custom"), wxDefaultPosition, size);
+ _scale_custom_edit = new Button (this, _("Edit..."));
+
_filters_label = create_label (this, _("Filters"), true);
_filters = new StaticText (this, _("None"), wxDefaultPosition, size);
_filters_button = new Button (this, _("Edit..."));
@@ -194,11 +167,6 @@ VideoPanel::VideoPanel (ContentPanel* p)
_right_crop->wrapped()->SetRange (0, 4096);
_bottom_crop->wrapped()->SetRange (0, 4096);
- _scale->wrapped()->Clear ();
- BOOST_FOREACH (VideoContentScale const & i, VideoContentScale::all ()) {
- _scale->wrapped()->Append (std_to_wx (i.name ()));
- }
-
_frame_type->wrapped()->Append (_("2D"));
_frame_type->wrapped()->Append (_("3D"));
_frame_type->wrapped()->Append (_("3D left/right"));
@@ -215,6 +183,9 @@ VideoPanel::VideoPanel (ContentPanel* p)
_use->Bind (wxEVT_CHECKBOX, boost::bind (&VideoPanel::use_clicked, this));
_reference->Bind (wxEVT_CHECKBOX, boost::bind (&VideoPanel::reference_clicked, this));
_filters_button->Bind (wxEVT_BUTTON, boost::bind (&VideoPanel::edit_filters_clicked, this));
+ _scale_fit->Bind (wxEVT_RADIOBUTTON, boost::bind (&VideoPanel::scale_fit_clicked, this));
+ _scale_custom->Bind (wxEVT_RADIOBUTTON, boost::bind (&VideoPanel::scale_custom_clicked, this));
+ _scale_custom_edit->Bind (wxEVT_BUTTON, boost::bind (&VideoPanel::scale_custom_edit_clicked, this));
_colour_conversion->Bind (wxEVT_CHOICE, boost::bind (&VideoPanel::colour_conversion_changed, this));
_range->Bind (wxEVT_CHOICE, boost::bind (&VideoPanel::range_changed, this));
_edit_colour_conversion_button->Bind (wxEVT_BUTTON, boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));
@@ -260,11 +231,13 @@ VideoPanel::add_to_grid ()
add_label_to_sizer (crop, _bottom_crop_label, true, wxGBPosition (cr, 2));
_bottom_crop->add (crop, wxGBPosition (cr, 3));
add_label_to_sizer (_grid, _crop_label, true, wxGBPosition(r, 0));
- _grid->Add (crop, wxGBPosition(r, 1), wxGBSpan(2, 3));
- r += 2;
+ _grid->Add (crop, wxGBPosition(r, 1));
+ ++r;
- _scale_to_label->Show (full);
- _scale->show (full);
+ _scale_label->Show (full);
+ _scale_fit->Show (full);
+ _scale_custom->Show (full);
+ _scale_custom_edit->Show (full);
_filters_label->Show (full);
_filters->Show (full);
_filters_button->Show (full);
@@ -283,8 +256,16 @@ VideoPanel::add_to_grid ()
++r;
if (full) {
- add_label_to_sizer (_grid, _scale_to_label, true, wxGBPosition (r, 0));
- _scale->add (_grid, wxGBPosition (r, 1), wxGBSpan (1, 2));
+ add_label_to_sizer (_grid, _scale_label, true, wxGBPosition (r, 0));
+ {
+ wxSizer* v = new wxBoxSizer (wxVERTICAL);
+ v->Add (_scale_fit, 0, wxBOTTOM, 4);
+ wxSizer* h = new wxBoxSizer (wxHORIZONTAL);
+ h->Add (_scale_custom, 1, wxRIGHT, 6);
+ h->Add (_scale_custom_edit, 0);
+ v->Add (h, 0);
+ _grid->Add (v, wxGBPosition(r, 1));
+ }
++r;
add_label_to_sizer (_grid, _filters_label, true, wxGBPosition (r, 0));
@@ -486,6 +467,20 @@ VideoPanel::film_content_changed (int property)
}
setup_sensitivity ();
+ } else if (property == VideoContentProperty::CUSTOM_RATIO || property == VideoContentProperty::CUSTOM_SIZE) {
+ set<Frame> check;
+ BOOST_FOREACH (shared_ptr<const Content> i, vc) {
+ check.insert (i->video->custom_ratio() || i->video->custom_size());
+ }
+
+ if (check.size() == 1) {
+ checked_set (_scale_fit, !vc.front()->video->custom_ratio() && !vc.front()->video->custom_size());
+ checked_set (_scale_custom, vc.front()->video->custom_ratio() || vc.front()->video->custom_size());
+ } else {
+ checked_set (_scale_fit, true);
+ checked_set (_scale_custom, false);
+ }
+ setup_sensitivity ();
}
}
@@ -576,7 +571,6 @@ VideoPanel::content_selection_changed ()
_right_crop->set_content (video_sel);
_top_crop->set_content (video_sel);
_bottom_crop->set_content (video_sel);
- _scale->set_content (video_sel);
film_content_changed (ContentProperty::VIDEO_FRAME_RATE);
film_content_changed (VideoContentProperty::CROP);
@@ -585,6 +579,8 @@ VideoPanel::content_selection_changed ()
film_content_changed (VideoContentProperty::FADE_OUT);
film_content_changed (VideoContentProperty::RANGE);
film_content_changed (VideoContentProperty::USE);
+ film_content_changed (VideoContentProperty::CUSTOM_RATIO);
+ film_content_changed (VideoContentProperty::CUSTOM_SIZE);
film_content_changed (FFmpegContentProperty::FILTERS);
film_content_changed (DCPContentProperty::REFERENCE_VIDEO);
@@ -623,7 +619,9 @@ VideoPanel::setup_sensitivity ()
_bottom_crop->wrapped()->Enable (false);
_fade_in->Enable (false);
_fade_out->Enable (false);
- _scale->wrapped()->Enable (false);
+ _scale_fit->Enable (false);
+ _scale_custom->Enable (false);
+ _scale_custom_edit->Enable (false);
_description->Enable (false);
_filters->Enable (false);
_filters_button->Enable (false);
@@ -641,7 +639,9 @@ VideoPanel::setup_sensitivity ()
_bottom_crop->wrapped()->Enable (true);
_fade_in->Enable (!video_sel.empty ());
_fade_out->Enable (!video_sel.empty ());
- _scale->wrapped()->Enable (true);
+ _scale_fit->Enable (true);
+ _scale_custom->Enable (true);
+ _scale_custom_edit->Enable (_scale_custom->GetValue());
_description->Enable (true);
_filters->Enable (true);
_filters_button->Enable (single && !ffmpeg_sel.empty ());
@@ -703,3 +703,39 @@ VideoPanel::reference_clicked ()
d->set_reference_video (_reference->GetValue ());
}
+
+
+void
+VideoPanel::scale_fit_clicked ()
+{
+ BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video()) {
+ i->video->set_custom_ratio (optional<float>());
+ }
+}
+
+
+void
+VideoPanel::scale_custom_clicked ()
+{
+ if (!scale_custom_edit_clicked()) {
+ _scale_fit->SetValue (true);
+ }
+}
+
+
+bool
+VideoPanel::scale_custom_edit_clicked ()
+{
+ shared_ptr<const VideoContent> vc = _parent->selected_video().front()->video;
+ CustomScaleDialog* d = new CustomScaleDialog (this, vc->size(), _parent->film()->frame_size(), vc->custom_ratio(), vc->custom_size());
+ int const r = d->ShowModal ();
+ if (r == wxID_OK) {
+ BOOST_FOREACH (shared_ptr<Content> i, _parent->selected_video()) {
+ i->video->set_custom_ratio (d->custom_ratio());
+ i->video->set_custom_size (d->custom_size());
+ }
+ }
+ d->Destroy ();
+ return r == wxID_OK;
+}
+
diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index 04063ef54..22c564482 100644
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -25,7 +25,6 @@
#include "content_sub_panel.h"
#include "content_widget.h"
#include "timecode.h"
-#include "lib/video_content_scale.h"
#include "lib/film.h"
class wxChoice;
@@ -55,6 +54,9 @@ private:
void fade_in_changed ();
void fade_out_changed ();
void add_to_grid ();
+ void scale_fit_clicked ();
+ void scale_custom_clicked ();
+ bool scale_custom_edit_clicked ();
void setup_description ();
void setup_sensitivity ();
@@ -77,8 +79,10 @@ private:
Timecode<dcpomatic::ContentTime>* _fade_in;
wxStaticText* _fade_out_label;
Timecode<dcpomatic::ContentTime>* _fade_out;
- wxStaticText* _scale_to_label;
- ContentChoice<VideoContent, VideoContentScale>* _scale;
+ wxStaticText* _scale_label;
+ wxRadioButton* _scale_fit;
+ wxRadioButton* _scale_custom;
+ wxButton* _scale_custom_edit;
wxStaticText* _description;
wxStaticText* _filters_label;
wxStaticText* _filters;
diff --git a/src/wx/wscript b/src/wx/wscript
index 22d9f0db6..a2fbe0c4e 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -49,6 +49,7 @@ sources = """
controls.cc
closed_captions_dialog.cc
credentials_download_certificate_panel.cc
+ custom_scale_dialog.cc
dcp_panel.cc
dcpomatic_button.cc
disk_warning_dialog.cc
@@ -165,7 +166,7 @@ sources = """
def configure(conf):
- wx_libs = 'core,richtext,adv,html,xml'
+ wx_libs = 'core,richtext,adv,html,xml,propgrid'
try:
wx_config = '/usr/lib64/wx/config/gtk2-unicode-3.0'
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-18 23:58:41 +0000