X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fdlgcircle.cpp;h=a117dd207466b7217b2f9ca4a408432808e8e216;hb=a18a12fc3bcb18e5c7ca5494d7f97fb8b93f90a2;hp=396ffae03efb7c6ab0fc2adb5b4a061d33aeab98;hpb=865303923fcb231a171992b75a73364ff469ff8c;p=architektonas

diff --git a/src/forms/dlgcircle.cpp b/src/forms/dlgcircle.cpp
index 396ffae..a117dd2 100644
--- a/src/forms/dlgcircle.cpp
+++ b/src/forms/dlgcircle.cpp
@@ -16,9 +16,9 @@
 
 #include "dlgcircle.h"
 
-#include "rs_circle.h"
+#include "circle.h"
 #include "drawing.h"
-#include "rs_math.h"
+#include "math.h"
 
 DlgCircle::DlgCircle(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/):
 	QDialog(parent, flags)
@@ -30,17 +30,17 @@ DlgCircle::~DlgCircle()
 {
 }
 
-void DlgCircle::setCircle(RS_Circle & c)
+void DlgCircle::setCircle(Circle & c)
 {
 	circle = &c;
 	//pen = circle->getPen();
 	ui.wPen->setPen(circle->getPen(false), true, false, "Pen");
-	Drawing * graphic = circle->getGraphic();
+	Drawing * drawing = circle->GetDrawing();
 
-	if (graphic != NULL)
-		ui.cbLayer->init(*(graphic->getLayerList()), false, false);
+	if (drawing)
+		ui.cbLayer->init(*(drawing->getLayerList()), false, false);
 
-	RS_Layer * lay = circle->getLayer(false);
+	Layer * lay = circle->getLayer(false);
 
 	if (lay != NULL)
 		ui.cbLayer->setLayer(*lay);
@@ -56,9 +56,9 @@ void DlgCircle::setCircle(RS_Circle & c)
 
 void DlgCircle::updateCircle()
 {
-	circle->setCenter(Vector(RS_Math::eval(ui.leCenterX->text()),
-		RS_Math::eval(ui.leCenterY->text())));
-	circle->setRadius(RS_Math::eval(ui.leRadius->text()));
+	circle->setCenter(Vector(Math::eval(ui.leCenterX->text()),
+		Math::eval(ui.leCenterY->text())));
+	circle->setRadius(Math::eval(ui.leRadius->text()));
 	circle->setPen(ui.wPen->getPen());
 	circle->setLayer(ui.cbLayer->currentText());
 	circle->calculateBorders();