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

Increased upscale max to 16x

Browse Source 
It was impossible to export a small crop upscaled to 1200px wide to
demonstrate the effects of noise reduction, so I bumped the max scale
from 4 to 16 (to match the 1600% main preview max zoom).
This commit is contained in:
Morgan Hardwood 2018-06-04 15:43:04 +02:00
parent c907f92c9c
commit fd1526fb8f
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/resize.cc
View File

@ -65,7 +65,7 @@ Resize::Resize () : FoldableToolPanel(this, "resize", M("TP_RESIZE_LABEL"), fals
pack_start (*combos, Gtk::PACK_SHRINK, 4); pack_start (*combos, Gtk::PACK_SHRINK, 4);
scale = new Adjuster (M("TP_RESIZE_SCALE"), 0.01, 4, 0.01, 1.); scale = new Adjuster (M("TP_RESIZE_SCALE"), 0.01, MAX_SCALE, 0.01, 1.);
scale->setAdjusterListener (this); scale->setAdjusterListener (this);
pack_start (*scale, Gtk::PACK_SHRINK, 4); pack_start (*scale, Gtk::PACK_SHRINK, 4);
@ -94,12 +94,12 @@ Resize::Resize () : FoldableToolPanel(this, "resize", M("TP_RESIZE_LABEL"), fals
w->set_digits (0); w->set_digits (0);
w->set_increments (1, 100); w->set_increments (1, 100);
w->set_value (800); w->set_value (800);
w->set_range (32, 4 * maxw); w->set_range (32, MAX_SCALE * maxw);
h->set_digits (0); h->set_digits (0);
h->set_increments (1, 100); h->set_increments (1, 100);
h->set_value (600); h->set_value (600);
h->set_range (32, 4 * maxh); h->set_range (32, MAX_SCALE * maxh);
wconn = w->signal_value_changed().connect ( sigc::mem_fun(*this, &Resize::entryWChanged), true); wconn = w->signal_value_changed().connect ( sigc::mem_fun(*this, &Resize::entryWChanged), true);
hconn = h->signal_value_changed().connect ( sigc::mem_fun(*this, &Resize::entryHChanged), true); hconn = h->signal_value_changed().connect ( sigc::mem_fun(*this, &Resize::entryHChanged), true);
@ -216,7 +216,7 @@ void Resize::write (ProcParams* pp, ParamsEdited* pedited)
if (pedited) { if (pedited) {
pedited->resize.enabled = !get_inconsistent(); pedited->resize.enabled = !get_inconsistent();
pedited->resize.dataspec = dataSpec != 4; pedited->resize.dataspec = dataSpec != MAX_SCALE;
pedited->resize.appliesTo = appliesTo->get_active_row_number() != 2; pedited->resize.appliesTo = appliesTo->get_active_row_number() != 2;
pedited->resize.method = method->get_active_row_number() != 3; pedited->resize.method = method->get_active_row_number() != 3;
@ -370,8 +370,8 @@ void Resize::setDimensions ()
refh = self->maxh; refh = self->maxh;
} }
self->w->set_range(32, 4 * refw); self->w->set_range(32, MAX_SCALE * refw);
self->h->set_range(32, 4 * refh); self->h->set_range(32, MAX_SCALE * refh);
switch (self->spec->get_active_row_number()) { switch (self->spec->get_active_row_number()) {
case 0: { case 0: {

2
rtgui/resize.h
View File

@ -80,6 +80,8 @@ private:
bool wDirty, hDirty; bool wDirty, hDirty;
ToolParamBlock* packBox; ToolParamBlock* packBox;
IdleRegister idle_register; IdleRegister idle_register;
static constexpr int MAX_SCALE = 16; // 16 to match the main preview max scale of 1600%
}; };
#endif #endif