From a48656e5fe69cfbe2bd3a24ddee8e32dffc0dae8 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 11 Feb 2022 06:50:28 +0100 Subject: [PATCH] Ellipse variable name change to create consistency Change variable names of the Ellipse from Angle0 to Angle1 to create consistency with all other named angle variables --- src/Mod/Part/App/PrimitiveFeature.cpp | 16 ++++++++-------- src/Mod/Part/App/PrimitiveFeature.h | 2 +- src/Mod/Part/Gui/DlgPrimitives.cpp | 26 +++++++++++++------------- src/Mod/Part/Gui/DlgPrimitives.ui | 6 +++--- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/Mod/Part/App/PrimitiveFeature.cpp b/src/Mod/Part/App/PrimitiveFeature.cpp index e3f44430d5..a9b9a98a51 100644 --- a/src/Mod/Part/App/PrimitiveFeature.cpp +++ b/src/Mod/Part/App/PrimitiveFeature.cpp @@ -1009,10 +1009,10 @@ Ellipse::Ellipse() { ADD_PROPERTY(MajorRadius,(4.0f)); ADD_PROPERTY(MinorRadius,(4.0f)); - ADD_PROPERTY(Angle0,(0.0f)); - Angle0.setConstraints(&angleRange); - ADD_PROPERTY(Angle1,(360.0f)); + ADD_PROPERTY(Angle1,(0.0f)); Angle1.setConstraints(&angleRange); + ADD_PROPERTY(Angle2,(360.0f)); + Angle2.setConstraints(&angleRange); } Ellipse::~Ellipse() @@ -1021,8 +1021,8 @@ Ellipse::~Ellipse() short Ellipse::mustExecute() const { - if (Angle0.isTouched() || - Angle1.isTouched() || + if (Angle1.isTouched() || + Angle2.isTouched() || MajorRadius.isTouched() || MinorRadius.isTouched()) return 1; @@ -1040,8 +1040,8 @@ App::DocumentObjectExecReturn *Ellipse::execute(void) ellipse.SetMajorRadius(this->MajorRadius.getValue()); ellipse.SetMinorRadius(this->MinorRadius.getValue()); - BRepBuilderAPI_MakeEdge clMakeEdge(ellipse, Base::toRadians(this->Angle0.getValue()), - Base::toRadians(this->Angle1.getValue())); + BRepBuilderAPI_MakeEdge clMakeEdge(ellipse, Base::toRadians(this->Angle1.getValue()), + Base::toRadians(this->Angle2.getValue())); const TopoDS_Edge& edge = clMakeEdge.Edge(); this->Shape.setValue(edge); @@ -1051,7 +1051,7 @@ App::DocumentObjectExecReturn *Ellipse::execute(void) void Ellipse::onChanged(const App::Property* prop) { if (!isRestoring()) { - if (prop == &MajorRadius || prop == &MinorRadius || prop == &Angle0 || prop == &Angle1){ + if (prop == &MajorRadius || prop == &MinorRadius || prop == &Angle1 || prop == &Angle2){ try { App::DocumentObjectExecReturn *ret = recompute(); delete ret; diff --git a/src/Mod/Part/App/PrimitiveFeature.h b/src/Mod/Part/App/PrimitiveFeature.h index a873055345..cde36e4975 100644 --- a/src/Mod/Part/App/PrimitiveFeature.h +++ b/src/Mod/Part/App/PrimitiveFeature.h @@ -406,8 +406,8 @@ public: App::PropertyLength MajorRadius; App::PropertyLength MinorRadius; - App::PropertyAngle Angle0; App::PropertyAngle Angle1; + App::PropertyAngle Angle2; /** @name methods override feature */ //@{ diff --git a/src/Mod/Part/Gui/DlgPrimitives.cpp b/src/Mod/Part/Gui/DlgPrimitives.cpp index ee3193748b..87f32d85e2 100644 --- a/src/Mod/Part/Gui/DlgPrimitives.cpp +++ b/src/Mod/Part/Gui/DlgPrimitives.cpp @@ -284,8 +284,8 @@ DlgPrimitives::DlgPrimitives(QWidget* parent, Part::Primitive* feature) // ellipse ui->ellipseMajorRadius->setRange(0, INT_MAX); ui->ellipseMinorRadius->setRange(0, INT_MAX); - ui->ellipseAngle0->setRange(0, 360); ui->ellipseAngle1->setRange(0, 360); + ui->ellipseAngle2->setRange(0, 360); // vertex ui->vertexX->setMaximum(INT_MAX); ui->vertexY->setMaximum(INT_MAX); @@ -580,17 +580,17 @@ DlgPrimitives::DlgPrimitives(QWidget* parent, Part::Primitive* feature) ui->ellipseMajorRadius->bind(ell->MajorRadius); ui->ellipseMinorRadius->setValue(ell->MinorRadius.getQuantityValue()); ui->ellipseMinorRadius->bind(ell->MinorRadius); - ui->ellipseAngle0->setValue(ell->Angle0.getQuantityValue()); - ui->ellipseAngle0->bind(ell->Angle0); ui->ellipseAngle1->setValue(ell->Angle1.getQuantityValue()); ui->ellipseAngle1->bind(ell->Angle1); + ui->ellipseAngle2->setValue(ell->Angle2.getQuantityValue()); + ui->ellipseAngle2->bind(ell->Angle2); 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->ellipseAngle2, SIGNAL(valueChanged(double)), mapper); } else if (type == Part::Vertex::getClassTypeId()) { Part::Vertex* v = static_cast(feature); @@ -975,15 +975,15 @@ QString DlgPrimitives::createEllipse(const QString& objectName, const QString& p "App.ActiveDocument.addObject(\"Part::Ellipse\",\"%1\")\n" "App.ActiveDocument.%1.MajorRadius=%2\n" "App.ActiveDocument.%1.MinorRadius=%3\n" - "App.ActiveDocument.%1.Angle0=%4\n" - "App.ActiveDocument.%1.Angle1=%5\n" + "App.ActiveDocument.%1.Angle1=%4\n" + "App.ActiveDocument.%1.Angle2=%5\n" "App.ActiveDocument.%1.Placement=%6\n" "App.ActiveDocument.%1.Label='%7'\n") .arg(objectName) .arg(Base::UnitsApi::toNumber(ui->ellipseMajorRadius->value())) .arg(Base::UnitsApi::toNumber(ui->ellipseMinorRadius->value())) - .arg(Base::UnitsApi::toNumber(ui->ellipseAngle0->value())) .arg(Base::UnitsApi::toNumber(ui->ellipseAngle1->value())) + .arg(Base::UnitsApi::toNumber(ui->ellipseAngle2->value())) .arg(placement) .arg(tr("Ellipse")); } @@ -1340,14 +1340,14 @@ QString DlgPrimitives::changeEllipse(const QString& objectName, const QString& p return QString::fromLatin1( "%1.MajorRadius=%2\n" "%1.MinorRadius=%3\n" - "%1.Angle0=%4\n" - "%1.Angle1=%5\n" + "%1.Angle1=%4\n" + "%1.Angle2=%5\n" "%1.Placement=%6\n") .arg(objectName) .arg(Base::UnitsApi::toNumber(ui->ellipseMajorRadius->value())) .arg(Base::UnitsApi::toNumber(ui->ellipseMinorRadius->value())) - .arg(Base::UnitsApi::toNumber(ui->ellipseAngle0->value())) .arg(Base::UnitsApi::toNumber(ui->ellipseAngle1->value())) + .arg(Base::UnitsApi::toNumber(ui->ellipseAngle2->value())) .arg(placement); } @@ -1757,12 +1757,12 @@ void DlgPrimitives::onChangeEllipse(QWidget* widget) 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->ellipseAngle1) { ell->Angle1.setValue(ui->ellipseAngle1->value().getValue()); } + else if (widget == ui->ellipseAngle2) { + ell->Angle2.setValue(ui->ellipseAngle2->value().getValue()); + } ell->recomputeFeature(); } diff --git a/src/Mod/Part/Gui/DlgPrimitives.ui b/src/Mod/Part/Gui/DlgPrimitives.ui index 3e47cda6a6..a2c2fb3dc4 100644 --- a/src/Mod/Part/Gui/DlgPrimitives.ui +++ b/src/Mod/Part/Gui/DlgPrimitives.ui @@ -2121,7 +2121,7 @@ - + false @@ -2131,7 +2131,7 @@ - + false @@ -2543,8 +2543,8 @@ buttonCircleFromThreePoints ellipseMajorRadius ellipseMinorRadius - ellipseAngle0 ellipseAngle1 + ellipseAngle2 vertexX vertexY vertexZ