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

fix typos

Browse Source
This commit is contained in:
wmayer
2017-09-25 22:36:31 +02:00
parent 6d9886775c
commit 14f6de974b
10 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/Mod/PartDesign/App/FeaturePipe.cpp
View File

@@ -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<std::string> auxsubedge = AuxillerySpine.getSubValues();
const Part::TopoShape& auxshape = static_cast<Part::Feature*>(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);
}
}

2
src/Mod/PartDesign/Gui/TaskPipeOrientation.ui
View File

@@ -68,7 +68,7 @@
<widget class="QWidget" name="standard"/>
<widget class="QWidget" name="fixed"/>
<widget class="QWidget" name="frenet"/>
<widget class="QWidget" name="auxillery">
<widget class="QWidget" name="auxiliary">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="curvelinear">

2
src/Mod/PartDesign/Gui/TaskPipeParameters.cpp
View File

@@ -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();

4
src/Mod/PartDesign/Gui/TaskShapeBinder.cpp
View File

@@ -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()) {

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

@@ -121,11 +121,11 @@ bool ViewProviderLoft::onDelete(const std::vector<std::string> & /*s*/)
return true;
}
void ViewProviderLoft::highlightReferences(const bool /*on*/, bool /*auxillery*/)
void ViewProviderLoft::highlightReferences(const bool /*on*/, bool /*auxiliary*/)
{/*
PartDesign::Loft* pcLoft = static_cast<PartDesign::Loft*>(getObject());
Part::Feature* base;
if(!auxillery)
if(!auxiliary)
base = static_cast<Part::Feature*>(pcLoft->Spine.getValue());
else
base = static_cast<Part::Feature*>(pcLoft->AuxillerySpine.getValue());
@@ -136,7 +136,7 @@ void ViewProviderLoft::highlightReferences(const bool /*on*/, bool /*auxillery*/
if (svp == NULL) return;
std::vector<std::string> edges;
if(!auxillery)
if(!auxiliary)
edges = pcLoft->Spine.getSubValuesStartsWith("Edge");
else
edges = pcLoft->AuxillerySpine.getSubValuesStartsWith("Edge");

2
src/Mod/PartDesign/Gui/ViewProviderLoft.h
View File

@@ -44,7 +44,7 @@ public:
bool doubleClicked();
virtual bool onDelete(const std::vector<std::string> &);
void highlightReferences(const bool on, bool auxillery);
void highlightReferences(const bool on, bool auxiliary);
protected:
virtual bool setEdit(int ModNum);

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

@@ -122,11 +122,11 @@ bool ViewProviderPipe::onDelete(const std::vector<std::string> &s)
void ViewProviderPipe::highlightReferences(const bool on, bool auxillery)
void ViewProviderPipe::highlightReferences(const bool on, bool auxiliary)
{
PartDesign::Pipe* pcPipe = static_cast<PartDesign::Pipe*>(getObject());
Part::Feature* base;
if(!auxillery)
if(!auxiliary)
base = static_cast<Part::Feature*>(pcPipe->Spine.getValue());
else
base = static_cast<Part::Feature*>(pcPipe->AuxillerySpine.getValue());
@@ -137,7 +137,7 @@ void ViewProviderPipe::highlightReferences(const bool on, bool auxillery)
if (svp == NULL) return;
std::vector<std::string> edges;
if(!auxillery)
if(!auxiliary)
edges = pcPipe->Spine.getSubValuesStartsWith("Edge");
else
edges = pcPipe->AuxillerySpine.getSubValuesStartsWith("Edge");

2
src/Mod/PartDesign/Gui/ViewProviderPipe.h
View File

@@ -44,7 +44,7 @@ public:
bool doubleClicked();
virtual bool onDelete(const std::vector<std::string> &);
void highlightReferences(const bool on, bool auxillery);
void highlightReferences(const bool on, bool auxiliary);
protected:
virtual QIcon getIcon(void) const;

2
src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp
View File

@@ -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<std::string> subs;

2
src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h
View File

@@ -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);