X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fdlgpoint.cpp;h=bb276ff8f5a0100ebf29f0c937accc05df32bb0b;hb=e1d1cacbb43055988d0d9db632fdf05c0bea9543;hp=81c306066a41c472eb2c3a745ebfca6dadc6e6dd;hpb=865303923fcb231a171992b75a73364ff469ff8c;p=architektonas diff --git a/src/forms/dlgpoint.cpp b/src/forms/dlgpoint.cpp index 81c3060..bb276ff 100644 --- a/src/forms/dlgpoint.cpp +++ b/src/forms/dlgpoint.cpp @@ -16,9 +16,9 @@ #include "dlgpoint.h" -#include "rs_point.h" +#include "point.h" #include "drawing.h" -#include "rs_math.h" +#include "math.h" DlgPoint::DlgPoint(QWidget * parent/*= NULL*/, Qt::WindowFlags flags/*= 0*/): QDialog(parent, flags) @@ -30,7 +30,7 @@ DlgPoint::~DlgPoint() { } -void DlgPoint::setPoint(RS_Point & p) +void DlgPoint::setPoint(Point & p) { point = &p; @@ -40,7 +40,7 @@ void DlgPoint::setPoint(RS_Point & p) if (graphic) ui.cbLayer->init(*(graphic->getLayerList()), false, false); - RS_Layer * lay = point->getLayer(false); + Layer * lay = point->getLayer(false); if (lay) ui.cbLayer->setLayer(*lay); @@ -54,8 +54,8 @@ void DlgPoint::setPoint(RS_Point & p) void DlgPoint::updatePoint() { - point->setPos(Vector(RS_Math::eval(ui.lePosX->text()), - RS_Math::eval(ui.lePosY->text()))); + point->setPos(Vector(Math::eval(ui.lePosX->text()), + Math::eval(ui.lePosY->text()))); point->setPen(ui.wPen->getPen()); point->setLayer(ui.cbLayer->currentText()); }