Return to python; simplify to work with only classic names, provide m…

…igration

src/Gui/SoFCUnifiedSelection.cpp

@@ -580,24 +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;
-                }
-            }
-        }
+//        // 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

src/Mod/Assembly/JointObject.py

@@ -201,6 +201,7 @@ def createProperties(self, joint):
         self.migrationScript(joint)
         self.migrationScript2(joint)
         self.migrationScript3(joint)
+        self.migrationScript4(joint)
 
         # First Joint Connector
         if not hasattr(joint, "Reference1"):
@@ -530,6 +531,20 @@ def migrationScript3(self, joint):
 
             joint.Offset2 = App.Placement(current_offset, App.Rotation(current_rotation, 0, 0))
 
+    def migrationScript4(self, joint):
+        if hasattr(joint, "Reference1"):
+            base_name, *sub_names, feature_name = joint.Reference1[1][0].split(".")
+            ref1 = ".".join((base_name, *sub_names[:-1], feature_name))
+            base_name, *sub_names, feature_name = joint.Reference1[1][1].split(".")
+            ref2 = ".".join((base_name, *sub_names[:-1], feature_name))
+            joint.Reference1 = (joint.Reference1[0], [ref1, ref2])
+        if hasattr(joint, "Reference2"):
+            base_name, *sub_names, feature_name = joint.Reference2[1][0].split(".")
+            ref1 = ".".join((base_name, *sub_names[:-1], feature_name))
+            base_name, *sub_names, feature_name = joint.Reference2[1][1].split(".")
+            ref2 = ".".join((base_name, *sub_names[:-1], feature_name))
+            joint.Reference2 = (joint.Reference2[0], [ref1, ref2])
+
     def dumps(self):
         return None
 
@@ -1800,25 +1815,12 @@ def getMovingPart(self, ref):
     # selectionObserver stuff
     def addSelection(self, doc_name, obj_name, sub_name, mousePos):
         rootObj = App.getDocument(doc_name).getObject(obj_name)
-        target_link = 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
+        # target_link = sub_name
+
+        # If the sub_name that comes in has extra features in it, remove them.
+        doc_obj, new_name, old_name = rootObj.resolveSubElement(sub_name)
+        element_name, *path_detail = sub_name.split(".")
+        target_link = ".".join((element_name, old_name))
         ref = [rootObj, [target_link]]
 
         moving_part = self.getMovingPart(ref)