X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.cpp;h=fc30ac8e259ce61a092b35210f2ab6280ce2b457;hb=7f3a6b11585376eecd80979ec3da2346c5314d88;hp=330f73377540c8e96c9cd2388f0888344534dfde;hpb=e11a07565fe5ef3dfafbf9a933d7a1575e058867;p=architektonas diff --git a/src/drawingview.cpp b/src/drawingview.cpp index 330f733..fc30ac8 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,31 +35,29 @@ #include "arc.h" #include "circle.h" #include "dimension.h" -#include "drawcircleaction.h" -#include "drawdimensionaction.h" -#include "drawlineaction.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(256, 256), - scale(1.0), offsetX(-10), offsetY(-10), - document(Vector(0, 0)), -// gridSpacing(32.0), collided(false), rotateTool(false), rx(150.0), ry(150.0), - gridSpacing(12.0), collided(false), rotateTool(false), rx(150.0), ry(150.0), - scrollDrag(false), addLineTool(false), addCircleTool(false), - addDimensionTool(false), toolAction(NULL) + 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; setBackgroundRole(QPalette::Base); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); -// 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); @@ -76,120 +75,172 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent), // Alternate way to do the above... line->SetDimensionOnLine(); #endif -// connect(toolAction, SIGNAL(ObjectReady(Object *)), this, -// SLOT(AddNewObjectToDocument(Object *))); -//This works, now how to scroll it??? -// QPixmap pm(256, 256); - QPainter pmp(&gridBackground); -#if 0 - pmp.fillRect(0, 0, 256, 256, Qt::lightGray); - - pmp.fillRect(0, 64, 64, 64, Qt::darkGray); - pmp.fillRect(0, 192, 64, 64, Qt::darkGray); - pmp.fillRect(64, 0, 64, 64, Qt::darkGray); - pmp.fillRect(64, 128, 64, 64, Qt::darkGray); - pmp.fillRect(128, 64, 64, 64, Qt::darkGray); - pmp.fillRect(128, 192, 64, 64, Qt::darkGray); - pmp.fillRect(192, 0, 64, 64, Qt::darkGray); - pmp.fillRect(192, 128, 64, 64, Qt::darkGray); -#else - pmp.fillRect(0, 0, 256, 256, QColor(240, 240, 240)); - pmp.setPen(QPen(QColor(210, 210, 255), 2.0, Qt::SolidLine)); - for(int i=0; i<255; i+=12) - pmp.drawLine(i, 0, i, 255); - for(int i=0; i<255; i+=12) - pmp.drawLine(0, i, 255, i); -#endif - pmp.end(); - UpdateGridBackground(); -} - -void DrawingView::SetRotateToolActive(bool state/*= true*/) -{ - rotateTool = state; - update(); +/* +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 / Painter::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 +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. + +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. Painter::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. + +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 +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 } -void DrawingView::SetAddLineToolActive(bool state/*= true*/) +void DrawingView::SetToolActive(Action * action) { - if (state) + if (action != NULL) { - toolAction = new DrawLineAction(); + toolAction = action; connect(toolAction, SIGNAL(ObjectReady(Object *)), this, SLOT(AddNewObjectToDocument(Object *))); + connect(toolAction, SIGNAL(NeedRefresh()), this, SLOT(HandleActionUpdate())); } - - update(); -//printf("DrawingView::SetAddLineToolActive(). toolAction=%08X\n", toolAction); } -void DrawingView::SetAddCircleToolActive(bool state/*= true*/) +void DrawingView::SetGridSize(uint32_t size) { - if (state) - { - toolAction = new DrawCircleAction(); - connect(toolAction, SIGNAL(ObjectReady(Object *)), this, - SLOT(AddNewObjectToDocument(Object *))); - } - - update(); -} + // 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)); -void DrawingView::SetAddDimensionToolActive(bool state/*= true*/) -{ - if (state) + for(int i=0; i<(BACKGROUND_MAX_SIZE-1); i+=gridPixels) { - toolAction = new DrawDimensionAction(); - connect(toolAction, SIGNAL(ObjectReady(Object *)), this, - SLOT(AddNewObjectToDocument(Object *))); + pmp.drawLine(i, 0, i, BACKGROUND_MAX_SIZE - 1); + pmp.drawLine(0, i, BACKGROUND_MAX_SIZE - 1, i); } - update(); + pmp.end(); + + // Set up new BG brush & zoom level (pixels per base unit) +// Painter::zoom = gridPixels / gridSpacing; + Painter::zoom = gridPixels / Object::gridSpacing; + UpdateGridBackground(); } void DrawingView::UpdateGridBackground(void) { -#if 0 -// Shift the background to match our scrolling... -QBrush newBrush = *backgroundBrush; -//QMatrix brushMatrix = backgroundBrush->matrix(); -QTransform brushMatrix = backgroundBrush->transform(); -brushMatrix.translate(Painter::origin.x, Painter::origin.y); -//brushMatrix.translate(15.0, 15.0); -//backgroundBrush->setMatrix(brushMatrix); -//backgroundBrush->setTransform(brushMatrix); -newBrush.setTransform(brushMatrix); -QPalette pal = palette(); -//pal.setBrush(backgroundRole(), *backgroundBrush); -pal.setBrush(backgroundRole(), newBrush); -setPalette(pal); -//Background painting does not honor the transformation matrix (either one)... -// So... -#else -//was: 128 -#define BG_BRUSH_SPAN 72 // 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] - x = (x < 0 ? 0 : BG_BRUSH_SPAN - 1) - (x % BG_BRUSH_SPAN); - y = (y < 0 ? 0 : BG_BRUSH_SPAN - 1) - (y % BG_BRUSH_SPAN); +/* +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, BG_BRUSH_SPAN, BG_BRUSH_SPAN); + QPixmap pm = gridBackground.copy(x, y, gridPixels, gridPixels); QPalette pal = palette(); pal.setBrush(backgroundRole(), QBrush(pm)); setAutoFillBackground(true); setPalette(pal); -#endif } @@ -205,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. @@ -228,58 +292,39 @@ void DrawingView::paintEvent(QPaintEvent * /*event*/) QPainter qtPainter(this); Painter painter(&qtPainter); -// qtPainter.setBackground(QBrush(Qt::DiagCrossPattern)); -// qtPainter.setBackgroundMode(Qt::OpaqueMode); - 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... - 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??? - // Draw grid - -#if 0 - painter.setPen(QPen(QColor(90, 90, 90), 1.0, Qt::DotLine)); - - //these two loops kill performance! - // Also, these overwrite our coordinate axes - for(double x=0; xDraw(&painter); + } + + if (Object::selectionInProgress) + { + painter.SetPen(QPen(QColor(255, 127, 0, 255))); + painter.SetBrush(QBrush(QColor(255, 127, 0, 100))); + painter.DrawRect(Object::selection); + } +} + + +void DrawingView::resizeEvent(QResizeEvent * /*event*/) +{ + Painter::screenSize = Vector(size().width(), size().height()); + UpdateGridBackground(); } @@ -290,11 +335,30 @@ void DrawingView::mousePressEvent(QMouseEvent * event) Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y())); 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); + } + + // Didn't hit any object and not using a tool, so do a selection rectangle + if (!(collided || toolAction)) + { + Object::selectionInProgress = true; + Object::selection.setTopLeft(QPointF(point.x, point.y)); + Object::selection.setBottomRight(QPointF(point.x, point.y)); + } } else if (event->button() == Qt::MiddleButton) { @@ -309,13 +373,17 @@ 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)); + // 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; @@ -326,40 +394,96 @@ 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) +#if 0 + // Grid processing... (only snap here is left button is down) + if ((event->buttons() & Qt::LeftButton) && Object::snapToGrid) + { + point = Object::SnapPointToGrid(point); + } + + // Snap points on objects always take precedence over the grid, whether + // dragging an object or not... +//thisnowok + if (Object::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 = 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()) - update(); + // This returns true if we've moved over an object... + if (document.PointerMoved(point)) + { + // 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); + + // 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(); } @@ -378,6 +502,12 @@ void DrawingView::mouseReleaseEvent(QMouseEvent * event) if (toolAction) toolAction->MouseReleased(); + + if (Object::selectionInProgress) + { + // Select all the stuff inside of selection + Object::selectionInProgress = false; + } } else if (event->button() == Qt::MiddleButton) { @@ -386,3 +516,46 @@ 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 - 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::keyPressEvent(QKeyEvent * event) +{ + if (toolAction) + toolAction->KeyDown(event->key()); +} + + +void DrawingView::keyReleaseEvent(QKeyEvent * event) +{ + if (toolAction) + toolAction->KeyReleased(event->key()); +} +