X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fline.cpp;h=7841fa8a823e43720d327985e16bf44370eb0ce2;hb=4a979ddae8aa6b3556f24e8b961f7787c4b40cbe;hp=8fc9b9c83f3e764940dc07dece9a67457f73a3cb;hpb=565c33c91ea355528145ba94b31b2e44309d0834;p=architektonas diff --git a/src/line.cpp b/src/line.cpp index 8fc9b9c..7841fa8 100644 --- a/src/line.cpp +++ b/src/line.cpp @@ -106,21 +106,7 @@ Line::~Line() QString text = QObject::tr("Length: %1 in.\n") + QChar(0x2221) + QObject::tr(": %2"); text = text.arg(absLength).arg(absAngle); -#if 0 - QPen pen = QPen(QColor(0x00, 0xFF, 0x00), 1.0, Qt::SolidLine); - painter->SetPen(pen); - painter->SetBrush(QBrush(QColor(0x40, 0xFF, 0x40, 0x9F))); - QRectF textRect(10.0, 10.0, 270.0, 70.0); // x, y, w, h (in Qt coords) - painter->DrawRoundedRect(textRect, 7.0, 7.0); - - textRect.setLeft(textRect.left() + 14); - painter->SetFont(*Object::font); - pen = QPen(QColor(0x00, 0x5F, 0xDF)); - painter->SetPen(pen); - painter->DrawText(textRect, Qt::AlignVCenter, text); -#else painter->DrawInformativeText(text); -#endif } } @@ -137,20 +123,24 @@ Line::~Line() what we can do here is set ignoreClicks to true to keep other objects that are selected from deselecting themselves. Will that fuck up something else? Not sure yet... :-/ +Actually, this is done here to keep tools from selecting stuff inadvertantly... */ - // Someone told us to fuck off, so we'll fuck off. :-) - if (ignoreClicks) - return false; - // We can assume this, since this is a mouse down event here. objectWasDragged = false; - HitTest(point); + bool hit = HitTest(point); + + // Someone told us to fuck off, so we'll fuck off. :-) + if (ignoreClicks) + return hit; // Now that we've done our hit testing on the non-snapped point, snap it if // necessary... if (snapToGrid) point = SnapPointToGrid(point); + if (snapPointIsValid) + point = snapPoint; + // this is shite. this should be checked for in the Container, not here! #warning "!!! This should be checked for in Container, not here !!!" // If we're part of a non-top-level container, send this signal to it @@ -161,87 +151,6 @@ yet... :-/ return true; } -/* -There's a small problem here with the implementation: You can have a dimension tied -to only one point while at the same time you can have a dimension sitting on this line. -Since there's only *one* dimPoint for each point, this can be problematic... - -We solve this by allowing only *one* Dimension object to be attached to the Line, -Arc, etc. and by giving the Dimension object a pointer to our endpoints. - -Problem still arises when we delete this object; The attached Dimension object will -then have bad pointers! What it *should* do is delete the object if and only if this -line is not attached to any other object. If it is, then one of those attachment -points should be sent to the dimension object (done for position & endpoint). - -NOTE: The STL vector *does not* take ownership of pointers, therefore is suitable - for our purposes - -Also: It would be nice to have a preview of the dimension being drawn, with a modifier -key to make it draw/show on the other side... - -TODO: Make Dimension preview with modifier keys for showing on other side -*/ -/* - -N.B.: This no longer works, as the DrawDimension object takes precedence over this code. - THIS DOES NOTHING ANYMORE!!! - -*/ -#if 0 - // Is the dimension tool active? Let's use it: - if (dimensionActive) - { - // User clicked on the line itself (endpoint checks should preceed this one): - // (Priorities are taken care of in HitTest()...) - if (hitLine) - { -#if 0 - if (attachedDimension == NULL) - { - // How to get this object into the top level container??? -/* -The real question is do we care. I think so, because if this isn't in the top -level container, it won't get drawn... -But we can fix that by making this object call any attached object's (like -a dimension only) Draw() function... :-/ -*/ - attachedDimension = new Dimension(&position, &endpoint, DTLinear, this); - - if (parent != NULL) - parent->Add(attachedDimension); - } - else - { - // If there's one already there, tell it to flip sides... - attachedDimension->FlipSides(); - } -#else - // New approach here: We look for connected objects. - Object * attachedDimension = FindAttachedDimension(); - - if (attachedDimension) - { - // If there's an attached Dimension, tell it to switch sides... - ((Dimension *)attachedDimension)->FlipSides(); - } - else - { - // Otherwise, we make a new one and attach it here. - attachedDimension = new Dimension(Connection(this, 0), Connection(this, 1.0), DTLinear, this); - connected.push_back(Connection(attachedDimension, 0)); - connected.push_back(Connection(attachedDimension, 1.0)); - - if (parent != NULL) - parent->Add(attachedDimension); - } -#endif - - return true; - } - } -#endif - if (state == OSInactive) { //How to translate this into pixels from Document space??? @@ -311,7 +220,7 @@ a dimension only) Draw() function... :-/ } -/*virtual*/ void Line::PointerMoved(Vector point) +/*virtual*/ bool Line::PointerMoved(Vector point) { if (selectionInProgress) { @@ -322,15 +231,20 @@ a dimension only) Draw() function... :-/ else state = OSInactive; - return; + return false; } - // Hit test tells us what we hit (if anything) through boolean variables. (It - // also tells us whether or not the state changed. --not any more) + // Hit test tells us what we hit (if anything) through boolean variables. SaveHitState(); - HitTest(point); + bool hovered = HitTest(point); needUpdate = HitStateChanged(); + if (snapToGrid) + point = SnapPointToGrid(point); + + if (snapPointIsValid) + point = snapPoint; + objectWasDragged = (draggingLine | draggingHandle1 | draggingHandle2); if (objectWasDragged) @@ -428,6 +342,8 @@ the horizontal line or vertical line that intersects from the current mouse posi dimPoint2->SetPoint2(draggingHandle2 ? v2 : endpoint); #endif } + + return hovered; } @@ -479,6 +395,7 @@ the horizontal line or vertical line that intersects from the current mouse posi Vector lineSegment = endpoint - position; Vector v1 = point - position; Vector v2 = point - endpoint; + Vector v3 = point - Center(); // Midpoint, for snapping... double t = Geometry::ParameterOfLineAndPoint(position, endpoint, point); double distance; @@ -510,12 +427,27 @@ the horizontal line or vertical line that intersects from the current mouse posi / lineSegment.Magnitude()); if ((v1.Magnitude() * Painter::zoom) < 8.0) + { hitPoint1 = true; + snapPoint = position; + snapPointIsValid = true; + } else if ((v2.Magnitude() * Painter::zoom) < 8.0) + { hitPoint2 = true; + snapPoint = endpoint; + snapPointIsValid = true; + } else if ((distance * Painter::zoom) < 5.0) hitLine = true; + // Not a manipulation point, but a snapping point: + if ((v3.Magnitude() * Painter::zoom) < 8.0) + { + snapPoint = Center(); + snapPointIsValid = true; + } + return (hitPoint1 || hitPoint2 || hitLine ? true : false); } @@ -637,23 +569,25 @@ same reference number. void Line::SetDimensionOnLine(Dimension * dimension/*= NULL*/) { // If they don't pass one in, create it for the caller. - if (dimension == NULL) + // But ONLY if this line has a parent container! + // This is really bad to do here, it should be done in the parent container, always! +#warning "!!! Parent container should be creating Dimension object !!!" + if ((dimension == NULL) && (parent != NULL)) { //printf("Line::SetDimensionOnLine(): Creating new dimension...\n"); -// dimension = new Dimension(position, endpoint, DTLinear, this); - dimension = new Dimension(Connection(this, 0), Connection(this, 1.0), DTLinear, this); + dimension = new Dimension(position, endpoint, DTLinear, parent); +// dimension = new Dimension(Connection(this, 0), Connection(this, 1.0), DTLinear, this); - if (parent) + // THIS IS SERIOUS!!! WITHOUT A PARENT, THIS OBJECT IS IN LIMBO!!! +// if (parent) //{ //printf("Line::SetDimensionOnLine(): Adding to parent...\n"); - parent->Add(dimension); + parent->Add(dimension); //} } - else - { - dimension->Connect(this, 0); - dimension->Connect(this, 1.0); - } + + dimension->Connect(this, 0); + dimension->Connect(this, 1.0); // Make sure the Dimension is connected to us... Connect(dimension, 0);