diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-02-16 10:40:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-02-16 10:40:12 +0100 |
| commit | bb949ec65adf95f4a2c7dd5ee7e97b9daaaf3d3f (patch) | |
| tree | 09153b297f7cebd3f13ab58188982366185298f6 /src/lib/ratio.cc | |
| parent | 39d51cddeeea82e602ab1925430b0dfb5752ac79 (diff) | |
C++11 tidying.
Diffstat (limited to 'src/lib/ratio.cc')
| -rw-r--r-- | src/lib/ratio.cc | 44 |
1 files changed, 26 insertions, 18 deletions
diff --git a/src/lib/ratio.cc b/src/lib/ratio.cc index 93ad5755d..5ba79c28b 100644 --- a/src/lib/ratio.cc +++ b/src/lib/ratio.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "ratio.h" #include "util.h" #include "config.h" @@ -26,27 +27,31 @@ #include "i18n.h" + using std::string; using std::vector; using boost::optional; + vector<Ratio const *> Ratio::_ratios; + void Ratio::setup_ratios () { - _ratios.push_back (new Ratio (float(1290) / 1080, "119", _("1.19"), optional<string>(), "119")); - _ratios.push_back (new Ratio (float(1440) / 1080, "133", _("1.33 (4:3)"), optional<string>(), "133")); - _ratios.push_back (new Ratio (float(1485) / 1080, "138", _("1.38 (Academy)"), optional<string>(), "137")); - _ratios.push_back (new Ratio (float(1544) / 1080, "143", _("1.43 (IMAX)"), optional<string>(), "143")); - _ratios.push_back (new Ratio (float(1800) / 1080, "166", _("1.66"), optional<string>(), "166")); - _ratios.push_back (new Ratio (float(1920) / 1080, "178", _("1.78 (16:9 or HD)"), optional<string>(), "178")); - _ratios.push_back (new Ratio (float(1998) / 1080, "185", _("1.85 (Flat)"), string(_("DCI Flat")), "F")); - _ratios.push_back (new Ratio (float(2048) / 872, "235", _("2.35 (35mm Scope)"), optional<string>(), "S")); - _ratios.push_back (new Ratio (float(2048) / 858, "239", _("2.39 (Scope)"), string(_("DCI Scope")), "S")); - _ratios.push_back (new Ratio (float(2048) / 1080, "190", _("1.90 (Full frame)"), string(_("Full frame")), "C")); + _ratios.push_back (new Ratio(float(1290) / 1080, "119", _("1.19"), optional<string>(), "119")); + _ratios.push_back (new Ratio(float(1440) / 1080, "133", _("1.33 (4:3)"), optional<string>(), "133")); + _ratios.push_back (new Ratio(float(1485) / 1080, "138", _("1.38 (Academy)"), optional<string>(), "137")); + _ratios.push_back (new Ratio(float(1544) / 1080, "143", _("1.43 (IMAX)"), optional<string>(), "143")); + _ratios.push_back (new Ratio(float(1800) / 1080, "166", _("1.66"), optional<string>(), "166")); + _ratios.push_back (new Ratio(float(1920) / 1080, "178", _("1.78 (16:9 or HD)"), optional<string>(), "178")); + _ratios.push_back (new Ratio(float(1998) / 1080, "185", _("1.85 (Flat)"), string(_("DCI Flat")), "F")); + _ratios.push_back (new Ratio(float(2048) / 872, "235", _("2.35 (35mm Scope)"), optional<string>(), "S")); + _ratios.push_back (new Ratio(float(2048) / 858, "239", _("2.39 (Scope)"), string(_("DCI Scope")), "S")); + _ratios.push_back (new Ratio(float(2048) / 1080, "190", _("1.90 (Full frame)"), string(_("Full frame")), "C")); } + Ratio const * Ratio::from_id (string i) { @@ -55,7 +60,7 @@ Ratio::from_id (string i) i = "138"; } - vector<Ratio const *>::iterator j = _ratios.begin (); + auto j = _ratios.begin (); while (j != _ratios.end() && (*j)->id() != i) { ++j; } @@ -67,30 +72,32 @@ Ratio::from_id (string i) return *j; } + /** @return Ratio corresponding to a given fractional ratio (+/- 0.01), or 0 */ Ratio const * Ratio::from_ratio (float r) { - vector<Ratio const *>::iterator j = _ratios.begin (); - while (j != _ratios.end() && fabs ((*j)->ratio() - r) > 0.01) { + auto j = _ratios.begin (); + while (j != _ratios.end() && fabs((*j)->ratio() - r) > 0.01) { ++j; } if (j == _ratios.end ()) { - return 0; + return nullptr; } return *j; } + Ratio const * Ratio::nearest_from_ratio (float r) { - Ratio const * nearest = 0; + Ratio const * nearest = nullptr; float distance = FLT_MAX; - for (vector<Ratio const *>::iterator i = _ratios.begin (); i != _ratios.end(); ++i) { - float const d = fabs ((*i)->ratio() - r); + for (auto i = _ratios.begin(); i != _ratios.end(); ++i) { + float const d = fabs((*i)->ratio() - r); if (d < distance) { distance = d; nearest = *i; @@ -113,6 +120,7 @@ Ratio::containers () return r; } + string Ratio::container_nickname () const { |