]> Shamusworld >> Repos - architektonas/blobdiff - src/drawingview.cpp
Rendering for Line, Circle, and Arc work.
[architektonas] / src / drawingview.cpp
index 06f4496c15d44da73474035d00750bf081bdead0..e93161a5a7235c544f93f0ae64b85d37e56c8c5f 100644 (file)
@@ -19,6 +19,7 @@
 //
 // STILL TO BE DONE:
 //
+// - Lots of stuff
 //
 
 // Uncomment this for debugging...
 #include "drawingview.h"
 
 #include <stdint.h>
+#include "global.h"
 #include "mathconstants.h"
-
-#include "arc.h"
-#include "circle.h"
-#include "dimension.h"
-#include "drawcircleaction.h"
-#include "drawdimensionaction.h"
-#include "drawlineaction.h"
-#include "line.h"
 #include "painter.h"
+#include "structs.h"
 
 
 #define BACKGROUND_MAX_SIZE    512
 
+// Class variable
+//Container DrawingView::document(Vector(0, 0));
+
 
 DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent),
        // The value in the settings file will override this.
        useAntialiasing(true),
        gridBackground(BACKGROUND_MAX_SIZE, BACKGROUND_MAX_SIZE),
-       scale(1.0), offsetX(-10), offsetY(-10),
-       document(Vector(0, 0)),
-       gridSpacing(12.0), gridPixels(0), collided(false), rotateTool(false),
-       rx(150.0), ry(150.0),
-       scrollDrag(false), addLineTool(false), addCircleTool(false),
-       addDimensionTool(false),
-       toolAction(NULL)
+       scale(1.0), offsetX(-10), offsetY(-10),// document(Vector(0, 0)),
+       gridPixels(0), collided(false)//, toolAction(NULL)
 {
-       document.isTopLevelContainer = true;
+//     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));
@@ -81,6 +73,20 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent),
        // Alternate way to do the above...
        line->SetDimensionOnLine();
 #endif
+#else
+       Line * line = new Line;//(Vector(5, 5), Vector(50, 40), &document);
+       line->p1 = Vector(5, 5);
+       line->p2 = Vector(50, 40);
+       line->type = OTLine;
+       line->thickness = 1.0;
+       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));
+#endif
 
 /*
 Here we set the grid size in pixels--12 in this case. Initially, we have our
@@ -91,16 +97,16 @@ 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 / Painter::zoom;
+       drawing->gridSpacing = 12.0 / Global::zoom;
 
-Painter::zoom is the zoom factor for the drawing, and all mouse clicks are
-translated to Cartesian coordinates through this. (Initially, Painter::zoom is
+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
-shittyness that comes with it.
+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
@@ -114,83 +120,36 @@ 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. Painter::zoom is simply the ratio of pixels to
+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"), Painter::zoom becomes 12px / 6" = 2.0 px/in.
+(& 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
-Painter::zoom *and* size. Same with the dimension text; it's drawn at 10pt and
+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.
+need a thickness parameter similar to the "size" param for dimensions. (And now
+we do! :-)
 
 */
-#if 0
-       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+=12)
-       {
-               pmp.drawLine(i, 0, i, BACKGROUND_MAX_SIZE - 1);
-               pmp.drawLine(0, i, BACKGROUND_MAX_SIZE - 1, i);
-       }
-
-       pmp.end();
-       UpdateGridBackground();
-#else
-       SetGridSize(12);
-#endif
-}
-
-
-void DrawingView::SetRotateToolActive(bool state/*= true*/)
-{
-       rotateTool = state;
-       update();
-}
-
-
-void DrawingView::SetAddLineToolActive(bool state/*= true*/)
-{
-       if (state)
-       {
-               toolAction = new DrawLineAction();
-               connect(toolAction, SIGNAL(ObjectReady(Object *)), this,
-                       SLOT(AddNewObjectToDocument(Object *)));
-       }
-
-       update();
-//printf("DrawingView::SetAddLineToolActive(). toolAction=%08X\n", toolAction);
-}
-
-
-void DrawingView::SetAddCircleToolActive(bool state/*= true*/)
-{
-       if (state)
-       {
-               toolAction = new DrawCircleAction();
-               connect(toolAction, SIGNAL(ObjectReady(Object *)), this,
-                       SLOT(AddNewObjectToDocument(Object *)));
-       }
-
-       update();
+       SetGridSize(12);        // This is in pixels
 }
 
 
