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 b1329f753576c7043542cbb5fd7feb8763a6f590..f06b9c0d84a4759000700fdad8b48b6b7cacf8e0 100644 (file)
--- a/src/forms/dlgimageoptions.cpp
+++ b/src/forms/dlgimageoptions.cpp
@@ -16,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*/):
@@ -72,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;
@@ -87,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()