]> Shamusworld >> Repos - architektonas/blobdiff - src/drawingview.cpp
Initial work on making Rotate tool work, plus removal of unneeded files.
[architektonas] / src / drawingview.cpp
index 55b56e7d87e02ae0aa5cbd1b1e4c428ffca9ebb2..f3cac0db04a00f44aa71934bfac4e6b21f122165 100644 (file)
@@ -4,52 +4,64 @@
 // (C) 2011 Underground Software
 // See the README and GPLv3 files for licensing and warranty information
 //
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
 //
 // Who  When        What
 // ---  ----------  -------------------------------------------------------------
 // JLH  03/22/2011  Created this file
+// JLH  09/29/2011  Added middle mouse button panning
 //
 
 // FIXED:
 //
+// - Redo rendering code to *not* use Qt's transform functions, as they are tied
+//   to a left-handed system and we need a right-handed one. [DONE]
 //
 // STILL TO BE DONE:
 //
+// - Lots of stuff
 //
 
 // Uncomment this for debugging...
 //#define DEBUG
-//#define DEBUGFOO            // Various tool debugging...
+//#define DEBUGFOO                             // Various tool debugging...
 //#define DEBUGTP                              // Toolpalette debugging...
 
 #include "drawingview.h"
 
 #include <stdint.h>
+#include "geometry.h"
+#include "global.h"
 #include "mathconstants.h"
+#include "painter.h"
+#include "structs.h"
+#include "utils.h"
 
-#include "arc.h"
-#include "circle.h"
-#include "dimension.h"
-#include "line.h"
+
+#define BACKGROUND_MAX_SIZE    512
+
+enum { ToolMouseDown, ToolMouseMove, ToolMouseUp };
+
+// Class variable
+//Container DrawingView::document(Vector(0, 0));
 
 
 DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent),
-//     scale(1.0), offsetX(-10), offsetY(-10), tool(TOOLSelect),
-//     ptHighlight(-1), oldPtHighlight(-1), ptNextHighlight(-1), oldPtNextHighlight(-1),
-//     polyFirstPoint(true)
-       scale(1.0), offsetX(-10), offsetY(-10),
-       document(Vector(0, 0)),
-       gridSpacing(32.0), collided(false)
+       // The value in the settings file will override this.
+       useAntialiasing(true), numSelected(0), numHovered(0), shiftDown(false),
+       ctrlDown(false), overrideColor(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)
 {
+//     document.isTopLevelContainer = true;
+//wtf? doesn't work except in c++11??? document = { 0 };
        setBackgroundRole(QPalette::Base);
        setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
-//     toolPalette = new ToolWindow();
-//     CreateCursors();
-//     setCursor(cur[TOOLSelect]);
-//     setMouseTracking(true);
+       Global::gridSpacing = 12.0;             // In base units (inch is default)
 
+#if 0
        Line * line = new Line(Vector(5, 5), Vector(50, 40), &document);
        document.Add(line);
        document.Add(new Line(Vector(50, 40), Vector(10, 83), &document));
@@ -58,12 +70,228 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent),
        document.Add(new Circle(Vector(50, 150), 49, &document));
        document.Add(new Arc(Vector(300, 300), 32, PI / 4.0, PI * 1.3, &document)),
        document.Add(new Arc(Vector(200, 200), 60, PI / 2.0, PI * 1.5, &document));
-       Dimension * dimension = new Dimension(Vector(0, 0), Vector(0, 0), &document);
-       line->SetDimensionOnPoint1(dimension);
-       line->SetDimensionOnPoint2(dimension);
+#if 1
+       Dimension * dimension = new Dimension(Vector(0, 0), Vector(0, 0), DTLinear, &document);
+       line->SetDimensionOnLine(dimension);
        document.Add(dimension);
+#else
+       // Alternate way to do the above...
+       line->SetDimensionOnLine();
+#endif
+#else
+       Line * line = new Line;//(Vector(5, 5), Vector(50, 40), &document);
+       line->p[0] = Vector(5, 5);
+       line->p[1] = Vector(50, 40);
+       line->type = OTLine;
+       line->thickness = 2.0;
+       line->style = LSDash;
+       line->color = 0xFF7F00;
+       document.objects.push_back(line);
+       document.objects.push_back(new Line(Vector(50, 40), Vector(10, 83)));
+       document.objects.push_back(new Line(Vector(10, 83), Vector(17, 2)));
+       document.objects.push_back(new Circle(Vector(100, 100), 36));
+       document.objects.push_back(new Circle(Vector(50, 150), 49));
+       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), "Here is some awesome text!"));
+#endif
+
+/*
+Here we set the grid size in pixels--12 in this case. Initially, we have our
+zoom set to make this represent 12 inches at a zoom factor of 25%. (This is
+arbitrary.) So, to be able to decouple the grid size from the zoom, we need
+to be able to set the size of the background grid (which we do here at an
+arbitrary 12 pixels) to anything we want (within reason, of course :-).
+
+The drawing enforces the grid spacing through the drawing->gridSpacing variable.
+
+       drawing->gridSpacing = 12.0 / Global::zoom;
+
+Global::zoom is the zoom factor for the drawing, and all mouse clicks are
+translated to Cartesian coordinates through this. (Initially, Global::zoom is
+set to 1.0. SCREEN_ZOOM is set to 1.0/4.0.)
+
+Really, the 100% zoom level can be set at *any* zoom level, it's more of a
+convenience function than any measure of absolutes. Doing things that way we
+could rid ourselves of the whole SCREEN_ZOOM parameter and all the attendant
+shittiness that comes with it.
+
+However, it seems that SCREEN_ZOOM is used to make text and arrow sizes show up
+a certain way, which means we should probably create something else in those
+objects to take its place--like some kind of scale factor. This would seem to
+imply that certain point sizes actually *do* tie things like fonts to absolute
+sizes on the screen, but not necessarily because you could have an inch scale
+with text that is quite small relative to other objects on the screen, which
+currently you have to zoom in to see (and which blows up the text). Point sizes
+in an application like this are a bit meaningless; even though an inch is an
+inch regardless of the zoom level a piece of text can be larger or smaller than
+this. Maybe this is the case for having a base unit and basing point sizes off
+of that.
+
+Here's what's been figured out. Global::zoom is simply the ratio of pixels to
+base units. What that means is that if you have a 12px grid with a 6" grid size
+(& base unit of "inches"), Global::zoom becomes 12px / 6" = 2.0 px/in.
+
+Dimensions now have a "size" parameter to set their absolute size in relation
+to the base unit. ATM, the arrows are drawn in pixels, but also scaled by
+Global::zoom *and* size. Same with the dimension text; it's drawn at 10pt and
+scaled the same way as the arrowheads.
+
+Need a way to scale line widths as well. :-/ Shouldn't be too difficult, just
+need a thickness parameter similar to the "size" param for dimensions. (And now
+we do! :-)
+
+*/
+       SetGridSize(12);        // This is in pixels
 }
 
