#include "painter.h"
-Dimension::Dimension(Vector p1, Vector p2, DimensionType dt/*= DTLinear*/ ,Object * p/*= NULL*/):
+Dimension::Dimension(Vector p1, Vector p2, DimensionType dt/*= DTLinear*/, Object * p/*= NULL*/):
Object(p1, p), endpoint(p2),
dragging(false), draggingHandle1(false), draggingHandle2(false),
- length(p2.Magnitude()), dimensionType(dt), size(0.25), point1(NULL), point2(NULL)
+ length(p2.Magnitude()), dimensionType(dt), size(0.25)//, point1(NULL), point2(NULL)
{
// We set the size to 1/4 base unit. Could be anything.
type = OTDimension;
}
-
+#if 0
// This is bad, p1 & p2 could be NULL, causing much consternation...
-Dimension::Dimension(Connection p1, Connection p2, DimensionType dt/*= DTLinear*/ , Object * p/*= NULL*/):
+Dimension::Dimension(Connection p1, Connection p2, DimensionType dt/*= DTLinear*/, Object * p/*= NULL*/):
dragging(false), draggingHandle1(false), draggingHandle2(false),
- length(0), dimensionType(dt), size(0.25), point1(p1), point2(p2)
+ length(0), dimensionType(dt), size(0.25)//, point1(p1), point2(p2)
{
type = OTDimension;
}
-
+#endif
Dimension::~Dimension()
{
/*
-The approach used below creates a hierarchy: Dimension is subservient to Line.
-
-Does this solve our problem of connected objects? Maybe, partially. Let's think this
-through. It only works for endpoints, not points in the middle...
-
-Also: this is bad, depending on the Draw() function to update the internal
- position(s) of the data of the object! (is it though?)
-
How to move: click once moves only the object/point clicked on, all connected
objects deform themselves accordingly. click twice selects ALL connected objects;
all objects move as a unified whole.
/*virtual*/ void Dimension::Draw(Painter * painter)
{
- // If there are valid Vector pointers in here, use them to update the internal
- // positions. Otherwise, we just use the internal positions by default.
- if (point1.object)
- position = point1.object->GetPointAtParameter(point1.t);
+ painter->SetPen(QPen(Qt::magenta, 2.0, Qt::DotLine));
+
+ if ((state == OSSelected) || ((state == OSInactive) && hitPoint1))
+ painter->DrawHandle(position);
- if (point2.object)
- endpoint = point2.object->GetPointAtParameter(point2.t);
+ if ((state == OSSelected) || ((state == OSInactive) && hitPoint2))
+ painter->DrawHandle(endpoint);
if (state == OSSelected)
- painter->SetPen(QPen(Qt::red, 2.0, Qt::DotLine));
+ painter->SetPen(QPen(Qt::cyan, 1.0 * Painter::zoom * size, Qt::SolidLine));
else
-// painter->SetPen(QPen(Qt::blue, 1.0, Qt::SolidLine));
painter->SetPen(QPen(Qt::blue, 1.0 * Painter::zoom * size, Qt::SolidLine));
painter->SetBrush(QBrush(QColor(Qt::blue)));
// Draw an aligned dimension line
- double angle = Vector(endpoint - position).Angle();
- double orthoAngle = angle + (PI / 2.0);
- Vector orthogonal = Vector(cos(orthoAngle), sin(orthoAngle));
- Vector unit = Vector(endpoint - position).Unit();
-
-// Arrowhead:
-// Point p1 = head - (unit * 9.0 * size);
-// Point p2 = p1 + (orthogonal * 3.0 * size);
-// Point p3 = p1 - (orthogonal * 3.0 * size);
+ Vector v(position, endpoint);
+ double angle = v.Angle();
+ Vector orthogonal = Vector::Normal(position, endpoint);
+ Vector unit = v.Unit();
+ linePt1 = position, linePt2 = endpoint;
+
+// Horizontally aligned display
+#if 1
+ Vector /*pos = position, endp = endpoint,*/ ortho;
+ double y1;
+
+ if ((angle < PI_OVER_2) || (angle > PI3_OVER_2))
+ {
+ y1 = (position.y > endpoint.y ? position.y : endpoint.y);
+ ortho = Vector(0, 1.0);
+ angle = 0;
+ }
+ else
+ {
+ y1 = (position.y > endpoint.y ? endpoint.y : position.y);
+ ortho = Vector(0, -1.0);
+ angle = PI;
+ }
+// pos.y = endp.y = y1;
+ linePt1.y = linePt2.y = y1;
+ unit = Vector(linePt1, linePt2).Unit();
+ Point p1 = linePt1 + (ortho * 10.0 * size);
+ Point p2 = linePt2 + (ortho * 10.0 * size);
+ Point p3 = linePt1 + (ortho * 16.0 * size);
+ Point p4 = linePt2 + (ortho * 16.0 * size);
+ Point p5 = position + (ortho * 4.0 * size);
+ Point p6 = endpoint + (ortho * 4.0 * size);
+#endif
/*
The numbers hardcoded into here, what are they?
I believe they are pixels.
*/
-
+#if 0
// Get our line parallel to our points
Point p1 = position + (orthogonal * 10.0 * size);
Point p2 = endpoint + (orthogonal * 10.0 * size);
Point p4 = endpoint + (orthogonal * 16.0 * size);
Point p5 = position + (orthogonal * 4.0 * size);
Point p6 = endpoint + (orthogonal * 4.0 * size);
-
- // Draw extension lines
+#endif
+ // Draw extension lines (if certain type)
painter->DrawLine(p3, p5);
painter->DrawLine(p4, p6);
// Calculate whether or not the arrowheads are too crowded to put inside
// the extension lines. 9.0 is the length of the arrowhead.
-// double t = Vector::Parameter(position, endpoint, endpoint - (unit * 9.0 * size));
- double t = Geometry::ParameterOfLineAndPoint(position, endpoint, endpoint - (unit * 9.0 * size));
+// double t = Geometry::ParameterOfLineAndPoint(position, endpoint, endpoint - (unit * 9.0 * size));
+// double t = Geometry::ParameterOfLineAndPoint(pos, endp, endp - (unit * 9.0 * size));
+ double t = Geometry::ParameterOfLineAndPoint(linePt1, linePt2, linePt2 - (unit * 9.0 * size));
//printf("Dimension::Draw(): t = %lf\n", t);
// On the screen, it's acting like this is actually 58%...
// Draw length of dimension line...
painter->SetFont(QFont("Arial", 8.0 * Painter::zoom * size));
+#if 0
Vector v1((p1.x - p2.x) / 2.0, (p1.y - p2.y) / 2.0);
Point ctr = p2 + v1;
+#else
+ Point ctr = p2 + (Vector(p2, p1) / 2.0);
+#endif
#if 0
QString dimText = QString("%1\"").arg(Vector(endpoint - position).Magnitude());
#else
QString dimText;
- double length = Vector(endpoint - position).Magnitude();
+// double length = v.Magnitude();
+ double length = fabs(position.x - endpoint.x);
if (length < 12.0)
dimText = QString("%1\"").arg(length);
#endif
painter->DrawAngledText(ctr, angle, dimText, size);
+
+// need to make another handle drawing function in Painter, instead of this
+ if (hitLine)
+ {
+ Point p9 = ((position + endpoint) / 2.0) + (orthogonal * 14.0)
+ + (unit * 7.0);
+
+ Point p10 = p9 + (orthogonal * -7.0);
+ Point p11 = p10 + (unit * 7.0);
+ Point p12 = p11 + (orthogonal * 7.0);
+ Point p13 = p12 + (unit * -7.0);
+ painter->DrawLine(p10, p11);
+ painter->DrawLine(p11, p12);
+ painter->DrawLine(p12, p13);
+ painter->DrawLine(p13, p10);
+ }
}
if (hitPoint1)
{
-// oldState = state;
-// state = OSSelected;
+ oldState = state;
+ state = OSSelected;
oldPoint = position;
draggingHandle1 = true;
return true;
}
else if (hitPoint2)
{
-// oldState = state;
-// state = OSSelected;
+ oldState = state;
+ state = OSSelected;
oldPoint = endpoint;
draggingHandle2 = true;
return true;
}
-/*virtual*/ void Dimension::PointerMoved(Vector point)
+/*virtual*/ bool Dimension::PointerMoved(Vector point)
{
- // We know this is true because mouse move messages don't come here unless
- // the object was actually clicked on--therefore we *know* we're being
- // dragged...
- objectWasDragged = true;
-
-/* if (dragging)
+ if (selectionInProgress)
{
- // Here we need to check whether or not we're dragging a handle or the object itself...
- Vector delta = point - oldPoint;
-
- position += delta;
- endpoint += delta;
+ // Check for whether or not the rect contains this line
+ if (selection.contains(position.x, position.y)
+ && selection.contains(endpoint.x, endpoint.y))
+ state = OSSelected;
+ else
+ state = OSInactive;
- oldPoint = point;
- needUpdate = true;
+ return false;
}
- else*/ if (draggingHandle1)
- {
- Vector delta = point - oldPoint;
- position += delta;
+ // 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)
+ SaveHitState();
+ bool hovered = HitTest(point);
+ needUpdate = HitStateChanged();
- oldPoint = point;
- needUpdate = true;
- }
- else if (draggingHandle2)
+ objectWasDragged = (/*draggingLine |*/ draggingHandle1 | draggingHandle2);
+
+ if (objectWasDragged)
{
Vector delta = point - oldPoint;
- endpoint += delta;
+ if (draggingHandle1)// || draggingLine)
+ position += delta;
+
+ if (draggingHandle2)// || draggingLine)
+ endpoint += delta;
oldPoint = point;
needUpdate = true;
}
- else
- needUpdate = false;
+
+ return hovered;
}
/*virtual*/ bool Dimension::HitTest(Point point)
{
- hitPoint1 = hitPoint2 = false;
-// Vector lineSegment(position, endpoint);
+ Vector orthogonal = Vector::Normal(position, endpoint);
+ // Get our line parallel to our points
+#if 0
+ Point p1 = position + (orthogonal * 10.0 * size);
+ Point p2 = endpoint + (orthogonal * 10.0 * size);
+#else
+ Point p1 = linePt1 + (orthogonal * 10.0 * size);
+ Point p2 = linePt2 + (orthogonal * 10.0 * size);
+#endif
+ Point p3(p1, point);
+
+ hitPoint1 = hitPoint2 = hitLine = hitFlipSwitch = false;
Vector v1(position, point);
Vector v2(endpoint, point);
+// Vector lineSegment(position, endpoint);
+ Vector lineSegment(p1, p2);
// double t = Geometry::ParameterOfLineAndPoint(position, endpoint, point);
-// double distance;
+ double t = Geometry::ParameterOfLineAndPoint(p1, p2, point);
+ double distance;
-// if (t < 0.0)
-// distance = v1.Magnitude();
-// else if (t > 1.0)
-// distance = v2.Magnitude();
-// else
+ if (t < 0.0)
+ distance = v1.Magnitude();
+ else if (t > 1.0)
+ distance = v2.Magnitude();
+ else
// distance = ?Det?(ls, v1) / |ls|
// distance = fabs((lineSegment.x * v1.y - v1.x * lineSegment.y)
-// / lineSegment.Magnitude());
+ distance = fabs((lineSegment.x * p3.y - p3.x * lineSegment.y)
+ / lineSegment.Magnitude());
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 (hitPoint1 || hitPoint2 ? true : false);
+ return (hitPoint1 || hitPoint2 || hitLine ? true : false);
+}
+
+
+void Dimension::SaveHitState(void)
+{
+ oldHitPoint1 = hitPoint1;
+ oldHitPoint2 = hitPoint2;
+ oldHitLine = hitLine;
+}
+
+
+bool Dimension::HitStateChanged(void)
+{
+ if ((hitPoint1 != oldHitPoint1) || (hitPoint2 != oldHitPoint2) || (hitLine != oldHitLine))
+ return true;
+
+ return false;
}
}
+/*virtual*/ void Dimension::MovePointAtParameter(double parameter, Vector v)
+{
+ if (parameter == 0)
+ position += v;
+ else if (parameter == 1.0)
+ endpoint += v;
+ else
+ {} // Not sure how to handle this case :-P
+}
+
+#if 0
/*virtual*/ void Dimension::Connect(Object * obj, double param)
{
// There are four possibilities here...
if (point2.object == obj)
point2.object = NULL;
}
-
+#endif
/*virtual*/ QRectF Dimension::Extents(void)
{
Point p1 = position;
Point p2 = endpoint;
- if (point1.object)
- p1 = point1.object->GetPointAtParameter(point1.t);
-
- if (point2.object)
- p2 = point2.object->GetPointAtParameter(point2.t);
+// if (point1.object)
+// p1 = point1.object->GetPointAtParameter(point1.t);
+//
+// if (point2.object)
+// p2 = point2.object->GetPointAtParameter(point2.t);
return QRectF(QPointF(p1.x, p1.y), QPointF(p2.x, p2.y));
}
void Dimension::FlipSides(void)
{
-#if 0
+#if 1
Vector tmp = position;
position = endpoint;
endpoint = tmp;
+//Not sure this matters...
+//#warning "!!! May need to swap parameter values on connected objects !!!"
#else
Connection tmp = point1;
point1 = point2;
projects / architektonas / blobdiff