X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factiondrawcirclecr.cpp;fp=src%2Factions%2Frs_actiondrawcirclecr.cpp;h=34af3c9ac80e57eb4858f18333e5880d7c0f20bf;hb=d774c2655ba2c3657a565f325411144452392277;hp=9e9d49a2b00cfb1f89708d5344cb2fa12c9a2c34;hpb=468780dd17f8b0ebb35427a9fc43491721d44d69;p=architektonas

diff --git a/src/actions/rs_actiondrawcirclecr.cpp b/src/actions/actiondrawcirclecr.cpp
similarity index 66%
rename from src/actions/rs_actiondrawcirclecr.cpp
rename to src/actions/actiondrawcirclecr.cpp
index 9e9d49a..34af3c9 100644
--- a/src/actions/rs_actiondrawcirclecr.cpp
+++ b/src/actions/actiondrawcirclecr.cpp
@@ -1,4 +1,4 @@
-// rs_actiondrawcirclecr.cpp
+// actiondrawcirclecr.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
@@ -12,7 +12,7 @@
 // JLH  06/03/2010  Added this text. :-)
 //
 
-#include "rs_actiondrawcirclecr.h"
+#include "actiondrawcirclecr.h"
 
 #include "rs_commandevent.h"
 #include "rs_dialogfactory.h"
@@ -22,34 +22,34 @@
 /**
  * Constructor.
  */
-RS_ActionDrawCircleCR::RS_ActionDrawCircleCR(RS_EntityContainer & container, GraphicView & graphicView): RS_PreviewActionInterface("Draw circles CR",
+ActionDrawCircleCR::ActionDrawCircleCR(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Draw circles CR",
 		container, graphicView)
 {
 	reset();
 }
 
-RS_ActionDrawCircleCR::~RS_ActionDrawCircleCR()
+ActionDrawCircleCR::~ActionDrawCircleCR()
 {
 }
 
-/*virtual*/ RS2::ActionType RS_ActionDrawCircleCR::rtti()
+/*virtual*/ RS2::ActionType ActionDrawCircleCR::rtti()
 {
 	return RS2::ActionDrawCircleCR;
 }
 
-void RS_ActionDrawCircleCR::reset()
+void ActionDrawCircleCR::reset()
 {
 	data = RS_CircleData(Vector(false), 0.0);
 }
 
-void RS_ActionDrawCircleCR::init(int status)
+void ActionDrawCircleCR::init(int status)
 {
-	RS_PreviewActionInterface::init(status);
+	ActionInterface::init(status);
 }
 
-void RS_ActionDrawCircleCR::trigger()
+void ActionDrawCircleCR::trigger()
 {
-	RS_PreviewActionInterface::trigger();
+	ActionInterface::trigger();
 
 	RS_Circle * circle = new RS_Circle(container, data);
 	circle->setLayerToActive();
@@ -73,12 +73,12 @@ void RS_ActionDrawCircleCR::trigger()
 
 	setStatus(SetCenter);
 
-	RS_DEBUG->print("RS_ActionDrawCircleCR::trigger(): circle added: %d", circle->getId());
+	RS_DEBUG->print("ActionDrawCircleCR::trigger(): circle added: %d", circle->getId());
 }
 
-void RS_ActionDrawCircleCR::mouseMoveEvent(QMouseEvent * e)
+void ActionDrawCircleCR::mouseMoveEvent(QMouseEvent * e)
 {
-	RS_DEBUG->print("RS_ActionDrawCircleCR::mouseMoveEvent begin");
+	RS_DEBUG->print("ActionDrawCircleCR::mouseMoveEvent begin");
 	Vector mouse = snapPoint(e);
 
 	switch (getStatus())
@@ -87,23 +87,21 @@ void RS_ActionDrawCircleCR::mouseMoveEvent(QMouseEvent * e)
 		data.center = mouse;
 		deletePreview();
 		clearPreview();
-		preview->addEntity(new RS_Circle(preview, data));
+// 		preview->addEntity(new RS_Circle(preview, data));
 		drawPreview();
 		break;
 	}
 
-	RS_DEBUG->print("RS_ActionDrawCircleCR::mouseMoveEvent end");
+	RS_DEBUG->print("ActionDrawCircleCR::mouseMoveEvent end");
 }
 
-void RS_ActionDrawCircleCR::mouseReleaseEvent(QMouseEvent * e)
+void ActionDrawCircleCR::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();
@@ -112,7 +110,7 @@ void RS_ActionDrawCircleCR::mouseReleaseEvent(QMouseEvent * e)
 	}
 }
 
-void RS_ActionDrawCircleCR::coordinateEvent(Vector * e)
+void ActionDrawCircleCR::coordinateEvent(Vector * e)
 {
 	if (e == NULL)
 		return;
@@ -131,7 +129,7 @@ void RS_ActionDrawCircleCR::coordinateEvent(Vector * e)
 	}
 }
 
-void RS_ActionDrawCircleCR::commandEvent(RS_CommandEvent * e)
+void ActionDrawCircleCR::commandEvent(RS_CommandEvent * e)
 {
 	QString c = e->getCommand().toLower();
 
@@ -175,7 +173,7 @@ void RS_ActionDrawCircleCR::commandEvent(RS_CommandEvent * e)
 	}
 }
 
-QStringList RS_ActionDrawCircleCR::getAvailableCommands()
+QStringList ActionDrawCircleCR::getAvailableCommands()
 {
 	QStringList cmd;
 
@@ -192,7 +190,7 @@ QStringList RS_ActionDrawCircleCR::getAvailableCommands()
 	return cmd;
 }
 
-void RS_ActionDrawCircleCR::updateMouseButtonHints()
+void ActionDrawCircleCR::updateMouseButtonHints()
 {
 	switch (getStatus())
 	{
@@ -210,26 +208,26 @@ void RS_ActionDrawCircleCR::updateMouseButtonHints()
 	}
 }
 
-void RS_ActionDrawCircleCR::showOptions()
+void ActionDrawCircleCR::showOptions()
 {
-	RS_ActionInterface::showOptions();
+	ActionInterface::showOptions();
 
 	RS_DIALOGFACTORY->requestOptions(this, true);
 }
 
-void RS_ActionDrawCircleCR::hideOptions()
+void ActionDrawCircleCR::hideOptions()
 {
-	RS_ActionInterface::hideOptions();
+	ActionInterface::hideOptions();
 
 	RS_DIALOGFACTORY->requestOptions(this, false);
 }
 
-void RS_ActionDrawCircleCR::updateMouseCursor()
+void ActionDrawCircleCR::updateMouseCursor()
 {
 	graphicView->setMouseCursor(RS2::CadCursor);
 }
 
-void RS_ActionDrawCircleCR::updateToolBar()
+void ActionDrawCircleCR::updateToolBar()
 {
 	if (!isFinished())
 		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
@@ -237,13 +235,12 @@ void RS_ActionDrawCircleCR::updateToolBar()
 		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarCircles);
 }
 
-double RS_ActionDrawCircleCR::getRadius()
+double ActionDrawCircleCR::getRadius()
 {
 	return data.radius;
 }
 
-void RS_ActionDrawCircleCR::setRadius(double r)
+void ActionDrawCircleCR::setRadius(double r)
 {
 	data.radius = r;
 }
-