diff --git a/src/Mod/PartDesign/App/FeaturePipe.cpp b/src/Mod/PartDesign/App/FeaturePipe.cpp index 126fff5d9b..4e112be1d6 100644 --- a/src/Mod/PartDesign/App/FeaturePipe.cpp +++ b/src/Mod/PartDesign/App/FeaturePipe.cpp @@ -165,7 +165,7 @@ App::DocumentObjectExecReturn *Pipe::execute(void) if(Mode.getValue()==3) { App::DocumentObject* auxspine = AuxillerySpine.getValue(); if (!(auxspine && auxspine->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId()))) - return new App::DocumentObjectExecReturn("No auxillery spine linked."); + return new App::DocumentObjectExecReturn("No auxiliary spine linked."); std::vector auxsubedge = AuxillerySpine.getSubValues(); const Part::TopoShape& auxshape = static_cast(auxspine)->Shape.getValue(); @@ -333,41 +333,41 @@ App::DocumentObjectExecReturn *Pipe::execute(void) void Pipe::setupAlgorithm(BRepOffsetAPI_MakePipeShell& mkPipeShell, TopoDS_Shape& auxshape) { - mkPipeShell.SetTolerance(Precision::Confusion()); + mkPipeShell.SetTolerance(Precision::Confusion()); - switch(Transition.getValue()) { - case 0: - mkPipeShell.SetTransitionMode(BRepBuilderAPI_Transformed); - break; - case 1: - mkPipeShell.SetTransitionMode(BRepBuilderAPI_RightCorner); - break; - case 2: - mkPipeShell.SetTransitionMode(BRepBuilderAPI_RoundCorner); - break; - } + switch(Transition.getValue()) { + case 0: + mkPipeShell.SetTransitionMode(BRepBuilderAPI_Transformed); + break; + case 1: + mkPipeShell.SetTransitionMode(BRepBuilderAPI_RightCorner); + break; + case 2: + mkPipeShell.SetTransitionMode(BRepBuilderAPI_RoundCorner); + break; + } + + bool auxiliary = false; + const Base::Vector3d& bVec = Binormal.getValue(); + switch(Mode.getValue()) { + case 1: + mkPipeShell.SetMode(gp_Ax2(gp_Pnt(0,0,0), gp_Dir(0,0,1), gp_Dir(1,0,0))); + break; + case 2: + mkPipeShell.SetMode(true); + break; + case 3: + auxiliary = true; + break; + case 4: + mkPipeShell.SetMode(gp_Dir(bVec.x,bVec.y,bVec.z)); + break; + } - bool auxillery = false; - const Base::Vector3d& bVec = Binormal.getValue(); - switch(Mode.getValue()) { - case 1: - mkPipeShell.SetMode(gp_Ax2(gp_Pnt(0,0,0), gp_Dir(0,0,1), gp_Dir(1,0,0))); - break; - case 2: - mkPipeShell.SetMode(true); - break; - case 3: - auxillery = true; - break; - case 4: - mkPipeShell.SetMode(gp_Dir(bVec.x,bVec.y,bVec.z)); - break; - } - - if(auxillery) { - mkPipeShell.SetMode(TopoDS::Wire(auxshape), AuxilleryCurvelinear.getValue()); - //mkPipeShell.SetMode(TopoDS::Wire(auxshape), AuxilleryCurvelinear.getValue(), BRepFill_ContactOnBorder); - } + if(auxiliary) { + mkPipeShell.SetMode(TopoDS::Wire(auxshape), AuxilleryCurvelinear.getValue()); + //mkPipeShell.SetMode(TopoDS::Wire(auxshape), AuxilleryCurvelinear.getValue(), BRepFill_ContactOnBorder); + } } diff --git a/src/Mod/PartDesign/Gui/TaskPipeOrientation.ui b/src/Mod/PartDesign/Gui/TaskPipeOrientation.ui index 538be2ea29..ebdb52a5b9 100644 --- a/src/Mod/PartDesign/Gui/TaskPipeOrientation.ui +++ b/src/Mod/PartDesign/Gui/TaskPipeOrientation.ui @@ -68,7 +68,7 @@ - + diff --git a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp index 568e3c0738..e49e5431e3 100644 --- a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp @@ -323,7 +323,7 @@ TaskPipeOrientation::TaskPipeOrientation(ViewProviderPipe* PipeView, bool /*newO Gui::Document* doc = Gui::Application::Instance->activeDocument(); //make sure th euser sees al important things: the base feature to select edges and the - //spine/auxillery spine he already selected + //spine/auxiliary spine he already selected if(pipe->AuxillerySpine.getValue()) { auto* svp = doc->getViewProvider(pipe->AuxillerySpine.getValue()); auxSpineShow = svp->isShow(); diff --git a/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp b/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp index 9c548cefdd..f734f26ffc 100644 --- a/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp +++ b/src/Mod/PartDesign/Gui/TaskShapeBinder.cpp @@ -91,7 +91,7 @@ TaskShapeBinder::TaskShapeBinder(ViewProviderShapeBinder *view, bool /*newObj*/, ui->listWidgetReferences->addItem(QString::fromStdString(sub)); //make sure th euser sees al important things: the base feature to select edges and the - //spine/auxillery spine he already selected + //spine/auxiliary spine he already selected if(obj) { auto* svp = doc->getViewProvider(obj); if(svp) { @@ -148,7 +148,7 @@ TaskShapeBinder::~TaskShapeBinder() Gui::Document* doc = Gui::Application::Instance->activeDocument(); //make sure th euser sees al important things: the base feature to select edges and the - //spine/auxillery spine he already selected + //spine/auxiliary spine he already selected if(pipe->BaseFeature.getValue()) doc->getViewProvider(pipe->BaseFeature.getValue())->hide(); if(pipe->Spine.getValue()) { diff --git a/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp b/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp index 0e7f1e3ea5..3819370843 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderLoft.cpp @@ -121,11 +121,11 @@ bool ViewProviderLoft::onDelete(const std::vector & /*s*/) return true; } -void ViewProviderLoft::highlightReferences(const bool /*on*/, bool /*auxillery*/) +void ViewProviderLoft::highlightReferences(const bool /*on*/, bool /*auxiliary*/) {/* PartDesign::Loft* pcLoft = static_cast(getObject()); Part::Feature* base; - if(!auxillery) + if(!auxiliary) base = static_cast(pcLoft->Spine.getValue()); else base = static_cast(pcLoft->AuxillerySpine.getValue()); @@ -136,7 +136,7 @@ void ViewProviderLoft::highlightReferences(const bool /*on*/, bool /*auxillery*/ if (svp == NULL) return; std::vector edges; - if(!auxillery) + if(!auxiliary) edges = pcLoft->Spine.getSubValuesStartsWith("Edge"); else edges = pcLoft->AuxillerySpine.getSubValuesStartsWith("Edge"); diff --git a/src/Mod/PartDesign/Gui/ViewProviderLoft.h b/src/Mod/PartDesign/Gui/ViewProviderLoft.h index 03b1be7dee..dcec346ee3 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderLoft.h +++ b/src/Mod/PartDesign/Gui/ViewProviderLoft.h @@ -44,7 +44,7 @@ public: bool doubleClicked(); virtual bool onDelete(const std::vector &); - void highlightReferences(const bool on, bool auxillery); + void highlightReferences(const bool on, bool auxiliary); protected: virtual bool setEdit(int ModNum); diff --git a/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp b/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp index 5ec2b87a6c..1e0d48ae38 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPipe.cpp @@ -122,11 +122,11 @@ bool ViewProviderPipe::onDelete(const std::vector &s) -void ViewProviderPipe::highlightReferences(const bool on, bool auxillery) +void ViewProviderPipe::highlightReferences(const bool on, bool auxiliary) { PartDesign::Pipe* pcPipe = static_cast(getObject()); Part::Feature* base; - if(!auxillery) + if(!auxiliary) base = static_cast(pcPipe->Spine.getValue()); else base = static_cast(pcPipe->AuxillerySpine.getValue()); @@ -137,7 +137,7 @@ void ViewProviderPipe::highlightReferences(const bool on, bool auxillery) if (svp == NULL) return; std::vector edges; - if(!auxillery) + if(!auxiliary) edges = pcPipe->Spine.getSubValuesStartsWith("Edge"); else edges = pcPipe->AuxillerySpine.getSubValuesStartsWith("Edge"); diff --git a/src/Mod/PartDesign/Gui/ViewProviderPipe.h b/src/Mod/PartDesign/Gui/ViewProviderPipe.h index 94a3812c75..b70cf443f5 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPipe.h +++ b/src/Mod/PartDesign/Gui/ViewProviderPipe.h @@ -44,7 +44,7 @@ public: bool doubleClicked(); virtual bool onDelete(const std::vector &); - void highlightReferences(const bool on, bool auxillery); + void highlightReferences(const bool on, bool auxiliary); protected: virtual QIcon getIcon(void) const; diff --git a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp index 32e2cb7159..3c681e1504 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp @@ -122,7 +122,7 @@ void ViewProviderShapeBinder::unsetEdit(int ModNum) { PartGui::ViewProviderPart::unsetEdit(ModNum); } -void ViewProviderShapeBinder::highlightReferences(const bool on, bool /*auxillery*/) +void ViewProviderShapeBinder::highlightReferences(const bool on, bool /*auxiliary*/) { Part::Feature* obj; std::vector subs; diff --git a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h index 54930b7172..1cc8478a76 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h +++ b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h @@ -39,7 +39,7 @@ public: virtual ~ViewProviderShapeBinder(); void setupContextMenu(QMenu*, QObject*, const char*); - void highlightReferences(const bool on, bool auxillery); + void highlightReferences(const bool on, bool auxiliary); protected: virtual bool setEdit(int ModNum);