{
// We set the size to 1/4 base unit. Could be anything.
type = OTDimension;
+// dimensionType = DTLinearHorz;
}
// Draw an aligned dimension line
Vector v(position, endpoint);
double angle = v.Angle();
- Vector orthogonal = Vector::Normal(position, endpoint);
+// 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;
+ Vector ortho;
+ double x1, y1, length;
- if ((angle < PI_OVER_2) || (angle > PI3_OVER_2))
+ if (dimensionType == DTLinearVert)
{
- y1 = (position.y > endpoint.y ? position.y : endpoint.y);
- ortho = Vector(0, 1.0);
- angle = 0;
+ if ((angle < 0) || (angle > PI))
+ // if ((angle < PI_OVER_2) || (angle > PI3_OVER_2))
+ {
+ x1 = (position.x > endpoint.x ? position.x : endpoint.x);
+ y1 = (position.y > endpoint.y ? position.y : endpoint.y);
+ ortho = Vector(1.0, 0);
+ // ortho = Vector(0, 1.0);
+ angle = PI3_OVER_2;
+ // angle = 0;
+ }
+ else
+ {
+ x1 = (position.x > endpoint.x ? endpoint.x : position.x);
+ y1 = (position.y > endpoint.y ? endpoint.y : position.y);
+ ortho = Vector(-1.0, 0);
+ // ortho = Vector(0, -1.0);
+ angle = PI_OVER_2;
+ // angle = PI;
+ }
+
+ linePt1.x = linePt2.x = x1;
+ length = fabs(position.y - endpoint.y);
}
- else
+ else if (dimensionType == DTLinearHorz)
{
- y1 = (position.y > endpoint.y ? endpoint.y : position.y);
- ortho = Vector(0, -1.0);
- angle = PI;
+ if ((angle < PI_OVER_2) || (angle > PI3_OVER_2))
+ {
+ x1 = (position.x > endpoint.x ? position.x : endpoint.x);
+ y1 = (position.y > endpoint.y ? position.y : endpoint.y);
+ ortho = Vector(0, 1.0);
+ angle = 0;
+ }
+ else
+ {
+ x1 = (position.x > endpoint.x ? endpoint.x : position.x);
+ y1 = (position.y > endpoint.y ? endpoint.y : position.y);
+ ortho = Vector(0, -1.0);
+ angle = PI;
+ }
+
+ linePt1.y = linePt2.y = y1;
+ length = fabs(position.x - endpoint.x);
+ }
+ else if (dimensionType == DTLinear)
+ {
+ angle = Vector(linePt1, linePt2).Angle();
+ ortho = Vector::Normal(linePt1, linePt2);
+ length = v.Magnitude();
}
-// pos.y = endp.y = y1;
- linePt1.y = linePt2.y = y1;
unit = Vector(linePt1, linePt2).Unit();
+// angle = Vector(linePt1, linePt2).Angle();
+// ortho = Vector::Normal(linePt1, linePt2);
+
Point p1 = linePt1 + (ortho * 10.0 * size);
Point p2 = linePt2 + (ortho * 10.0 * size);
Point p3 = linePt1 + (ortho * 16.0 * size);
// 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 = v.Magnitude();
- double length = fabs(position.x - endpoint.x);
if (length < 12.0)
dimText = QString("%1\"").arg(length);
painter->DrawAngledText(ctr, angle, dimText, size);
-// need to make another handle drawing function in Painter, instead of this
if (hitLine)
{
-#if 0
- 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);
-#else
+ Point hp1 = (p1 + p2) / 2.0;
+ Point hp2 = (p1 + hp1) / 2.0;
+ Point hp3 = (hp1 + p2) / 2.0;
+
if (hitFlipSwitch)
+ {
+ painter->SetPen(QPen(Qt::magenta, 1.0, Qt::SolidLine));
+ painter->SetBrush(QBrush(QColor(Qt::magenta)));
+ painter->DrawArrowHandle(hp1, ortho.Angle() + PI);
painter->SetPen(QPen(Qt::magenta, 2.0, Qt::DotLine));
+ }
- Point hp1 = (p1 + p2) / 2.0;
painter->DrawHandle(hp1);
-#endif
+ painter->SetPen(QPen(Qt::blue, 1.0 * Painter::zoom * size, Qt::SolidLine));
+
+ if (hitChangeSwitch1)
+ {
+ painter->SetPen(QPen(Qt::magenta, 1.0, Qt::SolidLine));
+ painter->SetBrush(QBrush(QColor(Qt::magenta)));
+ painter->DrawArrowToLineHandle(hp2, (dimensionType == DTLinearVert ? ortho.Angle() : 0));
+ painter->SetPen(QPen(Qt::magenta, 2.0, Qt::DotLine));
+ }
+
+ painter->DrawHandle(hp2);
+ painter->SetPen(QPen(Qt::blue, 1.0 * Painter::zoom * size, Qt::SolidLine));
+
+ if (hitChangeSwitch2)
+ {
+ painter->SetPen(QPen(Qt::magenta, 1.0, Qt::SolidLine));
+ painter->SetBrush(QBrush(QColor(Qt::magenta)));
+ painter->DrawArrowToLineHandle(hp3, PI_OVER_2);
+ painter->SetPen(QPen(Qt::magenta, 2.0, Qt::DotLine));
+ }
+
+ painter->DrawHandle(hp3);
}
}
// state = OSInactive;
// return true;
}
+ else if (hitChangeSwitch1)
+ {
+ // There are three cases here: aligned, horizontal, & vertical. Aligned
+ // and horizontal do the same thing, vertical goes back to linear.
+ if (dimensionType == DTLinearVert)
+ dimensionType = DTLinear;
+ else
+ dimensionType = DTLinearVert;
+
+ hitFlipSwitch = hitLine = false;
+ }
+ else if (hitChangeSwitch2)
+ {
+ // There are three cases here: aligned, horizontal, & vertical. Aligned
+ // and vertical do the same thing, horizontal goes back to linear.
+ if (dimensionType == DTLinearHorz)
+ dimensionType = DTLinear;
+ else
+ dimensionType = DTLinearHorz;
+
+ hitFlipSwitch = hitLine = false;
+ }
state = OSInactive;
return false;
#endif
Point p3(p1, point);
- hitPoint1 = hitPoint2 = hitLine = hitFlipSwitch = false;
+ hitPoint1 = hitPoint2 = hitLine = hitFlipSwitch = hitChangeSwitch1
+ = hitChangeSwitch2 = false;
Vector v1(position, point);
Vector v2(endpoint, point);
// Vector lineSegment(position, endpoint);
// double t = Geometry::ParameterOfLineAndPoint(position, endpoint, point);
double t = Geometry::ParameterOfLineAndPoint(p1, p2, point);
double distance;
- Point hFSPoint = Point((p1 + p2) / 2.0, point);
+ Point midpoint = (p1 + p2) / 2.0;
+ Point hFSPoint = Point(midpoint, point);
+ Point hCS1Point = Point((p1 + midpoint) / 2.0, point);
+ Point hCS2Point = Point((midpoint + p2) / 2.0, point);
if (t < 0.0)
distance = v1.Magnitude();
if ((hFSPoint.Magnitude() * Painter::zoom) < 8.0)
hitFlipSwitch = true;
+ else if ((hCS1Point.Magnitude() * Painter::zoom) < 8.0)
+ hitChangeSwitch1 = true;
+ else if ((hCS2Point.Magnitude() * Painter::zoom) < 8.0)
+ hitChangeSwitch2 = true;
- return (hitPoint1 || hitPoint2 || hitLine || hitFlipSwitch ? true : false);
+ return (hitPoint1 || hitPoint2 || hitLine || hitFlipSwitch || hitChangeSwitch1 || hitChangeSwitch2 ? true : false);
}
oldHitPoint2 = hitPoint2;
oldHitLine = hitLine;
oldHitFlipSwitch = hitFlipSwitch;
+ oldHitChangeSwitch1 = hitChangeSwitch1;
+ oldHitChangeSwitch2 = hitChangeSwitch2;
}
bool Dimension::HitStateChanged(void)
{
- if ((hitPoint1 != oldHitPoint1) || (hitPoint2 != oldHitPoint2) || (hitLine != oldHitLine) || (hitFlipSwitch != oldHitFlipSwitch))
+ if ((hitPoint1 != oldHitPoint1) || (hitPoint2 != oldHitPoint2)
+ || (hitLine != oldHitLine) || (hitFlipSwitch != oldHitFlipSwitch)
+ || (hitChangeSwitch1 != oldHitChangeSwitch1)
+ || (hitChangeSwitch2 != oldHitChangeSwitch2))
return true;
return false;
projects / architektonas / blobdiff