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

+ remove 'using namespace Part' inside header file

Browse Source
This commit is contained in:
wmayer
2016-04-13 16:20:31 +02:00
parent df48d1668b
commit 08df5cbc59
7 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/PartDesign/App/FeatureSketchBased.cpp
View File

@@ -210,7 +210,7 @@ TopoDS_Face ProfileBased::getVerifiedFace(bool silent) const {
err = "Linked object has no subshape specified";
else {
const TopoShape& shape = Profile.getValue<Part::Feature*>()->Shape.getShape();
const Part::TopoShape& shape = Profile.getValue<Part::Feature*>()->Shape.getShape();
TopoDS_Shape sub = shape.getSubShape(Profile.getSubValues()[0].c_str());
if(sub.ShapeType() == TopAbs_FACE)
return TopoDS::Face(sub);

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

@@ -121,7 +121,7 @@ void ShapeBinder::getFilterdReferences(App::PropertyLinkSubList* prop, Part::Fea
}
TopoShape ShapeBinder::buildShapeFromReferences( Part::Feature* obj, std::vector< std::string > subs) {
Part::TopoShape ShapeBinder::buildShapeFromReferences( Part::Feature* obj, std::vector< std::string > subs) {
if(!obj)
return TopoDS_Shape();
@@ -130,7 +130,7 @@ TopoShape ShapeBinder::buildShapeFromReferences( Part::Feature* obj, std::vector
return obj->Shape.getShape();
//if we use multiple subshapes we build a shape from them by fusing them together
TopoShape base;
Part::TopoShape base;
std::vector<TopoDS_Shape> operators;
for(std::string sub : subs) {
@@ -141,11 +141,11 @@ TopoShape ShapeBinder::buildShapeFromReferences( Part::Feature* obj, std::vector
}
try {
if(!operators.empty() && !base.isNull())
return base.multiFuse(operators);
if(!operators.empty() && !base.isNull())
return base.multiFuse(operators);
}
catch(...) {
return base;
}
return base;
}
}

2
src/Mod/PartDesign/App/ShapeBinder.h
View File

@@ -50,7 +50,7 @@ public:
App::PropertyLinkSubList Support;
static void getFilterdReferences(App::PropertyLinkSubList* prop, Part::Feature*& object, std::vector< std::string >& subobjects);
static TopoShape buildShapeFromReferences(Feature* obj, std::vector< std::string > subs);
static Part::TopoShape buildShapeFromReferences(Feature* obj, std::vector< std::string > subs);
const char* getViewProviderName(void) const {
return "PartDesignGui::ViewProviderShapeBinder";