// (C) 2011 Underground Software
// See the README and GPLv3 files for licensing and warranty information
//
-// JLH = James L. Hammons <jlhamm@acm.org>
+// JLH = James Hammons <jlhamm@acm.org>
//
// Who When What
// --- ---------- -------------------------------------------------------------
// 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...
#include "arc.h"
#include "circle.h"
#include "dimension.h"
+#include "drawcircleaction.h"
+#include "drawdimensionaction.h"
#include "drawlineaction.h"
#include "line.h"
#include "painter.h"
DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent),
// The value in the settings file will override this.
useAntialiasing(true),
+ 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),
- scrollDrag(false), addLineTool(false), toolAction(NULL)
+// 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),
+ toolAction(NULL)
{
+ document.isTopLevelContainer = true;
setBackgroundRole(QPalette::Base);
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
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
-// connect(toolAction, SIGNAL(ObjectReady(Object *)), this,
-// SLOT(AddNewObjectToDocument(Object *)));
+
+/*
+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);
+ 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<511; i+=12)
+ {
+ pmp.drawLine(i, 0, i, 511);
+ pmp.drawLine(0, i, 511, i);
+ }
+
+ pmp.end();
+ UpdateGridBackground();
}
+
void DrawingView::SetRotateToolActive(bool state/*= true*/)
{
rotateTool = state;
update();
}
+
void DrawingView::SetAddLineToolActive(bool state/*= true*/)
{
- if (state && toolAction == NULL)
+ if (state)
{
toolAction = new DrawLineAction();
connect(toolAction, SIGNAL(ObjectReady(Object *)), this,
SLOT(AddNewObjectToDocument(Object *)));
}
- else if (!state && toolAction)
+
+ update();
+//printf("DrawingView::SetAddLineToolActive(). toolAction=%08X\n", toolAction);
+}
+
+
+void DrawingView::SetAddCircleToolActive(bool state/*= true*/)
+{
+ if (state)
{
- delete toolAction;
- toolAction = NULL;
+ toolAction = new DrawCircleAction();
+ connect(toolAction, SIGNAL(ObjectReady(Object *)), this,
+ SLOT(AddNewObjectToDocument(Object *)));
}
- addLineTool = state;
update();
-//printf("DrawingView::SetAddLineToolActive(). toolAction=%08X\n", toolAction);
}
+
+void DrawingView::SetAddDimensionToolActive(bool state/*= true*/)
+{
+ if (state)
+ {
+ toolAction = new DrawDimensionAction();
+ connect(toolAction, SIGNAL(ObjectReady(Object *)), this,
+ SLOT(AddNewObjectToDocument(Object *)));
+ }
+
+ update();
+}
+
+
+void DrawingView::UpdateGridBackground(void)
+{
+//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);
+
+ // 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);
+ QPalette pal = palette();
+ pal.setBrush(backgroundRole(), QBrush(pm));
+ setAutoFillBackground(true);
+ setPalette(pal);
+}
+
+
void DrawingView::AddNewObjectToDocument(Object * object)
{
if (object)
//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.
return QPoint(offsetX + event->x(), offsetY + (size().height() - event->y()));
}
+
QPoint DrawingView::GetAdjustedClientPosition(int x, int y)
{
// VOODOO ALERT (ON Y COMPONENT!!!!) (eh?)
return QPoint(-offsetX + x, (size().height() - (-offsetY + y)) * +1.0);
}
+
void DrawingView::paintEvent(QPaintEvent * /*event*/)
{
QPainter qtPainter(this);
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));
}
// 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 (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);
+ }
}
+
void DrawingView::mousePressEvent(QMouseEvent * event)
{
if (event->button() == Qt::LeftButton)
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)
{
}
}
+
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)
{
delta /= Painter::zoom;
delta.y = -delta.y;
Painter::origin -= delta;
+
+ UpdateGridBackground();
update();
oldPoint = point;
return;
{
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!!!
//changed...
document.PointerMoved(point);
- if (document.NeedsUpdate())
+ if (document.NeedsUpdate() || Object::selectionInProgress)
update();
if (toolAction)
}
}
+
void DrawingView::mouseReleaseEvent(QMouseEvent * event)
{
if (event->button() == Qt::LeftButton)
if (toolAction)
toolAction->MouseReleased();
+
+ if (Object::selectionInProgress)
+ {
+ // Select all the stuff inside of selection
+ Object::selectionInProgress = false;
+ }
}
else if (event->button() == Qt::MiddleButton)
{
setCursor(Qt::ArrowCursor);
}
}
+
projects / architektonas / blobdiff