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

PartDesign: Port body to be a origin group

Browse Source
This commit is contained in:
Stefan Tröger
2016-12-21 08:51:54 +01:00
committed by wmayer
parent a025a20bed
commit 526d895a5d
17 changed files with 82 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Mod/Part/App/BodyBase.cpp
View File

@@ -35,21 +35,14 @@
namespace Part {
PROPERTY_SOURCE(Part::BodyBase, Part::Feature)
PROPERTY_SOURCE_WITH_EXTENSIONS(Part::BodyBase, Part::Feature)
BodyBase::BodyBase()
{
ADD_PROPERTY(Model , (0) );
ADD_PROPERTY(Tip , (0) );
ADD_PROPERTY(BaseFeature , (0) );
}
bool BodyBase::hasFeature(const App::DocumentObject* f) const
{
const std::vector<App::DocumentObject*> &features = Model.getValues();
return f == BaseFeature.getValue() || std::find(features.begin(), features.end(), f) != features.end();
}
BodyBase* BodyBase::findBodyOf(const App::DocumentObject* f)
{
App::Document* doc = f->getDocument();
@@ -57,7 +50,7 @@ BodyBase* BodyBase::findBodyOf(const App::DocumentObject* f)
std::vector<App::DocumentObject*> bodies = doc->getObjectsOfType(BodyBase::getClassTypeId());
for (std::vector<App::DocumentObject*>::const_iterator b = bodies.begin(); b != bodies.end(); b++) {
BodyBase* body = static_cast<BodyBase*>(*b);
if (body->hasFeature(f))
if (body->hasObject(f))
return body;
}
}
@@ -73,10 +66,10 @@ bool BodyBase::isAfter(const App::DocumentObject *feature, const App::DocumentOb
}
if (!target || target == BaseFeature.getValue() ) {
return hasFeature (feature);
return hasObject (feature);
}
const std::vector<App::DocumentObject *> & features = Model.getValues();
const std::vector<App::DocumentObject *> & features = Group.getValues();
auto featureIt = std::find(features.begin(), features.end(), feature);
auto targetIt = std::find(features.begin(), features.end(), target);