Major refactoring of actions: Moved implementation from header files

[architektonas] / src / actions / rs_actiondrawpoint.cpp

diff --git a/src/actions/rs_actiondrawpoint.cpp b/src/actions/rs_actiondrawpoint.cpp
index 79e599443081e9789ba892004f71e7a6cd45861d..8ec3a810a5f2f29e8a8fe295564a7671e739581e 100644 (file)
--- a/src/actions/rs_actiondrawpoint.cpp
+++ b/src/actions/rs_actiondrawpoint.cpp
@@ -14,11 +14,11 @@
 
 #include "rs_actiondrawpoint.h"
 
-#include "rs_snapper.h"
-#include "rs_point.h"
+#include "rs_dialogfactory.h"
+#include "rs_graphicview.h"
+#include "rs_preview.h"
 
-RS_ActionDrawPoint::RS_ActionDrawPoint(RS_EntityContainer & container,
-       RS_GraphicView & graphicView):
+RS_ActionDrawPoint::RS_ActionDrawPoint(RS_EntityContainer & container, RS_GraphicView & graphicView):
        RS_PreviewActionInterface("Draw Points", container, graphicView)
 {
 }
@@ -27,16 +27,6 @@ RS_ActionDrawPoint::~RS_ActionDrawPoint()
 {
 }
 
-QAction * RS_ActionDrawPoint::createGUIAction(RS2::ActionType /*type*/, QObject* /*parent*/)
-{
-       QAction * action = new QAction(tr("&Points") + QString("\tpo"), 0);
-//     QAction* action = new QAction(tr("Points"), tr("&Points"),
-//                                                                     QKeySequence(), NULL);
-       action->setStatusTip(tr("Draw Points"));
-
-       return action;
-}
-
 void RS_ActionDrawPoint::trigger()
 {
        if (pt.valid)
@@ -61,14 +51,14 @@ void RS_ActionDrawPoint::trigger()
 
 void RS_ActionDrawPoint::mouseMoveEvent(QMouseEvent * e)
 {
-               snapPoint(e);
+       snapPoint(e);
 }
 
 void RS_ActionDrawPoint::mouseReleaseEvent(QMouseEvent * e)
 {
        if (RS2::qtToRsButtonState(e->button()) == RS2::LeftButton)
        {
-               RS_CoordinateEvent ce(snapPoint(e));
+               Vector ce(snapPoint(e));
                coordinateEvent(&ce);
        }
        else if (RS2::qtToRsButtonState(e->button()) == RS2::RightButton)
@@ -78,12 +68,12 @@ void RS_ActionDrawPoint::mouseReleaseEvent(QMouseEvent * e)
        }
 }
 
-void RS_ActionDrawPoint::coordinateEvent(RS_CoordinateEvent * e)
+void RS_ActionDrawPoint::coordinateEvent(Vector * e)
 {
        if (e == NULL)
                return;
 
-       Vector mouse = e->getCoordinate();
+       Vector mouse = *e;
 
        pt = mouse;
        trigger();
@@ -118,6 +108,7 @@ void RS_ActionDrawPoint::updateMouseButtonHints()
                case 0:
                        RS_DIALOGFACTORY->updateMouseWidget(tr("Specify location"), tr("Cancel"));
                        break;
+
                default:
                        RS_DIALOGFACTORY->updateMouseWidget("", "");
                        break;
@@ -125,8 +116,9 @@ void RS_ActionDrawPoint::updateMouseButtonHints()
        }
 }
 
-void RS_ActionDrawPoint::updateMouseCursor() {
-    graphicView->setMouseCursor(RS2::CadCursor);
+void RS_ActionDrawPoint::updateMouseCursor()
+{
+       graphicView->setMouseCursor(RS2::CadCursor);
 }
 
 void RS_ActionDrawPoint::updateToolBar()
@@ -139,3 +131,4 @@ void RS_ActionDrawPoint::updateToolBar()
                        RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarPoints);
        }
 }
+