In the middle of major refactoring...

[architektonas] / src / actions / actiondrawellipseaxis.cpp

diff --git a/src/actions/rs_actiondrawellipseaxis.cpp b/src/actions/actiondrawellipseaxis.cpp
similarity index 78%
rename from src/actions/rs_actiondrawellipseaxis.cpp
rename to src/actions/actiondrawellipseaxis.cpp
index f1c72616d015acefefbf5b9d444c07497a747fd0..6f6a7f66a7169698fc0c6cef5e7b4574b6c87931 100644 (file)
--- a/src/actions/rs_actiondrawellipseaxis.cpp
+++ b/src/actions/actiondrawellipseaxis.cpp
@@ -1,4 +1,4 @@
-// rs_actiondrawellipseaxis.cpp
+// actiondrawellipseaxis.cpp
 //
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
@@ -12,7 +12,7 @@
 // JLH  05/22/2010  Added this text. :-)
 //
 
-#include "rs_actiondrawellipseaxis.h"
+#include "actiondrawellipseaxis.h"
 
 #include "rs_commandevent.h"
 #include "rs_dialogfactory.h"
@@ -25,7 +25,7 @@
  * @param isArc true if this action will produce an ellipse arc.
  *              false if it will produce a full ellipse.
  */
-RS_ActionDrawEllipseAxis::RS_ActionDrawEllipseAxis(RS_EntityContainer & container, GraphicView & graphicView, bool isArc): RS_PreviewActionInterface("Draw ellipse with axis",
+ActionDrawEllipseAxis::ActionDrawEllipseAxis(RS_EntityContainer & container, GraphicView & graphicView, bool isArc): ActionInterface("Draw ellipse with axis",
                container, graphicView)
 {
        this->isArc = isArc;
@@ -36,13 +36,13 @@ RS_ActionDrawEllipseAxis::RS_ActionDrawEllipseAxis(RS_EntityContainer & containe
        angle2 = 2 * M_PI;
 }
 
-RS_ActionDrawEllipseAxis::~RS_ActionDrawEllipseAxis()
+ActionDrawEllipseAxis::~ActionDrawEllipseAxis()
 {
 }
 
-void RS_ActionDrawEllipseAxis::init(int status)
+void ActionDrawEllipseAxis::init(int status)
 {
-       RS_PreviewActionInterface::init(status);
+       ActionInterface::init(status);
 
        if (status == SetCenter)
                center = Vector(false);
@@ -60,9 +60,9 @@ void RS_ActionDrawEllipseAxis::init(int status)
                angle2 = 2 * M_PI;
 }
 
-void RS_ActionDrawEllipseAxis::trigger()
+void ActionDrawEllipseAxis::trigger()
 {
-       RS_PreviewActionInterface::trigger();
+       ActionInterface::trigger();
 
        RS_EllipseData ellipseData(center, major, ratio, angle1, angle2, false);
        RS_Ellipse * ellipse = new RS_Ellipse(container, ellipseData);
@@ -88,13 +88,13 @@ void RS_ActionDrawEllipseAxis::trigger()
 
        setStatus(SetCenter);
 
-       RS_DEBUG->print("RS_ActionDrawEllipseAxis::trigger():"
+       RS_DEBUG->print("ActionDrawEllipseAxis::trigger():"
                " entity added: %d", ellipse->getId());
 }
 
-void RS_ActionDrawEllipseAxis::mouseMoveEvent(QMouseEvent * e)
+void ActionDrawEllipseAxis::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("RS_ActionDrawEllipseAxis::mouseMoveEvent begin");
+       RS_DEBUG->print("ActionDrawEllipseAxis::mouseMoveEvent begin");
 
        Vector mouse = snapPoint(e);
 
@@ -110,7 +110,7 @@ void RS_ActionDrawEllipseAxis::mouseMoveEvent(QMouseEvent * e)
                        deletePreview();
                        clearPreview();
                        RS_EllipseData ed(center, mouse - center, 0.5, 0.0, 2 * M_PI, false);
-                       preview->addEntity(new RS_Ellipse(preview, ed));
+//                     preview->addEntity(new RS_Ellipse(preview, ed));
                        drawPreview();
                }
                break;
@@ -125,7 +125,7 @@ void RS_ActionDrawEllipseAxis::mouseMoveEvent(QMouseEvent * e)
                        double d = line.getDistanceToPoint(mouse);
                        ratio = d / (line.getLength() / 2);
                        RS_EllipseData ed(center, major, ratio, 0.0, 2 * M_PI, false);
-                       preview->addEntity(new RS_Ellipse(preview, ed));
+//                     preview->addEntity(new RS_Ellipse(preview, ed));
                        drawPreview();
                }
                break;
@@ -145,10 +145,10 @@ void RS_ActionDrawEllipseAxis::mouseMoveEvent(QMouseEvent * e)
                        v.scale(Vector(1.0, 1.0 / ratio));
                        angle1 = v.angle(); // + major.angle();
 
-                       preview->addEntity(new RS_Line(preview, RS_LineData(center, mouse)));
+//                     preview->addEntity(new RS_Line(preview, RS_LineData(center, mouse)));
 
                        RS_EllipseData ed(center, major, ratio, angle1, angle1 + 1.0, false);
-                       preview->addEntity(new RS_Ellipse(preview, ed));
+//                     preview->addEntity(new RS_Ellipse(preview, ed));
                        drawPreview();
                }
                break;
