X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.cpp;h=0d62be16552d6eafc26e70268b8b085faa6b2ace;hb=7b7c8ec7d7f5379e09a8b7392f465f41639b0c79;hp=eccb0b170d2647c421d9269ae8701aad5aa199b5;hpb=4cb2b99e799d81dc8f589c54fb81fe20ef9ec2ad;p=architektonas

diff --git a/src/drawingview.cpp b/src/drawingview.cpp
index eccb0b1..0d62be1 100644
--- a/src/drawingview.cpp
+++ b/src/drawingview.cpp
@@ -14,11 +14,11 @@
 
 // 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...
@@ -43,6 +43,7 @@
 DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent),
 	// The value in the settings file will override this.
 	useAntialiasing(true),
+	gridBackground(256, 256),
 	scale(1.0), offsetX(-10), offsetY(-10),
 	document(Vector(0, 0)),
 	gridSpacing(32.0), collided(false), rotateTool(false), rx(150.0), ry(150.0),
@@ -74,6 +75,30 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent),
 #endif
 //	connect(toolAction, SIGNAL(ObjectReady(Object *)), this,
 //		SLOT(AddNewObjectToDocument(Object *)));
+//This works, now how to scroll it???
+//	QPixmap pm(256, 256);
+	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.setPen(QPen(QColor(190, 190, 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
+	pmp.end();
+	UpdateGridBackground();
 }
 
 void DrawingView::SetRotateToolActive(bool state/*= true*/)
@@ -128,6 +153,45 @@ void DrawingView::SetAddCircleToolActive(bool state/*= true*/)
 //printf("DrawingView::SetAddCircleToolActive(). toolAction=%08X\n", toolAction);
 }
 
+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;
+	// 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);
+#endif
+}
+
 void DrawingView::AddNewObjectToDocument(Object * object)
 {
 	if (object)
@@ -160,6 +224,9 @@ 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);
 
@@ -245,6 +312,8 @@ void DrawingView::mouseMoveEvent(QMouseEvent * event)
 		delta /= Painter::zoom;
 		delta.y = -delta.y;
 		Painter::origin -= delta;
+
+		UpdateGridBackground();
 		update();
 		oldPoint = point;
 		return;