Phase two of adding polyline functionality...

[architektonas] / src / forms / imageoptions.cpp

diff --git a/src/forms/imageoptions.cpp b/src/forms/imageoptions.cpp
index 8577613c4272c0beb89f65d04c23ebf4f49aacb5..be6c6613d7d32077bbbd8bb78261ebbc434203df 100644 (file)
--- a/src/forms/imageoptions.cpp
+++ b/src/forms/imageoptions.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 "imageoptions.h"
 
-#include "rs.h"
+#include "enums.h"
+#include "actiondrawimage.h"
+#include "actioninterface.h"
+#include "debug.h"
 #include "settings.h"
-#include "rs_actiondrawimage.h"
-#include "rs_actioninterface.h"
 
 ImageOptions::ImageOptions(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/):
        QWidget(parent, flags)
@@ -33,18 +36,18 @@ ImageOptions::~ImageOptions()
        settings.endGroup();
 }
 
-void ImageOptions::setAction(RS_ActionInterface * a, bool update)
+void ImageOptions::setAction(ActionInterface * a, bool update)
 {
        if (a != NULL && a->rtti() == RS2::ActionDrawImage)
        {
-               action = (RS_ActionDrawImage *)a;
+               action = (ActionDrawImage *)a;
 
                QString sAngle;
                QString sFactor;
 
                if (update)
                {
-                       sAngle = QString("%1").arg(RS_Math::rad2deg(action->getAngle()));
+                       sAngle = QString("%1").arg(Math::rad2deg(action->getAngle()));
                        sFactor = QString("%1").arg(action->getFactor());
                }
                else
@@ -61,7 +64,7 @@ void ImageOptions::setAction(RS_ActionInterface * a, bool update)
        }
        else
        {
-               RS_DEBUG->print(RS_Debug::D_ERROR, "ImageOptions::setAction: wrong action type");
+               DEBUG->print(Debug::D_ERROR, "ImageOptions::setAction: wrong action type");
                action = NULL;
        }
 }
@@ -70,7 +73,7 @@ void ImageOptions::updateData()
 {
        if (action != NULL)
        {
-               action->setAngle(RS_Math::deg2rad(RS_Math::eval(ui.leAngle->text())));
-               action->setFactor(RS_Math::eval(ui.leFactor->text()));
+               action->setAngle(Math::deg2rad(Math::eval(ui.leAngle->text())));
+               action->setFactor(Math::eval(ui.leFactor->text()));
        }
 }