X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factiondrawcircle3p.cpp;fp=src%2Factions%2Frs_actiondrawcircle3p.cpp;h=7985bb5ebdb96d6f49028bbd6a82296644c94b7e;hb=d774c2655ba2c3657a565f325411144452392277;hp=1d01eff928040b31520eb4d585aaddc4acc9652c;hpb=468780dd17f8b0ebb35427a9fc43491721d44d69;p=architektonas

diff --git a/src/actions/rs_actiondrawcircle3p.cpp b/src/actions/actiondrawcircle3p.cpp
similarity index 67%
rename from src/actions/rs_actiondrawcircle3p.cpp
rename to src/actions/actiondrawcircle3p.cpp
index 1d01eff..7985bb5 100644
--- a/src/actions/rs_actiondrawcircle3p.cpp
+++ b/src/actions/actiondrawcircle3p.cpp
@@ -1,4 +1,4 @@
-// rs_actiondrawcircle3p.cpp
+// actiondrawcircle3p.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
@@ -12,24 +12,25 @@
 // JLH  06/03/2010  Added this text. :-)
 //
 
-#include "rs_actiondrawcircle3p.h"
+#include "actiondrawcircle3p.h"
 
 #include "rs_commandevent.h"
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 #include "rs_preview.h"
 
-RS_ActionDrawCircle3P::RS_ActionDrawCircle3P(RS_EntityContainer & container, GraphicView & graphicView): RS_PreviewActionInterface("Draw circles",
-		container, graphicView)
+ActionDrawCircle3P::ActionDrawCircle3P(RS_EntityContainer & container,
+	GraphicView & graphicView): ActionInterface("Draw circles",
+	container, graphicView)
 {
 	reset();
 }
 
-RS_ActionDrawCircle3P::~RS_ActionDrawCircle3P()
+ActionDrawCircle3P::~ActionDrawCircle3P()
 {
 }
 
-void RS_ActionDrawCircle3P::reset()
+void ActionDrawCircle3P::reset()
 {
 	data.reset();
 	point1 = Vector(false);
@@ -37,34 +38,34 @@ void RS_ActionDrawCircle3P::reset()
 	point3 = Vector(false);
 }
 
-void RS_ActionDrawCircle3P::init(int status)
+void ActionDrawCircle3P::init(int status)
 {
-	RS_PreviewActionInterface::init(status);
+	ActionInterface::init(status);
 
 	reset();
 }
 
-void RS_ActionDrawCircle3P::trigger()
+void ActionDrawCircle3P::trigger()
 {
-	RS_PreviewActionInterface::trigger();
+	ActionInterface::trigger();
 
 	preparePreview();
 
 	if (data.isValid())
 	{
-		RS_Circle * circle = new RS_Circle(container,
-				data);
+		RS_Circle * circle = new RS_Circle(container, data);
 		circle->setLayerToActive();
 		circle->setPenToActive();
 		container->addEntity(circle);
 
 		// upd. undo list:
-		if (document != NULL)
+		if (document)
 		{
 			document->startUndoCycle();
 			document->addUndoable(circle);
 			document->endUndoCycle();
 		}
+
 		deleteSnapper();
 		Vector rz = graphicView->getRelativeZero();
 		graphicView->moveRelativeZero(Vector(0.0, 0.0));
@@ -79,21 +80,21 @@ void RS_ActionDrawCircle3P::trigger()
 		RS_DIALOGFACTORY->requestWarningDialog(tr("Invalid circle data."));
 }
 
-void RS_ActionDrawCircle3P::preparePreview()
+void ActionDrawCircle3P::preparePreview()
 {
 	data.reset();
 
 	if (point1.valid && point2.valid && point3.valid)
 	{
 		RS_Circle circle(NULL, data);
-		bool suc = circle.createFrom3P(point1, point2, point3);
+		bool success = circle.createFrom3P(point1, point2, point3);
 
-		if (suc)
+		if (success)
 			data = circle.getData();
 	}
 }
 
-void RS_ActionDrawCircle3P::mouseMoveEvent(QMouseEvent * e)
+void ActionDrawCircle3P::mouseMoveEvent(QMouseEvent * e)
 {
 	Vector mouse = snapPoint(e);
 
@@ -113,26 +114,24 @@ void RS_ActionDrawCircle3P::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;
 	}
 }
 
-void RS_ActionDrawCircle3P::mouseReleaseEvent(QMouseEvent * e)
+void ActionDrawCircle3P::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();
@@ -141,7 +140,7 @@ void RS_ActionDrawCircle3P::mouseReleaseEvent(QMouseEvent * e)
 	}
 }
 
-void RS_ActionDrawCircle3P::coordinateEvent(Vector * e)
+void ActionDrawCircle3P::coordinateEvent(Vector * e)
 {
 	if (e == NULL)
 		return;
@@ -172,7 +171,7 @@ void RS_ActionDrawCircle3P::coordinateEvent(Vector * e)
 	}
 }
 
-void RS_ActionDrawCircle3P::commandEvent(RS_CommandEvent * e)
+void ActionDrawCircle3P::commandEvent(RS_CommandEvent * e)
 {
 	QString c = e->getCommand().toLower();
 
@@ -184,29 +183,26 @@ void RS_ActionDrawCircle3P::commandEvent(RS_CommandEvent * e)
 	}
 }
 
-QStringList RS_ActionDrawCircle3P::getAvailableCommands()
+QStringList ActionDrawCircle3P::getAvailableCommands()
 {
 	QStringList cmd;
 	return cmd;
 }
 
-void RS_ActionDrawCircle3P::updateMouseButtonHints()
+void ActionDrawCircle3P::updateMouseButtonHints()
 {
 	switch (getStatus())
 	{
 	case SetPoint1:
-		RS_DIALOGFACTORY->updateMouseWidget(tr("Specify first point"),
-			tr("Cancel"));
+		RS_DIALOGFACTORY->updateMouseWidget(tr("Specify first point"), tr("Cancel"));
 		break;
 
 	case SetPoint2:
-		RS_DIALOGFACTORY->updateMouseWidget(tr("Specify second point"),
-			tr("Back"));
+		RS_DIALOGFACTORY->updateMouseWidget(tr("Specify second point"), tr("Back"));
 		break;
 
 	case SetPoint3:
-		RS_DIALOGFACTORY->updateMouseWidget(tr("Specify third point"),
-			tr("Back"));
+		RS_DIALOGFACTORY->updateMouseWidget(tr("Specify third point"), tr("Back"));
 		break;
 
 	default:
@@ -215,18 +211,15 @@ void RS_ActionDrawCircle3P::updateMouseButtonHints()
 	}
 }
 
-void RS_ActionDrawCircle3P::updateMouseCursor()
+void ActionDrawCircle3P::updateMouseCursor()
 {
 	graphicView->setMouseCursor(RS2::CadCursor);
 }
 
-void RS_ActionDrawCircle3P::updateToolBar()
+void ActionDrawCircle3P::updateToolBar()
 {
 	if (!isFinished())
 		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
 	else
 		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarCircles);
 }
-
-// EOF
-