Initial phase of adding polyline functionality. DOES NOT COMPILE.

[architektonas] / src / forms / dlgimageoptions.cpp

diff --git a/src/forms/dlgimageoptions.cpp b/src/forms/dlgimageoptions.cpp
index 391d30cd7c351a09184d9e0ad1e5593e0d5ce66e..f06b9c0d84a4759000700fdad8b48b6b7cacf8e0 100644 (file)
--- a/src/forms/dlgimageoptions.cpp
+++ b/src/forms/dlgimageoptions.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,7 +16,7 @@
 
 #include "dlgimageoptions.h"
 
-#include "rs_math.h"
+#include "mathextra.h"
 #include "settings.h"
 
 ImageOptionsDialog::ImageOptionsDialog(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/):
@@ -70,13 +72,13 @@ void  ImageOptionsDialog::resolutionChanged()
        {
                updateEnabled = false;
                bool ok = false;
-               double res = RS_Math::eval(ui.cbResolution->currentText(), &ok);
+               double res = Math::eval(ui.cbResolution->currentText(), &ok);
 
                if (!ok)
                        res = 1.0;
 
-               int w = RS_Math::round(res * graphicSize.x);
-               int h = RS_Math::round(res * graphicSize.y);
+               int w = Math::round(res * graphicSize.x);
+               int h = Math::round(res * graphicSize.y);
                ui.leWidth->setText(QString("%1").arg(w));
                ui.leHeight->setText(QString("%1").arg(h));
                updateEnabled = true;
@@ -85,8 +87,8 @@ void  ImageOptionsDialog::resolutionChanged()
 
 QSize ImageOptionsDialog::getSize()
 {
-       return QSize(RS_Math::round(RS_Math::eval(ui.leWidth->text())),
-               RS_Math::round(RS_Math::eval(ui.leHeight->text())));
+       return QSize(Math::round(Math::eval(ui.leWidth->text())),
+               Math::round(Math::eval(ui.leHeight->text())));
 }
 
 bool ImageOptionsDialog::isBackgroundBlack()