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

Toponaming: Cleanups

Browse Source
This commit is contained in:
bgbsww
2024-06-27 18:21:00 -04:00
committed by Chris Hennes
parent 7a4bc95d47
commit a674729dd3
4 changed files with 0 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,12 +52,6 @@ BodyBase* BodyBase::findBodyOf(const App::DocumentObject* f)
if (body->hasObject(f))
return body;
}
// for(;;) {
// auto group = App::GeoFeatureGroupExtension::getGroupOfObject(f);
// if(!group || group->isDerivedFrom(BodyBase::getClassTypeId()))
// return static_cast<BodyBase*>(group);
// f = group;
// }
}
return nullptr;

1
src/Mod/Part/App/PartFeature.cpp
View File

@@ -390,7 +390,6 @@ App::DocumentObject* Feature::getSubObject(const char* subname,
ts.setShape(ts.getShape().Located(TopLoc_Location()), false);
}
if (subname && *subname && !ts.isNull()) {
// ts = ts.getSubShape(subname); // TODO WAS THIS WRONG?
ts = ts.getSubTopoShape(subname,true);
}
if (doTransform && !ts.isNull()) {

55
src/Mod/PartDesign/App/Body.cpp
View File

@@ -119,22 +119,6 @@ App::DocumentObject* Body::getPrevSolidFeature(App::DocumentObject *start)
start = Tip.getValue();
}
//
// #ifdef FC_USE_TNP_FIX
// int index;
// if (!start || !start->getNameInDocument()
// // || start->isDerivedFrom(PartDesign::Extrusion::getClassTypeId())
// || start->isDerivedFrom(PartDesign::Solid::getClassTypeId())
// || !this->Group.find(start->getNameInDocument(), &index)) { // No Tip
// return nullptr;
// }
// const auto & objs = this->Group.getValues();
// for (--index; index>=0; --index) {
// if (isSolidFeature(objs[index]))
// return objs[index];
// }
//
// #else
if (!start) { // No Tip
return nullptr;
}
@@ -153,7 +137,6 @@ App::DocumentObject* Body::getPrevSolidFeature(App::DocumentObject *start)
if (rvIt != features.rend()) { // the solid found in model list
return *rvIt;
}
// #endif
return nullptr;
}
@@ -163,20 +146,6 @@ App::DocumentObject* Body::getNextSolidFeature(App::DocumentObject *start)
start = Tip.getValue();
}
// #ifdef FC_USE_TNP_FIX
// int index;
// if (!start || !start->getNameInDocument()
// || !this->Group.find(start->getNameInDocument(), &index)) { // No Tip
// return nullptr;
// }
//
// const auto & objs = this->Group.getValues();
// int count = this->Group.getSize();
// for (++index; index<count; ++index) {
// if (isSolidFeature(objs[index]))
// return objs[index];
// }
// #else
if (!start || !hasObject(start)) { // no or faulty tip
return nullptr;
}
@@ -198,7 +167,6 @@ App::DocumentObject* Body::getNextSolidFeature(App::DocumentObject *start)
if (rvIt != features.end()) { // the solid found in model list
return *rvIt;
}
// #endif
return nullptr;
}
@@ -537,29 +505,6 @@ std::vector<std::string> Body::getSubObjects(int reason) const {
App::DocumentObject *Body::getSubObject(const char *subname,
PyObject **pyObj, Base::Matrix4D *pmat, bool transform, int depth) const
{
// while(subname && *subname=='.') ++subname; // skip leading .
//
// // PartDesign::Feature now support grouping sibling features, and the user
// // is free to expand/collapse at any time. To not disrupt subname path
// // because of this, the body will peek the next two sub-objects reference,
// // and skip the first sub-object if possible.
// if(subname) {
// const char * firstDot = strchr(subname,'.');
// if (firstDot) {
// const char * secondDot = strchr(firstDot+1, '.');
// if (secondDot) {
// auto firstObj = Group.find(std::string(subname, firstDot).c_str());
// if (!firstObj || firstObj->isDerivedFrom(PartDesign::Feature::getClassTypeId())) {
// auto secondObj = Group.find(std::string(firstDot+1, secondDot).c_str());
// if (secondObj) {
// // we support only one level of sibling grouping, so no
// // recursive call to our own getSubObject()
// return Part::BodyBase::getSubObject(firstDot+1,pyObj,pmat,transform,depth+1);
// }
// }
// }
// }
// }
#if 1
return Part::BodyBase::getSubObject(subname,pyObj,pmat,transform,depth);
#else

12
src/Mod/Sketcher/App/SketchObject.cpp
View File

@@ -9435,16 +9435,6 @@ App::DocumentObject *SketchObject::getSubObject(
if(!subname || !subname[0])
return Part2DObject::getSubObject(subname,pyObj,pmat,transform,depth);
const char *element = Data::findElementName(subname);
// if(element != subname) {
// const char *dot = strchr(subname,'.');
// if(!dot)
// return 0;
// std::string name(subname,dot-subname);
// auto child = Exports.find(name.c_str());
// if(!child)
// return 0;
// return child->getSubObject(dot+1,pyObj,pmat,true,depth+1);
// }
Data::IndexedName indexedName = checkSubName(subname);
int index = indexedName.getIndex();
@@ -9455,12 +9445,10 @@ App::DocumentObject *SketchObject::getSubObject(
if (auto realType = convertInternalName(indexedName.getType())) {
if (realType[0] == '\0')
// subshape = InternalShape.getShape();
subshape = Shape.getShape();
else {
auto shapeType = Part::TopoShape::shapeType(realType, true);
if (shapeType != TopAbs_SHAPE)
// subshape = InternalShape.getShape().getSubTopoShape(shapeType, indexedName.getIndex(), true);
subshape = Shape.getShape().getSubTopoShape(shapeType, indexedName.getIndex(), true);
}
if (subshape.isNull())