X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.cpp;h=629999f148b4a83a9bb604bb0360bc502b54d2a1;hb=6c1279871f6bb86bc59e2561b6a7f74ab081f71e;hp=95721178a70be35ee56600f4a492390b8f1ed44c;hpb=64482766268cddae393da1277987de31e69ffdd9;p=architektonas diff --git a/src/drawingview.cpp b/src/drawingview.cpp index 9572117..629999f 100644 --- a/src/drawingview.cpp +++ b/src/drawingview.cpp @@ -19,6 +19,7 @@ // // STILL TO BE DONE: // +// - Lots of stuff // // Uncomment this for debugging... @@ -34,34 +35,29 @@ #include "arc.h" #include "circle.h" #include "dimension.h" +#include "geometry.h" #include "line.h" #include "painter.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; setBackgroundRole(QPalette::Base); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - Object::gridSpacing = 12.0; -// toolPalette = new ToolWindow(); -// CreateCursors(); -// setCursor(cur[TOOLSelect]); -// setMouseTracking(true); + Object::gridSpacing = 12.0; // In base units (inch is default) Line * line = new Line(Vector(5, 5), Vector(50, 40), &document); document.Add(line); @@ -126,14 +122,7 @@ need a thickness parameter similar to the "size" param for dimensions. (And now we do! :-) */ - SetGridSize(12); -} - - -void DrawingView::SetRotateToolActive(bool state/*= true*/) -{ - rotateTool = state; - update(); + SetGridSize(12); // This is in pixels } @@ -144,6 +133,7 @@ void DrawingView::SetToolActive(Action * action) toolAction = action; connect(toolAction, SIGNAL(ObjectReady(Object *)), this, SLOT(AddNewObjectToDocument(Object *))); + connect(toolAction, SIGNAL(NeedRefresh()), this, SLOT(HandleActionUpdate())); } } @@ -266,6 +256,19 @@ void DrawingView::AddNewObjectToDocument(Object * object) } +void DrawingView::HandleActionUpdate(void) +{ + update(); +} + + +void DrawingView::SetCurrentLayer(int layer) +{ + Object::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. @@ -284,28 +287,6 @@ QPoint DrawingView::GetAdjustedClientPosition(int x, int y) } -#if 0 -// -// 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. -// -Vector DrawingView::SnapPointToGrid(Vector point) -{ - 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; - return point; -} -#endif - - void DrawingView::paintEvent(QPaintEvent * /*event*/) { QPainter qtPainter(this); @@ -314,35 +295,18 @@ void DrawingView::paintEvent(QPaintEvent * /*event*/) if (useAntialiasing) qtPainter.setRenderHint(QPainter::Antialiasing); -// Painter::screenSize = Vector(size().width(), size().height()); Object::SetViewportHeight(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); if (toolAction) { -// painter.SetPen(QPen(Qt::green, 1.0, Qt::DashLine)); painter.SetPen(QPen(QColor(200, 100, 0, 255), 1.0, Qt::DashLine)); painter.DrawCrosshair(oldPoint); toolAction->Draw(&painter); @@ -350,9 +314,7 @@ void DrawingView::paintEvent(QPaintEvent * /*event*/) if (Object::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); } @@ -371,32 +333,22 @@ void DrawingView::mousePressEvent(QMouseEvent * event) if (event->button() == Qt::LeftButton) { Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y())); - -// Problem with this: Can't select stuff very well with the snap grid on. -// Completely screws things up, as sometimes things don't fall on the grid. -/* -So, how to fix this? Have the Object check itself? -Maybe we can fix this by having the initial point not be snapped, but when there's -a drag, we substitute the snapped point 'oldPoint' which the Object keeps track of -internally to know how far it was dragged... - -Now we do... :-/ -*/ -#if 0 - if (Object::snapToGrid) - point = Object::SnapPointToGrid(point); -#endif - collided = document.Collided(point); + // Do an update if collided with at least *one* object in the document if (collided) - update(); // Do an update if collided with at least *one* object in the document + update(); if (toolAction) { if (Object::snapToGrid) point = Object::SnapPointToGrid(point); + // We always snap to object points, and they take precendence over + // grid points... + if (Object::snapPointIsValid) + point = Object::snapPoint; + toolAction->MouseDown(point); } @@ -422,13 +374,16 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event) { Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y())); Object::selection.setBottomRight(QPointF(point.x, point.y)); + // Only needs to be done here, as mouse down is always preceded by movement + Object::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); + Vector delta(oldPoint, point); delta /= Painter::zoom; delta.y = -delta.y; Painter::origin -= delta; @@ -439,31 +394,106 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event) return; } - // Grid processing... +#if 0 + // Grid processing... (only snap here is left button is down) if ((event->buttons() & Qt::LeftButton) && Object::snapToGrid) { point = Object::SnapPointToGrid(point); } - oldPoint = point; + // Snap points on objects always take precedence over the grid, whether + // dragging an object or not... +//thisnowok + if (Object::snapPointIsValid) + { +// Uncommenting this causes the cursor to become unresponsive after the first +// object is added. +// point = Object::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(); + // 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) + { + Object::snapPoint = document.lastObjectHovered->GetPointAtParameter(t); + Object::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) + { + Object::snapPoint = p1; + Object::snapPointIsValid = true; + } + else if (n == 2) + { + double d1 = Vector(point, p1).Magnitude(); + double d2 = Vector(point, p2).Magnitude(); + + if (d1 < d2) + Object::snapPoint = p1; + else + Object::snapPoint = p2; + + Object::snapPointIsValid = true; + } + } + } +// else +// { + // Otherwise, it was a single object hovered... +// } + } if (toolAction) { if (Object::snapToGrid) - { point = Object::SnapPointToGrid(point); - oldPoint = point; - } + + // We always snap to object points, and they take precendence over + // grid points... + if (Object::snapPointIsValid) + point = Object::snapPoint; toolAction->MouseMoved(point); - update(); } + + // This is used to draw the tool crosshair... + oldPoint = point; + + if (document.NeedsUpdate() || Object::selectionInProgress || toolAction) + update(); } @@ -497,26 +527,45 @@ void DrawingView::mouseReleaseEvent(QMouseEvent * event) } -void DrawingView::keyPressEvent(QKeyEvent * event) +void DrawingView::wheelEvent(QWheelEvent * event) { - if (toolAction) - { - bool needUpdate = toolAction->KeyDown(event->key()); + double zoomFactor = 1.25; + QSize sizeWin = size(); + Vector center(sizeWin.width() / 2.0, sizeWin.height() / 2.0); + center = Painter::QtToCartesianCoords(center); - if (needUpdate) - update(); + // This is not centering for some reason. Need to figure out why. :-/ + if (event->delta() > 0) + { + Vector newOrigin = center - ((center - Painter::origin) / zoomFactor); + Painter::origin = newOrigin; + Painter::zoom *= zoomFactor; } + else + { + Vector newOrigin = center + ((-center + Painter::origin) * zoomFactor); + Painter::origin = newOrigin; + Painter::zoom /= zoomFactor; + } + +// Object::gridSpacing = gridPixels / Painter::zoom; +// UpdateGridBackground(); + SetGridSize(Object::gridSpacing * Painter::zoom); + update(); +// zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(Object::gridSpacing)); } -void DrawingView::keyReleaseEvent(QKeyEvent * event) +void DrawingView::keyPressEvent(QKeyEvent * event) { if (toolAction) - { - bool needUpdate = toolAction->KeyReleased(event->key()); + toolAction->KeyDown(event->key()); +} - if (needUpdate) - update(); - } + +void DrawingView::keyReleaseEvent(QKeyEvent * event) +{ + if (toolAction) + toolAction->KeyReleased(event->key()); }