X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdrawingview.cpp;h=656545b945c3738442e47513b96878f2843fe2f1;hb=dbfab6256efe6b03e9750e33081d9dcdcdfc1c34;hp=3020368913cfa3b4358df95669b1b65649523d15;hpb=642cf72c11b49a9e00128ab6258a2438c785a5ab;p=architektonas

diff --git a/src/drawingview.cpp b/src/drawingview.cpp
index 3020368..656545b 100644
--- a/src/drawingview.cpp
+++ b/src/drawingview.cpp
@@ -19,6 +19,7 @@
 //
 // STILL TO BE DONE:
 //
+// - Lots of stuff
 //
 
 // Uncomment this for debugging...
@@ -40,6 +41,9 @@
 
 #define BACKGROUND_MAX_SIZE	512
 
+// Class variable
+//Container DrawingView::document(Vector(0, 0));
+
 
 DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent),
 	// The value in the settings file will override this.
@@ -47,8 +51,8 @@ DrawingView::DrawingView(QWidget * parent/*= NULL*/): QWidget(parent),
 	gridBackground(BACKGROUND_MAX_SIZE, BACKGROUND_MAX_SIZE),
 	scale(1.0), offsetX(-10), offsetY(-10),
 	document(Vector(0, 0)),
-	/*gridSpacing(12.0),*/ gridPixels(0), collided(false), rotateTool(false),
-	rx(150.0), ry(150.0),
+	/*gridSpacing(12.0),*/ gridPixels(0), collided(false), //rotateTool(false),
+//	rx(150.0), ry(150.0),
 //	scrollDrag(false), addLineTool(false), addCircleTool(false),
 //	addDimensionTool(false),
 	toolAction(NULL)
@@ -130,13 +134,6 @@ we do! :-)
 }
 
 
-void DrawingView::SetRotateToolActive(bool state/*= true*/)
-{
-	rotateTool = state;
-	update();
-}
-
-
 void DrawingView::SetToolActive(Action * action)
 {
 	if (action != NULL)
@@ -144,6 +141,7 @@ void DrawingView::SetToolActive(Action * action)
 		toolAction = action;
 		connect(toolAction, SIGNAL(ObjectReady(Object *)), this,
 			SLOT(AddNewObjectToDocument(Object *)));
+		connect(toolAction, SIGNAL(NeedRefresh()), this, SLOT(HandleActionUpdate()));
 	}
 }
 
@@ -266,6 +264,12 @@ void DrawingView::AddNewObjectToDocument(Object * object)
 }
 
 
+void DrawingView::HandleActionUpdate(void)
+{
+	update();
+}
+
+
 void DrawingView::SetCurrentLayer(int layer)
 {
 	Object::currentLayer = layer;
@@ -291,28 +295,6 @@ QPoint DrawingView::GetAdjustedClientPosition(int x, int y)
 }
 
 
-#if 0
-//
-// This looks strange, but it's really quite simple: We want a point that's
-// more than half-way to the next grid point to snap there while conversely we
-// want a point that's less than half-way to to the next grid point then snap
-// to the one before it. So we add half of the grid spacing to the point, then
-// divide by it so that we can remove the fractional part, then multiply it
-// back to get back to the correct answer.
-//
-Vector DrawingView::SnapPointToGrid(Vector point)
-{
-	point += gridSpacing / 2.0;		// *This* adds to Z!!!
-	point /= gridSpacing;
-	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!!!
-	point *= gridSpacing;
-	return point;
-}
-#endif
-
-
 void DrawingView::paintEvent(QPaintEvent * /*event*/)
 {
 	QPainter qtPainter(this);
@@ -321,35 +303,18 @@ void DrawingView::paintEvent(QPaintEvent * /*event*/)
 	if (useAntialiasing)
 		qtPainter.setRenderHint(QPainter::Antialiasing);
 
-//	Painter::screenSize = Vector(size().width(), size().height());
 	Object::SetViewportHeight(size().height());
 
 	// Draw coordinate axes
-
 	painter.SetPen(QPen(Qt::blue, 1.0, Qt::DotLine));
 	painter.DrawLine(0, -16384, 0, 16384);
 	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));
-		painter.DrawLine(rx - 10, ry, rx + 10, ry);
-		painter.DrawLine(rx, ry - 10, rx, ry + 10);
-	}
-
-// Maybe we can make the grid into a background brush instead, and let Qt deal
-// with it??? YES!!
-
 	// The top level document takes care of rendering for us...
 	document.Draw(&painter);
 
 	if (toolAction)
 	{
-//		painter.SetPen(QPen(Qt::green, 1.0, Qt::DashLine));
 		painter.SetPen(QPen(QColor(200, 100, 0, 255), 1.0, Qt::DashLine));
 		painter.DrawCrosshair(oldPoint);
 		toolAction->Draw(&painter);
@@ -357,9 +322,7 @@ void DrawingView::paintEvent(QPaintEvent * /*event*/)
 
 	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);
 	}
@@ -508,10 +471,10 @@ void DrawingView::keyPressEvent(QKeyEvent * event)
 {
 	if (toolAction)
 	{
-		bool needUpdate = toolAction->KeyDown(event->key());
+		/*bool needUpdate =*/ toolAction->KeyDown(event->key());
 
-		if (needUpdate)
-			update();
+//		if (needUpdate)
+//			update();
 	}
 }
 
@@ -520,10 +483,10 @@ void DrawingView::keyReleaseEvent(QKeyEvent * event)
 {
 	if (toolAction)
 	{
-		bool needUpdate = toolAction->KeyReleased(event->key());
+		/*bool needUpdate =*/ toolAction->KeyReleased(event->key());
 
-		if (needUpdate)
-			update();
+//		if (needUpdate)
+//			update();
 	}
 }