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

Bug corrected in the curve editor (pen device handling)

Browse Source
This commit is contained in:
Hombre
2010-08-18 23:36:10 +02:00
parent 964f623de5
commit dc4deeab0c
2 changed files with 41 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
rtgui/mycurve.cc
View File

@@ -30,10 +30,9 @@ MyCurve::MyCurve () : listener(NULL), activeParam(-1), bghistvalid(false) {
prevInnerHeight = innerHeight; prevInnerHeight = innerHeight;
grab_point = -1; grab_point = -1;
lit_point = -1; lit_point = -1;
source = GDK_SOURCE_MOUSE;
buttonPressed = false; buttonPressed = false;
set_extension_events(Gdk::EXTENSION_EVENTS_CURSOR); set_extension_events(Gdk::EXTENSION_EVENTS_ALL);
add_events(Gdk::EXPOSURE_MASK | Gdk::POINTER_MOTION_MASK | Gdk::POINTER_MOTION_HINT_MASK | Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::BUTTON1_MOTION_MASK); add_events(Gdk::EXPOSURE_MASK | Gdk::POINTER_MOTION_MASK | Gdk::POINTER_MOTION_HINT_MASK | Gdk::ENTER_NOTIFY_MASK | Gdk::LEAVE_NOTIFY_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::BUTTON1_MOTION_MASK);
signal_event().connect( sigc::mem_fun(*this, &MyCurve::handleEvents) ); signal_event().connect( sigc::mem_fun(*this, &MyCurve::handleEvents) );
@@ -298,10 +297,6 @@ bool MyCurve::handleEvents (GdkEvent* event) {
buttonPressed = true; buttonPressed = true;
add_modal_grab (); add_modal_grab ();
//we memorize the input device that "pressed" in the editor, to avoid unwanted motion from
//an eventual mouse connected
source = event->button.device->source;
// get the pointer position // get the pointer position
getCursorPosition(event); getCursorPosition(event);
findClosestPoint(); findClosestPoint();
@@ -339,52 +334,50 @@ bool MyCurve::handleEvents (GdkEvent* event) {
case Gdk::BUTTON_RELEASE: case Gdk::BUTTON_RELEASE:
if (curve.type!=Parametric) { if (curve.type!=Parametric) {
if (event->button.device->source == source) { if (event->button.button == 1) {
if (event->button.button == 1) { buttonPressed = false;
buttonPressed = false; }
} if (!buttonPressed) {
if (!buttonPressed) { /* get the pointer position */
/* get the pointer position */ getCursorPosition(event);
getCursorPosition(event); findClosestPoint();
findClosestPoint();
remove_modal_grab (); remove_modal_grab ();
int previous_lit_point = lit_point; int previous_lit_point = lit_point;
/* delete inactive points: */ /* delete inactive points: */
itx = curve.x.begin(); itx = curve.x.begin();
ity = curve.y.begin(); ity = curve.y.begin();
for (src = dst = 0; src < num; ++src) for (src = dst = 0; src < num; ++src)
if (curve.x[src] >= 0.0) { if (curve.x[src] >= 0.0) {
curve.x[dst] = curve.x[src]; curve.x[dst] = curve.x[src];
curve.y[dst] = curve.y[src]; curve.y[dst] = curve.y[src];
++dst; ++dst;
++itx; ++itx;
++ity; ++ity;
}
if (dst < src) {
curve.x.erase (itx, curve.x.end());
curve.y.erase (ity, curve.y.end());
if (curve.x.size() <= 0) {
curve.x.push_back (0);
curve.y.push_back (0);
interpolate ();
draw (lit_point);
}
} }
if (distanceX <= minDistanceX) { if (dst < src) {
new_type = CSMove; curve.x.erase (itx, curve.x.end());
lit_point = closest_point; curve.y.erase (ity, curve.y.end());
} if (curve.x.size() <= 0) {
else { curve.x.push_back (0);
new_type = CSPlus; curve.y.push_back (0);
lit_point = -1; interpolate ();
}
if (lit_point != previous_lit_point)
draw (lit_point); draw (lit_point);
grab_point = -1; }
retval = true;
notifyListener ();
} }
if (distanceX <= minDistanceX) {
new_type = CSMove;
lit_point = closest_point;
}
else {
new_type = CSPlus;
lit_point = -1;
}
if (lit_point != previous_lit_point)
draw (lit_point);
grab_point = -1;
retval = true;
notifyListener ();
} }
} }
break; break;

1
rtgui/mycurve.h
View File

@@ -80,7 +80,6 @@ class MyCurve : public Gtk::DrawingArea {
double distanceY; // Y distance from the cursor to the closest point double distanceY; // Y distance from the cursor to the closest point
double ugpX; // unclamped grabbed point X coordinate in the graph double ugpX; // unclamped grabbed point X coordinate in the graph
double ugpY; // unclamped grabbed point Y coordinate in the graph double ugpY; // unclamped grabbed point Y coordinate in the graph
GdkInputSource source;
std::vector<Gdk::Point> point; std::vector<Gdk::Point> point;
std::vector<Gdk::Point> upoint; std::vector<Gdk::Point> upoint;
std::vector<Gdk::Point> lpoint; std::vector<Gdk::Point> lpoint;