+
+#if 0
+void DrawingView::SetToolActive(Action * action)
+{
+       if (action != NULL)
+       {
+               toolAction = action;
+               connect(toolAction, SIGNAL(ObjectReady(Object *)), this,
+                       SLOT(AddNewObjectToDocument(Object *)));
+               connect(toolAction, SIGNAL(NeedRefresh()), this, SLOT(HandleActionUpdate()));
+       }
+}
+#endif
+
+
+void DrawingView::SetGridSize(uint32_t size)
+{
+       // Sanity check
+       if (size == gridPixels)
+               return;
+
+       // Recreate the background bitmap
+       gridPixels = size;
+       QPainter pmp(&gridBackground);
+       pmp.fillRect(0, 0, BACKGROUND_MAX_SIZE, BACKGROUND_MAX_SIZE, QColor(240, 240, 240));
+       pmp.setPen(QPen(QColor(210, 210, 255), 2.0, Qt::SolidLine));
+
+       for(int i=0; i<(BACKGROUND_MAX_SIZE-1); i+=gridPixels)
+       {
+               pmp.drawLine(i, 0, i, BACKGROUND_MAX_SIZE - 1);
+               pmp.drawLine(0, i, BACKGROUND_MAX_SIZE - 1, i);
+       }
+
+       pmp.end();
+
+       // Set up new BG brush & zoom level (pixels per base unit)
+//     Painter::zoom = gridPixels / gridSpacing;
+       Global::zoom = gridPixels / Global::gridSpacing;
+       UpdateGridBackground();
+}
+
+
+void DrawingView::UpdateGridBackground(void)
+{
+       // Transform the origin to Qt coordinates
+       Vector pixmapOrigin = Painter::CartesianToQtCoords(Vector());
+       int x = (int)pixmapOrigin.x;
+       int y = (int)pixmapOrigin.y;
+       // Use mod arithmetic to grab the correct swatch of background
+/*
+Negative numbers still screw it up... Need to think about what we're
+trying to do here. The fact that it worked with 72 seems to have been pure luck.
+It seems the problem is negative numbers: We can't let that happen.
+When taking away the zero, it pops over 1 px at zero, then goes about 1/2 a
+grid at x<0.
+
+The bitmap looks like this:
+
++---+---+---+---+---
+|   |   |   |   |
+|   |   |   |   |
++---+---+---+---+---
+|   |   |   |   |
+|   |   |   |   |
+|   |   |   |   |
+
+@ x = 1, we want it to look like:
+
+-+---+---+---+---+---
+ |   |   |   |   |
+ |   |   |   |   |
+-+---+---+---+---+---
+ |   |   |   |   |
+ |   |   |   |   |
+ |   |   |   |   |
+
+Which means we need to grab the sample from x = 3. @ x = -1:
+
+---+---+---+---+---
+   |   |   |   |
+   |   |   |   |
+---+---+---+---+---
+   |   |   |   |
+   |   |   |   |
+   |   |   |   |
+
+Which means we need to grab the sample from x = 1. Which means we have to take
+the mirror of the modulus of gridPixels.
+
+Doing a mod of a negative number is problematic: 1st, the compiler converts the
+negative number to an unsigned int, then it does the mod. Gets you wrong answers
+most of the time, unless you use a power of 2. :-P So what we do here is just
+take the modulus of the negation, which means we don't have to worry about
+mirroring it later.
+
+The positive case looks gruesome (and it is) but it boils down to this: We take
+the modulus of the X coordinate, then mirror it by subtraction from the
+maximum (in this case, gridPixels). This gives us a number in the range of 1 to
+gridPixels. But we need the case where the result equalling gridPixels to be
+zero; so we do another modulus operation on the result to achieve this.
+*/
+       if (x < 0)
+               x = -x % gridPixels;
+       else
+               x = (gridPixels - (x % gridPixels)) % gridPixels;
+
+       if (y < 0)
+               y = -y % gridPixels;
+       else
+               y = (gridPixels - (y % gridPixels)) % gridPixels;
+
+       // Here we grab a section of the bigger pixmap, so that the background
+       // *looks* like it's scrolling...
+       QPixmap pm = gridBackground.copy(x, y, gridPixels, gridPixels);
+       QPalette pal = palette();
+       pal.setBrush(backgroundRole(), QBrush(pm));
+       setAutoFillBackground(true);
+       setPalette(pal);
+}
+
+
+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;
+//printf("DrawingView::CurrentLayer = %i\n", layer);
+}
+
+
 QPoint DrawingView::GetAdjustedMousePosition(QMouseEvent * event)
 {
        // This is undoing the transform, e.g. going from client coords to local coords.
@@ -72,6 +300,7 @@ QPoint DrawingView::GetAdjustedMousePosition(QMouseEvent * event)
        return QPoint(offsetX + event->x(), offsetY + (size().height() - event->y()));
 }
 
+
 QPoint DrawingView::GetAdjustedClientPosition(int x, int y)
 {
        // VOODOO ALERT (ON Y COMPONENT!!!!) (eh?)
@@ -80,601 +309,1054 @@ QPoint DrawingView::GetAdjustedClientPosition(int x, int y)
        return QPoint(-offsetX + x, (size().height() - (-offsetY + y)) * +1.0);
 }
 
+
 void DrawingView::paintEvent(QPaintEvent * /*event*/)
 {
-       QPainter painter(this);
-       painter.setRenderHint(QPainter::Antialiasing);
+       QPainter qtPainter(this);
+       Painter painter(&qtPainter);
 
-#if 0
-       painter.translate(QPoint(-offsetX, size.height() - (-offsetY)));
-       painter.scale(1.0, -1.0);
-#else
-       QTransform transform;
-//order of operations is important! N.B.: Can't use scaling other than 1.0, it
-//causes lines to look strange (i.e., it scales the pen strokes too)
-//     transform.translate(-offsetX, size().height() - (-offsetY));
-       transform.scale(1.0, -1.0);
-       transform.translate(-offsetX, -size().height() - offsetY);
-//     transform.scale(0.25, 0.25);
-       painter.setTransform(transform);
-#endif
-       Object::SetViewportHeight(size().height());
+       if (useAntialiasing)
+               qtPainter.setRenderHint(QPainter::Antialiasing);
+
+       Global::viewportHeight = size().height();
 
        // Draw coordinate axes
+       painter.SetPen(QPen(Qt::blue, 1.0, Qt::DotLine));
+       painter.DrawLine(0, -16384, 0, 16384);
+       painter.DrawLine(-16384, 0, 16384, 0);
 
-       painter.setPen(QPen(Qt::blue, 1.0, Qt::DotLine));
-       painter.drawLine(0, -16384, 0, 16384);
-       painter.drawLine(-16384, 0, 16384, 0);
+       // Do object rendering...
+       RenderObjects(&painter, document.objects);
 
-// Maybe we can make the grid into a background brush instead, and let Qt deal
-// with it???
-       // Draw grid
+       // Do tool rendering, if any...
+       if (Global::tool)
+       {
+               painter.SetPen(QPen(QColor(200, 100, 0, 255), 1.0, Qt::DashLine));
+               painter.DrawCrosshair(oldPoint);
+               ToolDraw(&painter);
+       }
 
-#if 0
-       painter.setPen(QPen(QColor(90, 90, 90), 1.0, Qt::DotLine));
+       // 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);
+       }
+}
 
