X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.cpp;h=8f689a80bd0e33cd2ef3000ba7bff14fea6d5c59;hb=11802354d1ddc5bc571d83d8fc9b600618cb4372;hp=4a71fa6469a7160c644dddce86bd0a394927497e;hpb=b5981e2c452fa0ad5d922025780f9200450698dc;p=architektonas diff --git a/src/drawingview.cpp b/src/drawingview.cpp index 4a71fa6..8f689a8 100644 --- a/src/drawingview.cpp +++ b/src/drawingview.cpp @@ -4,7 +4,7 @@ // (C) 2011 Underground Software // See the README and GPLv3 files for licensing and warranty information // -// JLH = James L. Hammons +// JLH = James Hammons // // Who When What // --- ---------- ------------------------------------------------------------- @@ -14,11 +14,11 @@ // 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: // -// - 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. // // Uncomment this for debugging... @@ -34,18 +34,29 @@ #include "arc.h" #include "circle.h" #include "dimension.h" +#include "drawcircleaction.h" +#include "drawdimensionaction.h" +#include "drawlineaction.h" #include "line.h" #include "painter.h" +#define BACKGROUND_MAX_SIZE 512 + + 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(32.0), collided(false), rotateTool(false), rx(150.0), ry(150.0), - scrollDrag(false) + 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) { + document.isTopLevelContainer = true; setBackgroundRole(QPalette::Base); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); @@ -63,21 +74,242 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent), 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)); #if 1 - Dimension * dimension = new Dimension(Vector(0, 0), Vector(0, 0), &document); + 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 + +/* +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. + +*/ +#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(); +} + + +void DrawingView::SetAddDimensionToolActive(bool state/*= true*/) +{ + if (state) + { + toolAction = new DrawDimensionAction(); + connect(toolAction, SIGNAL(ObjectReady(Object *)), this, + SLOT(AddNewObjectToDocument(Object *))); + } + + update(); +} + + +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; + 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); +} + + QPoint DrawingView::GetAdjustedMousePosition(QMouseEvent * event) { // This is undoing the transform, e.g. going from client coords to local coords. @@ -86,6 +318,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?) @@ -94,6 +327,7 @@ QPoint DrawingView::GetAdjustedClientPosition(int x, int y) return QPoint(-offsetX + x, (size().height() - (-offsetY + y)) * +1.0); } + void DrawingView::paintEvent(QPaintEvent * /*event*/) { QPainter qtPainter(this); @@ -102,7 +336,7 @@ void DrawingView::paintEvent(QPaintEvent * /*event*/) if (useAntialiasing) qtPainter.setRenderHint(QPainter::Antialiasing); - Painter::screenSize = Vector(size().width(), size().height()); +// Painter::screenSize = Vector(size().width(), size().height()); Object::SetViewportHeight(size().height()); // Draw coordinate axes @@ -112,7 +346,9 @@ void DrawingView::paintEvent(QPaintEvent * /*event*/) 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)); @@ -121,31 +357,32 @@ void DrawingView::paintEvent(QPaintEvent * /*event*/) } // Maybe we can make the grid into a background brush instead, and let Qt deal -// with it??? - // Draw grid +// with it??? YES!! -#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); - painter.SetPen(QPen(Qt::black, 1.0, Qt::SolidLine)); + 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); + } +} - for(double x=0; xbutton() == Qt::LeftButton) @@ -155,6 +392,17 @@ void DrawingView::mousePressEvent(QMouseEvent * event) if (collided) update(); // Do an update if collided with at least *one* object in the document + + if (toolAction) + 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) { @@ -165,19 +413,23 @@ 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)); 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 them. :-) + // conform to Cartesian coords, since the origin is using Cartesian. :-) Vector delta(point, oldPoint); delta /= Painter::zoom; delta.y = -delta.y; Painter::origin -= delta; + + UpdateGridBackground(); update(); oldPoint = point; return; @@ -195,6 +447,10 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event) { 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!!! @@ -205,10 +461,17 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event) //changed... document.PointerMoved(point); - if (document.NeedsUpdate()) + if (document.NeedsUpdate() || Object::selectionInProgress) + update(); + + if (toolAction) + { + toolAction->MouseMoved(point); update(); + } } + void DrawingView::mouseReleaseEvent(QMouseEvent * event) { if (event->button() == Qt::LeftButton) @@ -221,6 +484,15 @@ void DrawingView::mouseReleaseEvent(QMouseEvent * event) // if (document.NeedsUpdate()) // if (collided) update(); // Do an update if collided with at least *one* object in the document + + if (toolAction) + toolAction->MouseReleased(); + + if (Object::selectionInProgress) + { + // Select all the stuff inside of selection + Object::selectionInProgress = false; + } } else if (event->button() == Qt::MiddleButton) { @@ -228,3 +500,4 @@ void DrawingView::mouseReleaseEvent(QMouseEvent * event) setCursor(Qt::ArrowCursor); } } +