@@ -167,11 +167,10 @@ void RS_ActionDrawEllipseAxis::mouseMoveEvent(QMouseEvent * e)
                        v.scale(Vector(1.0, 1.0 / ratio));
                        angle2 = v.angle(); // + major.angle();
 
-                       preview->addEntity(new RS_Line(preview, RS_LineData(center, mouse)));
+//                     preview->addEntity(new RS_Line(preview, RS_LineData(center, mouse)));
 
-                       RS_EllipseData ed(
-                               center, major, ratio, angle1, angle2, false);
-                       preview->addEntity(new RS_Ellipse(preview, ed));
+                       RS_EllipseData ed(center, major, ratio, angle1, angle2, false);
+//                     preview->addEntity(new RS_Ellipse(preview, ed));
                        drawPreview();
                }
 
@@ -179,20 +178,18 @@ void RS_ActionDrawEllipseAxis::mouseMoveEvent(QMouseEvent * e)
                break;
        }
 
-       RS_DEBUG->print("RS_ActionDrawEllipseAxis::mouseMoveEvent end");
+       RS_DEBUG->print("ActionDrawEllipseAxis::mouseMoveEvent end");
 }
 
-void RS_ActionDrawEllipseAxis::mouseReleaseEvent(QMouseEvent * e)
+void ActionDrawEllipseAxis::mouseReleaseEvent(QMouseEvent * e)
 {
        // Proceed to next status
-//     if (RS2::qtToRsButtonState(e->button())==RS2::LeftButton)
        if (e->button() == Qt::LeftButton)
        {
                Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
        // Return to last status:
-//     else if (RS2::qtToRsButtonState(e->button())==RS2::RightButton)
        else if (e->button() == Qt::RightButton)
        {
                deletePreview();
@@ -201,7 +198,7 @@ void RS_ActionDrawEllipseAxis::mouseReleaseEvent(QMouseEvent * e)
        }
 }
 
-void RS_ActionDrawEllipseAxis::coordinateEvent(Vector * e)
+void ActionDrawEllipseAxis::coordinateEvent(Vector * e)
 {
        if (e == NULL)
                return;
@@ -266,7 +263,7 @@ void RS_ActionDrawEllipseAxis::coordinateEvent(Vector * e)
        }
 }
 
-void RS_ActionDrawEllipseAxis::commandEvent(RS_CommandEvent * e)
+void ActionDrawEllipseAxis::commandEvent(RS_CommandEvent * e)
 {
        QString c = e->getCommand().toLower();
 
@@ -334,13 +331,13 @@ void RS_ActionDrawEllipseAxis::commandEvent(RS_CommandEvent * e)
        }
 }
 
-QStringList RS_ActionDrawEllipseAxis::getAvailableCommands()
+QStringList ActionDrawEllipseAxis::getAvailableCommands()
 {
        QStringList cmd;
        return cmd;
 }
 
-void RS_ActionDrawEllipseAxis::updateMouseButtonHints()
+void ActionDrawEllipseAxis::updateMouseButtonHints()
 {
        if (RS_DIALOGFACTORY != NULL)
        {
@@ -379,14 +376,14 @@ void RS_ActionDrawEllipseAxis::updateMouseButtonHints()
        }
 }
 
-void RS_ActionDrawEllipseAxis::updateMouseCursor()
+void ActionDrawEllipseAxis::updateMouseCursor()
 {
        graphicView->setMouseCursor(RS2::CadCursor);
 }
 
-void RS_ActionDrawEllipseAxis::updateToolBar()
+void ActionDrawEllipseAxis::updateToolBar()
 {
-       if (RS_DIALOGFACTORY != NULL)
+       if (RS_DIALOGFACTORY)
        {
                if (!isFinished())
                        RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
@@ -394,5 +391,3 @@ void RS_ActionDrawEllipseAxis::updateToolBar()
                        RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarEllipses);
        }
 }
-
-// EOF