X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factiondrawcircle2p.cpp;fp=src%2Factions%2Frs_actiondrawcircle2p.cpp;h=43e3003b6e40774d754d5354cc534cfc94b955dd;hb=d774c2655ba2c3657a565f325411144452392277;hp=d9425550c8c0ab2dada58c3ebf4a384f2ee18ee9;hpb=468780dd17f8b0ebb35427a9fc43491721d44d69;p=architektonas

diff --git a/src/actions/rs_actiondrawcircle2p.cpp b/src/actions/actiondrawcircle2p.cpp
similarity index 71%
rename from src/actions/rs_actiondrawcircle2p.cpp
rename to src/actions/actiondrawcircle2p.cpp
index d942555..43e3003 100644
--- a/src/actions/rs_actiondrawcircle2p.cpp
+++ b/src/actions/actiondrawcircle2p.cpp
@@ -1,4 +1,4 @@
-// rs_actiondrawcircle2p.cpp
+// actiondrawcircle2p.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
@@ -12,40 +12,40 @@
 // JLH  06/03/2010  Added this text. :-)
 //
 
-#include "rs_actiondrawcircle2p.h"
+#include "actiondrawcircle2p.h"
 
 #include "rs_commandevent.h"
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 #include "rs_preview.h"
 
-RS_ActionDrawCircle2P::RS_ActionDrawCircle2P(RS_EntityContainer & container, GraphicView & graphicView): RS_PreviewActionInterface("Draw circles",
+ActionDrawCircle2P::ActionDrawCircle2P(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw circles",
 		container, graphicView)
 {
 	reset();
 }
 
-RS_ActionDrawCircle2P::~RS_ActionDrawCircle2P()
+ActionDrawCircle2P::~ActionDrawCircle2P()
 {
 }
 
-void RS_ActionDrawCircle2P::reset()
+void ActionDrawCircle2P::reset()
 {
 	data.reset();
 	point1 = Vector(false);
 	point2 = Vector(false);
 }
 
-void RS_ActionDrawCircle2P::init(int status)
+void ActionDrawCircle2P::init(int status)
 {
-	RS_PreviewActionInterface::init(status);
+	ActionInterface::init(status);
 
 	reset();
 }
 
-void RS_ActionDrawCircle2P::trigger()
+void ActionDrawCircle2P::trigger()
 {
-	RS_PreviewActionInterface::trigger();
+	ActionInterface::trigger();
 
 	preparePreview();
 
@@ -78,7 +78,7 @@ void RS_ActionDrawCircle2P::trigger()
 		RS_DIALOGFACTORY->requestWarningDialog(tr("Invalid Circle data."));
 }
 
-void RS_ActionDrawCircle2P::preparePreview()
+void ActionDrawCircle2P::preparePreview()
 {
 	data.reset();
 
@@ -92,7 +92,7 @@ void RS_ActionDrawCircle2P::preparePreview()
 	}
 }
 
-void RS_ActionDrawCircle2P::mouseMoveEvent(QMouseEvent * e)
+void ActionDrawCircle2P::mouseMoveEvent(QMouseEvent * e)
 {
 	Vector mouse = snapPoint(e);
 
@@ -108,11 +108,11 @@ void RS_ActionDrawCircle2P::mouseMoveEvent(QMouseEvent * e)
 
 		if (data.isValid())
 		{
-			RS_Circle * circle = new RS_Circle(preview, data);
-			deletePreview();
-			clearPreview();
-			preview->addEntity(circle);
-			drawPreview();
+// 			RS_Circle * circle = new RS_Circle(preview, data);
+// 			deletePreview();
+// 			clearPreview();
+// 			preview->addEntity(circle);
+// 			drawPreview();
 		}
 		break;
 
@@ -121,15 +121,13 @@ void RS_ActionDrawCircle2P::mouseMoveEvent(QMouseEvent * e)
 	}
 }
 
-void RS_ActionDrawCircle2P::mouseReleaseEvent(QMouseEvent * e)
+void ActionDrawCircle2P::mouseReleaseEvent(QMouseEvent * e)
 {
-//	if (RS2::qtToRsButtonState(e->button())==RS2::LeftButton)
 	if (e->button() == Qt::LeftButton)
 	{
 		Vector ce(snapPoint(e));
 		coordinateEvent(&ce);
 	}
-//	else if (RS2::qtToRsButtonState(e->button())==RS2::RightButton)
 	else if (e->button() == Qt::RightButton)
 	{
 		deletePreview();
@@ -138,7 +136,7 @@ void RS_ActionDrawCircle2P::mouseReleaseEvent(QMouseEvent * e)
 	}
 }
 
-void RS_ActionDrawCircle2P::coordinateEvent(Vector * e)
+void ActionDrawCircle2P::coordinateEvent(Vector * e)
 {
 	if (e == NULL)
 		return;
@@ -164,7 +162,7 @@ void RS_ActionDrawCircle2P::coordinateEvent(Vector * e)
 	}
 }
 
-void RS_ActionDrawCircle2P::commandEvent(RS_CommandEvent * e)
+void ActionDrawCircle2P::commandEvent(RS_CommandEvent * e)
 {
 	QString c = e->getCommand().toLower();
 
@@ -177,13 +175,13 @@ void RS_ActionDrawCircle2P::commandEvent(RS_CommandEvent * e)
 	}
 }
 
-QStringList RS_ActionDrawCircle2P::getAvailableCommands()
+QStringList ActionDrawCircle2P::getAvailableCommands()
 {
 	QStringList cmd;
 	return cmd;
 }
 
-void RS_ActionDrawCircle2P::updateMouseButtonHints()
+void ActionDrawCircle2P::updateMouseButtonHints()
 {
 	if (RS_DIALOGFACTORY != NULL)
 	{
@@ -206,14 +204,14 @@ void RS_ActionDrawCircle2P::updateMouseButtonHints()
 	}
 }
 
-void RS_ActionDrawCircle2P::updateMouseCursor()
+void ActionDrawCircle2P::updateMouseCursor()
 {
 	graphicView->setMouseCursor(RS2::CadCursor);
 }
 
-void RS_ActionDrawCircle2P::updateToolBar()
+void ActionDrawCircle2P::updateToolBar()
 {
-	if (RS_DIALOGFACTORY != NULL)
+	if (RS_DIALOGFACTORY)
 	{
 		if (!isFinished())
 			RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
@@ -221,6 +219,3 @@ void RS_ActionDrawCircle2P::updateToolBar()
 			RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarCircles);
 	}
 }
-
-// EOF
-