-       //these two loops kill performance!
-       for(double x=0; x<size().width(); x+=gridSpacing*10.0)
-               p.drawLine((int)x, -16384, (int)x, 16384);
 
-       for(double y=0; y<size().height(); y+=gridSpacing*10.0)
-               p.drawLine(-16384, (int)y, 16384, (int)y);
-#endif
+//
+// Renders objects in the passed in vector
+//
+void DrawingView::RenderObjects(Painter * painter, std::vector<void *> & v)
+{
+       std::vector<void *>::iterator i;
 
-       painter.setPen(QPen(Qt::black, 1.0, Qt::SolidLine));
+       for(i=v.begin(); i!=v.end(); i++)
+       {
+               Object * obj = (Object *)(*i);
+               float scaledThickness = Global::scale * obj->thickness;
+
+               if (!overrideColor)
+               {
+                       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->p[0], l->p[1]);
+
+                       if (l->hitPoint[0])
+                               painter->DrawHandle(l->p[0]);
+
+                       if (l->hitPoint[1])
+                               painter->DrawHandle(l->p[1]);
+
+                       break;
+               }
+               case OTCircle:
+               {
+                       Circle * ci = (Circle *)obj;
+                       painter->SetBrush(QBrush(Qt::NoBrush));
+                       painter->DrawEllipse(ci->p[0], ci->radius, ci->radius);
+                       break;
+               }
+               case OTArc:
+               {
+                       Arc * a = (Arc *)obj;
+                       painter->DrawArc(a->p[0], a->radius, a->angle1, a->angle2);
+                       break;
+               }
+               case OTDimension:
+               {
+                       Dimension * d = (Dimension *)obj;
 
-       for(double x=0; x<size().width(); x+=gridSpacing)
-               for(double y=0; y<size().height(); y+=gridSpacing)
-                       painter.drawPoint((int)x, (int)y);
+                       Vector v(d->p[0], d->p[1]);
+                       double angle = v.Angle();
+                       Vector unit = v.Unit();
+                       Vector linePt1 = d->p[0], linePt2 = d->p[1];
+                       Vector ortho;
+                       double x1, y1, length;
 
-       // The top level document takes care of rendering for us...
-       document.Draw(&painter);
+                       if (d->subtype == DTLinearVert)
+                       {
+                               if ((angle < 0) || (angle > PI))
+                               {
+                                       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->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->p[0].y - d->p[1].y);
+                       }
+                       else if (d->subtype == DTLinearHorz)
+                       {
+                               if ((angle < PI_OVER_2) || (angle > PI3_OVER_2))
+                               {
+                                       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->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->p[0].x - d->p[1].x);
+                       }
+                       else if (d->subtype == DTLinear)
+                       {
+                               angle = Vector(linePt1, linePt2).Angle();
+                               ortho = Vector::Normal(linePt1, linePt2);
+                               length = v.Magnitude();
+                       }
+
+                       unit = Vector(linePt1, linePt2).Unit();
+
+                       Point p1 = linePt1 + (ortho * 10.0 * scaledThickness);
+                       Point p2 = linePt2 + (ortho * 10.0 * scaledThickness);
+                       Point p3 = linePt1 + (ortho * 16.0 * scaledThickness);
+                       Point p4 = linePt2 + (ortho * 16.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?
+               I believe they are pixels.
+               */
+                       // 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 = 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%
+                       if (t > 0.58)
+                       {
+                               // Draw main dimension line + arrowheads
+                               painter->DrawLine(p1, p2);
+                               painter->DrawArrowhead(p1, p2, scaledThickness);
+                               painter->DrawArrowhead(p2, p1, scaledThickness);
+                       }
+                       else
+                       {
+                               // Draw outside arrowheads
+                               Point p7 = p1 - (unit * 9.0 * scaledThickness);
+                               Point p8 = p2 + (unit * 9.0 * scaledThickness);
+                               painter->DrawArrowhead(p1, p7, scaledThickness);
+                               painter->DrawArrowhead(p2, p8, scaledThickness);
+                               painter->DrawLine(p1, p1 - (unit * 14.0 * scaledThickness));
+                               painter->DrawLine(p2, p2 + (unit * 14.0 * scaledThickness));
+                       }
+
+                       // Draw length of dimension line...
+                       painter->SetFont(QFont("Arial", 8.0 * Global::zoom * scaledThickness));
+                       Point ctr = p2 + (Vector(p2, p1) / 2.0);
+
+               #if 0
+                       QString dimText = QString("%1\"").arg(Vector(endpoint - position).Magnitude());
+               #else
+                       QString dimText;
+
+                       if (length < 12.0)
+                               dimText = QString("%1\"").arg(length);
+                       else
+                       {
+                               double feet = (double)((int)length / 12);
+                               double inches = length - (feet * 12.0);
+
+                               if (inches == 0)
+                                       dimText = QString("%1'").arg(feet);
+                               else
+                                       dimText = QString("%1' %2\"").arg(feet).arg(inches);
+                       }
+               #endif
+
+                       painter->DrawAngledText(ctr, angle, dimText, scaledThickness);
+
+                       break;
+               }
+               case OTText:
+               {
+                       Text * t = (Text *)obj;
+                       painter->DrawTextObject(t->p[0], t->s.c_str(), scaledThickness);
+                       break;
+               }
+               default:
+                       break;
+               }
+       }
 }
 
-void DrawingView::mousePressEvent(QMouseEvent * event)
+
+void DrawingView::DeleteSelectedItems(void)
 {
-       if (event->button() == Qt::LeftButton)
-       {
-               QPoint pt = GetAdjustedMousePosition(event);
-               Vector point(pt.x(), pt.y());
+       std::vector<void *>::iterator i = document.objects.begin();
 
-               collided = document.Collided(point);
+       while (i != document.objects.end())
+       {
+               Object * obj = (Object *)(*i);
 
-               if (collided)
-                       update();       // Do an update if collided with at least *one* object in the document
+               if (obj->selected)
+               {
+                       delete obj;
+                       document.objects.erase(i);
+               }
+               else
+                       i++;
        }
 }
 
-void DrawingView::mouseMoveEvent(QMouseEvent * event)
-{
-       QPoint pt = GetAdjustedMousePosition(event);
-       Vector point(pt.x(), pt.y());
 
-       // Grid processing...
-#if 1
-       // 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 += gridSpacing / 2.0;                                     // *This* adds to Z!!!
-       point /= 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 *= gridSpacing;
-#endif
-//we should keep track of the last point here and only pass this down *if* the point
-//changed...
-       document.PointerMoved(point);
+void DrawingView::ClearSelection(void)
+{
+       std::vector<void *>::iterator i;
 
-       if (document.NeedsUpdate())
-               update();
+       for(i=document.objects.begin(); i!=document.objects.end(); i++)
+               ((Object *)(*i))->selected = false;
 }
 
-void DrawingView::mouseReleaseEvent(QMouseEvent * event)
+
+void DrawingView::AddHoveredToSelection(void)
 {
-       if (event->button() == Qt::LeftButton)
+       std::vector<void *>::iterator i;
+
+       for(i=document.objects.begin(); i!=document.objects.end(); i++)
        {
-               document.PointerReleased();
+               if (((Object *)(*i))->hovered)
+                       ((Object *)(*i))->selected = true;
+       }
+}
 
-//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
+
+void DrawingView::GetSelection(std::vector<void *> & v)
+{
+       v.clear();
+       std::vector<void *>::iterator i;
+
+       for(i=document.objects.begin(); i!=document.objects.end(); i++)
+       {
+               if (((Object *)(*i))->selected)
+                       v.push_back(*i);
        }
 }
 
 
-#if 0
-QSize DrawingView::minimumSizeHint() const
+void DrawingView::GetHovered(std::vector<void *> & v)
 {
-       return QSize(50, 50);
+       v.clear();
+       std::vector<void *>::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);
+//             }
+       }
 }
 
