Skip to content

Commit

Permalink
Toponaming: Support disabling hashing; getting element history
Browse files Browse the repository at this point in the history
  • Loading branch information
bgbsww authored and chennes committed Aug 22, 2024
1 parent a750034 commit 40d23c2
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 2 deletions.
15 changes: 13 additions & 2 deletions src/App/Document.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,12 @@ void Document::onChanged(const Property* prop)
// recursive call of onChanged()
this->Uid.setValue(id);
}
} else if(prop == &UseHasher) {
for(auto obj : d->objectArray) {
auto geofeature = dynamic_cast<GeoFeature*>(obj);
if(geofeature && geofeature->getPropertyOfGeometry())
geofeature->enforceRecompute();
}
}
}

Expand Down Expand Up @@ -864,6 +870,8 @@ Document::Document(const char* documentName)
0,
PropertyType(Prop_None),
"Whether to show hidden object items in the tree view");
ADD_PROPERTY_TYPE(UseHasher,(true), 0,PropertyType(Prop_Hidden),
"Whether to use hasher on topological naming");

// this creates and sets 'TransientDir' in onChanged()
ADD_PROPERTY_TYPE(TransientDir,
Expand Down Expand Up @@ -1074,10 +1082,13 @@ std::pair<bool,int> Document::addStringHasher(const StringHasherRef & hasher) co
}

StringHasherRef Document::getStringHasher(int idx) const {
StringHasherRef hasher;
if(idx<0) {
return d->Hasher;
if(UseHasher.getValue()) {
return d->Hasher;
}
return hasher;
}
StringHasherRef hasher;
auto it = d->hashers.right.find(idx);
if(it == d->hashers.right.end()) {
hasher = new StringHasher;
Expand Down
2 changes: 2 additions & 0 deletions src/App/Document.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ class AppExport Document : public App::PropertyContainer
PropertyString TipName;
/// Whether to show hidden items in TreeView
PropertyBool ShowHidden;
/// Whether to use hasher on topological naming
PropertyBool UseHasher;
//@}

/** @name Signals of the document */
Expand Down
15 changes: 15 additions & 0 deletions src/Mod/Part/App/PartFeaturePy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,20 @@
<Author Licence="LGPL" Name="Juergen Riegel" EMail="[email protected]" />
<UserDocu>This is the father of all shape object classes</UserDocu>
</Documentation>
<Methode Name="getElementHistory" Const="true" Keyword="true">
<Documentation>
<UserDocu>
getElementHistory(name,recursive=True,sameType=False,showName=False) - returns the element mapped name history

name: mapped element name belonging to this shape
recursive: if True, then track back the history through other objects till the origin
sameType: if True, then stop trace back when element type changes
showName: if False, return the owner object, or else return a tuple of object name and label

If not recursive, then return tuple(sourceObject, sourceElementName, [intermediateNames...]),
otherwise return a list of tuple.
</UserDocu>
</Documentation>
</Methode>
</PythonExport>
</GenerateModel>
39 changes: 39 additions & 0 deletions src/Mod/Part/App/PartFeaturePyImp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,45 @@ std::string PartFeaturePy::representation() const
return {"<Part::PartFeature>"};
}

PyObject *PartFeaturePy::getElementHistory(PyObject *args, PyObject *kwds) {
const char *name;
PyObject *recursive = Py_True;
PyObject *sameType = Py_False;
PyObject *showName = Py_False;
static char *kwlist[] = {"elementName", "recursive", "sameType", "showName", nullptr};
if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|OOO", kwlist, &name, &recursive, &sameType, &showName))
return {};

auto feature = getFeaturePtr();
Py::List list;
bool showObjName = PyObject_IsTrue(showName);
PY_TRY {
std::string tmp;
for (auto &history: Feature::getElementHistory(feature, name,
PyObject_IsTrue(recursive), PyObject_IsTrue(sameType))) {
Py::Tuple ret(3);
if (history.obj) {
if (showObjName) {
ret.setItem(0, Py::TupleN(Py::String(history.obj->getFullName()),
Py::String(history.obj->Label.getValue())));
} else
ret.setItem(0, Py::Object(history.obj->getPyObject(), true));
} else
ret.setItem(0, Py::Int(history.tag));
tmp.clear();
ret.setItem(1, Py::String(history.element.appendToBuffer(tmp)));
Py::List intermedates;
for (auto &h: history.intermediates) {
tmp.clear();
intermedates.append(Py::String(h.appendToBuffer(tmp)));
}
ret.setItem(2, intermedates);
list.append(ret);
}
return Py::new_reference_to(list);
} PY_CATCH;
}

PyObject *PartFeaturePy::getCustomAttributes(const char* ) const
{
return nullptr;
Expand Down

0 comments on commit 40d23c2

Please sign in to comment.