Initial phase of adding polyline functionality. DOES NOT COMPILE.

[architektonas] / src / forms / dlgdimlinear.cpp

diff --git a/src/forms/dlgdimlinear.cpp b/src/forms/dlgdimlinear.cpp
index e4cfea067d694ec060bcff9335fc13445e3dcfbc..ba92dec8a0e669e61b3090f05d1d874aa0360c1c 100644 (file)
--- a/src/forms/dlgdimlinear.cpp
+++ b/src/forms/dlgdimlinear.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 "dlgdimlinear.h"
 
-#include "rs_dimlinear.h"
+#include "dimlinear.h"
 #include "drawing.h"
-#include "rs_math.h"
+#include "math.h"
 
 DlgDimLinear::DlgDimLinear(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/):
        QDialog(parent, flags)
@@ -28,7 +30,7 @@ DlgDimLinear::~DlgDimLinear()
 {
 }
 
-void DlgDimLinear::setDim(RS_DimLinear & d)
+void DlgDimLinear::setDim(DimLinear & d)
 {
        dim = &d;
        ui.wPen->setPen(dim->getPen(false), true, false, "Pen");
@@ -37,17 +39,17 @@ void DlgDimLinear::setDim(RS_DimLinear & d)
        if (graphic)
                ui.cbLayer->init(*(graphic->getLayerList()), false, false);
 
-       RS_Layer * lay = dim->getLayer(false);
+       Layer * lay = dim->getLayer(false);
 
        if (lay)
                ui.cbLayer->setLayer(*lay);
 
        ui.wLabel->setLabel(dim->getLabel(false));
-       ui.leAngle->setText(QString("%1").arg(RS_Math::rad2deg(dim->getAngle())));
+       ui.leAngle->setText(QString("%1").arg(Math::rad2deg(dim->getAngle())));
 }
 
 void DlgDimLinear::updateDim()
 {
        dim->setLabel(ui.wLabel->getLabel());
-       dim->setAngle(RS_Math::deg2rad(RS_Math::eval(ui.leAngle->text(), 0.0)));
+       dim->setAngle(Math::deg2rad(Math::eval(ui.leAngle->text(), 0.0)));
 }