X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Frs_snapper.cpp;h=542863c92a3c0f4e3de3678c3fc0805c460244c7;hb=20cce16e98fc9b052c5862efa6394a285971e846;hp=0767b6ecd30593c5be9ae958ea68d35ea38fc8ca;hpb=c715d05d11ffe2913fe3465ec43d456ee9b85964;p=architektonas

diff --git a/src/base/rs_snapper.cpp b/src/base/rs_snapper.cpp
index 0767b6e..542863c 100644
--- a/src/base/rs_snapper.cpp
+++ b/src/base/rs_snapper.cpp
@@ -3,7 +3,9 @@
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // Extensively rewritten and refactored by James L. Hammons
-// (C) 2010 Underground Software
+// Portions copyright (C) 2001-2003 RibbonSoft
+// Copyright (C) 2010 Underground Software
+// See the README and GPLv2 files for licensing and warranty information
 //
 // JLH = James L. Hammons <jlhamm@acm.org>
 //
@@ -20,7 +22,7 @@
 #include "graphicview.h"
 #include "rs_grid.h"
 #include "rs_information.h"
-#include "paintintf.h"
+#include "paintinterface.h"
 #include "settings.h"
 
 /**
@@ -92,11 +94,10 @@ void RS_Snapper::SetGraphicView(GraphicView * v)
 }
 
 /**
- * @return Pointer to the entity which was the key entity for the
- * last successful snapping action. If the snap mode is "end point"
- * the key entity is the entity whos end point was caught.
- * If the snap mode didn't require an entity (e.g. free, grid) this
- * method will return NULL.
+ * @return Pointer to the entity which was the key entity for the last
+ * successful snapping action. If the snap mode is "end point" the key entity
+ * is the entity whos end point was caught. If the snap mode didn't require an
+ * entity (e.g. free, grid) this method will return NULL.
  */
 RS_Entity * RS_Snapper::getKeyEntity()
 {
@@ -115,11 +116,21 @@ void RS_Snapper::setSnapRestriction(RS2::SnapRestriction snapRes)
 	this->snapRes = snapRes;
 }
 
+RS2::SnapMode RS_Snapper::getSnapMode(void)
+{
+	return snapMode;
+}
+
+RS2::SnapRestriction RS_Snapper::getSnapRestriction(void)
+{
+	return snapRes;
+}
+
 /**
-* Sets the snap range in pixels for catchEntity().
-*
-* @see catchEntity()
-*/
+ * Sets the snap range in pixels for catchEntity().
+ *
+ * @see catchEntity()
+ */
 void RS_Snapper::setSnapRange(int r)
 {
 	snapRange = r;
@@ -229,7 +240,7 @@ Vector RS_Snapper::snapFree(Vector coord)
 Vector RS_Snapper::snapEndpoint(Vector coord)
 {
 	Vector vec(false);
-	vec = container->getNearestEndpoint(coord, NULL/*, &keyEntity*/);
+	vec = container->getNearestEndpoint(coord, NULL);
 
 	return vec;
 }
@@ -463,7 +474,8 @@ RS_Entity * RS_Snapper::catchEntity(QMouseEvent * e, RS2::ResolveLevel level)
  */
 /*virtual*/ void RS_Snapper::suspend()
 {
-	deleteSnapper();
+#warning "!!! This may need to have SetVisibility() called !!!"
+//	deleteSnapper();
 	snapSpot = snapCoord = Vector(false);
 }
 
@@ -472,7 +484,8 @@ RS_Entity * RS_Snapper::catchEntity(QMouseEvent * e, RS2::ResolveLevel level)
  */
 /*virtual*/ void RS_Snapper::resume()
 {
-	drawSnapper();
+#warning "!!! This may need to have SetVisibility() called !!!"
+//	drawSnapper();
 }
 
 /**
@@ -493,88 +506,6 @@ RS_Entity * RS_Snapper::catchEntity(QMouseEvent * e, RS2::ResolveLevel level)
 		RS_DIALOGFACTORY->requestSnapDistOptions(distance, true);
 }
 
-/**
- * Draws the snapper on the screen.
- */
-void RS_Snapper::drawSnapper()
-{
-printf("RS_Snapper::drawSnapper(): Using DEPRECATED function!!!\n");
-	if (!visible)
-		xorSnapper();
-}
-
-/**
- * Deletes the snapper from the screen.
- */
-void RS_Snapper::deleteSnapper()
-{
-printf("RS_Snapper::deleteSnapper(): Using DEPRECATED function!!!\n");
-	if (visible)
-	{
-		xorSnapper();
-		snapSpot = Vector(false);
-		snapCoord = Vector(false);
-	}
-}
-
-/**
- * Draws / deletes the current snapper spot.
- */
-void RS_Snapper::xorSnapper()
-{
-#warning "!!! RS_Snapper::xorSnapper() is DEPRECATED !!!"
-//Not completely true...
-//#warning "!!! xorSnapper() not working AT ALL !!!"
-#if 0
-	if (!finished && snapSpot.valid)
-	{
-		RS_Painter * painter = graphicView->createDirectPainter();
-		painter->setPreviewMode();
-
-		if (snapCoord.valid)
-		{
-			// snap point
-			painter->drawCircle(graphicView->toGui(snapCoord), 4);
-
-			// crosshairs:
-			if (showCrosshairs == true)
-			{
-				painter->setPen(RS_Pen(RS_Color(0, 255, 255), RS2::Width00, RS2::DashLine));
-				painter->drawLine(Vector(0, graphicView->toGuiY(snapCoord.y)),
-					Vector(graphicView->getWidth(), graphicView->toGuiY(snapCoord.y)));
-				painter->drawLine(Vector(graphicView->toGuiX(snapCoord.x), 0),
-					Vector(graphicView->toGuiX(snapCoord.x), graphicView->getHeight()));
-			}
-		}
-
-		if (snapCoord.valid && snapCoord != snapSpot)
-		{
-			painter->drawLine(graphicView->toGui(snapSpot) + Vector(-5, 0),
-				graphicView->toGui(snapSpot) + Vector(-1, 4));
-			painter->drawLine(graphicView->toGui(snapSpot) + Vector(0, 5),
-				graphicView->toGui(snapSpot) + Vector(4, 1));
-			painter->drawLine(graphicView->toGui(snapSpot) + Vector(5, 0),
-				graphicView->toGui(snapSpot) + Vector(1, -4));
-			painter->drawLine(graphicView->toGui(snapSpot) + Vector(0, -5),
-				graphicView->toGui(snapSpot) + Vector(-4, -1));
-		}
-
-		graphicView->destroyPainter();
-		visible = !visible;
-	}
-//#else
-	if (finished || !snapSpot.valid || !graphicView)
-		return;
-
-	graphicView->SetSnapperDraw(true);
-	graphicView->SetSnapperVars(snapSpot, snapCoord, showCrosshairs);
-//Apparently, this gets hit anyway by the preview code...
-//	graphicView->redraw();
-
-	visible = !visible;
-#endif
-}
-
 void RS_Snapper::SetVisible(bool visibility/*= true*/)
 {
 	visible = visibility;