In the middle of major refactoring...

[architektonas] / src / actions / actiondrawcircle.cpp

diff --git a/src/actions/rs_actiondrawcircle.cpp b/src/actions/actiondrawcircle.cpp
similarity index 61%
rename from src/actions/rs_actiondrawcircle.cpp
rename to src/actions/actiondrawcircle.cpp
index cf20b47424cdb33ef05256e876e4f4a6b5b6ca72..a6ddd14ba35b8bc8e870d969cf0b7a7521b1d05c 100644 (file)
--- a/src/actions/rs_actiondrawcircle.cpp
+++ b/src/actions/actiondrawcircle.cpp
@@ -1,4 +1,4 @@
-// rs_actiondrawcircle.cpp
+// actiondrawcircle.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
@@ -12,43 +12,43 @@
 // JLH  06/03/2010  Added this text. :-)
 //
 
-#include "rs_actiondrawcircle.h"
+#include "actiondrawcircle.h"
 
 #include "rs_commandevent.h"
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 #include "rs_preview.h"
 
-RS_ActionDrawCircle::RS_ActionDrawCircle(RS_EntityContainer & container, GraphicView & graphicView):
-       RS_PreviewActionInterface("Draw circles", container, graphicView)
+ActionDrawCircle::ActionDrawCircle(RS_EntityContainer & container, GraphicView & graphicView):
+       ActionInterface("Draw circles", container, graphicView)
 {
        reset();
 }
 
-RS_ActionDrawCircle::~RS_ActionDrawCircle()
+ActionDrawCircle::~ActionDrawCircle()
 {
 }
 
-/*virtual*/ RS2::ActionType RS_ActionDrawCircle::rtti()
+/*virtual*/ RS2::ActionType ActionDrawCircle::rtti()
 {
        return RS2::ActionDrawCircle;
 }
 
-void RS_ActionDrawCircle::reset()
+void ActionDrawCircle::reset()
 {
        data = RS_CircleData(Vector(false), 0.0);
 }
 
-void RS_ActionDrawCircle::init(int status)
+void ActionDrawCircle::init(int status)
 {
-       RS_PreviewActionInterface::init(status);
+       ActionInterface::init(status);
 
        reset();
 }
 
-void RS_ActionDrawCircle::trigger()
+void ActionDrawCircle::trigger()
 {
-       RS_PreviewActionInterface::trigger();
+       ActionInterface::trigger();
 
        RS_Circle * circle = new RS_Circle(container, data);
        circle->setLayerToActive();
@@ -73,12 +73,12 @@ void RS_ActionDrawCircle::trigger()
        setStatus(SetCenter);
        reset();
 
-       RS_DEBUG->print("RS_ActionDrawCircle::trigger(): circle added: %d", circle->getId());
+       RS_DEBUG->print("ActionDrawCircle::trigger(): circle added: %d", circle->getId());
 }
 
-void RS_ActionDrawCircle::mouseMoveEvent(QMouseEvent * e)
+void ActionDrawCircle::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("RS_ActionDrawCircle::mouseMoveEvent begin");
+       RS_DEBUG->print("ActionDrawCircle::mouseMoveEvent begin");
 
        Vector mouse = snapPoint(e);
 
@@ -95,17 +95,16 @@ void RS_ActionDrawCircle::mouseMoveEvent(QMouseEvent * e)
                        data.radius = data.center.distanceTo(mouse);
                        deletePreview();
                        clearPreview();
-                       preview->addEntity(new RS_Circle(preview,
-                                       data));
+//                     preview->addEntity(new RS_Circle(preview, data));
                        drawPreview();
                }
                break;
        }
 
-       RS_DEBUG->print("RS_ActionDrawCircle::mouseMoveEvent end");
+       RS_DEBUG->print("ActionDrawCircle::mouseMoveEvent end");
 }
 
-void RS_ActionDrawCircle::mouseReleaseEvent(QMouseEvent * e)
+void ActionDrawCircle::mouseReleaseEvent(QMouseEvent * e)
 {
        if (e->button() == Qt::LeftButton)
        {
@@ -120,9 +119,9 @@ void RS_ActionDrawCircle::mouseReleaseEvent(QMouseEvent * e)
        }
 }
 
