From d8a36bc1b234067a36fc182c0d30a5cf45fbf5f4 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 15 Nov 2020 13:17:52 +0100 Subject: [PATCH] Part: [skip ci] include generated ui files from within source file --- src/Mod/Part/Gui/DlgPrimitives.cpp | 1104 ++++++++++++++-------------- src/Mod/Part/Gui/DlgPrimitives.h | 9 +- 2 files changed, 559 insertions(+), 554 deletions(-) diff --git a/src/Mod/Part/Gui/DlgPrimitives.cpp b/src/Mod/Part/Gui/DlgPrimitives.cpp index bca073a7dd..e701003925 100644 --- a/src/Mod/Part/Gui/DlgPrimitives.cpp +++ b/src/Mod/Part/Gui/DlgPrimitives.cpp @@ -57,6 +57,8 @@ #include #include "DlgPrimitives.h" +#include "ui_DlgPrimitives.h" +#include "ui_Location.h" using namespace PartGui; @@ -188,108 +190,109 @@ private: DlgPrimitives::DlgPrimitives(QWidget* parent, Part::Primitive* feature) : QWidget(parent) + , ui(new Ui_DlgPrimitives) , featurePtr(feature) { - ui.setupUi(this); + ui->setupUi(this); Gui::Command::doCommand(Gui::Command::Doc, "from FreeCAD import Base"); Gui::Command::doCommand(Gui::Command::Doc, "import Part,PartGui"); // set limits // // plane - ui.planeLength->setRange(0, INT_MAX); - ui.planeWidth->setRange(0, INT_MAX); + ui->planeLength->setRange(0, INT_MAX); + ui->planeWidth->setRange(0, INT_MAX); // box - ui.boxLength->setRange(0, INT_MAX); - ui.boxWidth->setRange(0, INT_MAX); - ui.boxHeight->setRange(0, INT_MAX); + ui->boxLength->setRange(0, INT_MAX); + ui->boxWidth->setRange(0, INT_MAX); + ui->boxHeight->setRange(0, INT_MAX); // cylinder - ui.cylinderRadius->setRange(0, INT_MAX); - ui.cylinderHeight->setRange(0, INT_MAX); - ui.cylinderAngle->setRange(0, 360); + ui->cylinderRadius->setRange(0, INT_MAX); + ui->cylinderHeight->setRange(0, INT_MAX); + ui->cylinderAngle->setRange(0, 360); // cone - ui.coneRadius1->setRange(0, INT_MAX); - ui.coneRadius2->setRange(0, INT_MAX); - ui.coneHeight->setRange(0, INT_MAX); - ui.coneAngle->setRange(0, 360); + ui->coneRadius1->setRange(0, INT_MAX); + ui->coneRadius2->setRange(0, INT_MAX); + ui->coneHeight->setRange(0, INT_MAX); + ui->coneAngle->setRange(0, 360); // sphere - ui.sphereRadius->setRange(0, INT_MAX); - ui.sphereAngle1->setRange(-90, 90); - ui.sphereAngle2->setRange(-90, 90); - ui.sphereAngle3->setRange(0, 360); + ui->sphereRadius->setRange(0, INT_MAX); + ui->sphereAngle1->setRange(-90, 90); + ui->sphereAngle2->setRange(-90, 90); + ui->sphereAngle3->setRange(0, 360); // ellipsoid - ui.ellipsoidRadius1->setRange(0, INT_MAX); - ui.ellipsoidRadius2->setRange(0, INT_MAX); - ui.ellipsoidRadius3->setRange(0, INT_MAX); - ui.ellipsoidAngle1->setRange(-90, 90); - ui.ellipsoidAngle2->setRange(-90, 90); - ui.ellipsoidAngle3->setRange(0, 360); + ui->ellipsoidRadius1->setRange(0, INT_MAX); + ui->ellipsoidRadius2->setRange(0, INT_MAX); + ui->ellipsoidRadius3->setRange(0, INT_MAX); + ui->ellipsoidAngle1->setRange(-90, 90); + ui->ellipsoidAngle2->setRange(-90, 90); + ui->ellipsoidAngle3->setRange(0, 360); // torus - ui.torusRadius1->setRange(0, INT_MAX); - ui.torusRadius2->setRange(0, INT_MAX); - ui.torusAngle1->setRange(-180, 180); - ui.torusAngle2->setRange(-180, 180); - ui.torusAngle3->setRange(0, 360); + ui->torusRadius1->setRange(0, INT_MAX); + ui->torusRadius2->setRange(0, INT_MAX); + ui->torusAngle1->setRange(-180, 180); + ui->torusAngle2->setRange(-180, 180); + ui->torusAngle3->setRange(0, 360); // prism - ui.prismCircumradius->setRange(0, INT_MAX); - ui.prismHeight->setRange(0, INT_MAX); + ui->prismCircumradius->setRange(0, INT_MAX); + ui->prismHeight->setRange(0, INT_MAX); // wedge - ui.wedgeXmin->setMinimum(INT_MIN); - ui.wedgeXmin->setMaximum(INT_MAX); - ui.wedgeYmin->setMinimum(INT_MIN); - ui.wedgeYmin->setMaximum(INT_MAX); - ui.wedgeZmin->setMinimum(INT_MIN); - ui.wedgeZmin->setMaximum(INT_MAX); - ui.wedgeX2min->setMinimum(INT_MIN); - ui.wedgeX2min->setMaximum(INT_MAX); - ui.wedgeZ2min->setMinimum(INT_MIN); - ui.wedgeZ2min->setMaximum(INT_MAX); - ui.wedgeXmax->setMinimum(INT_MIN); - ui.wedgeXmax->setMaximum(INT_MAX); - ui.wedgeYmax->setMinimum(INT_MIN); - ui.wedgeYmax->setMaximum(INT_MAX); - ui.wedgeZmax->setMinimum(INT_MIN); - ui.wedgeZmax->setMaximum(INT_MAX); - ui.wedgeX2max->setMinimum(INT_MIN); - ui.wedgeX2max->setMaximum(INT_MAX); - ui.wedgeZ2max->setMinimum(INT_MIN); - ui.wedgeZ2max->setMaximum(INT_MAX); + ui->wedgeXmin->setMinimum(INT_MIN); + ui->wedgeXmin->setMaximum(INT_MAX); + ui->wedgeYmin->setMinimum(INT_MIN); + ui->wedgeYmin->setMaximum(INT_MAX); + ui->wedgeZmin->setMinimum(INT_MIN); + ui->wedgeZmin->setMaximum(INT_MAX); + ui->wedgeX2min->setMinimum(INT_MIN); + ui->wedgeX2min->setMaximum(INT_MAX); + ui->wedgeZ2min->setMinimum(INT_MIN); + ui->wedgeZ2min->setMaximum(INT_MAX); + ui->wedgeXmax->setMinimum(INT_MIN); + ui->wedgeXmax->setMaximum(INT_MAX); + ui->wedgeYmax->setMinimum(INT_MIN); + ui->wedgeYmax->setMaximum(INT_MAX); + ui->wedgeZmax->setMinimum(INT_MIN); + ui->wedgeZmax->setMaximum(INT_MAX); + ui->wedgeX2max->setMinimum(INT_MIN); + ui->wedgeX2max->setMaximum(INT_MAX); + ui->wedgeZ2max->setMinimum(INT_MIN); + ui->wedgeZ2max->setMaximum(INT_MAX); // helix - ui.helixPitch->setRange(0, INT_MAX); - ui.helixHeight->setRange(0, INT_MAX); - ui.helixRadius->setRange(0, INT_MAX); - ui.helixAngle->setRange(0, 90); + ui->helixPitch->setRange(0, INT_MAX); + ui->helixHeight->setRange(0, INT_MAX); + ui->helixRadius->setRange(0, INT_MAX); + ui->helixAngle->setRange(0, 90); // circle - ui.circleRadius->setRange(0, INT_MAX); - ui.circleAngle0->setRange(0, 360); - ui.circleAngle1->setRange(0, 360); + ui->circleRadius->setRange(0, INT_MAX); + ui->circleAngle0->setRange(0, 360); + ui->circleAngle1->setRange(0, 360); // ellipse - ui.ellipseMajorRadius->setRange(0, INT_MAX); - ui.ellipseMinorRadius->setRange(0, INT_MAX); - ui.ellipseAngle0->setRange(0, 360); - ui.ellipseAngle1->setRange(0, 360); + ui->ellipseMajorRadius->setRange(0, INT_MAX); + ui->ellipseMinorRadius->setRange(0, INT_MAX); + ui->ellipseAngle0->setRange(0, 360); + ui->ellipseAngle1->setRange(0, 360); // vertex - ui.vertexX->setMaximum(INT_MAX); - ui.vertexY->setMaximum(INT_MAX); - ui.vertexZ->setMaximum(INT_MAX); - ui.vertexX->setMinimum(INT_MIN); - ui.vertexY->setMinimum(INT_MIN); - ui.vertexZ->setMinimum(INT_MIN); + ui->vertexX->setMaximum(INT_MAX); + ui->vertexY->setMaximum(INT_MAX); + ui->vertexZ->setMaximum(INT_MAX); + ui->vertexX->setMinimum(INT_MIN); + ui->vertexY->setMinimum(INT_MIN); + ui->vertexZ->setMinimum(INT_MIN); // line - ui.edgeX1->setMaximum(INT_MAX); - ui.edgeX1->setMinimum(INT_MIN); - ui.edgeY1->setMaximum(INT_MAX); - ui.edgeY1->setMinimum(INT_MIN); - ui.edgeZ1->setMaximum(INT_MAX); - ui.edgeZ1->setMinimum(INT_MIN); - ui.edgeX2->setMaximum(INT_MAX); - ui.edgeX2->setMinimum(INT_MIN); - ui.edgeY2->setMaximum(INT_MAX); - ui.edgeY2->setMinimum(INT_MIN); - ui.edgeZ2->setMaximum(INT_MAX); - ui.edgeZ2->setMinimum(INT_MIN); + ui->edgeX1->setMaximum(INT_MAX); + ui->edgeX1->setMinimum(INT_MIN); + ui->edgeY1->setMaximum(INT_MAX); + ui->edgeY1->setMinimum(INT_MIN); + ui->edgeZ1->setMaximum(INT_MAX); + ui->edgeZ1->setMinimum(INT_MIN); + ui->edgeX2->setMaximum(INT_MAX); + ui->edgeX2->setMinimum(INT_MIN); + ui->edgeY2->setMaximum(INT_MAX); + ui->edgeY2->setMinimum(INT_MIN); + ui->edgeZ2->setMaximum(INT_MAX); + ui->edgeZ2->setMinimum(INT_MIN); // RegularPolygon - ui.regularPolygonCircumradius->setRange(0, INT_MAX); + ui->regularPolygonCircumradius->setRange(0, INT_MAX); // fill the dialog with data if the primitives already exists if (feature) { @@ -314,245 +317,245 @@ DlgPrimitives::DlgPrimitives(QWidget* parent, Part::Primitive* feature) Base::Type type = feature->getTypeId(); int index = std::distance(types.begin(), std::find(types.begin(), types.end(), type)); - ui.PrimitiveTypeCB->setCurrentIndex(index); - ui.widgetStack2->setCurrentIndex(index); + ui->PrimitiveTypeCB->setCurrentIndex(index); + ui->widgetStack2->setCurrentIndex(index); // if existing, the primitive type can not be changed by the user - ui.PrimitiveTypeCB->setDisabled(feature != nullptr); + ui->PrimitiveTypeCB->setDisabled(feature != nullptr); // ToDo: connect signal if there is a preview of primitives available // read values from the properties if (type == Part::Plane::getClassTypeId()) { Part::Plane* plane = static_cast(feature); - ui.planeLength->setValue(plane->Length.getQuantityValue()); - ui.planeWidth->setValue(plane->Width.getQuantityValue()); + ui->planeLength->setValue(plane->Length.getQuantityValue()); + ui->planeWidth->setValue(plane->Width.getQuantityValue()); QSignalMapper* mapper = new QSignalMapper(this); connect(mapper, SIGNAL(mapped(QWidget*)), this, SLOT(onChangePlane(QWidget*))); - connectSignalMapper(ui.planeLength, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.planeWidth, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->planeLength, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->planeWidth, SIGNAL(valueChanged(double)), mapper); } else if (type == Part::Box::getClassTypeId()) { Part::Box* box = static_cast(feature); - ui.boxLength->setValue(box->Length.getQuantityValue()); - ui.boxWidth->setValue(box->Width.getQuantityValue()); - ui.boxHeight->setValue(box->Height.getQuantityValue()); + ui->boxLength->setValue(box->Length.getQuantityValue()); + ui->boxWidth->setValue(box->Width.getQuantityValue()); + ui->boxHeight->setValue(box->Height.getQuantityValue()); QSignalMapper* mapper = new QSignalMapper(this); connect(mapper, SIGNAL(mapped(QWidget*)), this, SLOT(onChangeBox(QWidget*))); - connectSignalMapper(ui.boxLength, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.boxWidth, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.boxHeight, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->boxLength, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->boxWidth, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->boxHeight, SIGNAL(valueChanged(double)), mapper); } else if (type == Part::Cylinder::getClassTypeId()) { Part::Cylinder* cyl = static_cast(feature); - ui.cylinderRadius->setValue(cyl->Radius.getQuantityValue()); - ui.cylinderHeight->setValue(cyl->Height.getQuantityValue()); - ui.cylinderAngle->setValue(cyl->Angle.getQuantityValue()); + ui->cylinderRadius->setValue(cyl->Radius.getQuantityValue()); + ui->cylinderHeight->setValue(cyl->Height.getQuantityValue()); + ui->cylinderAngle->setValue(cyl->Angle.getQuantityValue()); QSignalMapper* mapper = new QSignalMapper(this); connect(mapper, SIGNAL(mapped(QWidget*)), this, SLOT(onChangeCylinder(QWidget*))); - connectSignalMapper(ui.cylinderRadius, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.cylinderHeight, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.cylinderAngle, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->cylinderRadius, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->cylinderHeight, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->cylinderAngle, SIGNAL(valueChanged(double)), mapper); } else if (type == Part::Cone::getClassTypeId()) { Part::Cone* cone = static_cast(feature); - ui.coneRadius1->setValue(cone->Radius1.getQuantityValue()); - ui.coneRadius2->setValue(cone->Radius2.getQuantityValue()); - ui.coneHeight->setValue(cone->Height.getQuantityValue()); - ui.coneAngle->setValue(cone->Angle.getQuantityValue()); + ui->coneRadius1->setValue(cone->Radius1.getQuantityValue()); + ui->coneRadius2->setValue(cone->Radius2.getQuantityValue()); + ui->coneHeight->setValue(cone->Height.getQuantityValue()); + ui->coneAngle->setValue(cone->Angle.getQuantityValue()); QSignalMapper* mapper = new QSignalMapper(this); connect(mapper, SIGNAL(mapped(QWidget*)), this, SLOT(onChangeCone(QWidget*))); - connectSignalMapper(ui.coneRadius1, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.coneRadius2, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.coneHeight, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.coneAngle, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->coneRadius1, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->coneRadius2, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->coneHeight, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->coneAngle, SIGNAL(valueChanged(double)), mapper); } else if (type == Part::Sphere::getClassTypeId()) { Part::Sphere* sphere = static_cast(feature); - ui.sphereRadius->setValue(sphere->Radius.getQuantityValue()); - ui.sphereAngle1->setValue(sphere->Angle1.getQuantityValue()); - ui.sphereAngle2->setValue(sphere->Angle2.getQuantityValue()); - ui.sphereAngle3->setValue(sphere->Angle3.getQuantityValue()); + ui->sphereRadius->setValue(sphere->Radius.getQuantityValue()); + ui->sphereAngle1->setValue(sphere->Angle1.getQuantityValue()); + ui->sphereAngle2->setValue(sphere->Angle2.getQuantityValue()); + ui->sphereAngle3->setValue(sphere->Angle3.getQuantityValue()); QSignalMapper* mapper = new QSignalMapper(this); connect(mapper, SIGNAL(mapped(QWidget*)), this, SLOT(onChangeSphere(QWidget*))); - connectSignalMapper(ui.sphereRadius, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.sphereAngle1, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.sphereAngle2, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.sphereAngle3, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->sphereRadius, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->sphereAngle1, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->sphereAngle2, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->sphereAngle3, SIGNAL(valueChanged(double)), mapper); } else if (type == Part::Ellipsoid::getClassTypeId()) { Part::Ellipsoid* ell = static_cast(feature); - ui.ellipsoidRadius1->setValue(ell->Radius1.getQuantityValue()); - ui.ellipsoidRadius2->setValue(ell->Radius2.getQuantityValue()); - ui.ellipsoidRadius3->setValue(ell->Radius3.getQuantityValue()); - ui.ellipsoidAngle1->setValue(ell->Angle1.getQuantityValue()); - ui.ellipsoidAngle2->setValue(ell->Angle2.getQuantityValue()); - ui.ellipsoidAngle3->setValue(ell->Angle3.getQuantityValue()); + ui->ellipsoidRadius1->setValue(ell->Radius1.getQuantityValue()); + ui->ellipsoidRadius2->setValue(ell->Radius2.getQuantityValue()); + ui->ellipsoidRadius3->setValue(ell->Radius3.getQuantityValue()); + ui->ellipsoidAngle1->setValue(ell->Angle1.getQuantityValue()); + ui->ellipsoidAngle2->setValue(ell->Angle2.getQuantityValue()); + ui->ellipsoidAngle3->setValue(ell->Angle3.getQuantityValue()); QSignalMapper* mapper = new QSignalMapper(this); connect(mapper, SIGNAL(mapped(QWidget*)), this, SLOT(onChangeEllipsoid(QWidget*))); - connectSignalMapper(ui.ellipsoidRadius1, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.ellipsoidRadius2, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.ellipsoidRadius3, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.ellipsoidAngle1, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.ellipsoidAngle2, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.ellipsoidAngle3, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->ellipsoidRadius1, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->ellipsoidRadius2, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->ellipsoidRadius3, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->ellipsoidAngle1, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->ellipsoidAngle2, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->ellipsoidAngle3, SIGNAL(valueChanged(double)), mapper); } else if (type == Part::Torus::getClassTypeId()) { Part::Torus* torus = static_cast(feature); - ui.torusRadius1->setValue(torus->Radius1.getQuantityValue()); - ui.torusRadius2->setValue(torus->Radius2.getQuantityValue()); - ui.torusAngle1->setValue(torus->Angle1.getQuantityValue()); - ui.torusAngle2->setValue(torus->Angle2.getQuantityValue()); - ui.torusAngle3->setValue(torus->Angle3.getQuantityValue()); + ui->torusRadius1->setValue(torus->Radius1.getQuantityValue()); + ui->torusRadius2->setValue(torus->Radius2.getQuantityValue()); + ui->torusAngle1->setValue(torus->Angle1.getQuantityValue()); + ui->torusAngle2->setValue(torus->Angle2.getQuantityValue()); + ui->torusAngle3->setValue(torus->Angle3.getQuantityValue()); QSignalMapper* mapper = new QSignalMapper(this); connect(mapper, SIGNAL(mapped(QWidget*)), this, SLOT(onChangeTorus(QWidget*))); - connectSignalMapper(ui.torusRadius1, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.torusRadius2, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.torusAngle1, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.torusAngle2, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.torusAngle3, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->torusRadius1, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->torusRadius2, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->torusAngle1, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->torusAngle2, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->torusAngle3, SIGNAL(valueChanged(double)), mapper); } else if (type == Part::Prism::getClassTypeId()) { Part::Prism* prism = static_cast(feature); - ui.prismPolygon->setValue(prism->Polygon.getValue()); - ui.prismCircumradius->setValue(prism->Circumradius.getQuantityValue()); - ui.prismHeight->setValue(prism->Height.getQuantityValue()); - ui.prismXSkew->setValue(prism->FirstAngle.getQuantityValue()); - ui.prismYSkew->setValue(prism->SecondAngle.getQuantityValue()); + ui->prismPolygon->setValue(prism->Polygon.getValue()); + ui->prismCircumradius->setValue(prism->Circumradius.getQuantityValue()); + ui->prismHeight->setValue(prism->Height.getQuantityValue()); + ui->prismXSkew->setValue(prism->FirstAngle.getQuantityValue()); + ui->prismYSkew->setValue(prism->SecondAngle.getQuantityValue()); QSignalMapper* mapper = new QSignalMapper(this); connect(mapper, SIGNAL(mapped(QWidget*)), this, SLOT(onChangePrism(QWidget*))); - connectSignalMapper(ui.prismPolygon, SIGNAL(valueChanged(int)), mapper); - connectSignalMapper(ui.prismCircumradius, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.prismHeight, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.prismXSkew, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.prismYSkew, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->prismPolygon, SIGNAL(valueChanged(int)), mapper); + connectSignalMapper(ui->prismCircumradius, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->prismHeight, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->prismXSkew, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->prismYSkew, SIGNAL(valueChanged(double)), mapper); } else if (type == Part::Wedge::getClassTypeId()) { Part::Wedge* wedge = static_cast(feature); - ui.wedgeXmin->setValue(wedge->Xmin.getQuantityValue()); - ui.wedgeYmin->setValue(wedge->Ymin.getQuantityValue()); - ui.wedgeZmin->setValue(wedge->Zmin.getQuantityValue()); - ui.wedgeX2min->setValue(wedge->X2min.getQuantityValue()); - ui.wedgeZ2min->setValue(wedge->Z2min.getQuantityValue()); - ui.wedgeXmax->setValue(wedge->Xmax.getQuantityValue()); - ui.wedgeYmax->setValue(wedge->Ymax.getQuantityValue()); - ui.wedgeZmax->setValue(wedge->Zmax.getQuantityValue()); - ui.wedgeX2max->setValue(wedge->X2max.getQuantityValue()); - ui.wedgeZ2max->setValue(wedge->Z2max.getQuantityValue()); + ui->wedgeXmin->setValue(wedge->Xmin.getQuantityValue()); + ui->wedgeYmin->setValue(wedge->Ymin.getQuantityValue()); + ui->wedgeZmin->setValue(wedge->Zmin.getQuantityValue()); + ui->wedgeX2min->setValue(wedge->X2min.getQuantityValue()); + ui->wedgeZ2min->setValue(wedge->Z2min.getQuantityValue()); + ui->wedgeXmax->setValue(wedge->Xmax.getQuantityValue()); + ui->wedgeYmax->setValue(wedge->Ymax.getQuantityValue()); + ui->wedgeZmax->setValue(wedge->Zmax.getQuantityValue()); + ui->wedgeX2max->setValue(wedge->X2max.getQuantityValue()); + ui->wedgeZ2max->setValue(wedge->Z2max.getQuantityValue()); QSignalMapper* mapper = new QSignalMapper(this); connect(mapper, SIGNAL(mapped(QWidget*)), this, SLOT(onChangeWedge(QWidget*))); - connectSignalMapper(ui.wedgeXmin, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.wedgeYmin, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.wedgeZmin, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.wedgeX2min, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.wedgeZ2min, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.wedgeXmax, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.wedgeYmax, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.wedgeZmax, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.wedgeX2max, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.wedgeZ2max, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->wedgeXmin, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->wedgeYmin, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->wedgeZmin, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->wedgeX2min, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->wedgeZ2min, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->wedgeXmax, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->wedgeYmax, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->wedgeZmax, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->wedgeX2max, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->wedgeZ2max, SIGNAL(valueChanged(double)), mapper); } else if (type == Part::Helix::getClassTypeId()) { Part::Helix* helix = static_cast(feature); - ui.helixPitch->setValue(helix->Pitch.getQuantityValue()); - ui.helixHeight->setValue(helix->Height.getQuantityValue()); - ui.helixRadius->setValue(helix->Radius.getQuantityValue()); - ui.helixAngle->setValue(helix->Angle.getQuantityValue()); - ui.helixLocalCS->setCurrentIndex(helix->LocalCoord.getValue()); + ui->helixPitch->setValue(helix->Pitch.getQuantityValue()); + ui->helixHeight->setValue(helix->Height.getQuantityValue()); + ui->helixRadius->setValue(helix->Radius.getQuantityValue()); + ui->helixAngle->setValue(helix->Angle.getQuantityValue()); + ui->helixLocalCS->setCurrentIndex(helix->LocalCoord.getValue()); QSignalMapper* mapper = new QSignalMapper(this); connect(mapper, SIGNAL(mapped(QWidget*)), this, SLOT(onChangeHelix(QWidget*))); - connectSignalMapper(ui.helixPitch, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.helixHeight, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.helixRadius, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.helixAngle, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.helixLocalCS, SIGNAL(currentIndexChanged(int)), mapper); + connectSignalMapper(ui->helixPitch, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->helixHeight, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->helixRadius, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->helixAngle, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->helixLocalCS, SIGNAL(currentIndexChanged(int)), mapper); } else if (type == Part::Spiral::getClassTypeId()) { Part::Spiral* spiral = static_cast(feature); - ui.spiralGrowth->setValue(spiral->Growth.getQuantityValue()); - ui.spiralRotation->setValue(spiral->Rotations.getQuantityValue().getValue()); - ui.spiralRadius->setValue(spiral->Radius.getQuantityValue()); + ui->spiralGrowth->setValue(spiral->Growth.getQuantityValue()); + ui->spiralRotation->setValue(spiral->Rotations.getQuantityValue().getValue()); + ui->spiralRadius->setValue(spiral->Radius.getQuantityValue()); QSignalMapper* mapper = new QSignalMapper(this); connect(mapper, SIGNAL(mapped(QWidget*)), this, SLOT(onChangeSpiral(QWidget*))); - connectSignalMapper(ui.spiralGrowth, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.spiralRotation, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.spiralRadius, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->spiralGrowth, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->spiralRotation, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->spiralRadius, SIGNAL(valueChanged(double)), mapper); } else if (type == Part::Circle::getClassTypeId()) { Part::Circle* circle = static_cast(feature); - ui.circleRadius->setValue(circle->Radius.getQuantityValue()); - ui.circleAngle0->setValue(circle->Angle0.getQuantityValue()); - ui.circleAngle1->setValue(circle->Angle1.getQuantityValue()); + ui->circleRadius->setValue(circle->Radius.getQuantityValue()); + ui->circleAngle0->setValue(circle->Angle0.getQuantityValue()); + ui->circleAngle1->setValue(circle->Angle1.getQuantityValue()); QSignalMapper* mapper = new QSignalMapper(this); connect(mapper, SIGNAL(mapped(QWidget*)), this, SLOT(onChangeCircle(QWidget*))); - connectSignalMapper(ui.circleRadius, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.circleAngle0, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.circleAngle1, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->circleRadius, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->circleAngle0, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->circleAngle1, SIGNAL(valueChanged(double)), mapper); } else if (type == Part::Ellipse::getClassTypeId()) { Part::Ellipse* ell = static_cast(feature); - ui.ellipseMajorRadius->setValue(ell->MajorRadius.getQuantityValue()); - ui.ellipseMinorRadius->setValue(ell->MinorRadius.getQuantityValue()); - ui.ellipseAngle0->setValue(ell->Angle0.getQuantityValue()); - ui.ellipseAngle1->setValue(ell->Angle1.getQuantityValue()); + ui->ellipseMajorRadius->setValue(ell->MajorRadius.getQuantityValue()); + ui->ellipseMinorRadius->setValue(ell->MinorRadius.getQuantityValue()); + ui->ellipseAngle0->setValue(ell->Angle0.getQuantityValue()); + ui->ellipseAngle1->setValue(ell->Angle1.getQuantityValue()); QSignalMapper* mapper = new QSignalMapper(this); connect(mapper, SIGNAL(mapped(QWidget*)), this, SLOT(onChangeEllipse(QWidget*))); - connectSignalMapper(ui.ellipseMajorRadius, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.ellipseMinorRadius, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.ellipseAngle0, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.ellipseAngle1, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->ellipseMajorRadius, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->ellipseMinorRadius, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->ellipseAngle0, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->ellipseAngle1, SIGNAL(valueChanged(double)), mapper); } else if (type == Part::Vertex::getClassTypeId()) { Part::Vertex* v = static_cast(feature); - ui.vertexX->setValue(v->X.getQuantityValue()); - ui.vertexY->setValue(v->Y.getQuantityValue()); - ui.vertexZ->setValue(v->Z.getQuantityValue()); + ui->vertexX->setValue(v->X.getQuantityValue()); + ui->vertexY->setValue(v->Y.getQuantityValue()); + ui->vertexZ->setValue(v->Z.getQuantityValue()); QSignalMapper* mapper = new QSignalMapper(this); connect(mapper, SIGNAL(mapped(QWidget*)), this, SLOT(onChangeVertex(QWidget*))); - connectSignalMapper(ui.vertexX, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.vertexY, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.vertexZ, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->vertexX, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->vertexY, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->vertexZ, SIGNAL(valueChanged(double)), mapper); } else if (type == Part::Line::getClassTypeId()) { Part::Line* line = static_cast(feature); - ui.edgeX1->setValue(line->X1.getQuantityValue()); - ui.edgeY1->setValue(line->Y1.getQuantityValue()); - ui.edgeZ1->setValue(line->Z1.getQuantityValue()); - ui.edgeX2->setValue(line->X2.getQuantityValue()); - ui.edgeY2->setValue(line->Y2.getQuantityValue()); - ui.edgeZ2->setValue(line->Z2.getQuantityValue()); + ui->edgeX1->setValue(line->X1.getQuantityValue()); + ui->edgeY1->setValue(line->Y1.getQuantityValue()); + ui->edgeZ1->setValue(line->Z1.getQuantityValue()); + ui->edgeX2->setValue(line->X2.getQuantityValue()); + ui->edgeY2->setValue(line->Y2.getQuantityValue()); + ui->edgeZ2->setValue(line->Z2.getQuantityValue()); QSignalMapper* mapper = new QSignalMapper(this); connect(mapper, SIGNAL(mapped(QWidget*)), this, SLOT(onChangeLine(QWidget*))); - connectSignalMapper(ui.edgeX1, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.edgeY1, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.edgeZ1, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.edgeX2, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.edgeY2, SIGNAL(valueChanged(double)), mapper); - connectSignalMapper(ui.edgeZ2, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->edgeX1, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->edgeY1, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->edgeZ1, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->edgeX2, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->edgeY2, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->edgeZ2, SIGNAL(valueChanged(double)), mapper); } else if (type == Part::RegularPolygon::getClassTypeId()) { Part::RegularPolygon* poly = static_cast(feature); - ui.regularPolygonPolygon->setValue(poly->Polygon.getValue()); - ui.regularPolygonCircumradius->setValue(poly->Circumradius.getQuantityValue()); + ui->regularPolygonPolygon->setValue(poly->Polygon.getValue()); + ui->regularPolygonCircumradius->setValue(poly->Circumradius.getQuantityValue()); QSignalMapper* mapper = new QSignalMapper(this); connect(mapper, SIGNAL(mapped(QWidget*)), this, SLOT(onChangeRegularPolygon(QWidget*))); - connectSignalMapper(ui.regularPolygonPolygon, SIGNAL(valueChanged(int)), mapper); - connectSignalMapper(ui.regularPolygonCircumradius, SIGNAL(valueChanged(double)), mapper); + connectSignalMapper(ui->regularPolygonPolygon, SIGNAL(valueChanged(int)), mapper); + connectSignalMapper(ui->regularPolygonCircumradius, SIGNAL(valueChanged(double)), mapper); } } } @@ -626,7 +629,7 @@ void DlgPrimitives::executeCallback(Picker* p) viewer->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), pickCallback, p); if (ret == 0) { - p->createPrimitive(this, ui.PrimitiveTypeCB->currentText(), doc); + p->createPrimitive(this, ui->PrimitiveTypeCB->currentText(), doc); } } } @@ -645,10 +648,10 @@ void DlgPrimitives::createPrimitive(const QString& placement) App::Document* doc = App::GetApplication().getActiveDocument(); if (!doc) { QMessageBox::warning(this, tr("Create %1") - .arg(ui.PrimitiveTypeCB->currentText()), tr("No active document")); + .arg(ui->PrimitiveTypeCB->currentText()), tr("No active document")); return; } - if (ui.PrimitiveTypeCB->currentIndex() == 0) { // plane + if (ui->PrimitiveTypeCB->currentIndex() == 0) { // plane name = QString::fromLatin1(doc->getUniqueObjectName("Plane").c_str()); cmd = QString::fromLatin1( "App.ActiveDocument.addObject(\"Part::Plane\",\"%1\")\n" @@ -657,12 +660,12 @@ void DlgPrimitives::createPrimitive(const QString& placement) "App.ActiveDocument.%1.Placement=%4\n" "App.ActiveDocument.%1.Label='%5'\n") .arg(name) - .arg(ui.planeLength->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.planeWidth->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->planeLength->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->planeWidth->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement) .arg(tr("Plane")); } - else if (ui.PrimitiveTypeCB->currentIndex() == 1) { // box + else if (ui->PrimitiveTypeCB->currentIndex() == 1) { // box name = QString::fromLatin1(doc->getUniqueObjectName("Box").c_str()); cmd = QString::fromLatin1( "App.ActiveDocument.addObject(\"Part::Box\",\"%1\")\n" @@ -672,13 +675,13 @@ void DlgPrimitives::createPrimitive(const QString& placement) "App.ActiveDocument.%1.Placement=%5\n" "App.ActiveDocument.%1.Label='%6'\n") .arg(name) - .arg(ui.boxLength->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.boxWidth->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.boxHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->boxLength->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->boxWidth->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->boxHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement) .arg(tr("Box")); } - else if (ui.PrimitiveTypeCB->currentIndex() == 2) { // cylinder + else if (ui->PrimitiveTypeCB->currentIndex() == 2) { // cylinder name = QString::fromLatin1(doc->getUniqueObjectName("Cylinder").c_str()); cmd = QString::fromLatin1( "App.ActiveDocument.addObject(\"Part::Cylinder\",\"%1\")\n" @@ -688,13 +691,13 @@ void DlgPrimitives::createPrimitive(const QString& placement) "App.ActiveDocument.%1.Placement=%5\n" "App.ActiveDocument.%1.Label='%6'\n") .arg(name) - .arg(ui.cylinderRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.cylinderHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.cylinderAngle->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->cylinderRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->cylinderHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->cylinderAngle->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement) .arg(tr("Cylinder")); } - else if (ui.PrimitiveTypeCB->currentIndex() == 3) { // cone + else if (ui->PrimitiveTypeCB->currentIndex() == 3) { // cone name = QString::fromLatin1(doc->getUniqueObjectName("Cone").c_str()); cmd = QString::fromLatin1( "App.ActiveDocument.addObject(\"Part::Cone\",\"%1\")\n" @@ -705,14 +708,14 @@ void DlgPrimitives::createPrimitive(const QString& placement) "App.ActiveDocument.%1.Placement=%6\n" "App.ActiveDocument.%1.Label='%7'\n") .arg(name) - .arg(ui.coneRadius1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.coneRadius2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.coneHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.coneAngle->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->coneRadius1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->coneRadius2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->coneHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->coneAngle->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement) .arg(tr("Cone")); } - else if (ui.PrimitiveTypeCB->currentIndex() == 4) { // sphere + else if (ui->PrimitiveTypeCB->currentIndex() == 4) { // sphere name = QString::fromLatin1(doc->getUniqueObjectName("Sphere").c_str()); cmd = QString::fromLatin1( "App.ActiveDocument.addObject(\"Part::Sphere\",\"%1\")\n" @@ -723,14 +726,14 @@ void DlgPrimitives::createPrimitive(const QString& placement) "App.ActiveDocument.%1.Placement=%6\n" "App.ActiveDocument.%1.Label='%7'\n") .arg(name) - .arg(ui.sphereRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.sphereAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.sphereAngle2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.sphereAngle3->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->sphereRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->sphereAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->sphereAngle2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->sphereAngle3->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement) .arg(tr("Sphere")); } - else if (ui.PrimitiveTypeCB->currentIndex() == 5) { // ellipsoid + else if (ui->PrimitiveTypeCB->currentIndex() == 5) { // ellipsoid name = QString::fromLatin1(doc->getUniqueObjectName("Ellipsoid").c_str()); cmd = QString::fromLatin1( "App.ActiveDocument.addObject(\"Part::Ellipsoid\",\"%1\")\n" @@ -743,16 +746,16 @@ void DlgPrimitives::createPrimitive(const QString& placement) "App.ActiveDocument.%1.Placement=%8\n" "App.ActiveDocument.%1.Label='%9'\n") .arg(name) - .arg(ui.ellipsoidRadius1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.ellipsoidRadius2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.ellipsoidRadius3->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.ellipsoidAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.ellipsoidAngle2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.ellipsoidAngle3->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipsoidRadius1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipsoidRadius2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipsoidRadius3->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipsoidAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipsoidAngle2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipsoidAngle3->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement) .arg(tr("Ellipsoid")); } - else if (ui.PrimitiveTypeCB->currentIndex() == 6) { // torus + else if (ui->PrimitiveTypeCB->currentIndex() == 6) { // torus name = QString::fromLatin1(doc->getUniqueObjectName("Torus").c_str()); cmd = QString::fromLatin1( "App.ActiveDocument.addObject(\"Part::Torus\",\"%1\")\n" @@ -764,15 +767,15 @@ void DlgPrimitives::createPrimitive(const QString& placement) "App.ActiveDocument.%1.Placement=%7\n" "App.ActiveDocument.%1.Label='%8'\n") .arg(name) - .arg(ui.torusRadius1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.torusRadius2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.torusAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.torusAngle2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.torusAngle3->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->torusRadius1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->torusRadius2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->torusAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->torusAngle2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->torusAngle3->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement) .arg(tr("Torus")); } - else if (ui.PrimitiveTypeCB->currentIndex() == 7) { // prism + else if (ui->PrimitiveTypeCB->currentIndex() == 7) { // prism name = QString::fromLatin1(doc->getUniqueObjectName("Prism").c_str()); cmd = QString::fromLatin1( "App.ActiveDocument.addObject(\"Part::Prism\",\"%1\")\n" @@ -784,15 +787,15 @@ void DlgPrimitives::createPrimitive(const QString& placement) "App.ActiveDocument.%1.Placement=%7\n" "App.ActiveDocument.%1.Label='%8'\n") .arg(name) - .arg(ui.prismPolygon->value()) - .arg(ui.prismCircumradius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.prismHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.prismXSkew->value().getValue(), 0, 'f', Base::UnitsApi::getDecimals()) - .arg(ui.prismYSkew->value().getValue(), 0, 'f', Base::UnitsApi::getDecimals()) + .arg(ui->prismPolygon->value()) + .arg(ui->prismCircumradius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->prismHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->prismXSkew->value().getValue(), 0, 'f', Base::UnitsApi::getDecimals()) + .arg(ui->prismYSkew->value().getValue(), 0, 'f', Base::UnitsApi::getDecimals()) .arg(placement) .arg(tr("Prism")); } - else if (ui.PrimitiveTypeCB->currentIndex() == 8) { // wedge + else if (ui->PrimitiveTypeCB->currentIndex() == 8) { // wedge name = QString::fromLatin1(doc->getUniqueObjectName("Wedge").c_str()); cmd = QString::fromLatin1( "App.ActiveDocument.addObject(\"Part::Wedge\",\"%1\")\n" @@ -809,20 +812,20 @@ void DlgPrimitives::createPrimitive(const QString& placement) "App.ActiveDocument.%1.Placement=%12\n" "App.ActiveDocument.%1.Label='%13'\n") .arg(name) - .arg(ui.wedgeXmin->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.wedgeYmin->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.wedgeZmin->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.wedgeX2min->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.wedgeZ2min->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.wedgeXmax->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.wedgeYmax->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.wedgeZmax->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.wedgeX2max->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.wedgeZ2max->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeXmin->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeYmin->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeZmin->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeX2min->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeZ2min->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeXmax->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeYmax->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeZmax->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeX2max->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeZ2max->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement) .arg(tr("Wedge")); } - else if (ui.PrimitiveTypeCB->currentIndex() == 9) { // helix + else if (ui->PrimitiveTypeCB->currentIndex() == 9) { // helix name = QString::fromLatin1(doc->getUniqueObjectName("Helix").c_str()); cmd = QString::fromLatin1( "App.ActiveDocument.addObject(\"Part::Helix\",\"%1\")\n" @@ -835,15 +838,15 @@ void DlgPrimitives::createPrimitive(const QString& placement) "App.ActiveDocument.%1.Placement=%7\n" "App.ActiveDocument.%1.Label='%8'\n") .arg(name) - .arg(ui.helixPitch->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.helixHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.helixRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.helixAngle->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.helixLocalCS->currentIndex()) + .arg(ui->helixPitch->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->helixHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->helixRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->helixAngle->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->helixLocalCS->currentIndex()) .arg(placement) .arg(tr("Helix")); } - else if (ui.PrimitiveTypeCB->currentIndex() == 10) { // spiral + else if (ui->PrimitiveTypeCB->currentIndex() == 10) { // spiral name = QString::fromLatin1(doc->getUniqueObjectName("Spiral").c_str()); cmd = QString::fromLatin1( "App.ActiveDocument.addObject(\"Part::Spiral\",\"%1\")\n" @@ -853,13 +856,13 @@ void DlgPrimitives::createPrimitive(const QString& placement) "App.ActiveDocument.%1.Placement=%5\n" "App.ActiveDocument.%1.Label='%6'\n") .arg(name) - .arg(ui.spiralGrowth->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.spiralRotation->value(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.spiralRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->spiralGrowth->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->spiralRotation->value(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->spiralRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement) .arg(tr("Spiral")); } - else if (ui.PrimitiveTypeCB->currentIndex() == 11) { // circle + else if (ui->PrimitiveTypeCB->currentIndex() == 11) { // circle name = QString::fromLatin1(doc->getUniqueObjectName("Circle").c_str()); cmd = QString::fromLatin1( "App.ActiveDocument.addObject(\"Part::Circle\",\"%1\")\n" @@ -869,13 +872,13 @@ void DlgPrimitives::createPrimitive(const QString& placement) "App.ActiveDocument.%1.Placement=%5\n" "App.ActiveDocument.%1.Label='%6'\n") .arg(name) - .arg(ui.circleRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.circleAngle0->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.circleAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->circleRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->circleAngle0->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->circleAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement) .arg(tr("Circle")); } - else if (ui.PrimitiveTypeCB->currentIndex() == 12) { // ellipse + else if (ui->PrimitiveTypeCB->currentIndex() == 12) { // ellipse name = QString::fromLatin1(doc->getUniqueObjectName("Ellipse").c_str()); cmd = QString::fromLatin1( "App.ActiveDocument.addObject(\"Part::Ellipse\",\"%1\")\n" @@ -886,14 +889,14 @@ void DlgPrimitives::createPrimitive(const QString& placement) "App.ActiveDocument.%1.Placement=%6\n" "App.ActiveDocument.%1.Label='%7'\n") .arg(name) - .arg(ui.ellipseMajorRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.ellipseMinorRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.ellipseAngle0->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.ellipseAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipseMajorRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipseMinorRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipseAngle0->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipseAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement) .arg(tr("Ellipse")); } - else if (ui.PrimitiveTypeCB->currentIndex() == 13) { // vertex + else if (ui->PrimitiveTypeCB->currentIndex() == 13) { // vertex name = QString::fromLatin1(doc->getUniqueObjectName("Vertex").c_str()); cmd = QString::fromLatin1( "App.ActiveDocument.addObject(\"Part::Vertex\",\"%1\")\n" @@ -903,13 +906,13 @@ void DlgPrimitives::createPrimitive(const QString& placement) "App.ActiveDocument.%1.Placement=%5\n" "App.ActiveDocument.%1.Label='%6'\n") .arg(name) - .arg(ui.vertexX->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.vertexY->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.vertexZ->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->vertexX->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->vertexY->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->vertexZ->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement) .arg(tr("Vertex")); } - else if (ui.PrimitiveTypeCB->currentIndex() == 14) { // line + else if (ui->PrimitiveTypeCB->currentIndex() == 14) { // line name = QString::fromLatin1(doc->getUniqueObjectName("Line").c_str()); cmd = QString::fromLatin1( "App.ActiveDocument.addObject(\"Part::Line\",\"%1\")\n" @@ -922,16 +925,16 @@ void DlgPrimitives::createPrimitive(const QString& placement) "App.ActiveDocument.%1.Placement=%8\n" "App.ActiveDocument.%1.Label='%9'\n") .arg(name) - .arg(ui.edgeX1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.edgeY1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.edgeZ1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.edgeX2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.edgeY2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.edgeZ2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->edgeX1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->edgeY1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->edgeZ1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->edgeX2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->edgeY2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->edgeZ2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement) .arg(tr("Line")); } - else if (ui.PrimitiveTypeCB->currentIndex() == 15) { // RegularPolygon + else if (ui->PrimitiveTypeCB->currentIndex() == 15) { // RegularPolygon name = QString::fromLatin1(doc->getUniqueObjectName("RegularPolygon").c_str()); cmd = QString::fromLatin1( "App.ActiveDocument.addObject(\"Part::RegularPolygon\",\"%1\")\n" @@ -940,14 +943,14 @@ void DlgPrimitives::createPrimitive(const QString& placement) "App.ActiveDocument.%1.Placement=%4\n" "App.ActiveDocument.%1.Label='%5'\n") .arg(name) - .arg(ui.regularPolygonPolygon->value()) - .arg(ui.regularPolygonCircumradius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->regularPolygonPolygon->value()) + .arg(ui->regularPolygonCircumradius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement) .arg(tr("Regular polygon")); } // Execute the Python block - QString prim = tr("Create %1").arg(ui.PrimitiveTypeCB->currentText()); + QString prim = tr("Create %1").arg(ui->PrimitiveTypeCB->currentText()); Gui::Application::Instance->activeDocument()->openCommand(prim.toUtf8()); Gui::Command::runCommand(Gui::Command::Doc, cmd.toUtf8()); Gui::Application::Instance->activeDocument()->commitCommand(); @@ -956,7 +959,7 @@ void DlgPrimitives::createPrimitive(const QString& placement) } catch (const Base::PyException& e) { QMessageBox::warning(this, tr("Create %1") - .arg(ui.PrimitiveTypeCB->currentText()), QString::fromLatin1(e.what())); + .arg(ui->PrimitiveTypeCB->currentText()), QString::fromLatin1(e.what())); } } @@ -978,8 +981,8 @@ void DlgPrimitives::accept(const QString& placement) "%1.Width=%3\n" "%1.Placement=%4\n") .arg(objectName) - .arg(ui.planeLength->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.planeWidth->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->planeLength->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->planeWidth->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement); } else if (type == Part::Box::getClassTypeId()) { @@ -989,9 +992,9 @@ void DlgPrimitives::accept(const QString& placement) "%1.Height=%4\n" "%1.Placement=%5\n") .arg(objectName) - .arg(ui.boxLength->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.boxWidth->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.boxHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->boxLength->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->boxWidth->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->boxHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement); } else if (type == Part::Cylinder::getClassTypeId()) { @@ -1001,9 +1004,9 @@ void DlgPrimitives::accept(const QString& placement) "%1.Angle=%4\n" "%1.Placement=%5\n") .arg(objectName) - .arg(ui.cylinderRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.cylinderHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.cylinderAngle->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->cylinderRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->cylinderHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->cylinderAngle->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement); } else if (type == Part::Cone::getClassTypeId()) { @@ -1014,10 +1017,10 @@ void DlgPrimitives::accept(const QString& placement) "%1.Angle=%5\n" "%1.Placement=%6\n") .arg(objectName) - .arg(ui.coneRadius1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.coneRadius2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.coneHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.coneAngle->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->coneRadius1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->coneRadius2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->coneHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->coneAngle->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement); } else if (type == Part::Sphere::getClassTypeId()) { @@ -1028,10 +1031,10 @@ void DlgPrimitives::accept(const QString& placement) "%1.Angle3=%5\n" "%1.Placement=%6\n") .arg(objectName) - .arg(ui.sphereRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.sphereAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.sphereAngle2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.sphereAngle3->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->sphereRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->sphereAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->sphereAngle2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->sphereAngle3->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement); } else if (type == Part::Ellipsoid::getClassTypeId()) { @@ -1044,12 +1047,12 @@ void DlgPrimitives::accept(const QString& placement) "%1.Angle3=%7\n" "%1.Placement=%8\n") .arg(objectName) - .arg(ui.ellipsoidRadius1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.ellipsoidRadius2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.ellipsoidRadius3->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.ellipsoidAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.ellipsoidAngle2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.ellipsoidAngle3->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipsoidRadius1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipsoidRadius2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipsoidRadius3->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipsoidAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipsoidAngle2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipsoidAngle3->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement); } else if (type == Part::Torus::getClassTypeId()) { @@ -1061,11 +1064,11 @@ void DlgPrimitives::accept(const QString& placement) "%1.Angle3=%6\n" "%1.Placement=%7\n") .arg(objectName) - .arg(ui.torusRadius1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.torusRadius2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.torusAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.torusAngle2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.torusAngle3->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->torusRadius1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->torusRadius2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->torusAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->torusAngle2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->torusAngle3->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement); } else if (type == Part::Prism::getClassTypeId()) { @@ -1077,11 +1080,11 @@ void DlgPrimitives::accept(const QString& placement) "%1.SecondAngle=%6\n" "%1.Placement=%7\n") .arg(objectName) - .arg(ui.prismPolygon->value()) - .arg(ui.prismCircumradius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.prismHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.prismXSkew->value().getValue(), 0, 'f', Base::UnitsApi::getDecimals()) - .arg(ui.prismYSkew->value().getValue(), 0, 'f', Base::UnitsApi::getDecimals()) + .arg(ui->prismPolygon->value()) + .arg(ui->prismCircumradius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->prismHeight->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->prismXSkew->value().getValue(), 0, 'f', Base::UnitsApi::getDecimals()) + .arg(ui->prismYSkew->value().getValue(), 0, 'f', Base::UnitsApi::getDecimals()) .arg(placement); } else if (type == Part::Wedge::getClassTypeId()) { @@ -1098,16 +1101,16 @@ void DlgPrimitives::accept(const QString& placement) "%1.Z2max=%11\n" "%1.Placement=%12\n") .arg(objectName) - .arg(ui.wedgeXmin->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.wedgeYmin->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.wedgeZmin->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.wedgeX2min->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.wedgeZ2min->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.wedgeXmax->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.wedgeYmax->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.wedgeZmax->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.wedgeX2max->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.wedgeZ2max->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeXmin->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeYmin->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeZmin->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeX2min->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeZ2min->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeXmax->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeYmax->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeZmax->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeX2max->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->wedgeZ2max->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement); } else if (type == Part::Helix::getClassTypeId()) { @@ -1119,11 +1122,11 @@ void DlgPrimitives::accept(const QString& placement) "%1.LocalCoord=%6\n" "%1.Placement=%7\n") .arg(objectName) - .arg(ui.helixPitch->value().getValue(), 0, 'f', Base::UnitsApi::getDecimals()) - .arg(ui.helixHeight->value().getValue(), 0, 'f', Base::UnitsApi::getDecimals()) - .arg(ui.helixRadius->value().getValue(), 0, 'f', Base::UnitsApi::getDecimals()) - .arg(ui.helixAngle->value().getValue(), 0, 'f', Base::UnitsApi::getDecimals()) - .arg(ui.helixLocalCS->currentIndex()) + .arg(ui->helixPitch->value().getValue(), 0, 'f', Base::UnitsApi::getDecimals()) + .arg(ui->helixHeight->value().getValue(), 0, 'f', Base::UnitsApi::getDecimals()) + .arg(ui->helixRadius->value().getValue(), 0, 'f', Base::UnitsApi::getDecimals()) + .arg(ui->helixAngle->value().getValue(), 0, 'f', Base::UnitsApi::getDecimals()) + .arg(ui->helixLocalCS->currentIndex()) .arg(placement); } else if (type == Part::Spiral::getClassTypeId()) { @@ -1133,9 +1136,9 @@ void DlgPrimitives::accept(const QString& placement) "%1.Radius=%4\n" "%1.Placement=%5\n") .arg(objectName) - .arg(ui.spiralGrowth->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.spiralRotation->value(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.spiralRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->spiralGrowth->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->spiralRotation->value(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->spiralRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement); } else if (type == Part::Circle::getClassTypeId()) { @@ -1145,9 +1148,9 @@ void DlgPrimitives::accept(const QString& placement) "%1.Angle1=%4\n" "%1.Placement=%5\n") .arg(objectName) - .arg(ui.circleRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.circleAngle0->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.circleAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->circleRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->circleAngle0->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->circleAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement); } else if (type == Part::Ellipse::getClassTypeId()) { @@ -1158,10 +1161,10 @@ void DlgPrimitives::accept(const QString& placement) "%1.Angle1=%5\n" "%1.Placement=%6\n") .arg(objectName) - .arg(ui.ellipseMajorRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.ellipseMinorRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.ellipseAngle0->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.ellipseAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipseMajorRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipseMinorRadius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipseAngle0->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->ellipseAngle1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement); } else if (type == Part::Vertex::getClassTypeId()) { @@ -1171,9 +1174,9 @@ void DlgPrimitives::accept(const QString& placement) "%1.Z=%4\n" "%1.Placement=%5\n") .arg(objectName) - .arg(ui.vertexX->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.vertexY->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.vertexZ->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->vertexX->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->vertexY->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->vertexZ->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement); } else if (type == Part::Line::getClassTypeId()) { @@ -1186,12 +1189,12 @@ void DlgPrimitives::accept(const QString& placement) "%1.Z2=%7\n" "%1.Placement=%8\n") .arg(objectName) - .arg(ui.edgeX1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.edgeY1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.edgeZ1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.edgeX2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.edgeY2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) - .arg(ui.edgeZ2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->edgeX1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->edgeY1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->edgeZ1->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->edgeX2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->edgeY2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->edgeZ2->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement); } else if (type == Part::RegularPolygon::getClassTypeId()) { @@ -1200,8 +1203,8 @@ void DlgPrimitives::accept(const QString& placement) "%1.Circumradius=%3\n" "%1.Placement=%4\n") .arg(objectName) - .arg(ui.regularPolygonPolygon->value()) - .arg(ui.regularPolygonCircumradius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) + .arg(ui->regularPolygonPolygon->value()) + .arg(ui->regularPolygonCircumradius->value().getValue(),0,'f',Base::UnitsApi::getDecimals()) .arg(placement); } @@ -1225,11 +1228,11 @@ void DlgPrimitives::onChangePlane(QWidget* widget) if (featurePtr.expired()) return; Part::Plane* plane = featurePtr.get(); - if (widget == ui.planeLength) { - plane->Length.setValue(ui.planeLength->value().getValue()); + if (widget == ui->planeLength) { + plane->Length.setValue(ui->planeLength->value().getValue()); } - else if (widget == ui.planeWidth) { - plane->Width.setValue(ui.planeWidth->value().getValue()); + else if (widget == ui->planeWidth) { + plane->Width.setValue(ui->planeWidth->value().getValue()); } plane->recomputeFeature(); @@ -1240,14 +1243,14 @@ void DlgPrimitives::onChangeBox(QWidget* widget) if (featurePtr.expired()) return; Part::Box* box = featurePtr.get(); - if (widget == ui.boxLength) { - box->Length.setValue(ui.boxLength->value().getValue()); + if (widget == ui->boxLength) { + box->Length.setValue(ui->boxLength->value().getValue()); } - else if (widget == ui.boxWidth) { - box->Width.setValue(ui.boxWidth->value().getValue()); + else if (widget == ui->boxWidth) { + box->Width.setValue(ui->boxWidth->value().getValue()); } - else if (widget == ui.boxHeight) { - box->Height.setValue(ui.boxHeight->value().getValue()); + else if (widget == ui->boxHeight) { + box->Height.setValue(ui->boxHeight->value().getValue()); } box->recomputeFeature(); @@ -1258,14 +1261,14 @@ void DlgPrimitives::onChangeCylinder(QWidget* widget) if (featurePtr.expired()) return; Part::Cylinder* cyl = featurePtr.get(); - if (widget == ui.cylinderRadius) { - cyl->Radius.setValue(ui.cylinderRadius->value().getValue()); + if (widget == ui->cylinderRadius) { + cyl->Radius.setValue(ui->cylinderRadius->value().getValue()); } - else if (widget == ui.cylinderHeight) { - cyl->Height.setValue(ui.cylinderHeight->value().getValue()); + else if (widget == ui->cylinderHeight) { + cyl->Height.setValue(ui->cylinderHeight->value().getValue()); } - else if (widget == ui.cylinderAngle) { - cyl->Angle.setValue(ui.cylinderAngle->value().getValue()); + else if (widget == ui->cylinderAngle) { + cyl->Angle.setValue(ui->cylinderAngle->value().getValue()); } cyl->recomputeFeature(); @@ -1276,17 +1279,17 @@ void DlgPrimitives::onChangeCone(QWidget* widget) if (featurePtr.expired()) return; Part::Cone* cone = featurePtr.get(); - if (widget == ui.coneRadius1) { - cone->Radius1.setValue(ui.coneRadius1->value().getValue()); + if (widget == ui->coneRadius1) { + cone->Radius1.setValue(ui->coneRadius1->value().getValue()); } - else if (widget == ui.coneRadius2) { - cone->Radius2.setValue(ui.coneRadius2->value().getValue()); + else if (widget == ui->coneRadius2) { + cone->Radius2.setValue(ui->coneRadius2->value().getValue()); } - else if (widget == ui.coneHeight) { - cone->Height.setValue(ui.coneHeight->value().getValue()); + else if (widget == ui->coneHeight) { + cone->Height.setValue(ui->coneHeight->value().getValue()); } - else if (widget == ui.coneAngle) { - cone->Angle.setValue(ui.coneAngle->value().getValue()); + else if (widget == ui->coneAngle) { + cone->Angle.setValue(ui->coneAngle->value().getValue()); } cone->recomputeFeature(); @@ -1297,17 +1300,17 @@ void DlgPrimitives::onChangeSphere(QWidget* widget) if (featurePtr.expired()) return; Part::Sphere* sphere = featurePtr.get(); - if (widget == ui.sphereRadius) { - sphere->Radius.setValue(ui.sphereRadius->value().getValue()); + if (widget == ui->sphereRadius) { + sphere->Radius.setValue(ui->sphereRadius->value().getValue()); } - else if (widget == ui.sphereAngle1) { - sphere->Angle1.setValue(ui.sphereAngle1->value().getValue()); + else if (widget == ui->sphereAngle1) { + sphere->Angle1.setValue(ui->sphereAngle1->value().getValue()); } - else if (widget == ui.sphereAngle2) { - sphere->Angle2.setValue(ui.sphereAngle2->value().getValue()); + else if (widget == ui->sphereAngle2) { + sphere->Angle2.setValue(ui->sphereAngle2->value().getValue()); } - else if (widget == ui.sphereAngle3) { - sphere->Angle3.setValue(ui.sphereAngle3->value().getValue()); + else if (widget == ui->sphereAngle3) { + sphere->Angle3.setValue(ui->sphereAngle3->value().getValue()); } sphere->recomputeFeature(); @@ -1318,23 +1321,23 @@ void DlgPrimitives::onChangeEllipsoid(QWidget* widget) if (featurePtr.expired()) return; Part::Ellipsoid* ell = featurePtr.get(); - if (widget == ui.ellipsoidRadius1) { - ell->Radius1.setValue(ui.ellipsoidRadius1->value().getValue()); + if (widget == ui->ellipsoidRadius1) { + ell->Radius1.setValue(ui->ellipsoidRadius1->value().getValue()); } - else if (widget == ui.ellipsoidRadius2) { - ell->Radius2.setValue(ui.ellipsoidRadius2->value().getValue()); + else if (widget == ui->ellipsoidRadius2) { + ell->Radius2.setValue(ui->ellipsoidRadius2->value().getValue()); } - else if (widget == ui.ellipsoidRadius3) { - ell->Radius3.setValue(ui.ellipsoidRadius3->value().getValue()); + else if (widget == ui->ellipsoidRadius3) { + ell->Radius3.setValue(ui->ellipsoidRadius3->value().getValue()); } - else if (widget == ui.ellipsoidAngle1) { - ell->Angle1.setValue(ui.ellipsoidAngle1->value().getValue()); + else if (widget == ui->ellipsoidAngle1) { + ell->Angle1.setValue(ui->ellipsoidAngle1->value().getValue()); } - else if (widget == ui.ellipsoidAngle2) { - ell->Angle2.setValue(ui.ellipsoidAngle2->value().getValue()); + else if (widget == ui->ellipsoidAngle2) { + ell->Angle2.setValue(ui->ellipsoidAngle2->value().getValue()); } - else if (widget == ui.ellipsoidAngle3) { - ell->Angle3.setValue(ui.ellipsoidAngle3->value().getValue()); + else if (widget == ui->ellipsoidAngle3) { + ell->Angle3.setValue(ui->ellipsoidAngle3->value().getValue()); } ell->recomputeFeature(); @@ -1345,20 +1348,20 @@ void DlgPrimitives::onChangeTorus(QWidget* widget) if (featurePtr.expired()) return; Part::Torus* torus = featurePtr.get(); - if (widget == ui.torusRadius1) { - torus->Radius1.setValue(ui.torusRadius1->value().getValue()); + if (widget == ui->torusRadius1) { + torus->Radius1.setValue(ui->torusRadius1->value().getValue()); } - else if (widget == ui.torusRadius2) { - torus->Radius2.setValue(ui.torusRadius2->value().getValue()); + else if (widget == ui->torusRadius2) { + torus->Radius2.setValue(ui->torusRadius2->value().getValue()); } - else if (widget == ui.torusAngle1) { - torus->Angle1.setValue(ui.torusAngle1->value().getValue()); + else if (widget == ui->torusAngle1) { + torus->Angle1.setValue(ui->torusAngle1->value().getValue()); } - else if (widget == ui.torusAngle2) { - torus->Angle2.setValue(ui.torusAngle2->value().getValue()); + else if (widget == ui->torusAngle2) { + torus->Angle2.setValue(ui->torusAngle2->value().getValue()); } - else if (widget == ui.torusAngle3) { - torus->Angle3.setValue(ui.torusAngle3->value().getValue()); + else if (widget == ui->torusAngle3) { + torus->Angle3.setValue(ui->torusAngle3->value().getValue()); } torus->recomputeFeature(); @@ -1369,20 +1372,20 @@ void DlgPrimitives::onChangePrism(QWidget* widget) if (featurePtr.expired()) return; Part::Prism* prism = featurePtr.get(); - if (widget == ui.prismPolygon) { - prism->Polygon.setValue(ui.prismPolygon->value()); + if (widget == ui->prismPolygon) { + prism->Polygon.setValue(ui->prismPolygon->value()); } - else if (widget == ui.prismCircumradius) { - prism->Circumradius.setValue(ui.prismCircumradius->value().getValue()); + else if (widget == ui->prismCircumradius) { + prism->Circumradius.setValue(ui->prismCircumradius->value().getValue()); } - else if (widget == ui.prismHeight) { - prism->Height.setValue(ui.prismHeight->value().getValue()); + else if (widget == ui->prismHeight) { + prism->Height.setValue(ui->prismHeight->value().getValue()); } - else if (widget == ui.prismXSkew) { - prism->FirstAngle.setValue(ui.prismXSkew->value().getValue()); + else if (widget == ui->prismXSkew) { + prism->FirstAngle.setValue(ui->prismXSkew->value().getValue()); } - else if (widget == ui.prismYSkew) { - prism->SecondAngle.setValue(ui.prismYSkew->value().getValue()); + else if (widget == ui->prismYSkew) { + prism->SecondAngle.setValue(ui->prismYSkew->value().getValue()); } prism->recomputeFeature(); @@ -1393,35 +1396,35 @@ void DlgPrimitives::onChangeWedge(QWidget* widget) if (featurePtr.expired()) return; Part::Wedge* wedge = featurePtr.get(); - if (widget == ui.wedgeXmin) { - wedge->Xmin.setValue(ui.wedgeXmin->value().getValue()); + if (widget == ui->wedgeXmin) { + wedge->Xmin.setValue(ui->wedgeXmin->value().getValue()); } - else if (widget == ui.wedgeYmin) { - wedge->Ymin.setValue(ui.wedgeYmin->value().getValue()); + else if (widget == ui->wedgeYmin) { + wedge->Ymin.setValue(ui->wedgeYmin->value().getValue()); } - else if (widget == ui.wedgeZmin) { - wedge->Zmin.setValue(ui.wedgeZmin->value().getValue()); + else if (widget == ui->wedgeZmin) { + wedge->Zmin.setValue(ui->wedgeZmin->value().getValue()); } - else if (widget == ui.wedgeX2min) { - wedge->X2min.setValue(ui.wedgeX2min->value().getValue()); + else if (widget == ui->wedgeX2min) { + wedge->X2min.setValue(ui->wedgeX2min->value().getValue()); } - else if (widget == ui.wedgeZ2min) { - wedge->Z2min.setValue(ui.wedgeZ2min->value().getValue()); + else if (widget == ui->wedgeZ2min) { + wedge->Z2min.setValue(ui->wedgeZ2min->value().getValue()); } - else if (widget == ui.wedgeXmax) { - wedge->Xmax.setValue(ui.wedgeXmax->value().getValue()); + else if (widget == ui->wedgeXmax) { + wedge->Xmax.setValue(ui->wedgeXmax->value().getValue()); } - else if (widget == ui.wedgeYmax) { - wedge->Ymax.setValue(ui.wedgeYmax->value().getValue()); + else if (widget == ui->wedgeYmax) { + wedge->Ymax.setValue(ui->wedgeYmax->value().getValue()); } - else if (widget == ui.wedgeZmax) { - wedge->Zmax.setValue(ui.wedgeZmax->value().getValue()); + else if (widget == ui->wedgeZmax) { + wedge->Zmax.setValue(ui->wedgeZmax->value().getValue()); } - else if (widget == ui.wedgeX2max) { - wedge->X2max.setValue(ui.wedgeX2max->value().getValue()); + else if (widget == ui->wedgeX2max) { + wedge->X2max.setValue(ui->wedgeX2max->value().getValue()); } - else if (widget == ui.wedgeZ2max) { - wedge->Z2max.setValue(ui.wedgeZ2max->value().getValue()); + else if (widget == ui->wedgeZ2max) { + wedge->Z2max.setValue(ui->wedgeZ2max->value().getValue()); } wedge->recomputeFeature(); @@ -1432,20 +1435,20 @@ void DlgPrimitives::onChangeHelix(QWidget* widget) if (featurePtr.expired()) return; Part::Helix* helix = featurePtr.get(); - if (widget == ui.helixPitch) { - helix->Pitch.setValue(ui.helixPitch->value().getValue()); + if (widget == ui->helixPitch) { + helix->Pitch.setValue(ui->helixPitch->value().getValue()); } - else if (widget == ui.helixHeight) { - helix->Height.setValue(ui.helixHeight->value().getValue()); + else if (widget == ui->helixHeight) { + helix->Height.setValue(ui->helixHeight->value().getValue()); } - else if (widget == ui.helixRadius) { - helix->Radius.setValue(ui.helixRadius->value().getValue()); + else if (widget == ui->helixRadius) { + helix->Radius.setValue(ui->helixRadius->value().getValue()); } - else if (widget == ui.helixAngle) { - helix->Angle.setValue(ui.helixAngle->value().getValue()); + else if (widget == ui->helixAngle) { + helix->Angle.setValue(ui->helixAngle->value().getValue()); } - else if (widget == ui.helixLocalCS) { - helix->LocalCoord.setValue(ui.helixLocalCS->currentIndex()); + else if (widget == ui->helixLocalCS) { + helix->LocalCoord.setValue(ui->helixLocalCS->currentIndex()); } helix->recomputeFeature(); @@ -1456,14 +1459,14 @@ void DlgPrimitives::onChangeSpiral(QWidget* widget) if (featurePtr.expired()) return; Part::Spiral* spiral = featurePtr.get(); - if (widget == ui.spiralGrowth) { - spiral->Growth.setValue(ui.spiralGrowth->value().getValue()); + if (widget == ui->spiralGrowth) { + spiral->Growth.setValue(ui->spiralGrowth->value().getValue()); } - else if (widget == ui.spiralRotation) { - spiral->Rotations.setValue(ui.spiralRotation->value()); + else if (widget == ui->spiralRotation) { + spiral->Rotations.setValue(ui->spiralRotation->value()); } - else if (widget == ui.spiralRadius) { - spiral->Radius.setValue(ui.spiralRadius->value().getValue()); + else if (widget == ui->spiralRadius) { + spiral->Radius.setValue(ui->spiralRadius->value().getValue()); } spiral->recomputeFeature(); @@ -1474,14 +1477,14 @@ void DlgPrimitives::onChangeCircle(QWidget* widget) if (featurePtr.expired()) return; Part::Circle* circle = featurePtr.get(); - if (widget == ui.circleRadius) { - circle->Radius.setValue(ui.circleRadius->value().getValue()); + if (widget == ui->circleRadius) { + circle->Radius.setValue(ui->circleRadius->value().getValue()); } - else if (widget == ui.circleAngle0) { - circle->Angle0.setValue(ui.circleAngle0->value().getValue()); + else if (widget == ui->circleAngle0) { + circle->Angle0.setValue(ui->circleAngle0->value().getValue()); } - else if (widget == ui.circleAngle1) { - circle->Angle1.setValue(ui.circleAngle1->value().getValue()); + else if (widget == ui->circleAngle1) { + circle->Angle1.setValue(ui->circleAngle1->value().getValue()); } circle->recomputeFeature(); @@ -1492,17 +1495,17 @@ void DlgPrimitives::onChangeEllipse(QWidget* widget) if (featurePtr.expired()) return; Part::Ellipse* ell = featurePtr.get(); - if (widget == ui.ellipseMajorRadius) { - ell->MajorRadius.setValue(ui.ellipseMajorRadius->value().getValue()); + if (widget == ui->ellipseMajorRadius) { + ell->MajorRadius.setValue(ui->ellipseMajorRadius->value().getValue()); } - else if (widget == ui.ellipseMinorRadius) { - ell->MinorRadius.setValue(ui.ellipseMinorRadius->value().getValue()); + else if (widget == ui->ellipseMinorRadius) { + ell->MinorRadius.setValue(ui->ellipseMinorRadius->value().getValue()); } - else if (widget == ui.ellipseAngle0) { - ell->Angle0.setValue(ui.ellipseAngle0->value().getValue()); + else if (widget == ui->ellipseAngle0) { + ell->Angle0.setValue(ui->ellipseAngle0->value().getValue()); } - else if (widget == ui.ellipseAngle1) { - ell->Angle1.setValue(ui.ellipseAngle1->value().getValue()); + else if (widget == ui->ellipseAngle1) { + ell->Angle1.setValue(ui->ellipseAngle1->value().getValue()); } ell->recomputeFeature(); @@ -1513,14 +1516,14 @@ void DlgPrimitives::onChangeVertex(QWidget* widget) if (featurePtr.expired()) return; Part::Vertex* v = featurePtr.get(); - if (widget == ui.vertexX) { - v->X.setValue(ui.vertexX->value().getValue()); + if (widget == ui->vertexX) { + v->X.setValue(ui->vertexX->value().getValue()); } - else if (widget == ui.vertexY) { - v->Y.setValue(ui.vertexY->value().getValue()); + else if (widget == ui->vertexY) { + v->Y.setValue(ui->vertexY->value().getValue()); } - else if (widget == ui.vertexZ) { - v->Z.setValue(ui.vertexZ->value().getValue()); + else if (widget == ui->vertexZ) { + v->Z.setValue(ui->vertexZ->value().getValue()); } v->recomputeFeature(); @@ -1531,23 +1534,23 @@ void DlgPrimitives::onChangeLine(QWidget* widget) if (featurePtr.expired()) return; Part::Line* line = featurePtr.get(); - if (widget == ui.edgeX1) { - line->X1.setValue(ui.edgeX1->value().getValue()); + if (widget == ui->edgeX1) { + line->X1.setValue(ui->edgeX1->value().getValue()); } - else if (widget == ui.edgeY1) { - line->Y1.setValue(ui.edgeY1->value().getValue()); + else if (widget == ui->edgeY1) { + line->Y1.setValue(ui->edgeY1->value().getValue()); } - else if (widget == ui.edgeZ1) { - line->Z1.setValue(ui.edgeZ1->value().getValue()); + else if (widget == ui->edgeZ1) { + line->Z1.setValue(ui->edgeZ1->value().getValue()); } - else if (widget == ui.edgeX2) { - line->X2.setValue(ui.edgeX2->value().getValue()); + else if (widget == ui->edgeX2) { + line->X2.setValue(ui->edgeX2->value().getValue()); } - else if (widget == ui.edgeY2) { - line->Y2.setValue(ui.edgeY2->value().getValue()); + else if (widget == ui->edgeY2) { + line->Y2.setValue(ui->edgeY2->value().getValue()); } - else if (widget == ui.edgeZ2) { - line->Z2.setValue(ui.edgeZ2->value().getValue()); + else if (widget == ui->edgeZ2) { + line->Z2.setValue(ui->edgeZ2->value().getValue()); } line->recomputeFeature(); @@ -1558,11 +1561,11 @@ void DlgPrimitives::onChangeRegularPolygon(QWidget* widget) if (featurePtr.expired()) return; Part::RegularPolygon* poly = featurePtr.get(); - if (widget == ui.regularPolygonPolygon) { - poly->Polygon.setValue(ui.regularPolygonPolygon->value()); + if (widget == ui->regularPolygonPolygon) { + poly->Polygon.setValue(ui->regularPolygonPolygon->value()); } - else if (widget == ui.regularPolygonCircumradius) { - poly->Circumradius.setValue(ui.regularPolygonCircumradius->value().getValue()); + else if (widget == ui->regularPolygonCircumradius) { + poly->Circumradius.setValue(ui->regularPolygonCircumradius->value().getValue()); } poly->recomputeFeature(); @@ -1574,15 +1577,16 @@ void DlgPrimitives::onChangeRegularPolygon(QWidget* widget) Location::Location(QWidget* parent, Part::Feature* feature) : QWidget(parent) + , ui(new Ui_Location) , featurePtr(feature) { mode = 0; - ui.setupUi(this); + ui->setupUi(this); - ui.XPositionQSB->setUnit(Base::Unit::Length); - ui.YPositionQSB->setUnit(Base::Unit::Length); - ui.ZPositionQSB->setUnit(Base::Unit::Length); - ui.AngleQSB->setUnit(Base::Unit::Angle); + ui->XPositionQSB->setUnit(Base::Unit::Length); + ui->YPositionQSB->setUnit(Base::Unit::Length); + ui->ZPositionQSB->setUnit(Base::Unit::Length); + ui->AngleQSB->setUnit(Base::Unit::Angle); // fill location widget if object already exists if (feature) { @@ -1590,28 +1594,28 @@ Location::Location(QWidget* parent, Part::Feature* feature) auto placement = feature->Placement.getValue(); auto position = placement.getPosition(); - ui.XPositionQSB->setValue(position.x); - ui.YPositionQSB->setValue(position.y); - ui.ZPositionQSB->setValue(position.z); + ui->XPositionQSB->setValue(position.x); + ui->YPositionQSB->setValue(position.y); + ui->ZPositionQSB->setValue(position.z); double rotationAngle; Base::Vector3d rotationAxes; auto rotation = placement.getRotation(); rotation.getRawValue(rotationAxes, rotationAngle); - ui.XDirectionEdit->setValue(rotationAxes.x); - ui.YDirectionEdit->setValue(rotationAxes.y); - ui.ZDirectionEdit->setValue(rotationAxes.z); + ui->XDirectionEdit->setValue(rotationAxes.x); + ui->YDirectionEdit->setValue(rotationAxes.y); + ui->ZDirectionEdit->setValue(rotationAxes.z); // the angle is rad, transform it for display to degrees - ui.AngleQSB->setValue(Base::toDegrees(rotationAngle)); + ui->AngleQSB->setValue(Base::toDegrees(rotationAngle)); //connect signals - connect(ui.XPositionQSB, SIGNAL(valueChanged(double)), this, SLOT(onChangePosRot())); - connect(ui.YPositionQSB, SIGNAL(valueChanged(double)), this, SLOT(onChangePosRot())); - connect(ui.ZPositionQSB, SIGNAL(valueChanged(double)), this, SLOT(onChangePosRot())); - connect(ui.AngleQSB, SIGNAL(valueChanged(double)), this, SLOT(onChangePosRot())); - connect(ui.XDirectionEdit, SIGNAL(valueChanged(double)), this, SLOT(onChangePosRot())); - connect(ui.YDirectionEdit, SIGNAL(valueChanged(double)), this, SLOT(onChangePosRot())); - connect(ui.ZDirectionEdit, SIGNAL(valueChanged(double)), this, SLOT(onChangePosRot())); + connect(ui->XPositionQSB, SIGNAL(valueChanged(double)), this, SLOT(onChangePosRot())); + connect(ui->YPositionQSB, SIGNAL(valueChanged(double)), this, SLOT(onChangePosRot())); + connect(ui->ZPositionQSB, SIGNAL(valueChanged(double)), this, SLOT(onChangePosRot())); + connect(ui->AngleQSB, SIGNAL(valueChanged(double)), this, SLOT(onChangePosRot())); + connect(ui->XDirectionEdit, SIGNAL(valueChanged(double)), this, SLOT(onChangePosRot())); + connect(ui->YDirectionEdit, SIGNAL(valueChanged(double)), this, SLOT(onChangePosRot())); + connect(ui->ZDirectionEdit, SIGNAL(valueChanged(double)), this, SLOT(onChangePosRot())); } } @@ -1638,16 +1642,16 @@ void Location::onChangePosRot() // read dialog values Base::Vector3d loc; - loc.x = ui.XPositionQSB->rawValue(); - loc.y = ui.YPositionQSB->rawValue(); - loc.z = ui.ZPositionQSB->rawValue(); - double angle = ui.AngleQSB->rawValue(); + loc.x = ui->XPositionQSB->rawValue(); + loc.y = ui->YPositionQSB->rawValue(); + loc.z = ui->ZPositionQSB->rawValue(); + double angle = ui->AngleQSB->rawValue(); // the angle is displayed in degrees, transform it to rad angle = Base::toRadians(angle); Base::Vector3d rot; - rot.x = ui.XDirectionEdit->value(); - rot.y = ui.YDirectionEdit->value(); - rot.z = ui.ZDirectionEdit->value(); + rot.x = ui->XDirectionEdit->value(); + rot.y = ui->YDirectionEdit->value(); + rot.z = ui->ZDirectionEdit->value(); // set placement and rotation Base::Placement placement; @@ -1698,12 +1702,12 @@ void Location::pickCallback(void * ud, SoEventCallback * n) SbVec3f pnt = point->getPoint(); SbVec3f nor = point->getNormal(); Location* dlg = reinterpret_cast(ud); - dlg->ui.XPositionQSB->setValue(pnt[0]); - dlg->ui.YPositionQSB->setValue(pnt[1]); - dlg->ui.ZPositionQSB->setValue(pnt[2]); - dlg->ui.XDirectionEdit->setValue(nor[0]); - dlg->ui.YDirectionEdit->setValue(nor[1]); - dlg->ui.ZDirectionEdit->setValue(nor[2]); + dlg->ui->XPositionQSB->setValue(pnt[0]); + dlg->ui->YPositionQSB->setValue(pnt[1]); + dlg->ui->ZPositionQSB->setValue(pnt[2]); + dlg->ui->XDirectionEdit->setValue(nor[0]); + dlg->ui->YDirectionEdit->setValue(nor[1]); + dlg->ui->ZDirectionEdit->setValue(nor[2]); n->setHandled(); } } @@ -1728,16 +1732,16 @@ QString Location::toPlacement() const // create a command to set the position and angle of the primitive object Base::Vector3d rot; - rot.x = ui.XDirectionEdit->value(); - rot.y = ui.YDirectionEdit->value(); - rot.z = ui.ZDirectionEdit->value(); + rot.x = ui->XDirectionEdit->value(); + rot.y = ui->YDirectionEdit->value(); + rot.z = ui->ZDirectionEdit->value(); - double angle = ui.AngleQSB->rawValue(); + double angle = ui->AngleQSB->rawValue(); Base::Vector3d loc; - loc.x = ui.XPositionQSB->rawValue(); - loc.y = ui.YPositionQSB->rawValue(); - loc.z = ui.ZPositionQSB->rawValue(); + loc.x = ui->XPositionQSB->rawValue(); + loc.y = ui->YPositionQSB->rawValue(); + loc.z = ui->ZPositionQSB->rawValue(); return QString::fromLatin1("App.Placement(App.Vector(%1,%2,%3),App.Rotation(App.Vector(%4,%5,%6),%7))") .arg(loc.x, 0, 'f', Base::UnitsApi::getDecimals()) diff --git a/src/Mod/Part/Gui/DlgPrimitives.h b/src/Mod/Part/Gui/DlgPrimitives.h index 97d308f29c..adde46ec11 100644 --- a/src/Mod/Part/Gui/DlgPrimitives.h +++ b/src/Mod/Part/Gui/DlgPrimitives.h @@ -23,12 +23,11 @@ #ifndef PARTGUI_DLGPRIMITIVES_H #define PARTGUI_DLGPRIMITIVES_H +#include #include #include #include #include -#include -#include class gp_Ax2; class SoPickedPoint; @@ -62,6 +61,7 @@ public: QEventLoop loop; }; +class Ui_DlgPrimitives; class DlgPrimitives : public QWidget { Q_OBJECT @@ -98,10 +98,11 @@ private: void connectSignalMapper(QWidget *sender, const char *signal, QSignalMapper* mapper); private: - Ui_DlgPrimitives ui; + std::unique_ptr ui; App::DocumentObjectWeakPtrT featurePtr; }; +class Ui_Location; class Location : public QWidget { Q_OBJECT @@ -119,7 +120,7 @@ private: static void pickCallback(void * ud, SoEventCallback * n); int mode; QPointer activeView; - Ui_Location ui; + std::unique_ptr ui; App::DocumentObjectWeakPtrT featurePtr; };