-QSize DrawingView::sizeHint() const
+
+void DrawingView::resizeEvent(QResizeEvent * /*event*/)
 {
-       return QSize(400, 400);
+       Global::screenSize = Vector(size().width(), size().height());
+       UpdateGridBackground();
 }
 
-void DrawingView::CreateCursors(void)
+
+void DrawingView::ToolMouse(int mode, Point p)
 {
-       int hotx[8] = {  1,  1, 11, 15,  1,  1,  1,  1 };
-       int hoty[8] = {  1,  1, 11, 13,  1,  1,  1,  1 };
+       if (Global::tool == TTLine)
+               LineHandler(mode, p);
+       else if (Global::tool == TTRotate)
+               RotateHandler(mode, p);
+}
+
 
-       for(int i=0; i<8; i++)
+void DrawingView::ToolDraw(Painter * painter)
+{
+       if (Global::tool == TTLine)
        {
-               QString s;
-               s.sprintf(":/res/cursor%u.png", i+1);
-               QPixmap pmTmp(s);
-               cur[i] = QCursor(pmTmp, hotx[i], hoty[i]);
+               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");
+                       text = text.arg(absLength).arg(absAngle);
+                       painter->DrawInformativeText(text);
+               }
+       }
+       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");
+                       text = text.arg(absAngle);
+
+                       if (ctrlDown)
+                               text += " (Copy)";
+
+                       painter->DrawInformativeText(text);
+               }
        }
 }
 
