Initial phase of adding polyline functionality. DOES NOT COMPILE.

[architektonas] / src / forms / printpreviewoptions.cpp

diff --git a/src/forms/printpreviewoptions.cpp b/src/forms/printpreviewoptions.cpp
index a88bbf253dfb35a5bb9529db35c467f9ce29cfcd..07dbf7ad81c531b6c684814d540659bda6d0019c 100644 (file)
--- a/src/forms/printpreviewoptions.cpp
+++ b/src/forms/printpreviewoptions.cpp
@@ -1,8 +1,11 @@
 // printpreviewoptions.cpp
 //
+// 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>
 //
@@ -13,11 +16,11 @@
 
 #include "printpreviewoptions.h"
 
-#include "rs.h"
-#include "rs_actioninterface.h"
-#include "rs_actionprintpreview.h"
-#include "rs_debug.h"
-#include "rs_math.h"
+#include "enums.h"
+#include "actioninterface.h"
+#include "actionprintpreview.h"
+#include "debug.h"
+#include "mathextra.h"
 
 //PrintPreviewOptions::PrintPreviewOptions(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
 PrintPreviewOptions::PrintPreviewOptions(QToolBar * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/):
@@ -64,11 +67,11 @@ PrintPreviewOptions::~PrintPreviewOptions()
        */
 }
 
-void PrintPreviewOptions::setAction(RS_ActionInterface * a, bool/*update*/)
+void PrintPreviewOptions::setAction(ActionInterface * a, bool/*update*/)
 {
        if (a != NULL && a->rtti() == RS2::ActionPrintPreview)
        {
-               action = (RS_ActionPrintPreview *)a;
+               action = (ActionPrintPreview *)a;
 
                updateDisabled = true;
                RS2::Unit u = action->getUnit();
@@ -93,7 +96,7 @@ void PrintPreviewOptions::setAction(RS_ActionInterface * a, bool/*update*/)
                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 {
                        RS_SETTINGS->beginGroup("/PrintPreview");
@@ -108,7 +111,7 @@ void PrintPreviewOptions::setAction(RS_ActionInterface * a, bool/*update*/)
        }
        else
        {
-               RS_DEBUG->print(RS_Debug::D_ERROR, "QG_PrintPreviewOptions::setAction: wrong action type");
+               DEBUG->print(Debug::D_ERROR, "QG_PrintPreviewOptions::setAction: wrong action type");
                action = NULL;
        }
 }
@@ -118,8 +121,8 @@ void PrintPreviewOptions::updateData()
        if (action != NULL)
        {
                /*
-               action->setAngle(RS_Math::deg2rad(RS_Math::eval(leAngle->text())));
-               action->setFactor(RS_Math::eval(leFactor->text()));
+               action->setAngle(Math::deg2rad(Math::eval(leAngle->text())));
+               action->setFactor(Math::eval(leFactor->text()));
                */
        }
 }
@@ -170,7 +173,7 @@ void PrintPreviewOptions::scale(const QString & s)
        else
        {
                bool ok = false;
-               double f = RS_Math::eval(s, &ok);
+               double f = Math::eval(s, &ok);
 
                if (ok)
                        action->setScale(f);