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

Changes to get the full spot width where needed

Browse Source
This commit is contained in:
Dániel Battyányi
2023-08-20 13:59:42 +02:00
parent 6b6200314f
commit 75541d6281
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtgui/filmnegative.cc
View File

@@ -538,7 +538,7 @@ bool FilmNegative::mouseOver(int modifierKey)
{ {
EditDataProvider* const provider = getEditProvider(); EditDataProvider* const provider = getEditProvider();
EditRectangle* const spotRect = static_cast<EditRectangle*>(visibleGeometry.at(0)); EditRectangle* const spotRect = static_cast<EditRectangle*>(visibleGeometry.at(0));
spotRect->setXYWH(provider->posImage.x - activePicker->get_spot_half_width(), provider->posImage.y - activePicker->get_spot_half_width() ,activePicker->get_spot_half_width() * 2, activePicker->get_spot_half_width() * 2); spotRect->setXYWH(provider->posImage.x - activePicker->get_spot_half_width(), provider->posImage.y - activePicker->get_spot_half_width() ,activePicker->get_spot_full_width(), activePicker->get_spot_full_width());
return true; return true;
} }
@@ -560,8 +560,8 @@ bool FilmNegative::button1Pressed(int modifierKey)
RGB ref1, ref2, dummy; RGB ref1, ref2, dummy;
if (fnp->getFilmNegativeSpot(refSpotCoords[0], picker.get_spot_half_width(), ref1, dummy) && if (fnp->getFilmNegativeSpot(refSpotCoords[0], picker.get_spot_full_width(), ref1, dummy) &&
fnp->getFilmNegativeSpot(refSpotCoords[1], picker.get_spot_half_width(), ref2, dummy)) { fnp->getFilmNegativeSpot(refSpotCoords[1], picker.get_spot_full_width(), ref2, dummy)) {
disableListener(); disableListener();
@@ -607,7 +607,7 @@ bool FilmNegative::button1Pressed(int modifierKey)
} }
RGB refOut; RGB refOut;
fnp->getFilmNegativeSpot(provider->posImage, refPicker.get_spot_half_width(), refInputValues, refOut); fnp->getFilmNegativeSpot(provider->posImage, refPicker.get_spot_full_width(), refInputValues, refOut);
// Output luminance of the sampled spot // Output luminance of the sampled spot
float spotLum = rtengine::Color::rgbLuminance(refOut.r, refOut.g, refOut.b); float spotLum = rtengine::Color::rgbLuminance(refOut.r, refOut.g, refOut.b);

4
rtgui/guiutils.h
View File

@@ -740,6 +740,10 @@ class SpotPicker : public Gtk::Grid
{ {
return _spotHalfWidth; return _spotHalfWidth;
} }
int get_spot_full_width() const
{
return _spotHalfWidth * 2;
}
template <class T_return, class T_obj> void add_button_toggled_event(T_return& returnv, const T_obj function) template <class T_return, class T_obj> void add_button_toggled_event(T_return& returnv, const T_obj function)
{ {
_spotButton.signal_toggled().connect(sigc::mem_fun(returnv, function)); _spotButton.signal_toggled().connect(sigc::mem_fun(returnv, function));