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

Part & PartDesign Cone: allow equal radii (#12219)

Browse Source 
* PartDesign_Cone: allow equal radii

* fix R2 < R1

* Part_Cone: allow equal radii
This commit is contained in:
Florian Foinant-Willig
2024-02-12 18:21:53 +01:00
committed by GitHub
parent 51f546f1f6
commit 1eb0444bd5
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -658,12 +658,21 @@ App::DocumentObjectExecReturn *Cone::execute()
if (Height.getValue() < Precision::Confusion())
return new App::DocumentObjectExecReturn("Height of cone too small");
try {
// Build a cone
BRepPrimAPI_MakeCone mkCone(Radius1.getValue(),
Radius2.getValue(),
Height.getValue(),
Angle.getValue()/180.0f*M_PI);
TopoDS_Shape ResultShape = mkCone.Shape();
TopoDS_Shape ResultShape;
if (std::abs(Radius1.getValue() - Radius2.getValue()) < Precision::Confusion()){
//Build a cylinder
BRepPrimAPI_MakeCylinder mkCylr(Radius1.getValue(),
Height.getValue(),
2.0 * M_PI);
ResultShape = mkCylr.Shape();
} else {
// Build a cone
BRepPrimAPI_MakeCone mkCone(Radius1.getValue(),
Radius2.getValue(),
Height.getValue(),
Angle.getValue()/180.0f*M_PI);
ResultShape = mkCone.Shape();
}
this->Shape.setValue(ResultShape);
}
catch (Standard_Failure& e) {

10
src/Mod/PartDesign/App/FeaturePrimitive.cpp
View File

@@ -354,17 +354,21 @@ App::DocumentObjectExecReturn* Cone::execute()
return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Radius of cone cannot be negative"));
if (Radius2.getValue() < 0.0)
return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Radius of cone cannot be negative"));
if (Radius1.getValue() == Radius2.getValue())
return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "The radii for cones must not be equal"));
if (Height.getValue() < Precision::Confusion())
return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Height of cone too small"));
try {
if (std::abs(Radius1.getValue() - Radius2.getValue()) < Precision::Confusion()){
//Build a cylinder
BRepPrimAPI_MakeCylinder mkCylr(Radius1.getValue(),
Height.getValue(),
2.0 * M_PI);
return FeaturePrimitive::execute(mkCylr.Shape());
}
// Build a cone
BRepPrimAPI_MakeCone mkCone(Radius1.getValue(),
Radius2.getValue(),
Height.getValue(),
Base::toRadians<double>(Angle.getValue()));
return FeaturePrimitive::execute(mkCone.Shape());
}
catch (Standard_Failure& e) {

6
src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
View File

@@ -755,12 +755,6 @@ bool TaskBoxPrimitives::setPrimitive(App::DocumentObject *obj)
break;
case 3: // cone
// the cone radii must not be equal
if (ui->coneRadius1->value().getValue() == ui->coneRadius2->value().getValue()) {
QMessageBox::warning(Gui::getMainWindow(), tr("Cone radii are equal"),
tr("The radii for cones must not be equal!"));
return false;
}
cmd = QString::fromLatin1(
"%1.Radius1='%2'\n"
"%1.Radius2='%3'\n"