X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdimension.cpp;h=9c9e15c8dd5af0ed3824c7926775caab700c8ec8;hb=57056be35f9295400dd873a17d8468b3287ebc0c;hp=b3c8da6adc1ce7d2a1af9fbca481f13ef9d80fd2;hpb=4d6ba8a6eb781dbee818b6a55d21df7b52468936;p=architektonas diff --git a/src/dimension.cpp b/src/dimension.cpp index b3c8da6..9c9e15c 100644 --- a/src/dimension.cpp +++ b/src/dimension.cpp @@ -27,17 +27,9 @@ Dimension::Dimension(Vector p1, Vector p2, DimensionType dt/*= DTLinear*/, Objec { // We set the size to 1/4 base unit. Could be anything. type = OTDimension; +// dimensionType = DTLinearHorz; } -#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*/): - dragging(false), draggingHandle1(false), draggingHandle2(false), - length(0), dimensionType(dt), size(0.25)//, point1(p1), point2(p2) -{ - type = OTDimension; -} -#endif Dimension::~Dimension() { @@ -45,14 +37,6 @@ 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. @@ -61,16 +45,6 @@ all objects move as a unified whole. /*virtual*/ void Dimension::Draw(Painter * painter) { -#if 0 - // 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); - - if (point2.object) - endpoint = point2.object->GetPointAtParameter(point2.t); -#endif - painter->SetPen(QPen(Qt::magenta, 2.0, Qt::DotLine)); if ((state == OSSelected) || ((state == OSInactive) && hitPoint1)) @@ -78,12 +52,10 @@ all objects move as a unified whole. if ((state == OSSelected) || ((state == OSInactive) && hitPoint2)) painter->DrawHandle(endpoint); -#if 1 + if (state == OSSelected) painter->SetPen(QPen(Qt::cyan, 1.0 * Painter::zoom * size, Qt::SolidLine)); else -// painter->SetPen(QPen(Qt::blue, 1.0, Qt::SolidLine)); -#endif painter->SetPen(QPen(Qt::blue, 1.0 * Painter::zoom * size, Qt::SolidLine)); painter->SetBrush(QBrush(QColor(Qt::blue))); @@ -91,16 +63,83 @@ all objects move as a unified whole. // Draw an aligned dimension line Vector v(position, endpoint); double angle = v.Angle(); -// double orthoAngle = angle + (PI / 2.0); -// Vector orthogonal = Vector(cos(orthoAngle), sin(orthoAngle)); - 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 ortho; + double x1, y1, length; + + if (dimensionType == DTLinearVert) + { + 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 if (dimensionType == DTLinearHorz) + { + 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(); + } + 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); + 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); @@ -109,15 +148,16 @@ I believe they are pixels. 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%... @@ -142,15 +182,12 @@ I believe they are pixels. // Draw length of dimension line... painter->SetFont(QFont("Arial", 8.0 * Painter::zoom * size)); - Vector v1((p1.x - p2.x) / 2.0, (p1.y - p2.y) / 2.0); - Point ctr = p2 + v1; + Point ctr = p2 + (Vector(p2, p1) / 2.0); #if 0 QString dimText = QString("%1\"").arg(Vector(endpoint - position).Magnitude()); #else QString dimText; -// double length = Vector(endpoint - position).Magnitude(); - double length = v.Magnitude(); if (length < 12.0) dimText = QString("%1\"").arg(length); @@ -170,17 +207,17 @@ I believe they are pixels. 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); + Point hp1 = (p1 + 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)); + } + + painter->DrawHandle(hp1); } } @@ -224,13 +261,20 @@ I believe they are pixels. draggingHandle2 = true; return true; } + else if (hitFlipSwitch) + { + FlipSides(); + hitFlipSwitch = hitLine = false; +// state = OSInactive; +// return true; + } state = OSInactive; return false; } -/*virtual*/ void Dimension::PointerMoved(Vector point) +/*virtual*/ bool Dimension::PointerMoved(Vector point) { if (selectionInProgress) { @@ -241,13 +285,13 @@ I believe they are pixels. 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) SaveHitState(); - HitTest(point); + bool hovered = HitTest(point); needUpdate = HitStateChanged(); objectWasDragged = (/*draggingLine |*/ draggingHandle1 | draggingHandle2); @@ -265,6 +309,8 @@ I believe they are pixels. oldPoint = point; needUpdate = true; } + + return hovered; } @@ -312,10 +358,16 @@ about keeping track of old states... /*virtual*/ bool Dimension::HitTest(Point point) { - Vector orthogonal = Vector::Normal(position, endpoint); +// Vector orthogonal = Vector::Normal(position, endpoint); + Vector orthogonal = Vector::Normal(linePt1, linePt2); // 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; @@ -326,6 +378,7 @@ about keeping track of old states... // double t = Geometry::ParameterOfLineAndPoint(position, endpoint, point); double t = Geometry::ParameterOfLineAndPoint(p1, p2, point); double distance; + Point hFSPoint = Point((p1 + p2) / 2.0, point); if (t < 0.0) distance = v1.Magnitude(); @@ -344,7 +397,10 @@ about keeping track of old states... else if ((distance * Painter::zoom) < 5.0) hitLine = true; - return (hitPoint1 || hitPoint2 || hitLine ? true : false); + if ((hFSPoint.Magnitude() * Painter::zoom) < 8.0) + hitFlipSwitch = true; + + return (hitPoint1 || hitPoint2 || hitLine || hitFlipSwitch ? true : false); } @@ -353,12 +409,13 @@ void Dimension::SaveHitState(void) oldHitPoint1 = hitPoint1; oldHitPoint2 = hitPoint2; oldHitLine = hitLine; + oldHitFlipSwitch = hitFlipSwitch; } bool Dimension::HitStateChanged(void) { - if ((hitPoint1 != oldHitPoint1) || (hitPoint2 != oldHitPoint2) || (hitLine != oldHitLine)) + if ((hitPoint1 != oldHitPoint1) || (hitPoint2 != oldHitPoint2) || (hitLine != oldHitLine) || (hitFlipSwitch != oldHitFlipSwitch)) return true; return false;