-/*
-TODO:
- o  Different colors for polys on selected points
- o  Different colors for handles on non-selected polys
- o  Line of sight (dashed, dotted) for off-curve points
- o  Repaints for press/release of CTRL/SHIFT during point creation
-*/
-void DrawingView::paintEvent(QPaintEvent * /*event*/)
+
+void DrawingView::LineHandler(int mode, Point p)
 {
-       QPainter p(this);
-//hm, causes lockup
-//     p.setRenderHint(QPainter::Antialiasing);
-//Doesn't do crap!
-//dc.SetBackground(*wxWHITE_BRUSH);
-
-// Due to the screwiness of wxWidgets coord system, the origin is ALWAYS
-// the upper left corner--regardless of axis orientation, etc...
-//     int width, height;
-//     dc.GetSize(&width, &height);
-       QSize winSize = size();
-
-//     dc.SetDeviceOrigin(-offsetX, height - (-offsetY));
-//     dc.SetAxisOrientation(true, true);
-       p.translate(QPoint(-offsetX, winSize.height() - (-offsetY)));
-       p.scale(1.0, -1.0);
-
-// Scrolling can be done by using OffsetViewportOrgEx
-// Scaling can be done by adjusting SetWindowExtEx (it's denominator of txform)
-// you'd use: % = ViewportExt / WindowExt
-// But it makes the window look like crap: fuggetuboutit.
-// Instead, we have to scale EVERYTHING by hand. Crap!
-// It's not *that* bad, but not as convenient either...
-
-//     dc.SetPen(*(wxThePenList->FindOrCreatePen(wxColour(0x00, 0x00, 0xFF), 1, wxDOT)));
-////   dc.DrawLine(0, 0, 10, 10);
-       p.setPen(QPen(Qt::blue, 1.0, Qt::DotLine));
-
-    // Draw coordinate axes
-
-//     dc.CrossHair(0, 0);
-       p.drawLine(0, -16384, 0, 16384);
-       p.drawLine(-16384, 0, 16384, 0);
-
-    // Draw points
-
-       for(int i=0; i<pts.GetNumPoints(); i++)
+       switch (mode)
        {
-               if (i == ptHighlight)
-               {
-//                     dc.SetPen(*(wxThePenList->FindOrCreatePen(wxColour(0xFF, 0x00, 0x00), 1, wxSOLID)));
-////                   SelectObject(hdc, hRedPen1);
-                       p.setPen(QPen(Qt::red, 1.0, Qt::SolidLine));
+       case ToolMouseDown:
+               if (Global::toolState == TSNone)
+                       toolPoint[0] = p;
+               else
+                       toolPoint[1] = p;
 
-                       if (pts.GetOnCurve(i))
-                       {
-                               DrawSquareDotN(p, pts.GetX(i), pts.GetY(i), 7);
-                               DrawSquareDotN(p, pts.GetX(i), pts.GetY(i), 9);
-                       }
-                       else
-                       {
-                               DrawRoundDotN(p, pts.GetX(i), pts.GetY(i), 7);
-                               DrawRoundDotN(p, pts.GetX(i), pts.GetY(i), 9);
-                       }
+               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 if ((i == ptHighlight || i == ptNextHighlight) && tool == TOOLAddPt)
+               else
                {
-//                     dc.SetPen(*(wxThePenList->FindOrCreatePen(wxColour(0x00, 0xAF, 0x00), 1, wxSOLID)));
-////                   SelectObject(hdc, hGreenPen1);
-                       p.setPen(QPen(Qt::green, 1.0, Qt::SolidLine));
+                       Line * l = new Line(toolPoint[0], toolPoint[1]);
+                       document.objects.push_back(l);
+                       toolPoint[0] = toolPoint[1];
+               }
+       }
+}
 
-                       if (pts.GetOnCurve(i))
-                       {
-                               DrawSquareDotN(p, pts.GetX(i), pts.GetY(i), 7);
-                               DrawSquareDotN(p, pts.GetX(i), pts.GetY(i), 9);
-                       }
-                       else
-                       {
-                               DrawRoundDotN(p, pts.GetX(i), pts.GetY(i), 7);
-                               DrawRoundDotN(p, pts.GetX(i), pts.GetY(i), 9);
-                       }
+
+void DrawingView::RotateHandler(int mode, Point p)
+{
+       switch (mode)
+       {
+       case ToolMouseDown:
+               if (Global::toolState == TSNone)
+               {
+                       toolPoint[0] = p;
+                       toolObjects.clear();
+                       CopyObjects(select, toolObjects);
+//                     ClearSelected(toolObjects);
+                       Global::toolState = TSPoint1;
                }
+               else if (Global::toolState == TSPoint1)
+                       toolPoint[0] = p;
                else
+                       toolPoint[1] = p;
+
+               break;
+       case ToolMouseMove:
+/*
+There's two approaches to this that we can do:
+
+ -- Keep a copy of selected objects & rotate those (drawing rotated + selected)
+ -- Rotate the selected (drawing selected only)
+
+Either way, we need to have a copy of the points before we change them; we also need
+to know whether or not to discard any changes made--maybe with a ToolCleanup()
+function.
+*/
+               if ((Global::toolState == TSPoint1) || (Global::toolState == TSNone))
+                       toolPoint[0] = p;
+               else if (Global::toolState == TSPoint2)
                {
-//                     dc.SetPen(*(wxThePenList->FindOrCreatePen(wxColour(0x00, 0x00, 0x00), 1, wxSOLID)));
-////                   SelectObject(hdc, hBlackPen1);
-                       p.setPen(QPen(Qt::black, 1.0, Qt::SolidLine));
+// need to reset the selected points to their non-rotated state in this case...
+                       if (shiftDown)
+                               return;
 
-                       if (pts.GetOnCurve(i))
-                               DrawSquareDot(p, pts.GetX(i), pts.GetY(i));
-                       else
-                               DrawRoundDot(p, pts.GetX(i), pts.GetY(i));
+                       toolPoint[1] = p;
+
+                       double angle = Vector(toolPoint[1], toolPoint[0]).Angle();
+                       std::vector<void *>::iterator j = select.begin();
+                       std::vector<void *>::iterator i = toolObjects.begin();
+
+//                     for(; i!=select.end(); i++, j++)
+                       for(; i!=toolObjects.end(); i++, j++)
+                       {
+                               Object * obj = (Object *)(*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 (tool == TOOLDelPt && i == ptHighlight)
+               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
                {
 #if 0
-                       dc.SetPen(*(wxThePenList->FindOrCreatePen(wxColour(0xFF, 0x00, 0x00), 1, wxSOLID)));
-//                     SelectObject(hdc, hRedPen1);
-//                     MoveToEx(hdc, pts.GetX(i) - 5, pts.GetY(i) - 5, NULL);
-//                     LineTo(hdc, pts.GetX(i) + 5, pts.GetY(i) + 5);
-//                     LineTo(hdc, pts.GetX(i) - 5, pts.GetY(i) - 5);//Lameness!
-//                     MoveToEx(hdc, pts.GetX(i) - 5, pts.GetY(i) + 5, NULL);
-//                     LineTo(hdc, pts.GetX(i) + 5, pts.GetY(i) - 5);
-//                     LineTo(hdc, pts.GetX(i) - 5, pts.GetY(i) + 5);//More lameness!!
+                       Line * l = new Line(toolPoint[0], toolPoint[1]);
+                       document.objects.push_back(l);
+                       toolPoint[0] = toolPoint[1];
 #endif
-                       p.setPen(QPen(Qt::red, 1.0, Qt::SolidLine));
-                       p.drawLine(pts.GetX(i) - 5, pts.GetY(i) - 5, pts.GetX(i) + 5, pts.GetY(i) + 5);
-                       p.drawLine(pts.GetX(i) + 5, pts.GetY(i) - 5, pts.GetX(i) - 5, pts.GetY(i) + 5);
                }
        }
+}
 
-////           SelectObject(hdc, hBlackPen1);
-//     dc.SetPen(*(wxThePenList->FindOrCreatePen(wxColour(0x00, 0x00, 0x00), 1, wxSOLID)));
-       p.setPen(QPen(Qt::black, 1.0, Qt::SolidLine));
-
-       // Draw curve formed by points
 
-       for(int poly=0; poly<pts.GetNumPolys(); poly++)
+void DrawingView::mousePressEvent(QMouseEvent * event)
+{
+       if (event->button() == Qt::LeftButton)
        {
-               if (pts.GetNumPoints(poly) > 2)
-               {
-                       // Initial move...
-                       // If it's not on curve, then move to it, otherwise move to last point...
-
-                       int x, y;
-
-                       if (pts.GetOnCurve(poly, pts.GetNumPoints(poly) - 1))
-                               x = (int)pts.GetX(poly, pts.GetNumPoints(poly) - 1), y = (int)pts.GetY(poly, pts.GetNumPoints(poly) - 1);
-                       else
-                               x = (int)pts.GetX(poly, 0), y = (int)pts.GetY(poly, 0);
+               Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y()));
 
-                       for(int i=0; i<pts.GetNumPoints(poly); i++)
-                       {
-                               if (pts.GetOnCurve(poly, i))
-//                                     LineTo(hdc, pts.GetX(poly, i), pts.GetY(poly, i));
-                               {
-                                       p.drawLine(x, y, pts.GetX(poly, i), pts.GetY(poly, i));
-                                       x = (int)pts.GetX(poly, i), y = (int)pts.GetY(poly, i);
-                               }
-                               else
-                               {
-                                       uint32 prev = pts.GetPrev(poly, i), next = pts.GetNext(poly, i);
-                                       float px = pts.GetX(poly, prev), py = pts.GetY(poly, prev),
-                                               nx = pts.GetX(poly, next), ny = pts.GetY(poly, next);
+               // Handle tool processing, if any
+               if (Global::tool)
+               {
+                       if (Global::snapToGrid)
+                               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;
+                       
+                       ToolMouse(ToolMouseDown, point);
+                       return;
+               }
 
-                                       if (!pts.GetOnCurve(poly, prev))
-                                               px = (px + pts.GetX(poly, i)) / 2.0f,
-                                               py = (py + pts.GetY(poly, i)) / 2.0f;
+               // Clear the selection only if CTRL isn't being held on click
+               if (!ctrlDown)
+                       ClearSelection();
 
-                                       if (!pts.GetOnCurve(poly, next))
-                                               nx = (nx + pts.GetX(poly, i)) / 2.0f,
-                                               ny = (ny + pts.GetY(poly, i)) / 2.0f;
+               // If any objects are being hovered on click, add them to the selection
+               // & return
+               if (numHovered > 0)
+               {
+                       AddHoveredToSelection();
+                       update();       // needed??
+                       GetHovered(hover);      // prolly needed
 
-                                       Bezier(p, point(px, py), point(pts.GetX(poly, i), pts.GetY(poly, i)), point(nx, ny));
-                                       x = (int)nx, y = (int)ny;
+                       // Needed for grab & moving objects
+                       if (Global::snapToGrid)
+                               oldPoint = SnapPointToGrid(point);
 
-                                       if (pts.GetOnCurve(poly, next))
-                                               i++;                                    // Following point is on curve, so move past it
-                               }
-                       }
+                       return;
                }
+
+               // Didn't hit any object and not using a tool, so do a selection rectangle
+               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)
+       {
+               scrollDrag = true;
+               oldPoint = Vector(event->x(), event->y());
+               // Should also change the mouse pointer as well...
+               setCursor(Qt::SizeAllCursor);
        }
 }
 
-void DrawingView::mousePressEvent(QMouseEvent * event)
+
+void DrawingView::mouseMoveEvent(QMouseEvent * event)
 {
-       if (event->button() == Qt::RightButton)
+       Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y()));
+       Global::selection.setBottomRight(QPointF(point.x, point.y));
+       // Only needs to be done here, as mouse down is always preceded by movement
+       Global::snapPointIsValid = false;
+
+       // Scrolling...
+       if (event->buttons() & Qt::MiddleButton)
        {
-               toolPalette->move(event->globalPos());
-               toolPalette->setVisible(true);
-               setCursor(cur[TOOLSelect]);
-               toolPalette->prevTool = TOOLSelect;
+               point = Vector(event->x(), event->y());
+               // Since we're using Qt coords for scrolling, we have to adjust them here to
+               // conform to Cartesian coords, since the origin is using Cartesian. :-)
+               Vector delta(oldPoint, point);
+               delta /= Global::zoom;
+               delta.y = -delta.y;
+               Global::origin -= delta;
+
+               UpdateGridBackground();
+               update();
+               oldPoint = point;
+               return;
        }
-       else if (event->button() == Qt::MidButton)
+
+       // If we're doing a selection rect, see if any objects are engulfed by it
+       // (implies left mouse button held down)
+       if (Global::selectionInProgress)
        {
-               setCursor(cur[2]);                                                      // Scrolling cursor
+               CheckObjectBounds();
+               update();
+               return;
        }
-       else if (event->button() == Qt::LeftButton)
+
+       // Handle object movement (left button down & over an object)
+       if ((event->buttons() & Qt::LeftButton) && numHovered && !Global::tool)
        {
-               if (tool == TOOLScroll || tool == TOOLZoom)
-;//meh                 CaptureMouse();                                         // Make sure we capture the mouse when in scroll/zoom mode
-               else if (tool == TOOLAddPt)             // "Add Point" tool
-               {
-                       if (pts.GetNumPoints() > 0)
-                       {
-                               QPoint pt = GetAdjustedMousePosition(event);
-                               pts.InsertPoint(pts.GetNext(ptHighlight), pt.x(), pt.y(), ((event->modifiers() == Qt::ShiftModifier || event->modifiers() == Qt::ControlModifier) ? false : true));
-                               ptHighlight = ptNextHighlight;
-                               update();
-                       }
-               }
-               else if (tool == TOOLAddPoly)   // "Add Poly" tool
-               {
-#ifdef DEBUGFOO
-WriteLogMsg("Adding point... # polys: %u, # points: %u", pts.GetNumPolys(), pts.GetNumPoints());
-#endif
-                       if (polyFirstPoint)
-                       {
-                               polyFirstPoint = false;
-                               pts.AddNewPolyAtEnd();
-                       }
+               HandleObjectMovement(point);
+               update();
+               oldPoint = point;
+               return;
+       }
 
-                       QPoint pt = GetAdjustedMousePosition(event);
-//printf("GetAdjustedMousePosition = %i, %i\n", pt.x(), pt.y());
-                       // Append a point to the end of the structure
-                       pts += IPoint(pt.x(), pt.y(), ((event->modifiers() == Qt::ShiftModifier || event->modifiers() == Qt::ControlModifier) ? false : true));
-                       ptHighlight = pts.GetNumPoints() - 1;
+       // Do object hit testing...
+       bool needUpdate = HitTestObjects(point);
+
+       // Do tool handling, if any are active...
+       if (Global::tool)
+       {
+               if (Global::snapToGrid)
+                       point = SnapPointToGrid(point);
+
+               ToolMouse(ToolMouseMove, point);
+       }
+
+       // This is used to draw the tool crosshair...
+       oldPoint = point;
+
+       if (needUpdate || Global::tool)
+               update();
+}
+
+
+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();
-#ifdef DEBUGFOO
-WriteLogMsg(" --> [# polys: %u, # points: %u]\n", pts.GetNumPolys(), pts.GetNumPoints());
-#endif
-               }
-               else if (tool == TOOLSelect || tool == TOOLPolySelect)
-               {
-                       if (pts.GetNumPoints() > 0)
-                       {
-                               pt = GetAdjustedClientPosition(pts.GetX(ptHighlight), pts.GetY(ptHighlight));
-//printf("GetAdjustedClientPosition = %i, %i\n", pt.x(), pt.y());
-//                             WarpPointer(pt.x, pt.y);
-                               QCursor::setPos(mapToGlobal(pt));
 
-                               if (event->modifiers() == Qt::ShiftModifier || event->modifiers() == Qt::ControlModifier)
-                               {
-                                       pts.SetOnCurve(ptHighlight, !pts.GetOnCurve(ptHighlight));
-                                       update();
-                               }
-                       }
+               if (Global::tool)
+               {
+                       Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y()));
+                       ToolMouse(ToolMouseUp, point);
+                       return;
                }
