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

Merge branch 'master' into retinex

Browse Source
This commit is contained in:
Beep6581
2015-09-27 21:18:17 +02:00
parent e234bb9278 e525fbb353
commit 6c49279ab9
12 changed files with 458 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rtgui/editorpanel.cc
View File

@@ -567,6 +567,7 @@ void EditorPanel::open (Thumbnail* tmb, rtengine::InitialImage* isrc)
Gtk::Allocation alloc;
iareapanel->imageArea->on_resized(alloc);
}
history->resetSnapShotNumber();
}
void EditorPanel::close ()

1
rtgui/history.h
View File

@@ -126,6 +126,7 @@ public:
void redo ();
bool blistenerLock;
void resetSnapShotNumber() {bmnum = 1;};
};
#endif

9
rtgui/sharpening.cc
View File

@@ -25,10 +25,6 @@ using namespace rtengine::procparams;
Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENING_LABEL"), true, true)
{
std::vector<GradientMilestone> milestones;
milestones.push_back( GradientMilestone(0.0, 0.0, 0.0, 0.0) );
milestones.push_back( GradientMilestone(1.0, 1.0, 1.0, 1.0) );
setEnabledTooltipMarkup(M("TP_SHARPENING_TOOLTIP"));
Gtk::HBox* hb = Gtk::manage (new Gtk::HBox ());
@@ -68,18 +64,17 @@ Sharpening::Sharpening () : FoldableToolPanel(this, "sharpening", M("TP_SHARPENI
radius = Gtk::manage (new Adjuster (M("TP_SHARPENING_RADIUS"), 0.3, 3, 0.01, 0.5));
threshold = Gtk::manage (new ThresholdAdjuster (M("TP_SHARPENING_THRESHOLD"), 0., 2000., 20., 80., 2000., 1200., 0, false));
threshold->setAdjusterListener (this);
threshold->setBgGradient(milestones);
pack_start(*hsep6a, Gtk::PACK_SHRINK, 2);
pack_start (*usm);
usm->pack_start(*radius);
usm->pack_start(*amount);
usm->pack_start(*threshold);
usm->pack_start(*amount);
hsep6a->show ();
radius->show ();
amount->show ();
threshold->show ();
amount->show ();
Gtk::HSeparator *hsep6 = Gtk::manage (new Gtk::HSeparator());
edgesonly = Gtk::manage (new Gtk::CheckButton (M("TP_SHARPENING_ONLYEDGES")));