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

[architektonas] / src / actions / actionmodifymirror.cpp

diff --git a/src/actions/actionmodifymirror.cpp b/src/actions/actionmodifymirror.cpp
index f0f037369af67702ed4ac0c4ff7769882318a721..786aeeb1704c52afea9b56e8968e04be98572a47 100644 (file)
--- a/src/actions/actionmodifymirror.cpp
+++ b/src/actions/actionmodifymirror.cpp
@@ -3,7 +3,9 @@
 // Part of the Architektonas Project
 // Originally part of QCad Community Edition by Andrew Mustun
 // Extensively rewritten and refactored by James L. Hammons
-// (C) 2010 Underground Software
+// Portions copyright (C) 2001-2003 RibbonSoft
+// Copyright (C) 2010 Underground Software
+// See the README and GPLv2 files for licensing and warranty information
 //
 // JLH = James L. Hammons <jlhamm@acm.org>
 //
@@ -14,10 +16,11 @@
 
 #include "actionmodifymirror.h"
 
-#include "rs_dialogfactory.h"
-#include "rs_preview.h"
+#include "debug.h"
+#include "dialogfactory.h"
+#include "preview.h"
 
-ActionModifyMirror::ActionModifyMirror(RS_EntityContainer & container, GraphicView & graphicView):
+ActionModifyMirror::ActionModifyMirror(EntityContainer & container, GraphicView & graphicView):
        ActionInterface("Mirror Entities", container, graphicView)
 {
 }
@@ -33,18 +36,18 @@ void ActionModifyMirror::init(int status)
 
 void ActionModifyMirror::trigger()
 {
-       RS_DEBUG->print("ActionModifyMirror::trigger()");
+       DEBUG->print("ActionModifyMirror::trigger()");
 
-       RS_Modification m(*container, graphicView);
+       Modification m(*container, graphicView);
        m.mirror(data);
 
-       if (RS_DIALOGFACTORY)
-               RS_DIALOGFACTORY->updateSelectionWidget(container->countSelected());
+       if (DIALOGFACTORY)
+               DIALOGFACTORY->updateSelectionWidget(container->countSelected());
 }
 
 void ActionModifyMirror::mouseMoveEvent(QMouseEvent * e)
 {
-       RS_DEBUG->print("ActionModifyMirror::mouseMoveEvent begin");
+       DEBUG->print("ActionModifyMirror::mouseMoveEvent begin");
 
        if (getStatus() == SetAxisPoint1 || getStatus() == SetAxisPoint2)
        {
@@ -66,7 +69,7 @@ void ActionModifyMirror::mouseMoveEvent(QMouseEvent * e)
                                clearPreview();
 /*                             preview->addSelectionFrom(*container);
                                preview->mirror(axisPoint1, axisPoint2);
-                               preview->addEntity(new RS_Line(preview,RS_LineData(axisPoint1, axisPoint2)));*/
+                               preview->addEntity(new Line(preview,LineData(axisPoint1, axisPoint2)));*/
                                drawPreview();
                        }
                        break;
@@ -76,7 +79,7 @@ void ActionModifyMirror::mouseMoveEvent(QMouseEvent * e)
                }
        }
 
-       RS_DEBUG->print("ActionModifyMirror::mouseMoveEvent end");
+       DEBUG->print("ActionModifyMirror::mouseMoveEvent end");
 }
 
 void ActionModifyMirror::mouseReleaseEvent(QMouseEvent * e)
@@ -114,9 +117,9 @@ void ActionModifyMirror::coordinateEvent(Vector * e)
                setStatus(ShowDialog);
                graphicView->moveRelativeZero(mouse);
 
-               if (RS_DIALOGFACTORY)
+               if (DIALOGFACTORY)
                {
-                       if (RS_DIALOGFACTORY->requestMirrorDialog(data))
+                       if (DIALOGFACTORY->requestMirrorDialog(data))
                        {
                                data.axisPoint1 = axisPoint1;
                                data.axisPoint2 = axisPoint2;
@@ -135,28 +138,28 @@ void ActionModifyMirror::coordinateEvent(Vector * e)
 
 void ActionModifyMirror::updateMouseButtonHints()
 {
-       if (RS_DIALOGFACTORY)
+       if (DIALOGFACTORY)
        {
                switch (getStatus())
                {
                /*case Select:
-                   RS_DIALOGFACTORY->updateMouseWidget(tr("Pick entities to move"),
+                   DIALOGFACTORY->updateMouseWidget(tr("Pick entities to move"),
                                                   tr("Cancel"));
                    break;*/
                case SetAxisPoint1:
-                       RS_DIALOGFACTORY->updateMouseWidget(
+                       DIALOGFACTORY->updateMouseWidget(
                                tr("Specify first point of mirror line"),
                                tr("Cancel"));
                        break;
 
                case SetAxisPoint2:
-                       RS_DIALOGFACTORY->updateMouseWidget(
+                       DIALOGFACTORY->updateMouseWidget(
                                tr("Specify second point of mirror line"),
                                tr("Back"));
                        break;
 
                default:
-                       RS_DIALOGFACTORY->updateMouseWidget("", "");
+                       DIALOGFACTORY->updateMouseWidget("", "");
                        break;
                }
        }
@@ -169,17 +172,17 @@ void ActionModifyMirror::updateMouseCursor()
 
 void ActionModifyMirror::updateToolBar()
 {
-       if (RS_DIALOGFACTORY != NULL)
+       if (DIALOGFACTORY != NULL)
        {
                switch (getStatus())
                {
                case SetAxisPoint1:
                case SetAxisPoint2:
-                       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+                       DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
                        break;
 
                default:
-                       RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
+                       DIALOGFACTORY->requestToolBar(RS2::ToolBarModify);
                        break;
                }
        }