X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Factions%2Factionmodifyround.cpp;fp=src%2Factions%2Frs_actionmodifyround.cpp;h=4eb96d436537b0fa61eba3c85356a9ba3a978b82;hb=d774c2655ba2c3657a565f325411144452392277;hp=530ddfab42e48a283af7e8493b4e9eaf52e3d1fc;hpb=468780dd17f8b0ebb35427a9fc43491721d44d69;p=architektonas

diff --git a/src/actions/rs_actionmodifyround.cpp b/src/actions/actionmodifyround.cpp
similarity index 71%
rename from src/actions/rs_actionmodifyround.cpp
rename to src/actions/actionmodifyround.cpp
index 530ddfa..4eb96d4 100644
--- a/src/actions/rs_actionmodifyround.cpp
+++ b/src/actions/actionmodifyround.cpp
@@ -1,4 +1,4 @@
-// rs_actionmodifyround.cpp
+// actionmodifyround.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
@@ -12,15 +12,15 @@
 // JLH  06/04/2010  Added this text. :-)
 //
 
-#include "rs_actionmodifyround.h"
+#include "actionmodifyround.h"
 
 #include "rs_commandevent.h"
 #include "rs_dialogfactory.h"
 #include "rs_information.h"
 #include "rs_preview.h"
 
-RS_ActionModifyRound::RS_ActionModifyRound(RS_EntityContainer & container, GraphicView & graphicView):
-	RS_PreviewActionInterface("Round Entities", container, graphicView)
+ActionModifyRound::ActionModifyRound(RS_EntityContainer & container, GraphicView & graphicView):
+	ActionInterface("Round Entities", container, graphicView)
 {
 	entity1 = NULL;
 	entity2 = NULL;
@@ -28,26 +28,26 @@ RS_ActionModifyRound::RS_ActionModifyRound(RS_EntityContainer & container, Graph
 	coord2 = Vector(false);
 }
 
-RS_ActionModifyRound::~RS_ActionModifyRound()
+ActionModifyRound::~ActionModifyRound()
 {
 }
 
-/*virtual*/ RS2::ActionType RS_ActionModifyRound::rtti()
+/*virtual*/ RS2::ActionType ActionModifyRound::rtti()
 {
 	return RS2::ActionModifyRound;
 }
 
-void RS_ActionModifyRound::init(int status)
+void ActionModifyRound::init(int status)
 {
-	RS_ActionInterface::init(status);
+	ActionInterface::init(status);
 
-	snapMode = RS2::SnapFree;
-	snapRes = RS2::RestrictNothing;
+/*	snapMode = RS2::SnapFree;
+	snapRes = RS2::RestrictNothing;*/
 }
 
-void RS_ActionModifyRound::trigger()
+void ActionModifyRound::trigger()
 {
-	RS_DEBUG->print("RS_ActionModifyRound::trigger()");
+	RS_DEBUG->print("ActionModifyRound::trigger()");
 
 	if (entity1 != NULL && entity1->isAtomic()
 	    && entity2 != NULL && entity2->isAtomic())
@@ -55,14 +55,9 @@ void RS_ActionModifyRound::trigger()
 		deletePreview();
 
 		RS_Modification m(*container, graphicView);
-		m.round(coord2,
-			coord1,
-			(RS_AtomicEntity *)entity1,
-			coord2,
-			(RS_AtomicEntity *)entity2,
-			data);
-
-		//coord = Vector(false);
+		m.round(coord2, coord1, (RS_AtomicEntity *)entity1, coord2,
+			(RS_AtomicEntity *)entity2, data);
+
 		coord1 = Vector(false);
 		entity1 = NULL;
 		coord2 = Vector(false);
@@ -76,9 +71,9 @@ void RS_ActionModifyRound::trigger()
 	}
 }
 
