X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.cpp;h=8f689a80bd0e33cd2ef3000ba7bff14fea6d5c59;hb=11802354d1ddc5bc571d83d8fc9b600618cb4372;hp=23c1d49100ad95f26a55aeb7e1a441a1a8875d0b;hpb=59e5af9d8606aa091fa979e19f78e9325a1c0825;p=architektonas diff --git a/src/drawingview.cpp b/src/drawingview.cpp index 23c1d49..8f689a8 100644 --- a/src/drawingview.cpp +++ b/src/drawingview.cpp @@ -41,17 +41,19 @@ #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(256, 256), + 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), - gridSpacing(12.0), collided(false), rotateTool(false), rx(150.0), ry(150.0), + gridSpacing(12.0), gridPixels(0), collided(false), rotateTool(false), + rx(150.0), ry(150.0), scrollDrag(false), addLineTool(false), addCircleTool(false), addDimensionTool(false), -// selectionInProgress(false), toolAction(NULL) { document.isTopLevelContainer = true; @@ -79,32 +81,68 @@ 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); + +/* +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 - 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)); + 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<255; i+=12) - pmp.drawLine(i, 0, i, 255); - for(int i=0; i<255; i+=12) - pmp.drawLine(0, i, 255, i); -#endif + + 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 } @@ -155,44 +193,108 @@ void DrawingView::SetAddDimensionToolActive(bool state/*= true*/) } +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) { -#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 } @@ -231,13 +333,10 @@ 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()); +// Painter::screenSize = Vector(size().width(), size().height()); Object::SetViewportHeight(size().height()); // Draw coordinate axes @@ -249,6 +348,7 @@ void DrawingView::paintEvent(QPaintEvent * /*event*/) // 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)); @@ -257,26 +357,7 @@ void DrawingView::paintEvent(QPaintEvent * /*event*/) } // 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; xbutton() == Qt::LeftButton)