-void DrawingView::SetAddDimensionToolActive(bool state/*= true*/)
+#if 0
+void DrawingView::SetToolActive(Action * action)
 {
-       if (state)
+       if (action != NULL)
        {
-               toolAction = new DrawDimensionAction();
+               toolAction = action;
                connect(toolAction, SIGNAL(ObjectReady(Object *)), this,
                        SLOT(AddNewObjectToDocument(Object *)));
+               connect(toolAction, SIGNAL(NeedRefresh()), this, SLOT(HandleActionUpdate()));
        }
-
-       update();
 }
+#endif
 
 
 void DrawingView::SetGridSize(uint32_t size)
@@ -214,22 +173,19 @@ void DrawingView::SetGridSize(uint32_t size)
        pmp.end();
 
        // Set up new BG brush & zoom level (pixels per base unit)
-       Painter::zoom = gridPixels / gridSpacing;
+//     Painter::zoom = gridPixels / gridSpacing;
+       Global::zoom = gridPixels / Global::gridSpacing;
        UpdateGridBackground();
 }
 
 
 void DrawingView::UpdateGridBackground(void)
 {
-//was: 128
-//#define BG_BRUSH_SPAN 72
-#define BG_BRUSH_SPAN (gridPixels)
        // 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
-       // Problem with mod 128: Negative numbers screw it up... [FIXED]
 /*
 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.
@@ -268,51 +224,33 @@ 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 inverse of the modulus of gridPixels.
+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
-
-This has been solved below:
-UGB: pmo=(2.000000,687.000000) X=2, X%48=2, new x=45
-UGB: pmo=(1.000000,687.000000) X=1, X%48=1, new x=46
-UGB: pmo=(0.000000,687.000000) X=0, X%48=0, new x=47
-UGB: pmo=(-1.000000,687.000000) X=-1, X%48=15, new x=1
-UGB: pmo=(-2.000000,686.000000) X=-2, X%48=14, new x=2
-UGB: pmo=(-3.000000,686.000000) X=-3, X%48=13, new x=3
-
-Problem with changing grid size causes x/y origin to be shown incorrectly:
-UGB: pmo=(10.000000,812.000000) X=10, X%12=10, new x=2
-UGB: pmo=(10.000000,812.000000) X=10, X%4=2,   new x=2
-UGB: pmo=(3.333333,818.666667)  X=3,  X%48=3,  new x=45
-UGB: pmo=(39.000000,782.000000) X=39, X%48=39, new x=9   <-- MMB move is here
-UGB: pmo=(39.000000,781.000000) X=39, X%48=39, new x=9
-
-
-
+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.
 */
-//printf("UGB: pmo=(%f,%f) X=%i, X%%%i=%i, ", pixmapOrigin.x, pixmapOrigin.y, x, BG_BRUSH_SPAN, x % BG_BRUSH_SPAN);
-//     x = (x < 0 ? 0 : BG_BRUSH_SPAN - 1) - (x % BG_BRUSH_SPAN);
-//     y = (y < 0 ? 0 : BG_BRUSH_SPAN - 1) - (y % BG_BRUSH_SPAN);
-//     x = (BG_BRUSH_SPAN - 1) - (x % BG_BRUSH_SPAN);
-//     y = (BG_BRUSH_SPAN - 1) - (y % BG_BRUSH_SPAN);
-//     x = (x < 0 ? 0 : BG_BRUSH_SPAN - 1) - ((x < 0 ? -x : x) % BG_BRUSH_SPAN);
        if (x < 0)
-               x = -x % BG_BRUSH_SPAN;
+               x = -x % gridPixels;
        else
-               x = (BG_BRUSH_SPAN - (x % BG_BRUSH_SPAN)) % BG_BRUSH_SPAN;
+               x = (gridPixels - (x % gridPixels)) % gridPixels;
 
-//     y = (y < 0 ? 0 : BG_BRUSH_SPAN - 1) - ((y < 0 ? -y : y) % BG_BRUSH_SPAN);
        if (y < 0)
-               y = -y % BG_BRUSH_SPAN;
+               y = -y % gridPixels;
        else
-               y = (BG_BRUSH_SPAN - (y % BG_BRUSH_SPAN)) % BG_BRUSH_SPAN;
-//printf("new x=%i\n", x);
+               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, BG_BRUSH_SPAN, BG_BRUSH_SPAN);
+       QPixmap pm = gridBackground.copy(x, y, gridPixels, gridPixels);
        QPalette pal = palette();
        pal.setBrush(backgroundRole(), QBrush(pm));
        setAutoFillBackground(true);