-               else if (tool == TOOLDelPt)
+
+               if (Global::selectionInProgress)
                {
-                       if (pts.GetNumPoints() > 0)
-//Or could use:
-//                     if (ptHighlight != -1)
+                       // Select all the stuff inside of selection
+                       Global::selectionInProgress = false;
+
+                       // Clear our vectors
+                       select.clear();
+                       hover.clear();
+
+                       // Scoop 'em up
+                       std::vector<void *>::iterator i;
+
+                       for(i=document.objects.begin(); i!=document.objects.end(); i++)
                        {
-//This assumes that WM_MOUSEMOVE happens before this!
-//The above commented out line should take care of this contingency... !!! FIX !!!
-                               pts.DeletePoint(ptHighlight);
-                               update();
+                               if (((Object *)(*i))->selected)
+                                       select.push_back(*i);
+
+//hmm, this is no good, too late to do any good :-P
+//                             if ((*i)->hovered)
+//                                     hover.push_back(*i);
                        }
                }
        }
-
-       event->accept();
+       else if (event->button() == Qt::MiddleButton)
+       {
+               scrollDrag = false;
+               setCursor(Qt::ArrowCursor);
+       }
 }
 
-void DrawingView::mouseMoveEvent(QMouseEvent * event)
+
+void DrawingView::wheelEvent(QWheelEvent * event)
 {
-       if (event->buttons() == Qt::RightButton)
-       {
-               ToolType newTool = toolPalette->FindSelectedTool();
+       double zoomFactor = 1.25;
+       QSize sizeWin = size();
+       Vector center(sizeWin.width() / 2.0, sizeWin.height() / 2.0);
+       center = Painter::QtToCartesianCoords(center);
 
-               if (newTool != toolPalette->prevTool)
-               {
-                       toolPalette->prevTool = newTool;
-                       toolPalette->repaint();
-               }
-       }
-       else if (event->buttons() == Qt::MidButton)
+       // This is not centering for some reason. Need to figure out why. :-/
+       if (event->delta() > 0)
        {
-               // Calc offset from previous point
-               pt = event->pos();
-               ptOffset = QPoint(pt.x() - ptPrevious.x(), pt.y() - ptPrevious.y());
-
-// Then multiply it by the scaling factor. Whee!
-               // This looks wacky because we're using screen coords for the offset...
-               // Otherwise, we would subtract both offsets!
-               offsetX -= ptOffset.x(), offsetY += ptOffset.y();
-               update();
-               ptPrevious = pt;
+               Vector newOrigin = center - ((center - Global::origin) / zoomFactor);
+               Global::origin = newOrigin;
+               Global::zoom *= zoomFactor;
        }
-       else if (event->buttons() == Qt::LeftButton)
+       else
        {
+               Vector newOrigin = center + ((-center + Global::origin) * zoomFactor);
+               Global::origin = newOrigin;
+               Global::zoom /= zoomFactor;
+       }
+
+#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
+}
+
+
+void DrawingView::keyPressEvent(QKeyEvent * event)
+{
 #if 0
-                       if (tool == TOOLScroll)
-                       {
-                           // Extract current point from lParam/calc offset from previous point
-
-                               pt = e.GetPosition();
-                               ptOffset.x = pt.x - ptPrevious.x,
-                               ptOffset.y = pt.y - ptPrevious.y;
-
-                               // NOTE: OffsetViewportOrg operates in DEVICE UNITS...
-
-//Seems there's no equivalent for this in wxWidgets...!
-//!!! FIX !!!
-//                             hdc = GetDC(hWnd);
-//                             OffsetViewportOrgEx(hdc, ptOffset.x, ptOffset.y, NULL);
-//                             ReleaseDC(hWnd, hdc);
-
-// this shows that it works, so the logic above must be faulty...
-// And it is. It should convert the coords first, then do the subtraction to figure the offset...
-// Above: DONE
-// Then multiply it by the scaling factor. Whee!
-                               // This looks wacky because we're using screen coords for the offset...
-                               // Otherwise, we would subtract both offsets!
-                               offsetX -= ptOffset.x, offsetY += ptOffset.y;
-                               Refresh();
-                       }
-                       else
+       if (toolAction)
+               toolAction->KeyDown(event->key());
 #endif
-                       if (tool == TOOLAddPt || tool == TOOLAddPoly || tool == TOOLSelect)
-                       {
-                               if (tool != TOOLAddPt || pts.GetNumPoints() > 0)//yecch.
-                               {
-//temporary, for testing. BTW, Select drag bug is here...!
-#if 1
-                                       QPoint pt2 = GetAdjustedMousePosition(event);
-                                       pts.SetXY(ptHighlight, pt2.x(), pt2.y());
-                                       update();
+       bool oldShift = shiftDown;
+       bool oldCtrl = ctrlDown;
+
+       if (event->key() == Qt::Key_Shift)
+               shiftDown = true;
+       else if (event->key() == Qt::Key_Control)
+               ctrlDown = true;
+
+       if ((oldShift != shiftDown) || (oldCtrl != ctrlDown))
+               update();
+}
+
+
+void DrawingView::keyReleaseEvent(QKeyEvent * event)
+{
+#if 0
+       if (toolAction)
+               toolAction->KeyReleased(event->key());
 #endif
-                               }
-                       }
-                       else if (tool == TOOLPolySelect)
-                       {
-                               if (pts.GetNumPoints() > 0)
-                               {
-                                       QPoint pt2 = GetAdjustedMousePosition(event);
-                                       // Should also set onCurve here as well, depending on keystate
-//Or should we?
-                                       pts.OffsetPoly(pts.GetPoly(ptHighlight), pt2.x() - pts.GetX(ptHighlight), pt2.y() - pts.GetY(ptHighlight));
-                                       update();
-                               }
-                       }
-       }
-       else if (event->buttons() == Qt::NoButton)
+       bool oldShift = shiftDown;
+       bool oldCtrl = ctrlDown;
+
+       if (event->key() == Qt::Key_Shift)
+               shiftDown = false;
+       else if (event->key() == Qt::Key_Control)
+               ctrlDown = false;
+
+       if ((oldShift != shiftDown) || (oldCtrl != ctrlDown))
+               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<void *>::iterator i;
+       numSelected = 0;
+
+       for(i=document.objects.begin(); i!=document.objects.end(); i++)
        {
-               // Moving, not dragging...
-               if (tool == TOOLSelect || tool == TOOLDelPt || tool == TOOLAddPt
-                       || tool == TOOLPolySelect)// || tool == TOOLAddPoly)
+               Object * obj = (Object *)(*i);
+               obj->selected = false;
+
+               switch (obj->type)
                {
-                       QPoint pt2 = GetAdjustedMousePosition(event);
-                       double closest = 1.0e+99;
+               case OTLine:
+               {
+                       Line * l = (Line *)obj;
 
-                       for(int i=0; i<pts.GetNumPoints(); i++)
-                       {
-                               double dist = ((pt2.x() - pts.GetX(i)) * (pt2.x() - pts.GetX(i)))
-                                       + ((pt2.y() - pts.GetY(i)) * (pt2.y() - pts.GetY(i)));
+                       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;
+               }
+               case OTCircle:
+               {
+                       Circle * c = (Circle *)obj;
 
-                               if (dist < closest)
-                                       closest = dist, ptHighlight = i;
+                       if (Global::selection.contains(c->p[0].x - c->radius, c->p[0].y - c->radius) && Global::selection.contains(c->p[0].x + c->radius, c->p[0].y + c->radius))
+                               c->selected = true;
+
+                       break;
+               }
+               case OTArc:
+               {
+                       Arc * a = (Arc *)obj;
+
+                       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);
+
+#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 (ptHighlight != oldPtHighlight)
+                       if (bounds.bottom() > bounds.top())
                        {
-                               oldPtHighlight = ptHighlight;
-                               update();
+                               double temp = bounds.bottom();
+                               bounds.setBottom(bounds.top());
+                               bounds.setTop(temp);
                        }
+#else
+                       // Doesn't work as advertised! For shame!
+                       bounds = bounds.normalized();
+#endif
 
-                       // What follows here looks like voodoo, but is really simple. What we do is
-                       // check to see if the mouse point has a perpendicular intersection with any of
-                       // the line segments. If it does, calculate the length of the perpendicular
-                       // and choose the smallest length. If there is no perpendicular, then choose the
-                       // length of line connecting the closer of either the first endpoint or the
-                       // second and choose the smallest of those.
+                       // If the end of the arc is before the beginning, add 360 degrees to it
+                       if (end < start)
+                               end += 2.0 * PI;
 
-                       // There is one bit of math that looks like voodoo to me ATM--will explain once
-                       // I understand it better (the calculation of the length of the perpendicular).
+                       // Adjust the bounds depending on which axes are crossed
+                       if ((start < PI_OVER_2) && (end > PI_OVER_2))
+                               bounds.setTop(1.0);
 
-                       if (pts.GetNumPoints() > 1 && tool == TOOLAddPt)
-                       {
-                               double smallest = 1.0e+99;
+                       if ((start < PI) && (end > PI))
+                               bounds.setLeft(-1.0);
 
-                               for(int i=0; i<pts.GetNumPoints(); i++)
-                               {
-                                       int32 p1x = pts.GetX(i), p1y = pts.GetY(i),
-                                               p2x = pts.GetX(pts.GetNext(i)), p2y = pts.GetY(pts.GetNext(i));
-
-                                       vector ls(p2x, p2y, 0, p1x, p1y, 0), v1(pt2.x(), pt2.y(), 0, p1x, p1y, 0),
-                                               v2(pt2.x(), pt2.y(), 0, p2x, p2y, 0);
-                                       double pp = ls.dot(v1) / ls.length(), dist;
-// Geometric interpretation:
-// pp is the paremeterized point on the vector ls where the perpendicular intersects ls.
-// If pp < 0, then the perpendicular lies beyond the 1st endpoint. If pp > length of ls,
-// then the perpendicular lies beyond the 2nd endpoint.
-
-                                       if (pp < 0.0)
-                                               dist = v1.length();
-                                       else if (pp > ls.length())
-                                               dist = v2.length();
-                                       else                                    // distance = ?Det?(ls, v1) / |ls|
-                                               dist = fabs((ls.x * v1.y - v1.x * ls.y) / ls.length());
-
-//The answer to the above looks like it might be found here:
-//
-//If the segment endpoints are s and e, and the point is p, then the test for the perpendicular
-//intercepting the segment is equivalent to insisting that the two dot products {s-e}.{s-p} and
-//{e-s}.{e-p} are both non-negative.  Perpendicular distance from the point to the segment is
-//computed by first computing the area of the triangle the three points form, then dividing by the
-//length of the segment.  Distances are done just by the Pythagorean theorem.  Twice the area of the
-//triangle formed by three points is the determinant of the following matrix:
-//
-//sx sy 1
-//ex ey 1
-//px py 1
-//
-//By translating the start point to the origin, this can be rewritten as:
-//By subtracting row 1 from all rows, you get the following:
-//[because sx = sy = 0. you could leave out the -sx/y terms below. because we subtracted
-// row 1 from all rows (including row 1) row 1 turns out to be zero. duh!]
-//
-//0         0         0
-//(ex - sx) (ey - sy) 0
-//(px - sx) (py - sy) 0
-//
-//which greatly simplifies the calculation of the determinant.
+                       if ((start < (PI + PI_OVER_2)) && (end > (PI + PI_OVER_2)))
+                               bounds.setBottom(-1.0);
 
-                                       if (dist < smallest)
-                                               smallest = dist, ptNextHighlight = pts.GetNext(i), ptHighlight = i;
-                               }
+                       if ((start < (2.0 * PI)) && (end > (2.0 * PI)))
+                               bounds.setRight(1.0);
 
-                               if (ptNextHighlight != oldPtNextHighlight)
-                               {
-                                       oldPtNextHighlight = ptNextHighlight;
-                                       update();
-                               }
-                       }
+                       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, bounds.top() * a->radius));
+                       bounds.setBottomRight(QPointF(bounds.right() * a->radius, bounds.bottom() * a->radius));
+                       bounds.translate(a->p[0].x, a->p[0].y);
+
+                       if (Global::selection.contains(bounds))
+                               a->selected = true;
+
+                       break;
+               }
+               default:
+                       break;
                }
 
