DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent),
// The value in the settings file will override this.
useAntialiasing(true),
- gridBackground(256, 256),
+ gridBackground(512, 512),
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),
- selectionInProgress(false),
+// selectionInProgress(false),
toolAction(NULL)
{
document.isTopLevelContainer = true;
// 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);
+
+/*
+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.
+
+
+*/
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.fillRect(0, 0, 512, 512, 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<511; i+=12)
+ {
+ pmp.drawLine(i, 0, i, 511);
+ pmp.drawLine(0, i, 511, i);
+ }
+
pmp.end();
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
pal.setBrush(backgroundRole(), QBrush(pm));
setAutoFillBackground(true);
setPalette(pal);
-#endif
}
QPainter qtPainter(this);
Painter painter(&qtPainter);
-// qtPainter.setBackground(QBrush(Qt::DiagCrossPattern));
-// qtPainter.setBackgroundMode(Qt::OpaqueMode);
-
if (useAntialiasing)
qtPainter.setRenderHint(QPainter::Antialiasing);
// 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));
}
// 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; x<size().width(); x+=gridSpacing*10.0)
- painter.drawLine((int)x, -16384, (int)x, 16384);
-
- for(double y=0; y<size().height(); y+=gridSpacing*10.0)
- painter.drawLine(-16384, (int)y, 16384, (int)y);
-#endif
-
-// painter.SetPen(QPen(Qt::black, 1.0, Qt::SolidLine));
-//
-// for(double x=0; x<size().width(); x+=gridSpacing)
-// for(double y=0; y<size().height(); y+=gridSpacing)
-// painter.DrawPoint((int)x, (int)y);
+// with it??? YES!!
// The top level document takes care of rendering for us...
document.Draw(&painter);
if (toolAction)
toolAction->Draw(&painter);
- if (selectionInProgress)
+ 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(selection);
+ painter.DrawRect(Object::selection);
}
}
// Didn't hit any object and not using a tool, so do a selection rectangle
if (!(collided || toolAction))
{
- selectionInProgress = true;
- selection.setTopLeft(QPointF(point.x, point.y));
- selection.setBottomRight(QPointF(point.x, point.y));
+ 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)
void DrawingView::mouseMoveEvent(QMouseEvent * event)
{
Vector point = Painter::QtToCartesianCoords(Vector(event->x(), event->y()));
- selection.setBottomRight(QPointF(point.x, point.y));
+ Object::selection.setBottomRight(QPointF(point.x, point.y));
if (event->buttons() & Qt::MiddleButton)
{
//changed...
document.PointerMoved(point);
- if (document.NeedsUpdate() || selectionInProgress)
+ if (document.NeedsUpdate() || Object::selectionInProgress)
update();
if (toolAction)
if (toolAction)
toolAction->MouseReleased();
- if (selectionInProgress)
+ if (Object::selectionInProgress)
{
// Select all the stuff inside of selection
- selectionInProgress = false;
+ Object::selectionInProgress = false;
}
}
else if (event->button() == Qt::MiddleButton)
projects / architektonas / blobdiff