Phase two of adding polyline functionality...

[architektonas] / src / actions / actioninfoarea.cpp

diff --git a/src/actions/actioninfoarea.cpp b/src/actions/actioninfoarea.cpp
index 04dff283adddd678bbd034707f65c0c2fdfc55be..7c9ca32cb8ea180cafc718c8dab5f9fc2ae08fce 100644 (file)
--- a/src/actions/actioninfoarea.cpp
+++ b/src/actions/actioninfoarea.cpp
@@ -16,11 +16,12 @@
 
 #include "actioninfoarea.h"
 
-#include "rs_dialogfactory.h"
+#include "debug.h"
+#include "dialogfactory.h"
 #include "graphicview.h"
-#include "rs_preview.h"
+#include "preview.h"
 
-ActionInfoArea::ActionInfoArea(RS_EntityContainer & container, GraphicView & graphicView): ActionInterface("Info Area",
+ActionInfoArea::ActionInfoArea(EntityContainer & container, GraphicView & graphicView): ActionInterface("Info Area",
                container, graphicView)
 {
 }
@@ -41,7 +42,7 @@ void ActionInfoArea::init(int status)
 
 void ActionInfoArea::trigger()
 {
-       RS_DEBUG->print("ActionInfoArea::trigger()");
+       DEBUG->print("ActionInfoArea::trigger()");
 
        if (ia.isValid())
        {
@@ -50,9 +51,9 @@ void ActionInfoArea::trigger()
                double area = ia.getArea();
                double circ = ia.getCircumference();
 
-               RS_DEBUG->print("ActionInfoArea::trigger: area: %f", area);
-               RS_DIALOGFACTORY->commandMessage(tr("Area: %1").arg(area));
-               RS_DIALOGFACTORY->commandMessage(tr("Circumference: %1").arg(circ));
+               DEBUG->print("ActionInfoArea::trigger: area: %f", area);
+               DIALOGFACTORY->commandMessage(tr("Area: %1").arg(area));
+               DIALOGFACTORY->commandMessage(tr("Circumference: %1").arg(circ));
        }
 
        ia.reset();
@@ -62,14 +63,14 @@ void ActionInfoArea::trigger()
            double dist = point1.distanceTo(point2);
            QString str;
            str.sprintf("%.6f", dist);
-           RS_DIALOGFACTORY->commandMessage(tr("Distance: %1").arg(str));
+           DIALOGFACTORY->commandMessage(tr("Distance: %1").arg(str));
           }
         */
 }
 
 void ActionInfoArea::mouseMoveEvent(QMouseEvent * e)
 {
-       //RS_DEBUG->print("ActionInfoArea::mouseMoveEvent begin");
+       //DEBUG->print("ActionInfoArea::mouseMoveEvent begin");
 
        if (getStatus() == SetFirstPoint
            || getStatus() == SetNextPoint)
@@ -99,12 +100,12 @@ void ActionInfoArea::mouseMoveEvent(QMouseEvent * e)
                                        closingLine = NULL;
                                }
 
-//                             currentLine = new RS_Line(preview, RS_LineData(prev, mouse));
+//                             currentLine = new Line(preview, LineData(prev, mouse));
 //                             preview->addEntity(currentLine);
 
 //                             if (preview->count() > 1)
 //                             {
-//                                     closingLine = new RS_Line(preview, RS_LineData(mouse, point1));
+//                                     closingLine = new Line(preview, LineData(mouse, point1));
 //                                     preview->addEntity(closingLine);
 //                             }
 
@@ -144,7 +145,7 @@ void ActionInfoArea::mouseReleaseEvent(QMouseEvent * e)
                                closingLine = NULL;
                        }
 
-//                     currentLine = new RS_Line(preview, RS_LineData(prev, point1));
+//                     currentLine = new Line(preview, LineData(prev, point1));
 //                     preview->addEntity(currentLine);
                        drawPreview();
                }
@@ -171,7 +172,7 @@ void ActionInfoArea::coordinateEvent(Vector * e)
                clearPreview();
 
                ia.addPoint(mouse);
-               RS_DIALOGFACTORY->commandMessage(tr("Point: %1/%2").arg(mouse.x).arg(mouse.y));
+               DIALOGFACTORY->commandMessage(tr("Point: %1/%2").arg(mouse.x).arg(mouse.y));
 
                graphicView->moveRelativeZero(point1);
                prev = mouse;
@@ -184,7 +185,7 @@ void ActionInfoArea::coordinateEvent(Vector * e)
                if (point1.valid)
                {
                        ia.addPoint(mouse);
-                       RS_DIALOGFACTORY->commandMessage(tr("Point: %1/%2").arg(mouse.x).arg(mouse.y));
+                       DIALOGFACTORY->commandMessage(tr("Point: %1/%2").arg(mouse.x).arg(mouse.y));
 
                        currentLine = NULL;
 
@@ -210,19 +211,19 @@ void ActionInfoArea::updateMouseButtonHints()
        switch (getStatus())
        {
        case SetFirstPoint:
-               RS_DIALOGFACTORY->updateMouseWidget(
+               DIALOGFACTORY->updateMouseWidget(
                        tr("Specify first point of polygon"),
                        tr("Cancel"));
                break;
 
        case SetNextPoint:
-               RS_DIALOGFACTORY->updateMouseWidget(
+               DIALOGFACTORY->updateMouseWidget(
                        tr("Specify next point of polygon"),
                        tr("Terminate"));
                break;
 
        default:
-               RS_DIALOGFACTORY->updateMouseWidget("", "");
+               DIALOGFACTORY->updateMouseWidget("", "");
                break;
        }
 }
@@ -238,11 +239,11 @@ void ActionInfoArea::updateToolBar()
        {
        case SetFirstPoint:
        case SetNextPoint:
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarSnap);
                break;
 
        default:
-               RS_DIALOGFACTORY->requestToolBar(RS2::ToolBarInfo);
+               DIALOGFACTORY->requestToolBar(RS2::ToolBarInfo);
                break;
        }
 }