Fixed hatch dialog, added snap/preview to circle tools.

[architektonas] / src / actions / actionmodifyrotate.cpp

diff --git a/src/actions/actionmodifyrotate.cpp b/src/actions/actionmodifyrotate.cpp
index 893b36ba41b2c4cf0303f68e70510243a8d4496f..5f616f5c0d8e5865b807f22db1ff7db16c2fc0f8 100644 (file)
--- a/src/actions/actionmodifyrotate.cpp
+++ b/src/actions/actionmodifyrotate.cpp
@@ -16,9 +16,10 @@
 
 #include "actionmodifyrotate.h"
 
-#include "rs_dialogfactory.h"
+#include "debug.h"
+#include "dialogfactory.h"
 
-ActionModifyRotate::ActionModifyRotate(RS_EntityContainer & container, GraphicView & graphicView):
+ActionModifyRotate::ActionModifyRotate(EntityContainer & container, GraphicView & graphicView):
        ActionInterface("Rotate Entities",
                container, graphicView)
 {
@@ -35,17 +36,17 @@ void ActionModifyRotate::init(int status)
 
 void ActionModifyRotate::trigger()
 {
-       RS_DEBUG->print("ActionModifyRotate::trigger()");
+       DEBUG->print("ActionModifyRotate::trigger()");
 
-       RS_Modification m(*container, graphicView);
+       Modification m(*container, graphicView);
        m.rotate(data);
 
-       RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+       DIALOGFACTORY->updateSelectionWidget(container->countSelected());
 }
 
 void ActionModifyRotate::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("ActionModifyRotate::mouseMoveEvent begin");
+       DEBUG->print("ActionModifyRotate::mouseMoveEvent begin");
 
        if (getStatus() == SetReferencePoint)
        {
@@ -62,7 +63,7 @@ void ActionModifyRotate::mouseMoveEvent(QMouseEvent * e)
                }
        }
 
-       RS_DEBUG->print("ActionModifyRotate::mouseMoveEvent end");
+       DEBUG->print("ActionModifyRotate::mouseMoveEvent end");
 }
 
 void ActionModifyRotate::mouseReleaseEvent(QMouseEvent * e)
@@ -93,7 +94,7 @@ void ActionModifyRotate::coordinateEvent(Vector * e)
                referencePoint = pos;
                setStatus(ShowDialog);
 
-               if (RS_DIALOGFACTORY->requestRotateDialog(data))
+               if (DIALOGFACTORY->requestRotateDialog(data))
                {
                        data.center = referencePoint;
                        trigger();
@@ -111,12 +112,12 @@ void ActionModifyRotate::updateMouseButtonHints()
        switch (getStatus())
        {
        case SetReferencePoint:
-               RS_DIALOGFACTORY->updateMouseWidget(tr("Specify reference point"),
+               DIALOGFACTORY->updateMouseWidget(tr("Specify reference point"),
                        tr("Back"));
                break;
 
        default:
-               RS_DIALOGFACTORY->updateMouseWidget("", "");
+               DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }
@@ -131,11 +132,11 @@ void ActionModifyRotate::updateToolBar()
        switch (getStatus())
        {
        case SetReferencePoint:
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
                break;
 
        default:
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
                break;
        }
 }