From 9426a17d7752f82b27c47f12df0062b882df3077 Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Wed, 13 May 2015 10:39:50 -0500 Subject: [PATCH] Added ability to manipulate Arcs. --- src/drawingview.cpp | 95 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 4 deletions(-) diff --git a/src/drawingview.cpp b/src/drawingview.cpp index 9e1b56c..7b49323 100644 --- a/src/drawingview.cpp +++ b/src/drawingview.cpp @@ -376,6 +376,16 @@ void DrawingView::RenderObjects(Painter * painter, std::vector & v) break; case OTArc: painter->DrawArc(obj->p[0], obj->radius[0], obj->angle[0], obj->angle[1]); + + if (obj->hitPoint[0]) + painter->DrawHandle(obj->p[0]); + + if (obj->hitPoint[1]) + painter->DrawHandle(obj->p[0] + (Vector(cos(obj->angle[0]), sin(obj->angle[0])) * obj->radius[0])); + + if (obj->hitPoint[2]) + painter->DrawHandle(obj->p[0] + (Vector(cos(obj->angle[0] + obj->angle[1]), sin(obj->angle[0] + obj->angle[1])) * obj->radius[0])); + break; case OTDimension: { @@ -1391,8 +1401,8 @@ bool DrawingView::HitTestObjects(Point point) } case OTArc: { - bool oldHP = obj->hitPoint[0], oldHO = obj->hitObject; - obj->hitPoint[0] = obj->hitObject = false; + bool oldHP0 = obj->hitPoint[0], oldHP1 = obj->hitPoint[1], oldHP2 = obj->hitPoint[2], oldHO = obj->hitObject; + obj->hitPoint[0] = obj->hitPoint[1] = obj->hitPoint[2] = obj->hitObject = false; double length = Vector::Magnitude(obj->p[0], point); double angle = Vector::Angle(obj->p[0], point); @@ -1404,15 +1414,24 @@ bool DrawingView::HitTestObjects(Point point) double span = angle - obj->angle[0]; // N.B.: Still need to hit test the arc start & arc span handles... + double spanAngle = obj->angle[0] + obj->angle[1]; + Point handle1 = obj->p[0] + (Vector(cos(obj->angle[0]), sin(obj->angle[0])) * obj->radius[0]); + Point handle2 = obj->p[0] + (Vector(cos(spanAngle), sin(spanAngle)) * obj->radius[0]); + double length2 = Vector::Magnitude(point, handle1); + double length3 = Vector::Magnitude(point, handle2); if ((length * Global::zoom) < 8.0) obj->hitPoint[0] = true; + else if ((length2 * Global::zoom) < 8.0) + obj->hitPoint[1] = true; + else if ((length3 * Global::zoom) < 8.0) + obj->hitPoint[2] = true; else if (((fabs(length - obj->radius[0]) * Global::zoom) < 2.0) && (span < obj->angle[1])) obj->hitObject = true; - obj->hovered = (obj->hitPoint[0] || obj->hitObject ? true : false); + obj->hovered = (obj->hitPoint[0] || obj->hitPoint[1] || obj->hitPoint[2] || obj->hitObject ? true : false); - if ((oldHP != obj->hitPoint[0]) || (oldHO != obj->hitObject)) + if ((oldHP0 != obj->hitPoint[0]) || (oldHP1 != obj->hitPoint[1]) || (oldHP2 != obj->hitPoint[2]) || (oldHO != obj->hitObject)) needUpdate = true; break; @@ -1467,6 +1486,74 @@ void DrawingView::HandleObjectMovement(Point point) informativeText = text.arg(obj->radius[0], 0, 'd', 4);//.arg(obj->radius[0] / oldRadius * 100.0, 0, 'd', 0); } + break; + case OTArc: + if (obj->hitPoint[0]) + obj->p[0] = point; + else if (obj->hitPoint[1]) + { + // Change the Arc's span (handle #1) + if (shiftDown) + { + double angle = Vector::Angle(obj->p[0], point); + double delta = angle - obj->angle[0]; + + if (delta < 0) + delta += PI_TIMES_2; + + obj->angle[1] -= delta; + obj->angle[0] = angle; + + if (obj->angle[1] < 0) + obj->angle[1] += PI_TIMES_2; + + QString text = QObject::tr("Span: %1") + QChar(0x00B0) + QObject::tr("\n%2") + QChar(0x00B0) + QObject::tr(" - %3") + QChar(0x00B0); + informativeText = text.arg(obj->angle[1] * RADIANS_TO_DEGREES, 0, 'd', 4).arg(obj->angle[0] * RADIANS_TO_DEGREES, 0, 'd', 2).arg((obj->angle[0] + obj->angle[1]) * RADIANS_TO_DEGREES, 0, 'd', 2); + return; + } + + double angle = Vector::Angle(obj->p[0], point); + obj->angle[0] = angle; + QString text = QObject::tr("Start angle: %1") + QChar(0x00B0); + informativeText = text.arg(obj->angle[0] * RADIANS_TO_DEGREES, 0, 'd', 4); + } + else if (obj->hitPoint[2]) + { + // Change the Arc's span (handle #2) + if (shiftDown) + { + double angle = Vector::Angle(obj->p[0], point); + obj->angle[1] = angle - obj->angle[0]; + + if (obj->angle[1] < 0) + obj->angle[1] += PI_TIMES_2; + + QString text = QObject::tr("Span: %1") + QChar(0x00B0) + QObject::tr("\n%2") + QChar(0x00B0) + QObject::tr(" - %3") + QChar(0x00B0); + informativeText = text.arg(obj->angle[1] * RADIANS_TO_DEGREES, 0, 'd', 4).arg(obj->angle[0] * RADIANS_TO_DEGREES, 0, 'd', 2).arg((obj->angle[0] + obj->angle[1]) * RADIANS_TO_DEGREES, 0, 'd', 2); + return; + } + + double angle = Vector::Angle(obj->p[0], point); + obj->angle[0] = angle - obj->angle[1]; + + if (obj->angle[0] < 0) + obj->angle[0] += PI_TIMES_2; + + QString text = QObject::tr("End angle: %1") + QChar(0x00B0); + informativeText = text.arg((obj->angle[0] + obj->angle[1]) * RADIANS_TO_DEGREES, 0, 'd', 4); + } + else if (obj->hitObject) + { + if (shiftDown) + { + return; + } + + obj->radius[0] = Vector::Magnitude(obj->p[0], point); + QString text = QObject::tr("Radius: %1"); + informativeText = text.arg(obj->radius[0], 0, 'd', 4); + } + break; default: break; -- 2.37.2