}
painter->DrawArc(position, radius, startAngle, angleSpan);
+// painter->DrawRect(Extents());
}
/*virtual*/ void Arc::PointerMoved(Vector point)
{
+ if (selectionInProgress)
+ {
+ // Check for whether or not the rect contains this circle
+ if (selection.normalized().contains(Extents()))
+ state = OSSelected;
+ else
+ state = OSInactive;
+
+ return;
+ }
+
// The TLC will send these messages if the object is selected but not clicked on.
// So we have to be careful with our assumptions here.
// This is actually untrue in that case, we need to come up with something better
// Here we check for just a click: If object was clicked and dragged, then
// revert to the old state (OSInactive). Otherwise, keep the new state that
// we set.
-/*Maybe it would be better to just check for "object was dragged" state and not have to worry
-about keeping track of old states...
-Well, we can't know if it was dragged from Inactive or not, that's the problem. We could make
-a variable called "needToRevertToInactive" instead
+/*
+Maybe it would be better to just check for "object was dragged" state and not
+have to worry about keeping track of old states...
+Well, we can't know if it was dragged from Inactive or not, that's the problem.
+We could make a variable called "needToRevertToInactive" instead
I mean, we could write like:
if (objectWasDragged && oldState == OSInactive)
/*virtual*/ QRectF Arc::Extents(void)
{
-#warning "!!! Arc extents not calculated !!!"
- return QRectF();
-}
+ double start = startAngle;
+ double end = start + angleSpan;
+ QPointF p1(cos(start), sin(start));
+ QPointF p2(cos(end), sin(end));
+ QRectF bounds(p1, p2);
+
+ // Swap X/Y coordinates if they're backwards...
+ if (bounds.left() > bounds.right())
+ {
+ double temp = bounds.left();
+ bounds.setLeft(bounds.right());
+ bounds.setRight(temp);
+ }
+ if (bounds.bottom() > bounds.top())
+ {
+ double temp = bounds.bottom();
+ bounds.setBottom(bounds.top());
+ bounds.setTop(temp);
+ }
-#if 0
-/*virtual*/ bool Arc::NeedsUpdate(void)
-{
- return needUpdate;
+ // If the end of the arc is before the beginning, add 360 degrees to it
+ if (end < start)
+ end += 2.0 * PI;
+
+ // Adjust the bounds depending on which axes are crossed
+ if ((start < PI_OVER_2) && (end > PI_OVER_2))
+ bounds.setTop(1.0);
+
+ if ((start < PI) && (end > PI))
+ bounds.setLeft(-1.0);
+
+ if ((start < (PI + PI_OVER_2)) && (end > (PI + PI_OVER_2)))
+ bounds.setBottom(-1.0);
+
+ if ((start < (2.0 * PI)) && (end > (2.0 * PI)))
+ bounds.setRight(1.0);
+
+ if ((start < ((2.0 * PI) + PI_OVER_2)) && (end > ((2.0 * PI) + PI_OVER_2)))
+ bounds.setTop(1.0);
+
+ if ((start < (3.0 * PI)) && (end > (3.0 * PI)))
+ bounds.setLeft(-1.0);
+
+ if ((start < ((3.0 * PI) + PI_OVER_2)) && (end > ((3.0 * PI) + PI_OVER_2)))
+ bounds.setBottom(-1.0);
+
+ bounds.setTopLeft(QPointF(bounds.left() * radius, bounds.top() * radius));
+ bounds.setBottomRight(QPointF(bounds.right() * radius, bounds.bottom() * radius));
+ bounds.translate(position.x, position.y);
+ return bounds;
}
-#endif
#if 0
-/*virtual*/ ObjectType Arc::Type(void)
+/*virtual*/ bool Arc::NeedsUpdate(void)
{
- return OTArc;
+ return needUpdate;
}
#endif
#include "line.h"
#include <QtGui>
+#include "container.h"
#include "dimension.h"
+#include "mathconstants.h"
#include "painter.h"
else
// painter->DrawLine((int)position.x, (int)position.y, (int)endpoint.x, (int)endpoint.y);
painter->DrawLine(position, endpoint);
+
+ // If we're rotating or setting the span, draw an information panel
+ // showing both absolute and relative angles being set.
+ if (draggingHandle1 || draggingHandle2)
+ {
+ double absAngle = (Vector(endpoint - position).Angle()) * RADIANS_TO_DEGREES;
+// double relAngle = (startAngle >= oldAngle ? startAngle - oldAngle :
+// startAngle - oldAngle + (2.0 * PI)) * RADIANS_TO_DEGREES;
+ double absLength = Vector(position - endpoint).Magnitude();
+
+ QString text;
+
+ text = QObject::tr("Length: %1 in.\n") + QChar(0x2221) + QObject::tr(": %2");
+ text = text.arg(absLength).arg(absAngle);
+
+ 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
+ painter->DrawRoundedRect(textRect, 7.0, 7.0);
+
+ textRect.setLeft(textRect.left() + 14);
+ painter->SetFont(*Object::font);
+// pen = QPen(QColor(0xDF, 0x5F, 0x00), 1.0, Qt::SolidLine);
+ pen = QPen(QColor(0x00, 0x5F, 0xDF));
+ painter->SetPen(pen);
+ painter->DrawText(textRect, Qt::AlignVCenter, text);
+// painter->SetPen(QPen(QColor(0xDF, 0x5F, 0x00)));
+ }
}
/*virtual*/ Vector Line::Center(void)
objectWasDragged = false;
HitTest(point);
+ // If we're part of a non-top-level container, send this signal to it
+ if (parent->type == OTContainer && !((Container *)parent)->isTopLevelContainer
+ && (hitLine || hitPoint1 || hitPoint2))
+ {
+ parent->state = OSSelected;
+ 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.
/*virtual*/ void Line::PointerMoved(Vector point)
{
+ if (selectionInProgress)
+ {
+ // Check for whether or not the rect contains this line
+#if 0
+ if (selection.normalized().contains(Extents()))
+#else
+ if (selection.normalized().contains(position.x, position.y)
+ && selection.normalized().contains(endpoint.x, endpoint.y))
+#endif
+ state = OSSelected;
+ else
+ state = OSInactive;
+
+ return;
+ }
+
// Hit test tells us what we hit (if anything) through boolean variables. It
// also tells us whether or not the state changed.
needUpdate = HitTest(point);
}
+bool Line::HitTest(Point point)
+{
+ SaveState();
+
+ hitPoint1 = hitPoint2 = hitLine = false;
+ Vector lineSegment = endpoint - position;
+ Vector v1 = point - position;
+ Vector v2 = point - endpoint;
+ double parameterizedPoint = lineSegment.Dot(v1) / lineSegment.Magnitude(), distance;
+
+ // Geometric interpretation:
+ // The parameterized point on the vector lineSegment is where the perpendicular
+ // intersects lineSegment. If pp < 0, then the perpendicular lies beyond the 1st
+ // endpoint. If pp > length of ls, then the perpendicular lies beyond the 2nd endpoint.
+
+ if (parameterizedPoint < 0.0)
+ distance = v1.Magnitude();
+ else if (parameterizedPoint > lineSegment.Magnitude())
+ distance = v2.Magnitude();
+ else
+ // distance = ?Det?(ls, v1) / |ls|
+ distance = fabs((lineSegment.x * v1.y - v1.x * lineSegment.y) / lineSegment.Magnitude());
+
+ // Geometric interpretation of the above:
+ // If the segment endpoints are s and e, and the point is p, then the test
+ // for the perpendicular intercepting the segment is equivalent to insisting
+ // that the two dot products {s-e}.{s-p} and {e-s}.{e-p} are both non-negative.
+ // Perpendicular distance from the point to the segment is computed by first
+ // computing the area of the triangle the three points form, then dividing by
+ // the length of the segment. Distances are done just by the Pythagorean
+ // theorem. Twice the area of the triangle formed by three points is the
+ // determinant of the following matrix:
+ //
+ // sx sy 1 0 0 1 0 0 0
+ // ex ey 1 ==> ex ey 1 ==> ex ey 0
+ // px py 1 px py 1 px py 0
+ //
+ // By translating the start point to the origin, and subtracting row 1 from
+ // all other rows, we end up with the matrix on the right which greatly
+ // simplifies the calculation of the determinant.
+
+//How do we determine distance here? Especially if zoomed in or out???
+//#warning "!!! Distances tested for may not be valid if zoomed in or out !!!"
+// [FIXED]
+ if ((v1.Magnitude() * Painter::zoom) < 8.0)
+ hitPoint1 = true;
+ else if ((v2.Magnitude() * Painter::zoom) < 8.0)
+ hitPoint2 = true;
+ else if ((distance * Painter::zoom) < 5.0)
+ hitLine = true;
+
+ return StateChanged();
+}
+
+
// Check to see if the point passed in coincides with any we have. If so, return a
// pointer to it; otherwise, return NULL.
/*virtual*/ Vector * Line::GetPointAt(Vector v)
}
-#if 0
-/*virtual*/ ObjectType Line::Type(void)
-{
- return OTLine;
-}
-#endif
-
-
void Line::SetDimensionOnLine(Dimension * dimension/*=NULL*/)
{
// If they don't pass one in, create it for the caller.
}
-bool Line::HitTest(Point point)
-{
- SaveState();
-
- hitPoint1 = hitPoint2 = hitLine = false;
- Vector lineSegment = endpoint - position;
- Vector v1 = point - position;
- Vector v2 = point - endpoint;
- double parameterizedPoint = lineSegment.Dot(v1) / lineSegment.Magnitude(), distance;
-
- // Geometric interpretation:
- // The parameterized point on the vector lineSegment is where the perpendicular
- // intersects lineSegment. If pp < 0, then the perpendicular lies beyond the 1st
- // endpoint. If pp > length of ls, then the perpendicular lies beyond the 2nd endpoint.
-
- if (parameterizedPoint < 0.0)
- distance = v1.Magnitude();
- else if (parameterizedPoint > lineSegment.Magnitude())
- distance = v2.Magnitude();
- else
- // distance = ?Det?(ls, v1) / |ls|
- distance = fabs((lineSegment.x * v1.y - v1.x * lineSegment.y) / lineSegment.Magnitude());
-
- // Geometric interpretation of the above:
- // If the segment endpoints are s and e, and the point is p, then the test
- // for the perpendicular intercepting the segment is equivalent to insisting
- // that the two dot products {s-e}.{s-p} and {e-s}.{e-p} are both non-negative.
- // Perpendicular distance from the point to the segment is computed by first
- // computing the area of the triangle the three points form, then dividing by
- // the length of the segment. Distances are done just by the Pythagorean
- // theorem. Twice the area of the triangle formed by three points is the
- // determinant of the following matrix:
- //
- // sx sy 1 0 0 1 0 0 0
- // ex ey 1 ==> ex ey 1 ==> ex ey 0
- // px py 1 px py 1 px py 0
- //
- // By translating the start point to the origin, and subtracting row 1 from
- // all other rows, we end up with the matrix on the right which greatly
- // simplifies the calculation of the determinant.
-
-//How do we determine distance here? Especially if zoomed in or out???
-//#warning "!!! Distances tested for may not be valid if zoomed in or out !!!"
-// [FIXED]
- if ((v1.Magnitude() * Painter::zoom) < 8.0)
- hitPoint1 = true;
- else if ((v2.Magnitude() * Painter::zoom) < 8.0)
- hitPoint2 = true;
- else if ((distance * Painter::zoom) < 5.0)
- hitLine = true;
-
- return StateChanged();
-}
-
void Line::SaveState(void)
{
oldHitPoint1 = hitPoint1;
oldHitLine = hitLine;
}
+
bool Line::StateChanged(void)
{
if ((hitPoint1 != oldHitPoint1) || (hitPoint2 != oldHitPoint2) || (hitLine != oldHitLine))
return false;
}
+
/*
Intersection of two lines: