From b9efb481a23f0e7238d1c6496ce047f7bb2311bf Mon Sep 17 00:00:00 2001 From: FEA-eng <59876896+FEA-eng@users.noreply.github.com> Date: Thu, 4 Sep 2025 16:36:15 +0200 Subject: [PATCH] PartDesign: Correct typo in multiple solids error (#23642) * PartDesign: Update FeatureFillet.cpp * PartDesign: Update FeaturePipe.cpp * PartDesign: Update FeatureLoft.cpp * PartDesign: Update FeatureExtrude.cpp * PartDesign: Update FeatureGroove.cpp * PartDesign: Update FeatureBoolean.cpp * PartDesign: Update FeatureChamfer.cpp * PartDesign: Update FeatureHole.cpp * PartDesign: Update FeatureDraft.cpp * PartDesign: Update FeatureRevolution.cpp * PartDesign: Remove empty lines added by GitHub editor * PartDesign: Remove empty lines added by GitHub editor * PartDesign: Remove empty lines added by GitHub editor * PartDesign: Remove empty lines added by GitHub editor * PartDesign: Remove empty lines added by GitHub editor * PartDesign: Remove empty lines added by GitHub editor * PartDesign: Remove empty lines added by GitHub editor * PartDesign: Remove empty lines added by GitHub editor * PartDesign: Remove empty lines added by GitHub editor --- src/Mod/PartDesign/App/FeatureBoolean.cpp | 3 +-- src/Mod/PartDesign/App/FeatureChamfer.cpp | 3 ++- src/Mod/PartDesign/App/FeatureDraft.cpp | 2 +- src/Mod/PartDesign/App/FeatureExtrude.cpp | 6 +++--- src/Mod/PartDesign/App/FeatureFillet.cpp | 2 +- src/Mod/PartDesign/App/FeatureGroove.cpp | 2 +- src/Mod/PartDesign/App/FeatureHole.cpp | 2 +- src/Mod/PartDesign/App/FeatureLoft.cpp | 4 ++-- src/Mod/PartDesign/App/FeaturePipe.cpp | 4 ++-- src/Mod/PartDesign/App/FeatureRevolution.cpp | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Mod/PartDesign/App/FeatureBoolean.cpp b/src/Mod/PartDesign/App/FeatureBoolean.cpp index 3338112517..9d169c6449 100644 --- a/src/Mod/PartDesign/App/FeatureBoolean.cpp +++ b/src/Mod/PartDesign/App/FeatureBoolean.cpp @@ -160,7 +160,7 @@ App::DocumentObjectExecReturn *Boolean::execute() result = refineShapeIfActive(result); if (!isSingleSolidRuleSatisfied(result.getShape())) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compounds' in the active body.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compound' in the active body.")); } this->Shape.setValue(getSolid(result)); @@ -221,4 +221,3 @@ void Boolean::handleChangedPropertyName(Base::XMLReader &reader, const char * Ty } - diff --git a/src/Mod/PartDesign/App/FeatureChamfer.cpp b/src/Mod/PartDesign/App/FeatureChamfer.cpp index 63443623af..493df5d9c5 100644 --- a/src/Mod/PartDesign/App/FeatureChamfer.cpp +++ b/src/Mod/PartDesign/App/FeatureChamfer.cpp @@ -171,7 +171,7 @@ App::DocumentObjectExecReturn *Chamfer::execute() this->rawShape = shape; shape = refineShapeIfActive(shape); if (!isSingleSolidRuleSatisfied(shape.getShape())) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compounds' in the active body.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compound' in the active body.")); } shape = getSolid(shape); @@ -260,3 +260,4 @@ static App::DocumentObjectExecReturn *validateParameters(int chamferType, double return App::DocumentObject::StdReturn; } + diff --git a/src/Mod/PartDesign/App/FeatureDraft.cpp b/src/Mod/PartDesign/App/FeatureDraft.cpp index 1bc842c5ff..d8f2c7e9b3 100644 --- a/src/Mod/PartDesign/App/FeatureDraft.cpp +++ b/src/Mod/PartDesign/App/FeatureDraft.cpp @@ -288,7 +288,7 @@ App::DocumentObjectExecReturn *Draft::execute() } if (!isSingleSolidRuleSatisfied(shape.getShape())) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compounds' in the active body.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compound' in the active body.")); } this->Shape.setValue(getSolid(shape)); diff --git a/src/Mod/PartDesign/App/FeatureExtrude.cpp b/src/Mod/PartDesign/App/FeatureExtrude.cpp index 9e5664f191..38c649f4f3 100644 --- a/src/Mod/PartDesign/App/FeatureExtrude.cpp +++ b/src/Mod/PartDesign/App/FeatureExtrude.cpp @@ -573,7 +573,7 @@ App::DocumentObjectExecReturn* FeatureExtrude::buildExtrusion(ExtrudeOptions opt solRes = refineShapeIfActive(result); if (!isSingleSolidRuleSatisfied(solRes.getShape())) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compounds' in the active body.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compound' in the active body.")); } this->Shape.setValue(getSolid(solRes)); } @@ -586,7 +586,7 @@ App::DocumentObjectExecReturn* FeatureExtrude::buildExtrusion(ExtrudeOptions opt this->rawShape = prism; prism = refineShapeIfActive(prism); if (!isSingleSolidRuleSatisfied(prism.getShape())) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compounds' in the active body.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compound' in the active body.")); } prism = getSolid(prism); this->Shape.setValue(prism); @@ -596,7 +596,7 @@ App::DocumentObjectExecReturn* FeatureExtrude::buildExtrusion(ExtrudeOptions opt this->rawShape = prism; prism = refineShapeIfActive(prism); if (!isSingleSolidRuleSatisfied(prism.getShape())) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compounds' in the active body.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compound' in the active body.")); } this->Shape.setValue(prism); } diff --git a/src/Mod/PartDesign/App/FeatureFillet.cpp b/src/Mod/PartDesign/App/FeatureFillet.cpp index 98d104674e..7195912bc6 100644 --- a/src/Mod/PartDesign/App/FeatureFillet.cpp +++ b/src/Mod/PartDesign/App/FeatureFillet.cpp @@ -116,7 +116,7 @@ App::DocumentObjectExecReturn *Fillet::execute() this->rawShape = shape; shape = refineShapeIfActive(shape); if (!isSingleSolidRuleSatisfied(shape.getShape())) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compounds' in the active body.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compound' in the active body.")); } shape = getSolid(shape); diff --git a/src/Mod/PartDesign/App/FeatureGroove.cpp b/src/Mod/PartDesign/App/FeatureGroove.cpp index d7fd6521b6..09187d80f9 100644 --- a/src/Mod/PartDesign/App/FeatureGroove.cpp +++ b/src/Mod/PartDesign/App/FeatureGroove.cpp @@ -193,7 +193,7 @@ App::DocumentObjectExecReturn *Groove::execute() this->rawShape = boolOp; boolOp = refineShapeIfActive(boolOp); if (!isSingleSolidRuleSatisfied(boolOp.getShape())) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compounds' in the active body.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compound' in the active body.")); } boolOp = getSolid(boolOp); Shape.setValue(boolOp); diff --git a/src/Mod/PartDesign/App/FeatureHole.cpp b/src/Mod/PartDesign/App/FeatureHole.cpp index 048aee49a0..69c2ed804b 100644 --- a/src/Mod/PartDesign/App/FeatureHole.cpp +++ b/src/Mod/PartDesign/App/FeatureHole.cpp @@ -2182,7 +2182,7 @@ App::DocumentObjectExecReturn* Hole::execute() if (!isSingleSolidRuleSatisfied(result.getShape())) { return new App::DocumentObjectExecReturn( - QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compounds' in the active body.")); + QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compound' in the active body.")); } this->Shape.setValue(result); diff --git a/src/Mod/PartDesign/App/FeatureLoft.cpp b/src/Mod/PartDesign/App/FeatureLoft.cpp index 71ba58b861..a37dbfd7d9 100644 --- a/src/Mod/PartDesign/App/FeatureLoft.cpp +++ b/src/Mod/PartDesign/App/FeatureLoft.cpp @@ -274,7 +274,7 @@ App::DocumentObjectExecReturn *Loft::execute() if(base.isNull()) { if (!isSingleSolidRuleSatisfied(result.getShape())) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compounds' in the active body.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compound' in the active body.")); } Shape.setValue(getSolid(result)); return App::DocumentObject::StdReturn; @@ -309,7 +309,7 @@ App::DocumentObjectExecReturn *Loft::execute() this->rawShape = boolOp; boolOp = refineShapeIfActive(boolOp); if (!isSingleSolidRuleSatisfied(boolOp.getShape())) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compounds' in the active body.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compound' in the active body.")); } boolOp = getSolid(boolOp); Shape.setValue(boolOp); diff --git a/src/Mod/PartDesign/App/FeaturePipe.cpp b/src/Mod/PartDesign/App/FeaturePipe.cpp index ec3d7e3bf1..2bcfb0dc70 100644 --- a/src/Mod/PartDesign/App/FeaturePipe.cpp +++ b/src/Mod/PartDesign/App/FeaturePipe.cpp @@ -402,7 +402,7 @@ App::DocumentObjectExecReturn *Pipe::execute() if (!isSingleSolidRuleSatisfied(boolOp.getShape())) { return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", - "Result has multiple solids: enable 'Allow Compounds' in the active body.")); + "Result has multiple solids: enable 'Allow Compound' in the active body.")); } // store shape before refinement @@ -423,7 +423,7 @@ App::DocumentObjectExecReturn *Pipe::execute() if (!isSingleSolidRuleSatisfied(boolOp.getShape())) { return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", - "Result has multiple solids: enable 'Allow Compounds' in the active body.")); + "Result has multiple solids: enable 'Allow Compound' in the active body.")); } // store shape before refinement diff --git a/src/Mod/PartDesign/App/FeatureRevolution.cpp b/src/Mod/PartDesign/App/FeatureRevolution.cpp index 3a53b72961..62ead5d6ef 100644 --- a/src/Mod/PartDesign/App/FeatureRevolution.cpp +++ b/src/Mod/PartDesign/App/FeatureRevolution.cpp @@ -230,7 +230,7 @@ App::DocumentObjectExecReturn* Revolution::execute() result = refineShapeIfActive(result); } if (!isSingleSolidRuleSatisfied(result.getShape())) { - return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compounds' in the active body.")); + return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Result has multiple solids: enable 'Allow Compound' in the active body.")); } result = getSolid(result); this->Shape.setValue(result);