X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fpainter.cpp;h=7d146b1888cdfb3d5b430cf0c2e269860e4c2aee;hb=d549bfdc8c872b966b9d787c00e5e8027366093c;hp=1bb2e6bb33845aa3a000d385fb811efedeb366d1;hpb=6441dd1283d8a16b9a3a02df407f20434fa9dfa1;p=architektonas

diff --git a/src/painter.cpp b/src/painter.cpp
index 1bb2e6b..7d146b1 100644
--- a/src/painter.cpp
+++ b/src/painter.cpp
@@ -27,10 +27,12 @@ Painter::Painter(QPainter * p/*= NULL*/): painter(p)
 {
 }
 
+
 Painter::~Painter()
 {
 }
 
+
 Vector Painter::CartesianToQtCoords(Vector v)
 {
 	// Convert regular Cartesian coordinates to the inverted Y-axis Qt coordinates
@@ -38,6 +40,7 @@ Vector Painter::CartesianToQtCoords(Vector v)
 	return Vector((v.x - origin.x) * zoom, screenSize.y - ((v.y - origin.y) * zoom));
 }
 
+
 Vector Painter::QtToCartesianCoords(Vector v)
 {
 	// Convert screen location, with inverted Y-axis coordinates, to regular
@@ -66,6 +69,7 @@ The way we calculate the Cartesian to Qt shows the 2nd (origin is cartesian) to
 */
 }
 
+
 void Painter::SetRenderHint(int hint)
 {
 	if (!painter)
@@ -74,6 +78,7 @@ void Painter::SetRenderHint(int hint)
 	painter->setRenderHint((QPainter::RenderHint)hint);
 }
 
+
 void Painter::SetBrush(QBrush brush)
 {
 	if (!painter)
@@ -82,6 +87,7 @@ void Painter::SetBrush(QBrush brush)
 	painter->setBrush(brush);
 }
 
+
 void Painter::SetFont(QFont font)
 {
 	if (!painter)
@@ -90,6 +96,7 @@ void Painter::SetFont(QFont font)
 	painter->setFont(font);
 }
 
+
 void Painter::SetPen(QPen pen)
 {
 	if (!painter)
@@ -98,6 +105,7 @@ void Painter::SetPen(QPen pen)
 	painter->setPen(pen);
 }
 
+
 void Painter::DrawAngledText(Vector center, double angle, QString text)
 {
 	if (!painter)
@@ -111,20 +119,21 @@ void Painter::DrawAngledText(Vector center, double angle, QString text)
 	// We may need this stuff... If dimension text is large enough.
 //	int textWidth = QFontMetrics(painter->font()).width(text);
 //	int textHeight = QFontMetrics(painter->font()).height();
-	QRectF textBox(-100 * zoom, -100 * zoom, 200 * zoom, 200 * zoom);	// x, y, w, h; x/y = upper left corner
+// 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
 
 	// 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 :-)
-	int yOffset = -12 * zoom;
+	float yOffset = -12.0 * zoom * SCREEN_ZOOM;
 
 	// Fix text so it isn't upside down...
 	if ((angle > PI * 0.5) && (angle < PI * 1.5))
 	{
 		angle += PI;
-		yOffset = 12 * zoom;
+		yOffset = 12.0 * zoom * SCREEN_ZOOM;
 	}
 
 #if 0
@@ -142,6 +151,7 @@ void Painter::DrawAngledText(Vector center, double angle, QString text)
 	painter->restore();
 }
 
+
 void Painter::DrawArc(Vector center, double radius, double startAngle, double span)
 {
 	center = CartesianToQtCoords(center);
@@ -154,6 +164,7 @@ void Painter::DrawArc(Vector center, double radius, double startAngle, double sp
 	painter->drawArc(rectangle, angle1, angle2);
 }
 
+
 void Painter::DrawEllipse(Vector center, double axis1, double axis2)
 {
 	// Need to multiply scalar quantities by the zoom factor as well...
@@ -161,14 +172,17 @@ void Painter::DrawEllipse(Vector center, double axis1, double axis2)
 	painter->drawEllipse(QPointF(center.x, center.y), axis1 * zoom, axis2 * zoom);
 }
 
+
 // This function is for drawing object handles without regard for zoom level;
 // we don't want our object handle size to depend on the zoom level!
 void Painter::DrawHandle(Vector center)
 {
 	center = CartesianToQtCoords(center);
+	painter->setBrush(Qt::NoBrush);
 	painter->drawEllipse(QPointF(center.x, center.y), 4.0, 4.0);
 }
 
+
 void Painter::DrawLine(int x1, int y1, int x2, int y2)
 {
 	if (!painter)
@@ -179,6 +193,7 @@ void Painter::DrawLine(int x1, int y1, int x2, int y2)
 	painter->drawLine(v1.x, v1.y, v2.x, v2.y);
 }
 
+
 void Painter::DrawLine(Vector v1, Vector v2)
 {
 	if (!painter)
@@ -189,6 +204,7 @@ void Painter::DrawLine(Vector v1, Vector v2)
 	painter->drawLine(QPointF(v1.x, v1.y), QPointF(v2.x, v2.y));
 }
 
+
 void Painter::DrawPoint(int x, int y)
 {
 	if (!painter)
@@ -198,6 +214,7 @@ void Painter::DrawPoint(int x, int y)
 	painter->drawPoint(v.x, v.y);
 }
 
+
 void Painter::DrawRoundedRect(QRectF rect, double radiusX, double radiusY)
 {
 	if (!painter)
@@ -206,6 +223,19 @@ void Painter::DrawRoundedRect(QRectF rect, double radiusX, double radiusY)
 	painter->drawRoundedRect(rect, radiusX, radiusY);
 }
 
+
+void Painter::DrawRect(QRectF rect)
+{
+	if (!painter)
+		return;
+
+	Vector v1 = CartesianToQtCoords(Vector(rect.x(), rect.y()));
+	Vector v2 = CartesianToQtCoords(Vector(rect.right(), rect.bottom()));
+	QRectF screenRect(QPointF(v1.x, v1.y), QPointF(v2.x, v2.y));
+	painter->drawRect(screenRect);
+}
+
+
 void Painter::DrawText(QRectF rect, int type, QString text)
 {
 	if (!painter)
@@ -214,6 +244,7 @@ void Painter::DrawText(QRectF rect, int type, QString text)
 	painter->drawText(rect, (Qt::AlignmentFlag)type, text);
 }
 
+
 void Painter::DrawArrowhead(Vector head, Vector tail)
 {
 	QPolygonF arrow;
@@ -224,9 +255,10 @@ void Painter::DrawArrowhead(Vector head, Vector tail)
 	Vector orthogonal = Vector(cos(orthoAngle), sin(orthoAngle));
 	Vector unit = Vector(head - tail).Unit();
 
-	Point p1 = head - (unit * 9.0);
-	Point p2 = p1 + (orthogonal * 3.0);
-	Point p3 = p1 - (orthogonal * 3.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);
 
 	Point p4 = CartesianToQtCoords(head);
 	Point p5 = CartesianToQtCoords(p2);