liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed reading and displaying of floating-point values in dynamic profile rules

Browse Source
This commit is contained in:
Alberto Griggio
2017-03-04 13:48:19 +01:00
parent b3f75398c5
commit 0720659627
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/dynamicprofile.cc
View File

@@ -104,8 +104,8 @@ void get_double_range(DynamicProfileEntry::Range<double> &dest,
const Glib::ustring &key) const Glib::ustring &key)
{ {
try { try {
int min = kf.get_double(group, key + "_min"); double min = kf.get_double(group, key + "_min");
int max = kf.get_double(group, key + "_max"); double max = kf.get_double(group, key + "_max");
if (min <= max) { if (min <= max) {
dest.min = min; dest.min = min;
dest.max = max; dest.max = max;

18
rtgui/dynamicprofilepanel.cc
View File

@@ -26,10 +26,10 @@
namespace { namespace {
template <class V> template <class V>
Glib::ustring to_str(V n) Glib::ustring to_str(V n, int precision=1)
{ {
std::ostringstream buf; std::ostringstream buf;
buf << std::setprecision(1) << std::fixed << n; buf << std::setprecision(precision) << std::fixed << n;
return buf.str(); return buf.str();
} }
@@ -369,13 +369,13 @@ void DynamicProfilePanel::render_profilepath(
} }
#define RENDER_RANGE_(tp, name) \ #define RENDER_RANGE_(tp, name, prec) \
auto row = *iter; \ auto row = *iter; \
Gtk::CellRendererText *ct = static_cast<Gtk::CellRendererText *>(cell); \ Gtk::CellRendererText *ct = static_cast<Gtk::CellRendererText *>(cell); \
DynamicProfileEntry::Range<tp> r = row[columns_. name]; \ DynamicProfileEntry::Range<tp> r = row[columns_. name]; \
DynamicProfileEntry dflt; \ DynamicProfileEntry dflt; \
if (r.min > dflt.name.min || r.max < dflt.name.max) { \ if (r.min > dflt.name.min || r.max < dflt.name.max) { \
auto value = to_str(r.min) + " - " + to_str(r.max); \ auto value = to_str(r.min, prec) + " - " + to_str(r.max, prec); \
ct->property_text() = value; \ ct->property_text() = value; \
} else { \ } else { \
ct->property_text() = ""; \ ct->property_text() = ""; \
@@ -384,35 +384,35 @@ void DynamicProfilePanel::render_profilepath(
void DynamicProfilePanel::render_iso( void DynamicProfilePanel::render_iso(
Gtk::CellRenderer *cell, const Gtk::TreeModel::iterator &iter) Gtk::CellRenderer *cell, const Gtk::TreeModel::iterator &iter)
{ {
RENDER_RANGE_(int, iso); RENDER_RANGE_(int, iso, 0);
} }
void DynamicProfilePanel::render_fnumber( void DynamicProfilePanel::render_fnumber(
Gtk::CellRenderer *cell, const Gtk::TreeModel::iterator &iter) Gtk::CellRenderer *cell, const Gtk::TreeModel::iterator &iter)
{ {
RENDER_RANGE_(double, fnumber); RENDER_RANGE_(double, fnumber, 1);
} }
void DynamicProfilePanel::render_focallen( void DynamicProfilePanel::render_focallen(
Gtk::CellRenderer *cell, const Gtk::TreeModel::iterator &iter) Gtk::CellRenderer *cell, const Gtk::TreeModel::iterator &iter)
{ {
RENDER_RANGE_(double, focallen); RENDER_RANGE_(double, focallen, 1);
} }
void DynamicProfilePanel::render_shutterspeed( void DynamicProfilePanel::render_shutterspeed(
Gtk::CellRenderer *cell, const Gtk::TreeModel::iterator &iter) Gtk::CellRenderer *cell, const Gtk::TreeModel::iterator &iter)
{ {
RENDER_RANGE_(double, shutterspeed); RENDER_RANGE_(double, shutterspeed, 4);
} }
void DynamicProfilePanel::render_expcomp( void DynamicProfilePanel::render_expcomp(
Gtk::CellRenderer *cell, const Gtk::TreeModel::iterator &iter) Gtk::CellRenderer *cell, const Gtk::TreeModel::iterator &iter)
{ {
RENDER_RANGE_(double, expcomp); RENDER_RANGE_(double, expcomp, 1);
} }
#undef RENDER_RANGE_ #undef RENDER_RANGE_