X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factioninfodist.cpp;fp=src%2Factions%2Frs_actioninfodist.cpp;h=57c744b2c9a1c973c9a8eff7cf1df0b7928796b2;hb=d774c2655ba2c3657a565f325411144452392277;hp=af59d52643b37869107c1abc77db714ad7becf0d;hpb=468780dd17f8b0ebb35427a9fc43491721d44d69;p=architektonas

diff --git a/src/actions/rs_actioninfodist.cpp b/src/actions/actioninfodist.cpp
similarity index 71%
rename from src/actions/rs_actioninfodist.cpp
rename to src/actions/actioninfodist.cpp
index af59d52..57c744b 100644
--- a/src/actions/rs_actioninfodist.cpp
+++ b/src/actions/actioninfodist.cpp
@@ -1,4 +1,4 @@
-// rs_actioninfodist.cpp
+// actioninfodist.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
@@ -12,29 +12,29 @@
 // JLH  06/04/2010  Added this text. :-)
 //
 
-#include "rs_actioninfodist.h"
+#include "actioninfodist.h"
 
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 #include "rs_preview.h"
 
-RS_ActionInfoDist::RS_ActionInfoDist(RS_EntityContainer & container, GraphicView & graphicView): RS_PreviewActionInterface("Info Dist",
+ActionInfoDist::ActionInfoDist(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Info Dist",
 		container, graphicView)
 {
 }
 
-RS_ActionInfoDist::~RS_ActionInfoDist()
+ActionInfoDist::~ActionInfoDist()
 {
 }
 
-void RS_ActionInfoDist::init(int status)
+void ActionInfoDist::init(int status)
 {
-	RS_ActionInterface::init(status);
+	ActionInterface::init(status);
 }
 
-void RS_ActionInfoDist::trigger()
+void ActionInfoDist::trigger()
 {
-	RS_DEBUG->print("RS_ActionInfoDist::trigger()");
+	RS_DEBUG->print("ActionInfoDist::trigger()");
 
 	if (point1.valid && point2.valid)
 	{
@@ -45,9 +45,9 @@ void RS_ActionInfoDist::trigger()
 	}
 }
 
-void RS_ActionInfoDist::mouseMoveEvent(QMouseEvent * e)
+void ActionInfoDist::mouseMoveEvent(QMouseEvent * e)
 {
-	RS_DEBUG->print("RS_ActionInfoDist::mouseMoveEvent begin");
+	RS_DEBUG->print("ActionInfoDist::mouseMoveEvent begin");
 
 	if (getStatus() == SetPoint1
 	    || getStatus() == SetPoint2)
@@ -67,11 +67,7 @@ void RS_ActionInfoDist::mouseMoveEvent(QMouseEvent * e)
 
 				deletePreview();
 				clearPreview();
-
-				preview->addEntity(new RS_Line(preview,
-						RS_LineData(point1,
-							point2)));
-
+//				preview->addEntity(new RS_Line(preview, RS_LineData(point1, point2)));
 				drawPreview();
 			}
 			break;
@@ -81,10 +77,10 @@ void RS_ActionInfoDist::mouseMoveEvent(QMouseEvent * e)
 		}
 	}
 
-	RS_DEBUG->print("RS_ActionInfoDist::mouseMoveEvent end");
+	RS_DEBUG->print("ActionInfoDist::mouseMoveEvent end");
 }
 
-void RS_ActionInfoDist::mouseReleaseEvent(QMouseEvent * e)
+void ActionInfoDist::mouseReleaseEvent(QMouseEvent * e)
 {
 	if (e->button() == Qt::LeftButton)
 	{
@@ -99,7 +95,7 @@ void RS_ActionInfoDist::mouseReleaseEvent(QMouseEvent * e)
 	}
 }
 
-void RS_ActionInfoDist::coordinateEvent(Vector * e)
+void ActionInfoDist::coordinateEvent(Vector * e)
 {
 	if (e == NULL)
 		return;
@@ -132,7 +128,7 @@ void RS_ActionInfoDist::coordinateEvent(Vector * e)
 	}
 }
 
-void RS_ActionInfoDist::updateMouseButtonHints()
+void ActionInfoDist::updateMouseButtonHints()
 {
 	switch (getStatus())
 	{
@@ -154,12 +150,12 @@ void RS_ActionInfoDist::updateMouseButtonHints()
 	}
 }
 
-void RS_ActionInfoDist::updateMouseCursor()
+void ActionInfoDist::updateMouseCursor()
 {
 	graphicView->setMouseCursor(RS2::CadCursor);
 }
 
-void RS_ActionInfoDist::updateToolBar()
+void ActionInfoDist::updateToolBar()
 {
 	switch (getStatus())
 	{
@@ -173,5 +169,3 @@ void RS_ActionInfoDist::updateToolBar()
 		break;
 	}
 }
-
-// EOF