// This just zooms leaving origin intact... should zoom in at the current center! [DONE]
Painter::zoom *= zoomFactor;
drawing->gridSpacing = 12.0 / Painter::zoom;
- zoomIndicator->setText(QString("Grid: %2\" Zoom: %1%").arg(Painter::zoom * 100.0 * SCREEN_ZOOM).arg(drawing->gridSpacing));
+// zoomIndicator->setText(QString("Grid: %2\" Zoom: %1%").arg(Painter::zoom * 100.0 * SCREEN_ZOOM).arg(drawing->gridSpacing));
+ zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(drawing->gridSpacing));
drawing->UpdateGridBackground();
drawing->update();
}
// This just zooms leaving origin intact... should zoom out at the current center! [DONE]
Painter::zoom /= zoomFactor;
drawing->gridSpacing = 12.0 / Painter::zoom;
- zoomIndicator->setText(QString("Grid: %2\" Zoom: %1%").arg(Painter::zoom * 100.0 * SCREEN_ZOOM).arg(drawing->gridSpacing));
+// zoomIndicator->setText(QString("Grid: %2\" Zoom: %1%").arg(Painter::zoom * 100.0 * SCREEN_ZOOM).arg(drawing->gridSpacing));
+ zoomIndicator->setText(QString("Grid: %1\", BU: Inch").arg(drawing->gridSpacing));
drawing->UpdateGridBackground();
drawing->update();
}
QPushButton * pb2 = new QPushButton("-");
QPushButton * pb3 = new QPushButton("Edit");
QPushButton * pb4 = new QPushButton("Import");
-// QPushButton * pb5 = new QPushButton("v");
QHBoxLayout * hbox1 = new QHBoxLayout;
hbox1->addWidget(pb1);
hbox1->addWidget(pb2);
hbox1->addWidget(pb3);
hbox1->addWidget(pb4);
-// hbox1->addWidget(pb5);
hbox1->addStretch();
QVBoxLayout * mainLayout = new QVBoxLayout;
Dimension::Dimension(Vector p1, Vector p2, DimensionType dt/*= DTLinear*/ ,Object * p/*= NULL*/):
Object(p1, p), endpoint(p2),
dragging(false), draggingHandle1(false), draggingHandle2(false),
- length(p2.Magnitude()), dimensionType(dt), point1(NULL), point2(NULL)
+ length(p2.Magnitude()), dimensionType(dt), point1(NULL), point2(NULL),
+ size(0.25)
{
+ // We set the size to 1/4 base unit. Could be anything.
type = OTDimension;
}
// This is bad, p1 & p2 could be NULL, causing much consternation...
Dimension::Dimension(Connection p1, Connection p2, DimensionType dt/*= DTLinear*/ , Object * p/*= NULL*/):
dragging(false), draggingHandle1(false), draggingHandle2(false),
- length(0), dimensionType(dt), point1(p1), point2(p2)
+ length(0), dimensionType(dt), point1(p1), point2(p2),
+ size(0.25)
{
type = OTDimension;
}
Vector orthogonal = Vector(cos(orthoAngle), sin(orthoAngle));
Vector unit = Vector(endpoint - position).Unit();
+#if 0
//NOTE: SCREEN_ZOOM is our kludge factor... We need to figure out a better
// way of doing this...
// Get our line parallel to our points
Point p4 = endpoint + (orthogonal * 16.0 * SCREEN_ZOOM);
Point p5 = position + (orthogonal * 4.0 * SCREEN_ZOOM);
Point p6 = endpoint + (orthogonal * 4.0 * SCREEN_ZOOM);
+#else
+/*
+The numbers hardcoded into here, what are they?
+I believe they are pixels.
+*/
+
+ // Get our line parallel to our points
+ Point p1 = position + (orthogonal * 10.0 * size);
+ Point p2 = endpoint + (orthogonal * 10.0 * size);
+
+ // Draw main dimension line
+ painter->DrawLine(p1, p2);
+
+ Point p3 = position + (orthogonal * 16.0 * size);
+ Point p4 = endpoint + (orthogonal * 16.0 * size);
+ Point p5 = position + (orthogonal * 4.0 * size);
+ Point p6 = endpoint + (orthogonal * 4.0 * size);
+#endif
// Draw extension lines
painter->DrawLine(p3, p5);
painter->DrawLine(p4, p6);
painter->SetBrush(QBrush(QColor(Qt::blue)));
- painter->DrawArrowhead(p1, p2);
- painter->DrawArrowhead(p2, p1);
+// painter->DrawArrowhead(p1, p2);
+// painter->DrawArrowhead(p2, p1);
+ painter->DrawArrowhead(p1, p2, size);
+ painter->DrawArrowhead(p2, p1, size);
// Draw length of dimension line...
- painter->SetFont(QFont("Arial", 10.0 * Painter::zoom * SCREEN_ZOOM));
+// painter->SetFont(QFont("Arial", 10.0 * Painter::zoom * SCREEN_ZOOM));
+ painter->SetFont(QFont("Arial", 10.0 * Painter::zoom * size));
Vector v1((p1.x - p2.x) / 2.0, (p1.y - p2.y) / 2.0);
Point ctr = p2 + v1;
QString dimText = QString("%1\"").arg(Vector(endpoint - position).Magnitude());
- painter->DrawAngledText(ctr, angle, dimText);
+// painter->DrawAngledText(ctr, angle, dimText);
+ painter->DrawAngledText(ctr, angle, dimText, size);
}
virtual void Disconnect(Object *, double);
virtual void DisconnectAll(Object *);
virtual QRectF Extents(void);
-// virtual ObjectType Type(void);
void FlipSides(void);
protected:
bool objectWasDragged;
double length;
DimensionType dimensionType;
+ double size; // Size of arrows/text in base units
// We use these in lieu of the built-in connected[] array; no reason to
// do it this way especially
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),
// 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);
}
-void Painter::DrawAngledText(Vector center, double angle, QString text)
+void Painter::DrawAngledText(Vector center, double angle, QString text, double size)
{
if (!painter)
return;
// int textWidth = QFontMetrics(painter->font()).width(text);
// int textHeight = QFontMetrics(painter->font()).height();
// NOTE: SCREEN_ZOOM is a kludge to make things look right at screen resolution...
- QRectF textBox(-100.0 * zoom * SCREEN_ZOOM, -100.0 * zoom * SCREEN_ZOOM, 200.0 * zoom * SCREEN_ZOOM, 200.0 * zoom * SCREEN_ZOOM); // x, y, w, h; x/y = upper left corner
+// QRectF textBox(-100.0 * zoom * SCREEN_ZOOM, -100.0 * zoom * SCREEN_ZOOM, 200.0 * zoom * SCREEN_ZOOM, 200.0 * zoom * SCREEN_ZOOM); // x, y, w, h; x/y = upper left corner
+ QRectF textBox(-100.0 * zoom * size, -100.0 * zoom * size, 200.0 * zoom * size, 200.0 * zoom * size); // x, y, w, h; x/y = upper left corner
// This is in pixels. Might not render correctly at all zoom levels.
// Need to figure out if dimensions are always rendered at one size regardless of zoom,
// or if they have a definite size, and are thus zoomable.
// If zoomable, this is incorrect:
// (Added zoom, so this is correct now :-)
- float yOffset = -12.0 * zoom * SCREEN_ZOOM;
+// float yOffset = -12.0 * zoom * SCREEN_ZOOM;
+ float yOffset = -12.0 * zoom * size;
// Fix text so it isn't upside down...
if ((angle > PI * 0.5) && (angle < PI * 1.5))
{
angle += PI;
- yOffset = 12.0 * zoom * SCREEN_ZOOM;
+// yOffset = 12.0 * zoom * SCREEN_ZOOM;
+ yOffset = 12.0 * zoom * size;
}
#if 0
}
-void Painter::DrawArrowhead(Vector head, Vector tail)
+void Painter::DrawArrowhead(Vector head, Vector tail, double size)
{
QPolygonF arrow;
Vector orthogonal = Vector(cos(orthoAngle), sin(orthoAngle));
Vector unit = Vector(head - tail).Unit();
+#if 0
// NOTE: SCREEN_ZOOM is a kludge to make things look right at scale...
Point p1 = head - (unit * 9.0 * SCREEN_ZOOM);
Point p2 = p1 + (orthogonal * 3.0 * SCREEN_ZOOM);
Point p3 = p1 - (orthogonal * 3.0 * SCREEN_ZOOM);
+#else
+ Point p1 = head - (unit * 9.0 * size);
+ Point p2 = p1 + (orthogonal * 3.0 * size);
+ Point p3 = p1 - (orthogonal * 3.0 * size);
+#endif
Point p4 = CartesianToQtCoords(head);
Point p5 = CartesianToQtCoords(p2);
#include <QtGui>
#include "vector.h"
-#define SCREEN_ZOOM (1.0 / 4.0)
+//#define SCREEN_ZOOM (1.0 / 4.0)
// Forward declarations
void SetBrush(QBrush);
void SetFont(QFont);
void SetPen(QPen);
- void DrawAngledText(Vector, double, QString);
+ void DrawAngledText(Vector, double, QString, double);
void DrawArc(Vector, double, double, double);
void DrawEllipse(Vector, double, double);
void DrawHandle(Vector);
void DrawRoundedRect(QRectF, double, double);
void DrawRect(QRectF);
void DrawText(QRectF, int, QString);
- void DrawArrowhead(Vector, Vector);
+ void DrawArrowhead(Vector, Vector, double);
public:
static Vector CartesianToQtCoords(Vector);
projects / architektonas / commitdiff