-void RS_ActionModifyRound::mouseMoveEvent(QMouseEvent * e)
+void ActionModifyRound::mouseMoveEvent(QMouseEvent * e)
 {
-	RS_DEBUG->print("RS_ActionModifyRound::mouseMoveEvent begin");
+	RS_DEBUG->print("ActionModifyRound::mouseMoveEvent begin");
 
 	Vector mouse = graphicView->toGraph(e->x(), e->y());
 	RS_Entity * se = catchEntity(e, RS2::ResolveAll);
@@ -99,28 +94,22 @@ void RS_ActionModifyRound::mouseMoveEvent(QMouseEvent * e)
 		{
 			deletePreview();
 			clearPreview();
-			//preview->addSelectionFrom(*container);
-			//preview->move(targetPoint-referencePoint);
-			RS_Entity * tmp1 = entity1->clone();
-			RS_Entity * tmp2 = entity2->clone();
-			tmp1->reparent(preview);
-			tmp2->reparent(preview);
-			preview->addEntity(tmp1);
-			preview->addEntity(tmp2);
-
-			bool trim = data.trim;
+/*			RS_Entity * tmp1 = entity1->clone();
+			RS_Entity * tmp2 = entity2->clone();*/
+// 			tmp1->reparent(preview);
+// 			tmp2->reparent(preview);
+// 			preview->addEntity(tmp1);
+// 			preview->addEntity(tmp2);
+
+/*			bool trim = data.trim;
 			data.trim = false;
 			RS_Modification m(*preview, NULL, false);
-			m.round(coord2,
-				coord1,
-				(RS_AtomicEntity *)tmp1,
-				coord2,
-				(RS_AtomicEntity *)tmp2,
-				data);
+			m.round(coord2, coord1, (RS_AtomicEntity *)tmp1, coord2,
+				(RS_AtomicEntity *)tmp2, data);
 			data.trim = trim;
 
 			preview->removeEntity(tmp1);
-			preview->removeEntity(tmp2);
+			preview->removeEntity(tmp2);*/
 			drawPreview();
 		}
 		break;
@@ -129,10 +118,10 @@ void RS_ActionModifyRound::mouseMoveEvent(QMouseEvent * e)
 		break;
 	}
 
-	RS_DEBUG->print("RS_ActionModifyRound::mouseMoveEvent end");
+	RS_DEBUG->print("ActionModifyRound::mouseMoveEvent end");
 }
 
-void RS_ActionModifyRound::mouseReleaseEvent(QMouseEvent * e)
+void ActionModifyRound::mouseReleaseEvent(QMouseEvent * e)
 {
 	Vector mouse = graphicView->toGraph(e->x(), e->y());
 	RS_Entity * se = catchEntity(e, RS2::ResolveAll);
@@ -172,7 +161,7 @@ void RS_ActionModifyRound::mouseReleaseEvent(QMouseEvent * e)
 	}
 }
 
-void RS_ActionModifyRound::commandEvent(RS_CommandEvent * e)
+void ActionModifyRound::commandEvent(RS_CommandEvent * e)
 {
 	QString c = e->getCommand().toLower();
 
@@ -246,7 +235,7 @@ void RS_ActionModifyRound::commandEvent(RS_CommandEvent * e)
 	}
 }
 
-QStringList RS_ActionModifyRound::getAvailableCommands()
+QStringList ActionModifyRound::getAvailableCommands()
 {
 	QStringList cmd;
 
@@ -264,23 +253,23 @@ QStringList RS_ActionModifyRound::getAvailableCommands()
 	return cmd;
 }
 
-void RS_ActionModifyRound::showOptions()
+void ActionModifyRound::showOptions()
 {
-	RS_ActionInterface::showOptions();
+	ActionInterface::showOptions();
 
 	if (RS_DIALOGFACTORY != NULL)
 		RS_DIALOGFACTORY->requestOptions(this, true);
 }
 
-void RS_ActionModifyRound::hideOptions()
+void ActionModifyRound::hideOptions()
 {
-	RS_ActionInterface::hideOptions();
+	ActionInterface::hideOptions();
 
 	if (RS_DIALOGFACTORY != NULL)
 		RS_DIALOGFACTORY->requestOptions(this, false);
 }
 
-void RS_ActionModifyRound::updateMouseButtonHints()
+void ActionModifyRound::updateMouseButtonHints()
 {
 	if (RS_DIALOGFACTORY != NULL)
 	{
@@ -312,33 +301,33 @@ void RS_ActionModifyRound::updateMouseButtonHints()
 	}
 }
 
-void RS_ActionModifyRound::updateMouseCursor()
+void ActionModifyRound::updateMouseCursor()
 {
 	graphicView->setMouseCursor(RS2::CadCursor);
 }
 
-void RS_ActionModifyRound::updateToolBar()
+void ActionModifyRound::updateToolBar()
 {
 	if (RS_DIALOGFACTORY != NULL)
 		RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
 }
 
-void RS_ActionModifyRound::setRadius(double r)
+void ActionModifyRound::setRadius(double r)
 {
 	data.radius = r;
 }
 
-double RS_ActionModifyRound::getRadius()
+double ActionModifyRound::getRadius()
 {
 	return data.radius;
 }
 
-void RS_ActionModifyRound::setTrim(bool t)
+void ActionModifyRound::setTrim(bool t)
 {
 	data.trim = t;
 }
 
-bool RS_ActionModifyRound::isTrimOn()
+bool ActionModifyRound::isTrimOn()
 {
 	return data.trim;
 }