#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)
{
}
-void DlgEllipse::setEllipse(RS_Ellipse & e)
+void DlgEllipse::setEllipse(Ellipse & e)
{
ellipse = &e;
//pen = ellipse->getPen();
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);
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());