Phase two of adding polyline functionality...

[architektonas] / src / forms / dlgarc.cpp

diff --git a/src/forms/dlgarc.cpp b/src/forms/dlgarc.cpp
index b79bbaedc81959eff89af84c3c7d84448b084ada..847667a96d5f2bb8601f7fbe41c08ed382781b74 100644 (file)
--- a/src/forms/dlgarc.cpp
+++ b/src/forms/dlgarc.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,9 +16,9 @@
 
 #include "dlgarc.h"
 
-#include "rs_arc.h"
+#include "arc.h"
 #include "drawing.h"
-#include "rs_math.h"
+#include "math.h"
 
 DlgArc::DlgArc(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/):
        QDialog(parent, flags)
@@ -28,7 +30,7 @@ DlgArc::~DlgArc()
 {
 }
 
-void DlgArc::setArc(RS_Arc & a)
+void DlgArc::setArc(Arc & a)
 {
        arc = &a;
        //pen = arc->getPen();
@@ -38,7 +40,7 @@ void DlgArc::setArc(RS_Arc & a)
        if (graphic != NULL)
                ui.cbLayer->init(*(graphic->getLayerList()), false, false);
 
-       RS_Layer * lay = arc->getLayer(false);
+       Layer * lay = arc->getLayer(false);
 
        if (lay != NULL)
                ui.cbLayer->setLayer(*lay);
@@ -50,20 +52,20 @@ void DlgArc::setArc(RS_Arc & a)
        ui.leCenterY->setText(s);
        s.setNum(arc->getRadius());
        ui.leRadius->setText(s);
-       s.setNum(RS_Math::rad2deg(arc->getAngle1()));
+       s.setNum(Math::rad2deg(arc->getAngle1()));
        ui.leAngle1->setText(s);
-       s.setNum(RS_Math::rad2deg(arc->getAngle2()));
+       s.setNum(Math::rad2deg(arc->getAngle2()));
        ui.leAngle2->setText(s);
        ui.cbReversed->setChecked(arc->isReversed());
 }
 
 void DlgArc::updateArc()
 {
-       arc->setCenter(Vector(RS_Math::eval(ui.leCenterX->text()),
-               RS_Math::eval(ui.leCenterY->text())));
-       arc->setRadius(RS_Math::eval(ui.leRadius->text()));
-       arc->setAngle1(RS_Math::deg2rad(RS_Math::eval(ui.leAngle1->text())));
-       arc->setAngle2(RS_Math::deg2rad(RS_Math::eval(ui.leAngle2->text())));
+       arc->setCenter(Vector(Math::eval(ui.leCenterX->text()),
+               Math::eval(ui.leCenterY->text())));
+       arc->setRadius(Math::eval(ui.leRadius->text()));
+       arc->setAngle1(Math::deg2rad(Math::eval(ui.leAngle1->text())));
+       arc->setAngle2(Math::deg2rad(Math::eval(ui.leAngle2->text())));
        arc->setReversed(ui.cbReversed->isChecked());
        arc->setPen(ui.wPen->getPen());
        arc->setLayer(ui.cbLayer->currentText());