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

More bugfix for issue #2239

Browse Source
This commit is contained in:
Hombre 2019-08-15 20:23:29 +02:00
parent a46b85f226
commit 68e26fb648
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/spot.cc
View File

@ -106,17 +106,8 @@ public:
return *this; return *this;
} }
/*
float fv = float(v);
x1 = int(float(x1) / fv + 0.5f);
y1 = int(float(y1) / fv + 0.5f);
x2 = int(float(x2) / fv + 0.5f);
y2 = int(float(y2) / fv + 0.5f);
*/
// Aletrnate rounding possibility
int w = x2 - x1 + 1; int w = x2 - x1 + 1;
int h = x2 - x1 + 1; int h = y2 - y1 + 1;
w = w / v + (w % v > 0); w = w / v + (w % v > 0);
h = h / v + (h % v > 0); h = h / v + (h % v > 0);
x1 /= v; x1 /= v;
@ -188,7 +179,7 @@ public:
} }
spotArea /= v; spotArea /= v;
imgArea /= v; imgArea /= v;
radius = radius / float(v); radius /= float(v);
featherRadius = getWidth() / 2.f; featherRadius = getWidth() / 2.f;
// intersectionArea doesn't need resize, because it's set after resizing // intersectionArea doesn't need resize, because it's set after resizing
return *this; return *this;

2
rtgui/spot.cc
View File

@ -432,7 +432,7 @@ void Spot::deleteSelectedEntry()
} }
// TODO // TODO
CursorShape Spot::getCursor (int objectID) CursorShape Spot::getCursor (int objectID) const
{ {
return CSHandOpen; return CSHandOpen;
} }

4
rtgui/spot.h
View File

@ -103,7 +103,7 @@ public:
void setBatchMode (bool batchMode) override; void setBatchMode (bool batchMode) override;
// EditSubscriber interface // EditSubscriber interface
CursorShape getCursor (int objectID); CursorShape getCursor (int objectID) const;
bool mouseOver (int modifierKey) override; bool mouseOver (int modifierKey) override;
bool button1Pressed (int modifierKey) override; bool button1Pressed (int modifierKey) override;
bool button1Released () override; bool button1Released () override;
@ -117,7 +117,7 @@ public:
void switchOffEditMode () override; void switchOffEditMode () override;
//TweakOperator interface //TweakOperator interface
void tweakParams(rtengine::procparams::ProcParams& pparams); void tweakParams(rtengine::procparams::ProcParams& pparams) override;
rtengine::ProcEvent EvSpotEnabled; rtengine::ProcEvent EvSpotEnabled;
rtengine::ProcEvent EvSpotEnabledOPA; // used to toggle-on the Spot 'On Preview Adjustment' mode rtengine::ProcEvent EvSpotEnabledOPA; // used to toggle-on the Spot 'On Preview Adjustment' mode