kindred/create
1
1
Fork 0
Code Issues 44 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Ellipse variable name change to create consistency

Browse Source 
Change variable names of the Ellipse from Angle0 to Angle1 to create consistency with all other named angle variables
This commit is contained in:
Sebastian
2022-02-11 06:50:28 +01:00
committed by wmayer
parent 9e9790f1b1
commit a48656e5fe
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mod/Part/App/PrimitiveFeature.cpp
View File

@@ -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<double>(this->Angle0.getValue()),
Base::toRadians<double>(this->Angle1.getValue()));
BRepBuilderAPI_MakeEdge clMakeEdge(ellipse, Base::toRadians<double>(this->Angle1.getValue()),
Base::toRadians<double>(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;

2
src/Mod/Part/App/PrimitiveFeature.h
View File

@@ -406,8 +406,8 @@ public:
App::PropertyLength MajorRadius;
App::PropertyLength MinorRadius;
App::PropertyAngle Angle0;
App::PropertyAngle Angle1;
App::PropertyAngle Angle2;
/** @name methods override feature */
//@{

26
src/Mod/Part/Gui/DlgPrimitives.cpp
View File

@@ -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<Part::Vertex*>(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();
}

6
src/Mod/Part/Gui/DlgPrimitives.ui
View File

@@ -2121,7 +2121,7 @@
</widget>
</item>
<item row="2" column="1">
<widget class="Gui::QuantitySpinBox" name="ellipseAngle0">
<widget class="Gui::QuantitySpinBox" name="ellipseAngle1">
<property name="keyboardTracking">
<bool>false</bool>
</property>
@@ -2131,7 +2131,7 @@
</widget>
</item>
<item row="3" column="1">
<widget class="Gui::QuantitySpinBox" name="ellipseAngle1">
<widget class="Gui::QuantitySpinBox" name="ellipseAngle2">
<property name="keyboardTracking">
<bool>false</bool>
</property>
@@ -2543,8 +2543,8 @@
<tabstop>buttonCircleFromThreePoints</tabstop>
<tabstop>ellipseMajorRadius</tabstop>
<tabstop>ellipseMinorRadius</tabstop>
<tabstop>ellipseAngle0</tabstop>
<tabstop>ellipseAngle1</tabstop>
<tabstop>ellipseAngle2</tabstop>
<tabstop>vertexX</tabstop>
<tabstop>vertexY</tabstop>
<tabstop>vertexZ</tabstop>