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

Correctly build reference from selection subname

Browse Source
This commit is contained in:
bgbsww
2024-09-22 07:52:13 -04:00
parent 86fa65ba48
commit f0053e5388
3 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/App/PropertyLinks.cpp
View File

@@ -272,7 +272,7 @@ void PropertyLinkBase::_registerElementReference(App::DocumentObject *obj, std::
return;
}
if (shadow.newName.empty()) {
_updateElementReference(0, obj, sub, shadow, false);
_updateElementReference(nullptr, obj, sub, shadow, false);
return;
}
GeoFeature* geo = nullptr;
@@ -283,7 +283,7 @@ void PropertyLinkBase::_registerElementReference(App::DocumentObject *obj, std::
elementName,
true,
GeoFeature::ElementNameType::Export,
0,
nullptr,
&element,
&geo);
if (!geo || !element || !element[0]) {

18
src/Gui/SoFCUnifiedSelection.cpp
View File

@@ -580,6 +580,24 @@ bool SoFCUnifiedSelection::setSelection(const std::vector<PickedInfo> &infos, bo
const char *docname = vpd->getObject()->getDocument()->getName();
auto getFullSubElementName = [vpd](std::string &subName) {
// First, remove and clean up any unnecessary elements in the subName. We are essentially
// identifying places where there is an unneeded extra level of element in the name and
// removing it. If any of the lookups fail while we do that, we just use the subname unchanged.
const char *element = Data::findElementName(subName.c_str());
std::string::difference_type dotCount = std::count(subName.begin(), subName.end(), '.');
if ( element != nullptr && dotCount > 1) {
auto basename = subName;
basename.resize(basename.size() - strlen(element) - 1); // chop off the end and the '.', see if still okay
const char *temp_element = Data::findElementName(basename.c_str());
if ( element != nullptr ) {
basename.resize(basename.size() - strlen(temp_element)); // chop off the extra element
basename.append(element); // and place the end back on.
temp_element = Data::findElementName(basename.c_str());
if ( temp_element != nullptr ) { // if this is still a legit link, then use ut.
subName = basename;
}
}
}
App::ElementNamePair elementName;
App::GeoFeature::resolveElement(vpd->getObject(), subName.c_str(), elementName);
if (!elementName.newName.empty()) { // If we have a mapped name use it

31
src/Mod/Assembly/JointObject.py
View File

@@ -1800,19 +1800,26 @@ class TaskAssemblyCreateJoint(QtCore.QObject):
# selectionObserver stuff
def addSelection(self, doc_name, obj_name, sub_name, mousePos):
rootObj = App.getDocument(doc_name).getObject(obj_name)
resolved = rootObj.resolveSubElement(sub_name)
element_name_TNP = resolved[1]
element_name = resolved[2]
target_link = sub_name
# Preprocess the sub_name to remove the TNP string
# We do this because after we need to add the vertex_name as well.
# And the names will be resolved anyway after.
if len(element_name_TNP.split(".")) == 2:
names = sub_name.split(".")
names.pop(-2) # remove the TNP string
sub_name = ".".join(names)
ref = [rootObj, [sub_name]]
# There was extra code here to try to deal with TNP at a python layer. That is to be avoided at all costs,
# and corrections have been made to the underlying c++ code in the PR that includes this comment.
#
# The original python code was flawed, but two possible correct implementation in python follow. However the
# c++ approach is better, as the python layer should not know about TNP mitigation implementation.
#
# doc_obj, new_name, old_name = rootObj.resolveSubElement(sub_name)
# doc_obj, cont_obj, sub_sub_element_name, new_name = rootObj.resolve(sub_name)
# # The subname identified by selectionObserver has extra components in it. To get the minimal reference to
# # the element we need, we must identify the extra piece sub_sub_element name and remove it, and then
# # identify the new_name ( TNP path ) and remove it, and put the old_name ( short name ) on.
# # Alternatively we could take just the element and build back up using the sub_sub_element name to get a
# # different legit path, but the first approach is preferable.
# # element_name, *path_detail = sub_name.split(".")
# # target_link = ".".join((element_name,sub_sub_element_name,old_name))
# element_name = sub_name.replace(sub_sub_element_name, "").replace(new_name, "")
# target_link = element_name[:-1] + old_name
ref = [rootObj, [target_link]]
moving_part = self.getMovingPart(ref)