X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fdlginsert.cpp;h=be029bf687057268022e2a96aaf840f0ec5d1bef;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=591f8c9aa49ed9509e13d25957348cf82c8d1c61;hpb=05a1d5fa057f4f45bc1f9903f1bdc0be2f10e3bf;p=architektonas

diff --git a/src/forms/dlginsert.cpp b/src/forms/dlginsert.cpp
index 591f8c9..be029bf 100644
--- a/src/forms/dlginsert.cpp
+++ b/src/forms/dlginsert.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 "dlginsert.h"
 
-#include "rs_insert.h"
+#include "insert.h"
 #include "drawing.h"
-#include "rs_math.h"
+#include "math.h"
 
 DlgInsert::DlgInsert(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/):
 	QDialog(parent, flags)
@@ -28,7 +30,7 @@ DlgInsert::~DlgInsert()
 {
 }
 
-void DlgInsert::setInsert(RS_Insert & i)
+void DlgInsert::setInsert(Insert & i)
 {
 	insert = &i;
 	//pen = insert->getPen();
@@ -38,7 +40,7 @@ void DlgInsert::setInsert(RS_Insert & i)
 	if (graphic)
 		ui.cbLayer->init(*(graphic->getLayerList()), false, false);
 
-	RS_Layer * lay = insert->getLayer(false);
+	Layer * lay = insert->getLayer(false);
 
 	if (lay)
 		ui.cbLayer->setLayer(*lay);
@@ -50,7 +52,7 @@ void DlgInsert::setInsert(RS_Insert & i)
 	ui.leInsertionPointY->setText(s);
 	s.setNum(insert->getScale().x);
 	ui.leScale->setText(s);
-	s.setNum(RS_Math::rad2deg(insert->getAngle()));
+	s.setNum(Math::rad2deg(insert->getAngle()));
 	ui.leAngle->setText(s);
 	s.setNum(insert->getRows());
 	ui.leRows->setText(s);
@@ -64,15 +66,15 @@ void DlgInsert::setInsert(RS_Insert & i)
 
 void DlgInsert::updateInsert()
 {
-	insert->setInsertionPoint(Vector(RS_Math::eval(ui.leInsertionPointX->text()),
-		RS_Math::eval(ui.leInsertionPointY->text())));
-	insert->setScale(Vector(RS_Math::eval(ui.leScale->text()),
-		RS_Math::eval(ui.leScale->text())));
-	insert->setAngle(RS_Math::deg2rad(RS_Math::eval(ui.leAngle->text())));
-	insert->setRows(RS_Math::round(RS_Math::eval(ui.leRows->text())));
-	insert->setCols(RS_Math::round(RS_Math::eval(ui.leCols->text())));
-	insert->setSpacing(Vector(RS_Math::eval(ui.leRowSpacing->text()),
-		RS_Math::eval(ui.leColSpacing->text())));
+	insert->setInsertionPoint(Vector(Math::eval(ui.leInsertionPointX->text()),
+		Math::eval(ui.leInsertionPointY->text())));
+	insert->setScale(Vector(Math::eval(ui.leScale->text()),
+		Math::eval(ui.leScale->text())));
+	insert->setAngle(Math::deg2rad(Math::eval(ui.leAngle->text())));
+	insert->setRows(Math::round(Math::eval(ui.leRows->text())));
+	insert->setCols(Math::round(Math::eval(ui.leCols->text())));
+	insert->setSpacing(Vector(Math::eval(ui.leRowSpacing->text()),
+		Math::eval(ui.leColSpacing->text())));
 	insert->setPen(ui.wPen->getPen());
 	insert->setLayer(ui.cbLayer->currentText());
 }