-void RS_ActionDrawCircle::coordinateEvent(Vector * e)
+void ActionDrawCircle::coordinateEvent(Vector * e)
 {
-       if (e == NULL)
+       if (!e)
                return;
 
        Vector mouse = *e;
@@ -151,13 +150,13 @@ void RS_ActionDrawCircle::coordinateEvent(Vector * e)
        }
 }
 
-void RS_ActionDrawCircle::commandEvent(RS_CommandEvent * e)
+void ActionDrawCircle::commandEvent(RS_CommandEvent * e)
 {
        QString c = e->getCommand().toLower();
 
        if (checkCommand("help", c))
        {
-               if (RS_DIALOGFACTORY != NULL)
+               if (RS_DIALOGFACTORY)
                        RS_DIALOGFACTORY->commandMessage(msgAvailableCommands()
                                + getAvailableCommands().join(", "));
                return;
@@ -165,83 +164,76 @@ void RS_ActionDrawCircle::commandEvent(RS_CommandEvent * e)
 
        switch (getStatus())
        {
-       case SetRadius: {
+       case SetRadius:
+       {
                bool ok;
                double r = RS_Math::eval(c, &ok);
 
-               if (ok == true)
+               if (ok)
                        data.radius = r;
-               else if (RS_DIALOGFACTORY != NULL)
-                       RS_DIALOGFACTORY->commandMessage(
-                               tr("Not a valid expression"));
+               else if (RS_DIALOGFACTORY)
+                       RS_DIALOGFACTORY->commandMessage(tr("Not a valid expression"));
 
                trigger();
                //setStatus(SetCenter);
        }
-       break;
+               break;
 
        default:
                break;
        }
 }
 
-QStringList RS_ActionDrawCircle::getAvailableCommands()
+QStringList ActionDrawCircle::getAvailableCommands()
 {
        QStringList cmd;
        return cmd;
 }
 
-void RS_ActionDrawCircle::updateMouseButtonHints()
+void ActionDrawCircle::updateMouseButtonHints()
 {
        switch (getStatus())
        {
        case SetCenter:
-
-               if (RS_DIALOGFACTORY != NULL)
-                       RS_DIALOGFACTORY->updateMouseWidget(
-                               tr("Specify center"), tr("Cancel"));
+               if (RS_DIALOGFACTORY)
+                       RS_DIALOGFACTORY->updateMouseWidget(tr("Specify center"), tr("Cancel"));
                break;
 
        case SetRadius:
-
-               if (RS_DIALOGFACTORY != NULL)
+               if (RS_DIALOGFACTORY)
                        RS_DIALOGFACTORY->updateMouseWidget(tr("Specify radius"), tr("Back"));
                break;
 
        default:
-
-               if (RS_DIALOGFACTORY != NULL)
+               if (RS_DIALOGFACTORY)
                        RS_DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }
 
-void RS_ActionDrawCircle::showOptions()
+void ActionDrawCircle::showOptions()
 {
-       RS_ActionInterface::showOptions();
+       ActionInterface::showOptions();
 }
 
-void RS_ActionDrawCircle::hideOptions()
+void ActionDrawCircle::hideOptions()
 {
-       RS_ActionInterface::hideOptions();
+       ActionInterface::hideOptions();
 }
 
-void RS_ActionDrawCircle::updateMouseCursor()
+void ActionDrawCircle::updateMouseCursor()
 {
        graphicView->setMouseCursor(RS2::CadCursor);
 }
 
-void RS_ActionDrawCircle::updateToolBar()
+void ActionDrawCircle::updateToolBar()
 {
        if (!isFinished())
        {
-               if (RS_DIALOGFACTORY != NULL)
+               if (RS_DIALOGFACTORY)
                        RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
        }
-       else if (RS_DIALOGFACTORY != NULL)
+       else if (RS_DIALOGFACTORY)
                RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarCircles);
 
 }
-
-// EOF
-