@@ -324,14 +262,27 @@ void DrawingView::AddNewObjectToDocument(Object * object)
 {
        if (object)
        {
-               object->Reparent(&document);
-               document.Add(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.
@@ -358,51 +309,77 @@ void DrawingView::paintEvent(QPaintEvent * /*event*/)
        if (useAntialiasing)
                qtPainter.setRenderHint(QPainter::Antialiasing);
 
-//     Painter::screenSize = Vector(size().width(), size().height());
-       Object::SetViewportHeight(size().height());
+       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);
 
-       // Draw supplemental (tool related) points
-// NOTE that this can be done as an action!
-// In that case, we would need access to the document...
-// [We can do that by making the document a class object...]
-       if (rotateTool)
-       {
-               painter.SetPen(QPen(QColor(0, 200, 0), 2.0, Qt::SolidLine));
-               painter.DrawLine(rx - 10, ry, rx + 10, ry);
-               painter.DrawLine(rx, ry - 10, rx, ry + 10);
-       }
-
-// Maybe we can make the grid into a background brush instead, and let Qt deal
-// with it??? YES!!
-
        // The top level document takes care of rendering for us...
-       document.Draw(&painter);
+//     document.Draw(&painter);
+       // Not any more it doesn't...
+       RenderObjects(&painter, &document);
 
+#if 0
        if (toolAction)
+       {
+               painter.SetPen(QPen(QColor(200, 100, 0, 255), 1.0, Qt::DashLine));
+               painter.DrawCrosshair(oldPoint);
                toolAction->Draw(&painter);
+       }
+#endif
 
-       if (Object::selectionInProgress)
+#if 1
+       if (Global::selectionInProgress)
        {
-//             painter.SetPen(QPen(Qt::green, 1.0, Qt::SolidLine));
                painter.SetPen(QPen(QColor(255, 127, 0, 255)));
-//             painter.SetBrush(QBrush(Qt::NoBrush));
                painter.SetBrush(QBrush(QColor(255, 127, 0, 100)));
-               painter.DrawRect(Object::selection);
+               painter.DrawRect(Global::selection);
+       }
+#endif
+}
+
+
+void DrawingView::RenderObjects(Painter * p, Container * c)
+{
+       std::vector<void *>::iterator i;
+
+       for(i=c->objects.begin(); i!=c->objects.end(); i++)
+       {
+               Object * obj = (Object *)(*i);
+               p->SetPen(QPen(Qt::black, 1.0 * Global::zoom * obj->thickness, Qt::SolidLine));
+
+               switch (obj->type)
+               {
+               case OTLine:
+               {
+                       Line * l = (Line *)obj;
+                       p->DrawLine(l->p1, l->p2);
+                       break;
+               }
+               case OTCircle:
+               {
+                       Circle * ci = (Circle *)obj;
+                       p->DrawEllipse(ci->p1, ci->radius, ci->radius);
+                       break;
+               }
+               case OTArc:
+               {
+                       Arc * a = (Arc *)obj;
+                       p->DrawArc(a->p1, a->radius, a->angle1, a->angle2);
+                       break;
+               }
+               default:
+                       break;
+               }
        }
 }
 
 
-void DrawingView::resizeEvent(QResizeEvent * event)
+void DrawingView::resizeEvent(QResizeEvent * /*event*/)
 {
-       Painter::screenSize = Vector(size().width(), size().height());
-//     Painter::screenSize = Vector(event->size().width(), event->size().height());
-//printf("DrawingView::resizeEvent: new size:
+       Global::screenSize = Vector(size().width(), size().height());
        UpdateGridBackground();
 }
 
@@ -412,21 +389,37 @@ void DrawingView::mousePressEvent(QMouseEvent * event)
        if (event->button() == Qt::LeftButton)
        {
                Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y()));
