X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.cpp;h=16280d6e9802e1d5132d931164e908d76b6a517a;hb=3c2db966e79e6437db75eebcff0bfc427f37c71b;hp=58e0979495b3794d2df175ced51453ac6b6a912b;hpb=f507d97c1b1118834a70332f5f79d8479a6964c0;p=architektonas diff --git a/src/drawingview.cpp b/src/drawingview.cpp index 58e0979..16280d6 100644 --- a/src/drawingview.cpp +++ b/src/drawingview.cpp @@ -35,6 +35,7 @@ #include "mathconstants.h" #include "painter.h" #include "structs.h" +#include "utils.h" #define BACKGROUND_MAX_SIZE 512 @@ -45,7 +46,8 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent), // The value in the settings file will override this. - useAntialiasing(true), + useAntialiasing(true), numSelected(0), numHovered(0), shiftDown(false), + ctrlDown(false), gridBackground(BACKGROUND_MAX_SIZE, BACKGROUND_MAX_SIZE), scale(1.0), offsetX(-10), offsetY(-10),// document(Vector(0, 0)), gridPixels(0), collided(false)//, toolAction(NULL) @@ -76,8 +78,8 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent), #endif #else Line * line = new Line;//(Vector(5, 5), Vector(50, 40), &document); - line->p1 = Vector(5, 5); - line->p2 = Vector(50, 40); + line->p[0] = Vector(5, 5); + line->p[1] = Vector(50, 40); line->type = OTLine; line->thickness = 2.0; line->style = LSDash; @@ -90,7 +92,7 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent), document.objects.push_back(new Arc(Vector(300, 300), 32, PI / 4.0, PI * 1.3)), document.objects.push_back(new Arc(Vector(200, 200), 60, PI / 2.0, PI * 1.5)); document.objects.push_back(new Dimension(Vector(50, 40), Vector(5, 5))); - document.objects.push_back(new Text(Vector(10, 83), "Tyegxt!")); + document.objects.push_back(new Text(Vector(10, 83), "Here is some awesome text!")); #endif /* @@ -263,24 +265,6 @@ zero; so we do another modulus operation on the result to achieve this. } -void DrawingView::AddNewObjectToDocument(Object * object) -{ - if (object) - { -// object->Reparent(&document); -// document.Add(object); - update(); - } -//printf("DrawingView::AddNewObjectToDocument(). object=%08X\n", object); -} - - -void DrawingView::HandleActionUpdate(void) -{ - update(); -} - - void DrawingView::SetCurrentLayer(int layer) { Global::currentLayer = layer; @@ -321,74 +305,86 @@ void DrawingView::paintEvent(QPaintEvent * /*event*/) painter.DrawLine(0, -16384, 0, 16384); painter.DrawLine(-16384, 0, 16384, 0); - // The top level document takes care of rendering for us... -// document.Draw(&painter); - // Not any more it doesn't... - RenderObjects(&painter, &document); + // Do object rendering... + RenderObjects(&painter, document.objects); -#if 0 - if (toolAction) + // Do tool rendering, if any... + if (Global::tool) { painter.SetPen(QPen(QColor(200, 100, 0, 255), 1.0, Qt::DashLine)); painter.DrawCrosshair(oldPoint); - toolAction->Draw(&painter); + ToolDraw(&painter); } -#endif -#if 1 + // Do selection rectangle rendering, if any if (Global::selectionInProgress) { painter.SetPen(QPen(QColor(255, 127, 0, 255))); painter.SetBrush(QBrush(QColor(255, 127, 0, 100))); painter.DrawRect(Global::selection); } -#endif + + if (!informativeText.isEmpty()) + painter.DrawInformativeText(informativeText); } -void DrawingView::RenderObjects(Painter * painter, Container * c) +// +// Renders objects in the passed in vector +// +void DrawingView::RenderObjects(Painter * painter, std::vector & v) { std::vector::iterator i; - for(i=c->objects.begin(); i!=c->objects.end(); i++) + for(i=v.begin(); i!=v.end(); i++) { Object * obj = (Object *)(*i); float scaledThickness = Global::scale * obj->thickness; - painter->SetPen(obj->color, Global::zoom * scaledThickness, obj->style); - painter->SetBrush(obj->color); - if (obj->selected || obj->hovered) - painter->SetPen(0xFF0000, Global::zoom * scaledThickness, LSDash); + if ((Global::tool == TTRotate) && ctrlDown && obj->selected) + { + painter->SetPen(0x00FF00, 2.0, LSSolid); + } + else + { + painter->SetPen(obj->color, Global::zoom * scaledThickness, obj->style); + painter->SetBrush(obj->color); + + if (obj->selected || obj->hitObject) + painter->SetPen(0xFF0000, Global::zoom * scaledThickness, LSDash); + } switch (obj->type) { case OTLine: - { - Line * l = (Line *)obj; - painter->DrawLine(l->p1, l->p2); + painter->DrawLine(obj->p[0], obj->p[1]); + + if (obj->hitPoint[0]) + painter->DrawHandle(obj->p[0]); + + if (obj->hitPoint[1]) + painter->DrawHandle(obj->p[1]); + break; - } case OTCircle: - { - Circle * ci = (Circle *)obj; painter->SetBrush(QBrush(Qt::NoBrush)); - painter->DrawEllipse(ci->p1, ci->radius, ci->radius); + painter->DrawEllipse(obj->p[0], obj->radius[0], obj->radius[0]); + + if (obj->hitPoint[0]) + painter->DrawHandle(obj->p[0]); + break; - } case OTArc: - { - Arc * a = (Arc *)obj; - painter->DrawArc(a->p1, a->radius, a->angle1, a->angle2); + painter->DrawArc(obj->p[0], obj->radius[0], obj->angle[0], obj->angle[1]); break; - } case OTDimension: { Dimension * d = (Dimension *)obj; - Vector v(d->p1, d->p2); + Vector v(d->p[0], d->p[1]); double angle = v.Angle(); Vector unit = v.Unit(); - Vector linePt1 = d->p1, linePt2 = d->p2; + Vector linePt1 = d->p[0], linePt2 = d->p[1]; Vector ortho; double x1, y1, length; @@ -396,41 +392,41 @@ void DrawingView::RenderObjects(Painter * painter, Container * c) { if ((angle < 0) || (angle > PI)) { - x1 = (d->p1.x > d->p2.x ? d->p1.x : d->p2.x); - y1 = (d->p1.y > d->p2.y ? d->p1.y : d->p2.y); + x1 = (d->p[0].x > d->p[1].x ? d->p[0].x : d->p[1].x); + y1 = (d->p[0].y > d->p[1].y ? d->p[0].y : d->p[1].y); ortho = Vector(1.0, 0); angle = PI3_OVER_2; } else { - x1 = (d->p1.x > d->p2.x ? d->p2.x : d->p1.x); - y1 = (d->p1.y > d->p2.y ? d->p2.y : d->p1.y); + x1 = (d->p[0].x > d->p[1].x ? d->p[1].x : d->p[0].x); + y1 = (d->p[0].y > d->p[1].y ? d->p[1].y : d->p[0].y); ortho = Vector(-1.0, 0); angle = PI_OVER_2; } linePt1.x = linePt2.x = x1; - length = fabs(d->p1.y - d->p2.y); + length = fabs(d->p[0].y - d->p[1].y); } else if (d->subtype == DTLinearHorz) { if ((angle < PI_OVER_2) || (angle > PI3_OVER_2)) { - x1 = (d->p1.x > d->p2.x ? d->p1.x : d->p2.x); - y1 = (d->p1.y > d->p2.y ? d->p1.y : d->p2.y); + x1 = (d->p[0].x > d->p[1].x ? d->p[0].x : d->p[1].x); + y1 = (d->p[0].y > d->p[1].y ? d->p[0].y : d->p[1].y); ortho = Vector(0, 1.0); angle = 0; } else { - x1 = (d->p1.x > d->p2.x ? d->p2.x : d->p1.x); - y1 = (d->p1.y > d->p2.y ? d->p2.y : d->p1.y); + x1 = (d->p[0].x > d->p[1].x ? d->p[1].x : d->p[0].x); + y1 = (d->p[0].y > d->p[1].y ? d->p[1].y : d->p[0].y); ortho = Vector(0, -1.0); angle = PI; } linePt1.y = linePt2.y = y1; - length = fabs(d->p1.x - d->p2.x); + length = fabs(d->p[0].x - d->p[1].x); } else if (d->subtype == DTLinear) { @@ -445,8 +441,8 @@ void DrawingView::RenderObjects(Painter * painter, Container * c) Point p2 = linePt2 + (ortho * 10.0 * scaledThickness); Point p3 = linePt1 + (ortho * 16.0 * scaledThickness); Point p4 = linePt2 + (ortho * 16.0 * scaledThickness); - Point p5 = d->p1 + (ortho * 4.0 * scaledThickness); - Point p6 = d->p2 + (ortho * 4.0 * scaledThickness); + Point p5 = d->p[0] + (ortho * 4.0 * scaledThickness); + Point p6 = d->p[1] + (ortho * 4.0 * scaledThickness); /* The numbers hardcoded into here, what are they? @@ -461,8 +457,8 @@ void DrawingView::RenderObjects(Painter * painter, Container * c) double t = Geometry::ParameterOfLineAndPoint(linePt1, linePt2, linePt2 - (unit * 9.0 * scaledThickness)); //printf("Dimension::Draw(): t = %lf\n", t); - // On the screen, it's acting like this is actually 58%... - // This is correct, we want it to happen at > 50% + // On the screen, it's acting like this is actually 58%... + // This is correct, we want it to happen at > 50% if (t > 0.58) { // Draw main dimension line + arrowheads @@ -511,10 +507,7 @@ void DrawingView::RenderObjects(Painter * painter, Container * c) case OTText: { Text * t = (Text *)obj; - - for(float angle=0; angle<(PI*3.0/2.0); angle+=PI/8.0) - painter->DrawTextObject(t->p1, t->s.c_str(), scaledThickness, angle); - + painter->DrawTextObject(t->p[0], t->s.c_str(), scaledThickness); break; } default: @@ -524,6 +517,47 @@ void DrawingView::RenderObjects(Painter * painter, Container * c) } +void DrawingView::AddHoveredToSelection(void) +{ + std::vector::iterator i; + + for(i=document.objects.begin(); i!=document.objects.end(); i++) + { + if (((Object *)(*i))->hovered) + ((Object *)(*i))->selected = true; + } +} + + +void DrawingView::GetSelection(std::vector & v) +{ + v.clear(); + std::vector::iterator i; + + for(i=document.objects.begin(); i!=document.objects.end(); i++) + { + if (((Object *)(*i))->selected) + v.push_back(*i); + } +} + + +void DrawingView::GetHovered(std::vector & v) +{ + v.clear(); + std::vector::iterator i; + + for(i=document.objects.begin(); i!=document.objects.end(); i++) + { + if (((Object *)(*i))->hovered) +// { +//printf("GetHovered: adding object (%X) to hover... hp1=%s, hp2=%s, hl=%s\n", (*i), (((Line *)(*i))->hitPoint[0] ? "true" : "false"), (((Line *)(*i))->hitPoint[1] ? "true" : "false"), (((Line *)(*i))->hitObject ? "true" : "false")); + v.push_back(*i); +// } + } +} + + void DrawingView::resizeEvent(QResizeEvent * /*event*/) { Global::screenSize = Vector(size().width(), size().height()); @@ -531,42 +565,333 @@ void DrawingView::resizeEvent(QResizeEvent * /*event*/) } +void DrawingView::ToolHandler(int mode, Point p) +{ + if (Global::tool == TTLine) + LineHandler(mode, p); + else if (Global::tool == TTCircle) + CircleHandler(mode, p); + else if (Global::tool == TTRotate) + RotateHandler(mode, p); +} + + +void DrawingView::ToolDraw(Painter * painter) +{ + if (Global::tool == TTLine) + { + if (Global::toolState == TSNone) + { + painter->DrawHandle(toolPoint[0]); + } + else if ((Global::toolState == TSPoint2) && shiftDown) + { + painter->DrawHandle(toolPoint[1]); + } + else + { + painter->DrawLine(toolPoint[0], toolPoint[1]); + painter->DrawHandle(toolPoint[1]); + + Vector v(toolPoint[0], toolPoint[1]); + double absAngle = v.Angle() * RADIANS_TO_DEGREES; + double absLength = v.Magnitude(); + QString text = tr("Length: %1 in.\n") + QChar(0x2221) + tr(": %2"); + informativeText = text.arg(absLength).arg(absAngle); + } + } + else if (Global::tool == TTCircle) + { + if (Global::toolState == TSNone) + { + painter->DrawHandle(toolPoint[0]); + } + else if ((Global::toolState == TSPoint2) && shiftDown) + { + painter->DrawHandle(toolPoint[1]); + } + else + { + double length = Vector::Magnitude(toolPoint[0], toolPoint[1]); +// painter->DrawLine(toolPoint[0], toolPoint[1]); +// painter->DrawHandle(toolPoint[1]); + painter->SetBrush(QBrush(Qt::NoBrush)); + painter->DrawEllipse(toolPoint[0], length, length); + QString text = tr("Radius: %1 in.");//\n") + QChar(0x2221) + tr(": %2"); + informativeText = text.arg(length);//.arg(absAngle); + } + } + else if (Global::tool == TTRotate) + { + if ((Global::toolState == TSNone) || (Global::toolState == TSPoint1)) + painter->DrawHandle(toolPoint[0]); + else if ((Global::toolState == TSPoint2) && shiftDown) + painter->DrawHandle(toolPoint[1]); + else + { + if (toolPoint[0] == toolPoint[1]) + return; + + painter->DrawLine(toolPoint[0], toolPoint[1]); + // Likely we need a tool container for this... (now we do!) +#if 0 + if (ctrlDown) + { + painter->SetPen(0x00FF00, 2.0, LSSolid); + overrideColor = true; + } + + RenderObjects(painter, toolObjects); + overrideColor = false; +#endif + + double absAngle = (Vector(toolPoint[1] - toolPoint[0]).Angle()) * RADIANS_TO_DEGREES; + + QString text = QChar(0x2221) + QObject::tr(": %1"); + informativeText = text.arg(absAngle); + + if (ctrlDown) + informativeText += " (Copy)"; + +// painter->DrawInformativeText(text); + } + } +} + + +void DrawingView::LineHandler(int mode, Point p) +{ + switch (mode) + { + case ToolMouseDown: + if (Global::toolState == TSNone) + toolPoint[0] = p; + else + toolPoint[1] = p; + + break; + case ToolMouseMove: + if (Global::toolState == TSNone) + toolPoint[0] = p; + else + toolPoint[1] = p; + + break; + case ToolMouseUp: + if (Global::toolState == TSNone) + { + Global::toolState = TSPoint2; + // Prevent spurious line from drawing... + toolPoint[1] = toolPoint[0]; + } + else if ((Global::toolState == TSPoint2) && shiftDown) + { + // Key override is telling us to make a new line, not continue the + // previous one. + toolPoint[0] = toolPoint[1]; + } + else + { + Line * l = new Line(toolPoint[0], toolPoint[1]); + document.objects.push_back(l); + toolPoint[0] = toolPoint[1]; + } + } +} + + +void DrawingView::CircleHandler(int mode, Point p) +{ + switch (mode) + { + case ToolMouseDown: + if (Global::toolState == TSNone) + toolPoint[0] = p; + else + toolPoint[1] = p; + + break; + case ToolMouseMove: + if (Global::toolState == TSNone) + toolPoint[0] = p; + else + toolPoint[1] = p; + + break; + case ToolMouseUp: + if (Global::toolState == TSNone) + { + Global::toolState = TSPoint2; + // Prevent spurious line from drawing... + toolPoint[1] = toolPoint[0]; + } + else if ((Global::toolState == TSPoint2) && shiftDown) + { + // Key override is telling us to make a new line, not continue the + // previous one. + toolPoint[0] = toolPoint[1]; + } + else + { + double length = Vector::Magnitude(toolPoint[0], toolPoint[1]); + Circle * c = new Circle(toolPoint[0], length); + document.objects.push_back(c); + toolPoint[0] = toolPoint[1]; + Global::toolState = TSNone; + } + } +} + + +void DrawingView::RotateHandler(int mode, Point p) +{ + switch (mode) + { + case ToolMouseDown: + if (Global::toolState == TSNone) + { + toolPoint[0] = p; + SavePointsFrom(select, toolScratch); + Global::toolState = TSPoint1; + } + else if (Global::toolState == TSPoint1) + toolPoint[0] = p; + else + toolPoint[1] = p; + + break; + case ToolMouseMove: + if ((Global::toolState == TSPoint1) || (Global::toolState == TSNone)) + toolPoint[0] = p; + else if (Global::toolState == TSPoint2) + { + toolPoint[1] = p; + + if (shiftDown) + return; + + double angle = Vector(toolPoint[0], toolPoint[1]).Angle(); + std::vector::iterator j = select.begin(); + std::vector::iterator i = toolScratch.begin(); + + for(; i!=toolScratch.end(); i++, j++) + { + Object obj = *i; + Point p1 = Geometry::RotatePointAroundPoint(obj.p[0], toolPoint[0], angle); + Point p2 = Geometry::RotatePointAroundPoint(obj.p[1], toolPoint[0], angle); + Object * obj2 = (Object *)(*j); + obj2->p[0] = p1; + obj2->p[1] = p2; + + if (obj.type == OTArc) + { + obj2->angle[0] = obj.angle[0] + angle; + + if (obj2->angle[0] > PI_TIMES_2) + obj2->angle[0] -= PI_TIMES_2; + } + } + } + + break; + case ToolMouseUp: + if (Global::toolState == TSPoint1) + { + Global::toolState = TSPoint2; + // Prevent spurious line from drawing... + toolPoint[1] = toolPoint[0]; + } + else if ((Global::toolState == TSPoint2) && shiftDown) + { + // Key override is telling us to make a new line, not continue the + // previous one. + toolPoint[0] = toolPoint[1]; + } + else + { + // Either we're finished with our rotate, or we're stamping a copy. + if (ctrlDown) + { + // Stamp a copy of the selection at the current rotation & bail + std::vector temp; + CopyObjects(select, temp); + ClearSelected(temp); + AddObjectsTo(document.objects, temp); + RestorePointsTo(select, toolScratch); + return; + } + + toolPoint[0] = p; + Global::toolState = TSPoint1; + SavePointsFrom(select, toolScratch); + } + + break; + case ToolKeyDown: + // Reset the selection if shift held down... + if (shiftDown) + RestorePointsTo(select, toolScratch); + + break; + case ToolKeyUp: + // Reset selection when key is let up + if (!shiftDown) + RotateHandler(ToolMouseMove, toolPoint[1]); + + break; + case ToolCleanup: + RestorePointsTo(select, toolScratch); + } +} + + void DrawingView::mousePressEvent(QMouseEvent * event) { if (event->button() == Qt::LeftButton) { Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y())); -// collided = document.Collided(point); - collided = false; - // Do an update if collided with at least *one* object in the document -// if (collided) -// update(); - -#if 0 - if (toolAction) + // Handle tool processing, if any + if (Global::tool) { if (Global::snapToGrid) - point = Global::SnapPointToGrid(point); + point = SnapPointToGrid(point); + + //Also, may want to figure out if hovering over a snap point on an object, + //snap to grid if not. + // Snap to object point if valid... +// if (Global::snapPointIsValid) +// point = Global::snapPoint; + + ToolHandler(ToolMouseDown, point); + return; + } + + // Clear the selection only if CTRL isn't being held on click + if (!ctrlDown) + ClearSelected(document.objects); +// ClearSelection(); + + // If any objects are being hovered on click, add them to the selection + // & return + if (numHovered > 0) + { + AddHoveredToSelection(); + update(); // needed?? + GetHovered(hover); // prolly needed - // We always snap to object points, and they take precendence over - // grid points... - if (Global::snapPointIsValid) - point = Global::snapPoint; + // Needed for grab & moving objects + // We do it *after*... why? (doesn't seem to confer any advantage...) + if (Global::snapToGrid) + oldPoint = SnapPointToGrid(point); - toolAction->MouseDown(point); + return; } -#endif -#if 1 // Didn't hit any object and not using a tool, so do a selection rectangle - if (!(collided))// || toolAction)) - { - Global::selectionInProgress = true; - Global::selection.setTopLeft(QPointF(point.x, point.y)); - Global::selection.setBottomRight(QPointF(point.x, point.y)); - } -#endif + Global::selectionInProgress = true; + Global::selection.setTopLeft(QPointF(point.x, point.y)); + Global::selection.setBottomRight(QPointF(point.x, point.y)); } else if (event->button() == Qt::MiddleButton) { @@ -602,219 +927,194 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event) return; } -#if 1 - // Grid processing... (only snap here is left button is down) - if ((event->buttons() & Qt::LeftButton) && Global::snapToGrid) - { - point = SnapPointToGrid(point); - } - - // Snap points on objects always take precedence over the grid, whether - // dragging an object or not... -//thisnowok - if (Global::snapPointIsValid) + // If we're doing a selection rect, see if any objects are engulfed by it + // (implies left mouse button held down) + if (Global::selectionInProgress) { -// Uncommenting this causes the cursor to become unresponsive after the first -// object is added. -// point = Global::snapPoint; + CheckObjectBounds(); + update(); + return; } -#endif - // Do checking here to see if object can be selected or not - if (Global::selectionInProgress) + // Handle object movement (left button down & over an object) + if ((event->buttons() & Qt::LeftButton) && numHovered && !Global::tool) { - std::vector::iterator i; -// QRectF bounds; - - for(i=document.objects.begin(); i!=document.objects.end(); i++) - { - Object * obj = (Object *)(*i); - obj->selected = false; -// QRectF extents; - - switch (obj->type) - { - case OTLine: - { - Line * l = (Line *)obj; - - if (Global::selection.contains(l->p1.x, l->p1.y) && Global::selection.contains(l->p2.x, l->p2.y)) - l->selected = true; - - break; - } - case OTCircle: - { - Circle * c = (Circle *)obj; - - if (Global::selection.contains(c->p1.x - c->radius, c->p1.y - c->radius) && Global::selection.contains(c->p1.x + c->radius, c->p1.y + c->radius)) - c->selected = true; + if (Global::snapToGrid) + point = SnapPointToGrid(point); - break; - } - case OTArc: - { - Arc * a = (Arc *)obj; + HandleObjectMovement(point); + update(); + oldPoint = point; + return; + } - double start = a->angle1; - double end = start + a->angle2; - QPointF p1(cos(start), sin(start)); - QPointF p2(cos(end), sin(end)); - QRectF bounds(p1, p2); + // Do object hit testing... + bool needUpdate = HitTestObjects(point); -#if 1 - // Swap X/Y coordinates if they're backwards... - if (bounds.left() > bounds.right()) + // Do tool handling, if any are active... + if (Global::tool) { - double temp = bounds.left(); - bounds.setLeft(bounds.right()); - bounds.setRight(temp); - } + if (Global::snapToGrid) + point = SnapPointToGrid(point); - if (bounds.bottom() > bounds.top()) - { - double temp = bounds.bottom(); - bounds.setBottom(bounds.top()); - bounds.setTop(temp); + ToolHandler(ToolMouseMove, point); } -#else - // Doesn't work as advertised! For shame! - bounds = bounds.normalized(); -#endif - // 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); + // This is used to draw the tool crosshair... + oldPoint = point; - if ((start < PI) && (end > PI)) - bounds.setLeft(-1.0); + if (needUpdate || Global::tool) + update(); +} - 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); +void DrawingView::mouseReleaseEvent(QMouseEvent * event) +{ + if (event->button() == Qt::LeftButton) + { +//We need to update especially if nothing collided and the state needs to change. !!! FIX !!! +//could set it up to use the document's update function (assumes that all object updates +//are being reported correctly: +// if (document.NeedsUpdate()) + // Do an update if collided with at least *one* object in the document +// if (collided) + update(); - if ((start < ((2.0 * PI) + PI_OVER_2)) && (end > ((2.0 * PI) + PI_OVER_2))) - bounds.setTop(1.0); + if (Global::tool) + { + Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y())); + ToolHandler(ToolMouseUp, point); + return; + } - if ((start < (3.0 * PI)) && (end > (3.0 * PI))) - bounds.setLeft(-1.0); + if (Global::selectionInProgress) + Global::selectionInProgress = false; - if ((start < ((3.0 * PI) + PI_OVER_2)) && (end > ((3.0 * PI) + PI_OVER_2))) - bounds.setBottom(-1.0); + informativeText.clear(); +// Should we be doing this automagically? Hmm... + // Clear our vectors + select.clear(); + hover.clear(); - bounds.setTopLeft(QPointF(bounds.left() * a->radius, bounds.top() * a->radius)); - bounds.setBottomRight(QPointF(bounds.right() * a->radius, bounds.bottom() * a->radius)); - bounds.translate(a->p1.x, a->p1.y); + // Scoop 'em up + std::vector::iterator i; - if (Global::selection.contains(bounds)) - a->selected = true; + for(i=document.objects.begin(); i!=document.objects.end(); i++) + { + if (((Object *)(*i))->selected) + select.push_back(*i); - break; - } - default: - break; - } +//hmm, this is no good, too late to do any good :-P +// if ((*i)->hovered) +// hover.push_back(*i); } } - -// oldPoint = point; -//we should keep track of the last point here and only pass this down *if* the point -//changed... - -#if 0 - // This returns true if we've moved over an object... - if (document.PointerMoved(point)) + else if (event->button() == Qt::MiddleButton) { -/* -Now objects handle mouse move snapping as well. The code below mainly works only -for tools; we need to fix it so that objects work as well... + scrollDrag = false; + setCursor(Qt::ArrowCursor); + } +} -There's a problem with the object point snapping in that it's dependent on the -order of the objects in the document. Most likely this is because it counts the -selected object last and thus fucks up the algorithm. Need to fix this... +void DrawingView::wheelEvent(QWheelEvent * event) +{ + double zoomFactor = 1.25; + QSize sizeWin = size(); + Vector center(sizeWin.width() / 2.0, sizeWin.height() / 2.0); + center = Painter::QtToCartesianCoords(center); -*/ - // Do object snapping here. Grid snapping on mouse down is done in the - // objects themselves, only because we have to hit test the raw point, - // not the snapped point. There has to be a better way...! - if (document.penultimateObjectHovered) - { - // Two objects are hovered, see if we have an intersection point - if ((document.lastObjectHovered->type == OTLine) && (document.penultimateObjectHovered->type == OTLine)) - { - double t; - int n = Geometry::Intersects((Line *)document.lastObjectHovered, (Line *)document.penultimateObjectHovered, &t); + // This is not centering for some reason. Need to figure out why. :-/ + if (event->delta() > 0) + { + Vector newOrigin = center - ((center - Global::origin) / zoomFactor); + Global::origin = newOrigin; + Global::zoom *= zoomFactor; + } + else + { + Vector newOrigin = center + ((-center + Global::origin) * zoomFactor); + Global::origin = newOrigin; + Global::zoom /= zoomFactor; + } - if (n == 1) - { - Global::snapPoint = document.lastObjectHovered->GetPointAtParameter(t); - Global::snapPointIsValid = true; - } - } - else if ((document.lastObjectHovered->type == OTCircle) && (document.penultimateObjectHovered->type == OTCircle)) - { - Point p1, p2; - int n = Geometry::Intersects((Circle *)document.lastObjectHovered, (Circle *)document.penultimateObjectHovered, 0, 0, 0, 0, &p1, &p2); +// Global::gridSpacing = gridPixels / Painter::zoom; +// UpdateGridBackground(); + SetGridSize(Global::gridSpacing * Global::zoom); + update(); +// zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Global::gridSpacing)); +} - if (n == 1) - { - Global::snapPoint = p1; - Global::snapPointIsValid = true; - } - else if (n == 2) - { - double d1 = Vector(point, p1).Magnitude(); - double d2 = Vector(point, p2).Magnitude(); - if (d1 < d2) - Global::snapPoint = p1; - else - Global::snapPoint = p2; +void DrawingView::keyPressEvent(QKeyEvent * event) +{ + bool oldShift = shiftDown; + bool oldCtrl = ctrlDown; - Global::snapPointIsValid = true; - } - } - } -// else -// { - // Otherwise, it was a single object hovered... -// } - } + if (event->key() == Qt::Key_Shift) + shiftDown = true; + else if (event->key() == Qt::Key_Control) + ctrlDown = true; - if (toolAction) + if ((oldShift != shiftDown) || (oldCtrl != ctrlDown)) { - if (Global::snapToGrid) - point = Global::SnapPointToGrid(point); - - // We always snap to object points, and they take precendence over - // grid points... - if (Global::snapPointIsValid) - point = Global::snapPoint; + if (Global::tool) + ToolHandler(ToolKeyDown, Point(0, 0)); - toolAction->MouseMoved(point); + update(); } -#endif - bool needUpdate = false; +} + + +void DrawingView::keyReleaseEvent(QKeyEvent * event) +{ + bool oldShift = shiftDown; + bool oldCtrl = ctrlDown; + + if (event->key() == Qt::Key_Shift) + shiftDown = false; + else if (event->key() == Qt::Key_Control) + ctrlDown = false; - // Don't do this kind of checking unless we're not doing a selection rectangle! - // Hmm, lines don't stay selected if globally selected... !!! FIX !!! - // it's because there were extra state variables, the hit* vars... - if (!Global::selectionInProgress) + if ((oldShift != shiftDown) || (oldCtrl != ctrlDown)) { + if (Global::tool) + ToolHandler(ToolKeyUp, Point(0, 0)); + + update(); + } +} + + +// +// This looks strange, but it's really quite simple: We want a point that's +// more than half-way to the next grid point to snap there while conversely we +// want a point that's less than half-way to to the next grid point then snap +// to the one before it. So we add half of the grid spacing to the point, then +// divide by it so that we can remove the fractional part, then multiply it +// back to get back to the correct answer. +// +Point DrawingView::SnapPointToGrid(Point point) +{ + point += Global::gridSpacing / 2.0; // *This* adds to Z!!! + point /= Global::gridSpacing; + point.x = floor(point.x);//need to fix this for negative numbers... + point.y = floor(point.y); + point.z = 0; // Make *sure* Z doesn't go anywhere!!! + point *= Global::gridSpacing; + return point; +} + + +void DrawingView::CheckObjectBounds(void) +{ std::vector::iterator i; - int numHovered = 0; + numSelected = 0; for(i=document.objects.begin(); i!=document.objects.end(); i++) { Object * obj = (Object *)(*i); -// obj->selected = false; + obj->selected = false; switch (obj->type) { @@ -822,43 +1122,8 @@ selected object last and thus fucks up the algorithm. Need to fix this... { Line * l = (Line *)obj; -// bool hitPoint1, hitPoint2, hitLine; - l->hitPoint[0] = l->hitPoint[1] = l->hitObject = false; - Vector lineSegment = l->p2 - l->p1; - Vector v1 = point - l->p1; - Vector v2 = point - l->p2; - double t = Geometry::ParameterOfLineAndPoint(l->p1, l->p2, point); - double distance; - - 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()); - - if ((v1.Magnitude() * Global::zoom) < 8.0) - { - l->hitPoint[0] = true; -// snapPoint = l->p1; -// snapPointIsValid = true; - } - else if ((v2.Magnitude() * Global::zoom) < 8.0) - { - l->hitPoint[1] = true; -// snapPoint = l->p2; -// snapPointIsValid = true; - } - else if ((distance * Global::zoom) < 5.0) - l->hitObject = true; - - bool oldHovered = l->hovered; - l->hovered = (l->hitPoint[0] || l->hitPoint[1] || l->hitObject ? true : false); - - if (oldHovered != l->hovered) - needUpdate = true; + if (Global::selection.contains(l->p[0].x, l->p[0].y) && Global::selection.contains(l->p[1].x, l->p[1].y)) + l->selected = true; break; } @@ -866,122 +1131,283 @@ selected object last and thus fucks up the algorithm. Need to fix this... { Circle * c = (Circle *)obj; + if (Global::selection.contains(c->p[0].x - c->radius[0], c->p[0].y - c->radius[0]) && Global::selection.contains(c->p[0].x + c->radius[0], c->p[0].y + c->radius[0])) + c->selected = true; + + break; + } + case OTArc: + { + Arc * a = (Arc *)obj; + + double start = a->angle[0]; + double end = start + a->angle[1]; + QPointF p1(cos(start), sin(start)); + QPointF p2(cos(end), sin(end)); + QRectF bounds(p1, p2); + +#if 1 + // 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); + } +#else + // Doesn't work as advertised! For shame! + bounds = bounds.normalized(); +#endif + + // 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() * a->radius[0], bounds.top() * a->radius[0])); + bounds.setBottomRight(QPointF(bounds.right() * a->radius[0], bounds.bottom() * a->radius[0])); + bounds.translate(a->p[0].x, a->p[0].y); + + if (Global::selection.contains(bounds)) + a->selected = true; break; } default: break; } - } - } - // This is used to draw the tool crosshair... - oldPoint = point; - -// if (/*document.NeedsUpdate() ||*/ Global::selectionInProgress /*|| toolAction*/) - if (needUpdate || Global::selectionInProgress) - update(); + if (obj->selected) + numSelected++; + } } -void DrawingView::mouseReleaseEvent(QMouseEvent * event) +bool DrawingView::HitTestObjects(Point point) { - if (event->button() == Qt::LeftButton) + std::vector::iterator i; + numHovered = 0; + bool needUpdate = false; + + for(i=document.objects.begin(); i!=document.objects.end(); i++) { -#if 0 - document.PointerReleased(); -#endif + Object * obj = (Object *)(*i); -//We need to update especially if nothing collided and the state needs to change. !!! FIX !!! -//could set it up to use the document's update function (assumes that all object updates -//are being reported correctly: -// if (document.NeedsUpdate()) -// if (collided) - update(); // Do an update if collided with at least *one* object in the document + switch (obj->type) + { + case OTLine: + { + bool oldHP0 = obj->hitPoint[0], oldHP1 = obj->hitPoint[1], oldHO = obj->hitObject; + obj->hitPoint[0] = obj->hitPoint[1] = obj->hitObject = false; + Vector lineSegment = obj->p[1] - obj->p[0]; + Vector v1 = point - obj->p[0]; + Vector v2 = point - obj->p[1]; + double t = Geometry::ParameterOfLineAndPoint(obj->p[0], obj->p[1], point); + double distance; + + 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()); -#if 0 - if (toolAction) - toolAction->MouseReleased(); -#endif + if ((v1.Magnitude() * Global::zoom) < 8.0) + obj->hitPoint[0] = true; + else if ((v2.Magnitude() * Global::zoom) < 8.0) + obj->hitPoint[1] = true; + else if ((distance * Global::zoom) < 5.0) + obj->hitObject = true; - if (Global::selectionInProgress) + obj->hovered = (obj->hitPoint[0] || obj->hitPoint[1] || obj->hitObject ? true : false); + + if ((oldHP0 != obj->hitPoint[0]) || (oldHP1 != obj->hitPoint[1]) || (oldHO != obj->hitObject)) + needUpdate = true; + + break; + } + case OTCircle: { - // Select all the stuff inside of selection - Global::selectionInProgress = false; + bool oldHP = obj->hitPoint[0], oldHO = obj->hitObject; + obj->hitPoint[0] = obj->hitObject = false; + double length = Vector::Magnitude(obj->p[0], point); + + if ((length * Global::zoom) < 8.0) + obj->hitPoint[0] = true; + else if ((fabs(length - obj->radius[0]) * Global::zoom) < 2.0) + obj->hitObject = true; + + obj->hovered = (obj->hitPoint[0] || obj->hitObject ? true : false); + + if ((oldHP != obj->hitPoint[0]) || (oldHO != obj->hitObject)) + needUpdate = true; + + break; } + default: + break; + } + + if (obj->hovered) +// { + numHovered++; +//printf("MouseMove: OBJECT HOVERED (numHovered = %i)\n", numHovered); +// } } - else if (event->button() == Qt::MiddleButton) - { - scrollDrag = false; - setCursor(Qt::ArrowCursor); - } + + return needUpdate; } -void DrawingView::wheelEvent(QWheelEvent * event) +void DrawingView::HandleObjectMovement(Point point) { - double zoomFactor = 1.25; - QSize sizeWin = size(); - Vector center(sizeWin.width() / 2.0, sizeWin.height() / 2.0); - center = Painter::QtToCartesianCoords(center); + Point delta = point - oldPoint; +//printf("HOM: old = (%f,%f), new = (%f, %f), delta = (%f, %f)\n", oldPoint.x, oldPoint.y, point.x, point.y, delta.x, delta.y); + Object * obj = (Object *)hover[0]; +//printf("Object type = %i (size=%i), ", obj->type, hover.size()); +//printf("Object (%X) move: hp1=%s, hp2=%s, hl=%s\n", obj, (obj->hitPoint[0] ? "true" : "false"), (obj->hitPoint[1] ? "true" : "false"), (obj->hitObject ? "true" : "false")); - // This is not centering for some reason. Need to figure out why. :-/ - if (event->delta() > 0) + switch (obj->type) { - Vector newOrigin = center - ((center - Global::origin) / zoomFactor); - Global::origin = newOrigin; - Global::zoom *= zoomFactor; - } - else - { - Vector newOrigin = center + ((-center + Global::origin) * zoomFactor); - Global::origin = newOrigin; - Global::zoom /= zoomFactor; - } + case OTLine: + if (obj->hitPoint[0]) + obj->p[0] = point; + else if (obj->hitPoint[1]) + obj->p[1] = point; + else if (obj->hitObject) + { + obj->p[0] += delta; + obj->p[1] += delta; + } -#if 1 -// Global::gridSpacing = gridPixels / Painter::zoom; -// UpdateGridBackground(); - SetGridSize(Global::gridSpacing * Global::zoom); - update(); -// zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Global::gridSpacing)); -#endif -} + break; + case OTCircle: + if (obj->hitPoint[0]) + obj->p[0] = point; + else if (obj->hitObject) + { +//this doesn't work. we need to save this on mouse down for this to work correctly! +// double oldRadius = obj->radius[0]; + obj->radius[0] = Vector::Magnitude(obj->p[0], point); + QString text = QObject::tr("Radius: %1");//\nScale: %2%"); + informativeText = text.arg(obj->radius[0], 0, 'd', 4);//.arg(obj->radius[0] / oldRadius * 100.0, 0, 'd', 0); + } -void DrawingView::keyPressEvent(QKeyEvent * event) -{ -#if 0 - if (toolAction) - toolAction->KeyDown(event->key()); -#endif + break; + default: + break; + } } -void DrawingView::keyReleaseEvent(QKeyEvent * event) -{ + #if 0 + // This returns true if we've moved over an object... + if (document.PointerMoved(point)) // <-- This + // This is where the object would do automagic dragging & shit. Since we don't + // do that anymore, we need a strategy to handle it. + { + +/* +Now objects handle mouse move snapping as well. The code below mainly works only +for tools; we need to fix it so that objects work as well... + +There's a problem with the object point snapping in that it's dependent on the +order of the objects in the document. Most likely this is because it counts the +selected object last and thus fucks up the algorithm. Need to fix this... + + +*/ + // Do object snapping here. Grid snapping on mouse down is done in the + // objects themselves, only because we have to hit test the raw point, + // not the snapped point. There has to be a better way...! + if (document.penultimateObjectHovered) + { + // Two objects are hovered, see if we have an intersection point + if ((document.lastObjectHovered->type == OTLine) && (document.penultimateObjectHovered->type == OTLine)) + { + double t; + int n = Geometry::Intersects((Line *)document.lastObjectHovered, (Line *)document.penultimateObjectHovered, &t); + + if (n == 1) + { + Global::snapPoint = document.lastObjectHovered->GetPointAtParameter(t); + Global::snapPointIsValid = true; + } + } + else if ((document.lastObjectHovered->type == OTCircle) && (document.penultimateObjectHovered->type == OTCircle)) + { + Point p1, p2; + int n = Geometry::Intersects((Circle *)document.lastObjectHovered, (Circle *)document.penultimateObjectHovered, 0, 0, 0, 0, &p1, &p2); + + if (n == 1) + { + Global::snapPoint = p1; + Global::snapPointIsValid = true; + } + else if (n == 2) + { + double d1 = Vector(point, p1).Magnitude(); + double d2 = Vector(point, p2).Magnitude(); + + if (d1 < d2) + Global::snapPoint = p1; + else + Global::snapPoint = p2; + + Global::snapPointIsValid = true; + } + } + } +// else +// { + // Otherwise, it was a single object hovered... +// } + } + if (toolAction) - toolAction->KeyReleased(event->key()); -#endif -} + { + if (Global::snapToGrid) + point = Global::SnapPointToGrid(point); -// -// This looks strange, but it's really quite simple: We want a point that's -// more than half-way to the next grid point to snap there while conversely we -// want a point that's less than half-way to to the next grid point then snap -// to the one before it. So we add half of the grid spacing to the point, then -// divide by it so that we can remove the fractional part, then multiply it -// back to get back to the correct answer. -// -Point DrawingView::SnapPointToGrid(Point point) -{ - point += Global::gridSpacing / 2.0; // *This* adds to Z!!! - point /= Global::gridSpacing; - point.x = floor(point.x);//need to fix this for negative numbers... - point.y = floor(point.y); - point.z = 0; // Make *sure* Z doesn't go anywhere!!! - point *= Global::gridSpacing; - return point; -} + // We always snap to object points, and they take precendence over + // grid points... + if (Global::snapPointIsValid) + point = Global::snapPoint; + + toolAction->MouseMoved(point); + } +#else +#endif