-               ptPrevious = event->pos();
+               if (obj->selected)
+                       numSelected++;
        }
-
-       event->accept();
 }
 
-void DrawingView::mouseReleaseEvent(QMouseEvent * event)
+
+bool DrawingView::HitTestObjects(Point point)
 {
-       if (event->button() == Qt::RightButton)
+       std::vector<void *>::iterator i;
+       numHovered = 0;
+       bool needUpdate = false;
+
+       for(i=document.objects.begin(); i!=document.objects.end(); i++)
        {
-               ToolType newTool = toolPalette->FindSelectedTool();
+               Object * obj = (Object *)(*i);
 
-               // We only change the tool if a new one was actually selected. Otherwise, we do nothing.
-               if (newTool != TOOLNone)
+               switch (obj->type)
                {
-                       tool = newTool;
+               case OTLine:
+               {
+                       Line * l = (Line *)obj;
+                       bool oldHP0 = l->hitPoint[0], oldHP1 = l->hitPoint[1], oldHO = l->hitObject;
+                       l->hitPoint[0] = l->hitPoint[1] = l->hitObject = false;
+                       Vector lineSegment = l->p[1] - l->p[0];
+                       Vector v1 = point - l->p[0];
+                       Vector v2 = point - l->p[1];
+                       double t = Geometry::ParameterOfLineAndPoint(l->p[0], l->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 (tool == TOOLScroll || tool == TOOLZoom || tool == TOOLAddPoly
-                               || tool == TOOLDelPoly)
-                               ptHighlight = -1;
+                       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);
+//                     l->hovered = l->hitObject;
 
-                       if (tool == TOOLAddPoly)
-                               polyFirstPoint = true;
+//                     if (oldHovered != l->hovered)
+                       if ((oldHP0 != l->hitPoint[0]) || (oldHP1 != l->hitPoint[1]) || (oldHO != l->hitObject))
+                               needUpdate = true;
+
+                       break;
                }
+               case OTCircle:
+               {
+                       Circle * c = (Circle *)obj;
 
-               toolPalette->setVisible(false);
-               setCursor(cur[tool]);
-               // Just in case we changed highlighting style with the new tool...
-               update();
+
+                       break;
+               }
+               default:
+                       break;
+               }
+
+               if (obj->hovered)
+//             {
+                       numHovered++;
+//printf("MouseMove: OBJECT HOVERED (numHovered = %i)\n", numHovered);
+//             }
        }
-       else if (event->button() == Qt::MidButton)
+
+       return needUpdate;
+}
+
+
+void DrawingView::HandleObjectMovement(Point point)
+{
+       if (Global::snapToGrid)
+               point = SnapPointToGrid(point);
+
+       Point delta = point - oldPoint;
+       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"));
+
+       switch (obj->type)
        {
-               setCursor(cur[tool]);                                           // Restore previous cursor
+       case OTLine:
+       {
+               Line * l = (Line *)obj;
+
+               if (l->hitPoint[0])
+                       l->p[0] = point;
+               else if (l->hitPoint[1])
+                       l->p[1] = point;
+               else if (l->hitObject)
+               {
+                       l->p[0] += delta;
+                       l->p[1] += delta;
+               }
+
+               break;
        }
-       else if (event->button() == Qt::LeftButton)
+       default:
+               break;
+       }
+}
+
+
+
+#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.
        {
-//             if (tool == TOOLScroll || tool == TOOLZoom)
-//                     ReleaseMouse();
-//this is prolly too much
-               ((TTEdit *)qApp)->charWnd->MakePathFromPoints(&pts);
-               ((TTEdit *)qApp)->charWnd->update();
+
+/*
+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...
+//             }
        }
 
-       event->accept();
-}
+       if (toolAction)
+       {
+               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;
+
+               toolAction->MouseMoved(point);
+       }
+#else
 #endif
+