X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fforms%2Fdlgspline.cpp;h=7624a225997f3a7a1baf8691cafe4be4af051831;hb=f62cebc26c7c3af447f0e4e4c43331f8589dce22;hp=5f5df0ddb036c0c840291406532d14e2020f253a;hpb=865303923fcb231a171992b75a73364ff469ff8c;p=architektonas diff --git a/src/forms/dlgspline.cpp b/src/forms/dlgspline.cpp index 5f5df0d..7624a22 100644 --- a/src/forms/dlgspline.cpp +++ b/src/forms/dlgspline.cpp @@ -17,7 +17,7 @@ #include "dlgspline.h" #include "drawing.h" -#include "rs_spline.h" +#include "spline.h" DlgSpline::DlgSpline(QWidget * parent/*= 0*/, Qt::WindowFlags flags/*= 0*/): QDialog(parent, flags) @@ -29,13 +29,13 @@ DlgSpline::~DlgSpline() { } -void DlgSpline::setSpline(RS_Spline & e) +void DlgSpline::setSpline(Spline & e) { spline = &e; //pen = spline->getPen(); ui.wPen->setPen(spline->getPen(false), true, false, "Pen"); Drawing * graphic = spline->getGraphic(); - RS_Layer * lay = spline->getLayer(false); + Layer * lay = spline->getLayer(false); if (graphic) ui.cbLayer->init(*(graphic->getLayerList()), false, false); @@ -53,7 +53,7 @@ void DlgSpline::setSpline(RS_Spline & e) void DlgSpline::updateSpline() { - spline->setDegree(RS_Math::round(RS_Math::eval(ui.cbDegree->currentText()))); + spline->setDegree(Math::round(Math::eval(ui.cbDegree->currentText()))); spline->setClosed(ui.cbClosed->isChecked()); spline->setPen(ui.wPen->getPen()); spline->setLayer(ui.cbLayer->currentText());