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

Merge branch 'dev' into review-idle_register-calls

Browse Source
This commit is contained in:
Flössie
2018-12-31 14:58:26 +01:00
parent 00b62d2b65 b968f956da
commit 5af3f64a9d
420 changed files with 15921 additions and 16795 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rtgui/mydiagonalcurve.cc
View File

@@ -545,7 +545,7 @@ bool MyDiagonalCurve::handleEvents (GdkEvent* event)
double minDistanceY = double(MIN_DISTANCE) / double(graphH - 1);
switch (event->type) {
case Gdk::BUTTON_PRESS:
case GDK_BUTTON_PRESS:
snapToElmt = -100;
if (curve.type != DCT_Parametric) {
@@ -694,7 +694,7 @@ bool MyDiagonalCurve::handleEvents (GdkEvent* event)
break;
case Gdk::BUTTON_RELEASE:
case GDK_BUTTON_RELEASE:
snapToElmt = -100;
if (curve.type != DCT_Parametric && edited_point == -1) {
@@ -755,7 +755,7 @@ bool MyDiagonalCurve::handleEvents (GdkEvent* event)
break;
case Gdk::LEAVE_NOTIFY:
case GDK_LEAVE_NOTIFY:
// Pointer can LEAVE even when dragging the point, so we don't modify the cursor in this case
// The cursor will have to LEAVE another time after the drag...
@@ -772,10 +772,10 @@ bool MyDiagonalCurve::handleEvents (GdkEvent* event)
retval = true;
break;
case Gdk::MOTION_NOTIFY:
case GDK_MOTION_NOTIFY:
snapToElmt = -100;
if (curve.type == DCT_Linear || curve.type == DCT_Spline || curve.type == DCT_NURBS) {
if (curve.type == DCT_Linear || curve.type == DCT_Spline || curve.type == DCT_NURBS || curve.type == DCT_CatumullRom) {
snapToMinDistY = snapToMinDistX = 10.;
snapToValY = snapToValX = 0.;
@@ -1026,7 +1026,7 @@ void MyDiagonalCurve::pipetteMouseOver (CurveEditor *ce, EditDataProvider *provi
double minDistanceX = double(MIN_DISTANCE) / double(graphW - 1);
if (curve.type == DCT_Linear || curve.type == DCT_Spline || curve.type == DCT_NURBS) {
if (curve.type == DCT_Linear || curve.type == DCT_Spline || curve.type == DCT_NURBS || curve.type == DCT_CatumullRom) {
// get the pointer position
getCursorPositionFromCurve(pipetteVal);
@@ -1415,6 +1415,8 @@ std::vector<double> MyDiagonalCurve::getPoints ()
result.push_back (double(DCT_Spline));
} else if (curve.type == DCT_NURBS) {
result.push_back (double(DCT_NURBS));
} else if (curve.type == DCT_CatumullRom) {
result.push_back (double(DCT_CatumullRom));
}
// then we push all the points coordinate
@@ -1552,6 +1554,7 @@ void MyDiagonalCurve::reset(const std::vector<double> &resetCurve, double identi
switch (curve.type) {
case DCT_Spline :
case DCT_NURBS :
case DCT_CatumullRom:
curve.x.resize(2);
curve.y.resize(2);
curve.x.at(0) = 0.;