In the middle of major refactoring...

[architektonas] / src / actions / actiondimdiametric.cpp

diff --git a/src/actions/rs_actiondimdiametric.cpp b/src/actions/actiondimdiametric.cpp
similarity index 76%
rename from src/actions/rs_actiondimdiametric.cpp
rename to src/actions/actiondimdiametric.cpp
index 80264c5439740745c36942a8352ee2f668886090..2403f9663fd6cbf4344651e6961950426ca48611 100644 (file)
--- a/src/actions/rs_actiondimdiametric.cpp
+++ b/src/actions/actiondimdiametric.cpp
@@ -1,4 +1,4 @@
-// rs_actiondimdiametric.cpp
+// actiondimdiametric.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
@@ -12,44 +12,44 @@
 // JLH  06/03/2010  Added this text. :-)
 //
 
-#include "rs_actiondimdiametric.h"
+#include "actiondimdiametric.h"
 
 #include "rs_commandevent.h"
 #include "rs_dialogfactory.h"
 #include "graphicview.h"
 #include "rs_preview.h"
 
-RS_ActionDimDiametric::RS_ActionDimDiametric(RS_EntityContainer & container, GraphicView & graphicView): RS_ActionDimension("Draw Diametric Dimensions",
-               container, graphicView)
+ActionDimDiametric::ActionDimDiametric(RS_EntityContainer & container,
+       GraphicView & graphicView): ActionDimension("Draw Diametric Dimensions",
+       container, graphicView)
 {
        reset();
 }
 
-RS_ActionDimDiametric::~RS_ActionDimDiametric()
+ActionDimDiametric::~ActionDimDiametric()
 {
 }
 
-/*virtual*/ RS2::ActionType RS_ActionDimDiametric::rtti()
+/*virtual*/ RS2::ActionType ActionDimDiametric::rtti()
 {
        return RS2::ActionDimDiametric;
 }
 
-void RS_ActionDimDiametric::reset()
+void ActionDimDiametric::reset()
 {
-       RS_ActionDimension::reset();
+       ActionDimension::reset();
        edata = RS_DimDiametricData(Vector(false), 0.0);
        entity = NULL;
        pos = Vector(false);
        RS_DIALOGFACTORY->requestOptions(this, true, true);
 }
 
-void RS_ActionDimDiametric::trigger()
+void ActionDimDiametric::trigger()
 {
-       RS_PreviewActionInterface::trigger();
-
+       ActionInterface::trigger();
        preparePreview();
 
-       if (entity != NULL)
+       if (entity)
        {
                RS_DimDiametric * newEntity = NULL;
 
@@ -63,12 +63,13 @@ void RS_ActionDimDiametric::trigger()
                container->addEntity(newEntity);
 
                // upd. undo list:
-               if (document != NULL)
+               if (document)
                {
                        document->startUndoCycle();
                        document->addUndoable(newEntity);
                        document->endUndoCycle();
                }
+
                deleteSnapper();
                Vector rz = graphicView->getRelativeZero();
                graphicView->moveRelativeZero(Vector(0.0, 0.0));
@@ -76,13 +77,12 @@ void RS_ActionDimDiametric::trigger()
                graphicView->moveRelativeZero(rz);
        }
        else
-               RS_DEBUG->print("RS_ActionDimDiametric::trigger:"
-                       " Entity is NULL\n");
+               RS_DEBUG->print("ActionDimDiametric::trigger: Entity is NULL\n");
 }
 
-void RS_ActionDimDiametric::preparePreview()
+void ActionDimDiametric::preparePreview()
 {
-       if (entity != NULL)
+       if (entity)
        {
                double radius = 0.0;
                Vector center = Vector(false);
@@ -107,9 +107,9 @@ void RS_ActionDimDiametric::preparePreview()
        }
 }
 
-void RS_ActionDimDiametric::mouseMoveEvent(QMouseEvent * e)
+void ActionDimDiametric::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("RS_ActionDimDiametric::mouseMoveEvent begin");
+       RS_DEBUG->print("ActionDimDiametric::mouseMoveEvent begin");
 
        Vector mouse(graphicView->toGraphX(e->x()), graphicView->toGraphY(e->y()));
 
@@ -126,13 +126,13 @@ void RS_ActionDimDiametric::mouseMoveEvent(QMouseEvent * e)
                        pos = snapPoint(e);
 
                        preparePreview();
-                       RS_DimDiametric * d = new RS_DimDiametric(preview, data, edata);
-                       d->update();
-
-                       deletePreview();
-                       clearPreview();
-                       preview->addEntity(d);
-                       drawPreview();
+//                     RS_DimDiametric * d = new RS_DimDiametric(preview, data, edata);
+//                     d->update();
+//
+//                     deletePreview();
+//                     clearPreview();
+//                     preview->addEntity(d);
+//                     drawPreview();
                }
                break;
 
@@ -140,10 +140,10 @@ void RS_ActionDimDiametric::mouseMoveEvent(QMouseEvent * e)
                break;
        }
 
-       RS_DEBUG->print("RS_ActionDimDiametric::mouseMoveEvent end");
+       RS_DEBUG->print("ActionDimDiametric::mouseMoveEvent end");
 }
 
-void RS_ActionDimDiametric::mouseReleaseEvent(QMouseEvent * e)
+void ActionDimDiametric::mouseReleaseEvent(QMouseEvent * e)
 {
        if (e->button() == Qt::LeftButton)
        {
@@ -195,7 +195,7 @@ void RS_ActionDimDiametric::mouseReleaseEvent(QMouseEvent * e)
        }
 }
 
-void RS_ActionDimDiametric::coordinateEvent(Vector * e)
+void ActionDimDiametric::coordinateEvent(Vector * e)
 {
        if (e == NULL)
                return;
@@ -214,7 +214,7 @@ void RS_ActionDimDiametric::coordinateEvent(Vector * e)
        }
 }
 
-void RS_ActionDimDiametric::commandEvent(RS_CommandEvent * e)
+void ActionDimDiametric::commandEvent(RS_CommandEvent * e)
 {
        QString c = e->getCommand().toLower();
 
@@ -263,7 +263,7 @@ void RS_ActionDimDiametric::commandEvent(RS_CommandEvent * e)
        }
 }
 
-QStringList RS_ActionDimDiametric::getAvailableCommands()
+QStringList ActionDimDiametric::getAvailableCommands()
 {
        QStringList cmd;
 
@@ -281,7 +281,7 @@ QStringList RS_ActionDimDiametric::getAvailableCommands()
        return cmd;
 }
 
-void RS_ActionDimDiametric::updateMouseButtonHints()
+void ActionDimDiametric::updateMouseButtonHints()
 {
        switch (getStatus())
        {
@@ -305,19 +305,17 @@ void RS_ActionDimDiametric::updateMouseButtonHints()
        }
 }
 
-void RS_ActionDimDiametric::showOptions()
+void ActionDimDiametric::showOptions()
 {
-       RS_ActionInterface::showOptions();
+       ActionInterface::showOptions();
 
        RS_DIALOGFACTORY->requestOptions(this, true);
 }
 
-void RS_ActionDimDiametric::hideOptions()
+void ActionDimDiametric::hideOptions()
 {
-       RS_ActionInterface::hideOptions();
+       ActionInterface::hideOptions();
 
        //RS_DIALOGFACTORY->requestDimDiametricOptions(edata, false);
        RS_DIALOGFACTORY->requestOptions(this, false);
 }
-
-// EOF