-               collided = document.Collided(point);
+//             collided = document.Collided(point);
+               collided = false;
 
-               if (collided)
-                       update();       // Do an update if collided with at least *one* object in the document
+               // Do an update if collided with at least *one* object in the document
+//             if (collided)
+//                     update();
 
+#if 0
                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->MouseDown(point);
+               }
+#endif
 
+#if 1
                // Didn't hit any object and not using a tool, so do a selection rectangle
-               if (!(collided || toolAction))
+               if (!(collided))// || toolAction))
                {
-                       Object::selectionInProgress = true;
-                       Object::selection.setTopLeft(QPointF(point.x, point.y));
-                       Object::selection.setBottomRight(QPointF(point.x, point.y));
+                       Global::selectionInProgress = true;
+                       Global::selection.setTopLeft(QPointF(point.x, point.y));
+                       Global::selection.setBottomRight(QPointF(point.x, point.y));
                }
+#endif
        }
        else if (event->button() == Qt::MiddleButton)
        {
@@ -441,17 +434,20 @@ void DrawingView::mousePressEvent(QMouseEvent * event)
 void DrawingView::mouseMoveEvent(QMouseEvent * event)
 {
        Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y()));
-       Object::selection.setBottomRight(QPointF(point.x, point.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)
        {
                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(point, oldPoint);
-               delta /= Painter::zoom;
+               Vector delta(oldPoint, point);
+               delta /= Global::zoom;
                delta.y = -delta.y;
-               Painter::origin -= delta;
+               Global::origin -= delta;
 
                UpdateGridBackground();
                update();
@@ -459,40 +455,110 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event)
                return;
        }
 
-       // 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.
-       if (event->buttons() & Qt::LeftButton)
+       // 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)
        {
-               point += gridSpacing / 2.0;                                     // *This* adds to Z!!!
-               point /= gridSpacing;
-//200% is ok, gridSpacing = 6 in this case...
-//won't run into problems until gridSpacing = 1.5 (zoom = 800%)
-//run into problems with this approach: when zoom level is 200% this truncates to
-//integers, which is *not* what's wanted here...
-               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;
+// Uncommenting this causes the cursor to become unresponsive after the first
+// object is added.
+//             point = Global::snapPoint;
        }
 #endif
+
+//     oldPoint = point;
 //we should keep track of the last point here and only pass this down *if* the point
 //changed...
-       document.PointerMoved(point);
 
-       if (document.NeedsUpdate() || Object::selectionInProgress)
-               update();
+#if 0
+       // This returns true if we've moved over an object...
+       if (document.PointerMoved(point))
+       {
+/*
+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)
        {
+               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);
-               update();
        }
+#endif
+
+       // This is used to draw the tool crosshair...
+       oldPoint = point;
+
+#if 1
+       if (/*document.NeedsUpdate() ||*/ Global::selectionInProgress /*|| toolAction*/)
+               update();
+#endif
 }
 
 
@@ -500,7 +566,9 @@ void DrawingView::mouseReleaseEvent(QMouseEvent * event)
 {
        if (event->button() == Qt::LeftButton)
        {
+#if 0
                document.PointerReleased();
+#endif
 
 //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
@@ -509,13 +577,15 @@ void DrawingView::mouseReleaseEvent(QMouseEvent * event)
 //             if (collided)
                        update();       // Do an update if collided with at least *one* object in the document
 
+#if 0
                if (toolAction)
                        toolAction->MouseReleased();
+#endif
 
-               if (Object::selectionInProgress)
+               if (Global::selectionInProgress)
                {
                        // Select all the stuff inside of selection
-                       Object::selectionInProgress = false;
+                       Global::selectionInProgress = false;
                }
        }
        else if (event->button() == Qt::MiddleButton)
@@ -525,3 +595,71 @@ void DrawingView::mouseReleaseEvent(QMouseEvent * event)
        }
 }
 
+
+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);
+
+       // 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 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 (toolAction)
+               toolAction->KeyDown(event->key());
+#endif
+}
+
+
+void DrawingView::keyReleaseEvent(QKeyEvent * event)
+{
+#if 0
+       if (toolAction)
+               toolAction->KeyReleased(event->key());
+#endif
+}
+
+//
+// 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;
+}
+