X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factiondrawarc3p.cpp;fp=src%2Factions%2Frs_actiondrawarc3p.cpp;h=9cd7bbd7ef2e179d53dd27333279c62f064473c1;hb=d774c2655ba2c3657a565f325411144452392277;hp=2450e76dbf7798829e4c3a79b92ac111b336569f;hpb=468780dd17f8b0ebb35427a9fc43491721d44d69;p=architektonas

diff --git a/src/actions/rs_actiondrawarc3p.cpp b/src/actions/actiondrawarc3p.cpp
similarity index 71%
rename from src/actions/rs_actiondrawarc3p.cpp
rename to src/actions/actiondrawarc3p.cpp
index 2450e76..9cd7bbd 100644
--- a/src/actions/rs_actiondrawarc3p.cpp
+++ b/src/actions/actiondrawarc3p.cpp
@@ -1,4 +1,4 @@
-// rs_actiondrawarc3p.cpp
+// actiondrawarc3p.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
@@ -12,26 +12,26 @@
 // JLH  06/03/2010  Added this text. :-)
 //
 
-#include "rs_actiondrawarc3p.h"
+#include "actiondrawarc3p.h"
 
-#include "rs_actiondrawarc.h"
+#include "actiondrawarc.h"
 #include "rs_commandevent.h"
 #include "commands.h"
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 #include "rs_preview.h"
 
-RS_ActionDrawArc3P::RS_ActionDrawArc3P(RS_EntityContainer & container, GraphicView & graphicView):
-	RS_PreviewActionInterface("Draw arcs 3P", container, graphicView)
+ActionDrawArc3P::ActionDrawArc3P(RS_EntityContainer & container, GraphicView & graphicView):
+	ActionInterface("Draw arcs 3P", container, graphicView)
 {
 	reset();
 }
 
-RS_ActionDrawArc3P::~RS_ActionDrawArc3P()
+ActionDrawArc3P::~ActionDrawArc3P()
 {
 }
 
-void RS_ActionDrawArc3P::reset()
+void ActionDrawArc3P::reset()
 {
 	data.reset();
 	point1 = Vector(false);
@@ -39,16 +39,16 @@ void RS_ActionDrawArc3P::reset()
 	point3 = Vector(false);
 }
 
-void RS_ActionDrawArc3P::init(int status)
+void ActionDrawArc3P::init(int status)
 {
-	RS_PreviewActionInterface::init(status);
+	ActionInterface::init(status);
 
 	//reset();
 }
 
-void RS_ActionDrawArc3P::trigger()
+void ActionDrawArc3P::trigger()
 {
-	RS_PreviewActionInterface::trigger();
+	ActionInterface::trigger();
 	preparePreview();
 
 	if (data.isValid())
@@ -79,7 +79,7 @@ void RS_ActionDrawArc3P::trigger()
 		RS_DIALOGFACTORY->commandMessage(tr("Invalid arc data."));
 }
 
-void RS_ActionDrawArc3P::preparePreview()
+void ActionDrawArc3P::preparePreview()
 {
 	data.reset();
 
@@ -93,7 +93,7 @@ void RS_ActionDrawArc3P::preparePreview()
 	}
 }
 
-void RS_ActionDrawArc3P::mouseMoveEvent(QMouseEvent * e)
+void ActionDrawArc3P::mouseMoveEvent(QMouseEvent * e)
 {
 	Vector mouse = snapPoint(e);
 
@@ -108,12 +108,12 @@ void RS_ActionDrawArc3P::mouseMoveEvent(QMouseEvent * e)
 
 		if (point1.valid)
 		{
-			RS_Line * line = new RS_Line(preview, RS_LineData(point1, point2));
-
-			deletePreview();
-			clearPreview();
-			preview->addEntity(line);
-			drawPreview();
+// 			RS_Line * line = new RS_Line(preview, RS_LineData(point1, point2));
+//
+// 			deletePreview();
+// 			clearPreview();
+// 			preview->addEntity(line);
+// 			drawPreview();
 		}
 		break;
 
@@ -123,12 +123,12 @@ void RS_ActionDrawArc3P::mouseMoveEvent(QMouseEvent * e)
 
 		if (data.isValid())
 		{
-			RS_Arc * arc = new RS_Arc(preview, data);
-
-			deletePreview();
-			clearPreview();
-			preview->addEntity(arc);
-			drawPreview();
+// 			RS_Arc * arc = new RS_Arc(preview, data);
+//
+// 			deletePreview();
+// 			clearPreview();
+// 			preview->addEntity(arc);
+// 			drawPreview();
 		}
 		break;
 
@@ -137,7 +137,7 @@ void RS_ActionDrawArc3P::mouseMoveEvent(QMouseEvent * e)
 	}
 }
 
-void RS_ActionDrawArc3P::mouseReleaseEvent(QMouseEvent * e)
+void ActionDrawArc3P::mouseReleaseEvent(QMouseEvent * e)
 {
 	if (e->button() == Qt::LeftButton)
 	{
@@ -152,7 +152,7 @@ void RS_ActionDrawArc3P::mouseReleaseEvent(QMouseEvent * e)
 	}
 }
 
-void RS_ActionDrawArc3P::coordinateEvent(Vector * e)
+void ActionDrawArc3P::coordinateEvent(Vector * e)
 {
 	if (e == NULL)
 		return;
@@ -183,7 +183,7 @@ void RS_ActionDrawArc3P::coordinateEvent(Vector * e)
 	}
 }
 
-void RS_ActionDrawArc3P::commandEvent(RS_CommandEvent * e)
+void ActionDrawArc3P::commandEvent(RS_CommandEvent * e)
 {
 	QString c = e->getCommand().toLower();
 
@@ -197,17 +197,17 @@ void RS_ActionDrawArc3P::commandEvent(RS_CommandEvent * e)
 	if (RS_COMMANDS->checkCommand("center", c, rtti()))
 	{
 		finish();
-		graphicView->setCurrentAction(new RS_ActionDrawArc(*container, *graphicView));
+		graphicView->setCurrentAction(new ActionDrawArc(*container, *graphicView));
 	}
 }
 
-QStringList RS_ActionDrawArc3P::getAvailableCommands()
+QStringList ActionDrawArc3P::getAvailableCommands()
 {
 	QStringList cmd;
 	return cmd;
 }
 
-void RS_ActionDrawArc3P::updateMouseButtonHints()
+void ActionDrawArc3P::updateMouseButtonHints()
 {
 	switch (getStatus())
 	{
@@ -229,12 +229,12 @@ void RS_ActionDrawArc3P::updateMouseButtonHints()
 	}
 }
 
-void RS_ActionDrawArc3P::updateMouseCursor()
+void ActionDrawArc3P::updateMouseCursor()
 {
 	graphicView->setMouseCursor(RS2::CadCursor);
 }
 
-void RS_ActionDrawArc3P::updateToolBar()
+void ActionDrawArc3P::updateToolBar()
 {
 	if (!isFinished())
 		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);