X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fdlgellipse.cpp;h=2b4eda5ff7239e452151636723b17aee4c3f2956;hb=5adb444f3e523d3fd028617ced72d1ea6661db21;hp=d81f11f11cd9f6e38699e4f6e985b1e550ac9521;hpb=05a1d5fa057f4f45bc1f9903f1bdc0be2f10e3bf;p=architektonas

diff --git a/src/forms/dlgellipse.cpp b/src/forms/dlgellipse.cpp
index d81f11f..2b4eda5 100644
--- a/src/forms/dlgellipse.cpp
+++ b/src/forms/dlgellipse.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 "dlgellipse.h"
 
-#include "rs_ellipse.h"
+#include "ellipse.h"
 #include "drawing.h"
-#include "rs_math.h"
+#include "math.h"
 
 DlgEllipse::DlgEllipse(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/):
 	QDialog(parent, flags)
@@ -28,7 +30,7 @@ DlgEllipse::~DlgEllipse()
 {
 }
 
-void DlgEllipse::setEllipse(RS_Ellipse & e)
+void DlgEllipse::setEllipse(Ellipse & e)
 {
 	ellipse = &e;
 	//pen = ellipse->getPen();
@@ -38,7 +40,7 @@ void DlgEllipse::setEllipse(RS_Ellipse & e)
 	if (graphic != NULL)
 		ui.cbLayer->init(*(graphic->getLayerList()), false, false);
 
-	RS_Layer * lay = ellipse->getLayer(false);
+	Layer * lay = ellipse->getLayer(false);
 
 	if (lay != NULL)
 		ui.cbLayer->setLayer(*lay);
@@ -52,31 +54,31 @@ void DlgEllipse::setEllipse(RS_Ellipse & e)
 	ui.leMajor->setText(s);
 	s.setNum(ellipse->getMajorP().magnitude() * ellipse->getRatio());
 	ui.leMinor->setText(s);
-	s.setNum(RS_Math::rad2deg(ellipse->getMajorP().angle()));
+	s.setNum(Math::rad2deg(ellipse->getMajorP().angle()));
 	ui.leRotation->setText(s);
-	s.setNum(RS_Math::rad2deg(ellipse->getAngle1()));
+	s.setNum(Math::rad2deg(ellipse->getAngle1()));
 	ui.leAngle1->setText(s);
-	s.setNum(RS_Math::rad2deg(ellipse->getAngle2()));
+	s.setNum(Math::rad2deg(ellipse->getAngle2()));
 	ui.leAngle2->setText(s);
 	ui.cbReversed->setChecked(ellipse->isReversed());
 }
 
 void DlgEllipse::updateEllipse()
 {
-	ellipse->setCenter(Vector(RS_Math::eval(ui.leCenterX->text()),
-		RS_Math::eval(ui.leCenterY->text())));
+	ellipse->setCenter(Vector(Math::eval(ui.leCenterX->text()),
+		Math::eval(ui.leCenterY->text())));
 	Vector v;
-	v.setPolar(RS_Math::eval(ui.leMajor->text()),
-		RS_Math::deg2rad(RS_Math::eval(ui.leRotation->text())));
+	v.setPolar(Math::eval(ui.leMajor->text()),
+		Math::deg2rad(Math::eval(ui.leRotation->text())));
 	ellipse->setMajorP(v);
 
-	if (RS_Math::eval(ui.leMajor->text()) > 1.0e-6)
-		ellipse->setRatio(RS_Math::eval(ui.leMinor->text()) / RS_Math::eval(ui.leMajor->text()));
+	if (Math::eval(ui.leMajor->text()) > 1.0e-6)
+		ellipse->setRatio(Math::eval(ui.leMinor->text()) / Math::eval(ui.leMajor->text()));
 	else
 		ellipse->setRatio(1.0);
 
-	ellipse->setAngle1(RS_Math::deg2rad(RS_Math::eval(ui.leAngle1->text())));
-	ellipse->setAngle2(RS_Math::deg2rad(RS_Math::eval(ui.leAngle2->text())));
+	ellipse->setAngle1(Math::deg2rad(Math::eval(ui.leAngle1->text())));
+	ellipse->setAngle2(Math::deg2rad(Math::eval(ui.leAngle2->text())));
 	ellipse->setReversed(ui.cbReversed->isChecked());
 	ellipse->setPen(ui.wPen->getPen());
 	ellipse->setLayer(ui.cbLayer->currentText());