Merge pull request #23 from drwho495/add-complex-find

Add complex find

Author: drwho495

.github/workflows/sub_weeklyBuild.yml

@@ -34,7 +34,7 @@ jobs:
           export BUILD_TAG=weekly-$(date "+%Y.%m.%d")
           echo "BUILD_TAG=${BUILD_TAG}" >> "$GITHUB_ENV"
           echo "build_tag=${BUILD_TAG}" >> "$GITHUB_OUTPUT"
-          gh release create ${BUILD_TAG} --title "Development Build ${BUILD_TAG}" -F .github/workflows/weekly-build-notes.md --prerelease || true
+          gh release create ${BUILD_TAG} --title "FreeCAD++ Release ${BUILD_TAG}" -F .github/workflows/weekly-build-notes.md || true
 
       - name: Upload Source
         id: upload_source

.github/workflows/weekly-build-notes.md

@@ -1,5 +1,5 @@
 > [!IMPORTANT]
-> Bleeding edge FreeCAD development builds for testing bugfixes, regressions, and recently implemented features. Do not use in a production environment.
+> FreeCAD++ is a fork with various features created by me and others for testing what will hopefully represent what 1.2 will look like.
 
 
 ### How-to use

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "src/Mod/AddonManager"]
 	path = src/Mod/AddonManager
 	url = https://github.com/FreeCAD/AddonManager.git
+[submodule "src/Mod/ConstraintDesign-wb"]
+	path = src/Mod/ConstraintDesign-wb
+	url = https://github.com/drwho495/constraintdesign-wb

cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake

@@ -119,6 +119,7 @@ macro(InitializeFreeCADBuildOptions)
     option(BUILD_PART "Build the FreeCAD part module" ON)
     option(BUILD_PART_DESIGN "Build the FreeCAD part design module" ON)
     option(BUILD_CAM "Build the FreeCAD CAM module" ON)
+    option(BUILD_CONSTRAINTDESIGN "Build the FreeCAD ConstraintDesign workbench module" ON)
     option(BUILD_ASSEMBLY "Build the FreeCAD Assembly module" ON)
     option(BUILD_PLOT "Build the FreeCAD plot module" ON)
     option(BUILD_POINTS "Build the FreeCAD points module" ON)

cMake/FreeCAD_Helpers/PrintFinalReport.cmake

@@ -111,6 +111,7 @@ macro(PrintFinalReport)
     value(BUILD_PART)
     value(BUILD_PART_DESIGN)
     value(BUILD_CAM)
+    value(BUILD_CONSTRAINTDESIGN)
     value(BUILD_PLOT)
     value(BUILD_POINTS)
     value(BUILD_REVERSEENGINEERING)

src/3rdParty/GSL

@@ -199,12 +199,12 @@ const std::string& ComplexGeoData::elementMapPrefix()
 
 std::string ComplexGeoData::getElementMapVersion() const
 {
-    return "4";
+    return "5";
 }
 
 bool ComplexGeoData::checkElementMapVersion(const char* ver) const
 {
-    return !boost::equals(ver, "3") && !boost::equals(ver, "4") && !boost::starts_with(ver, "3.");
+    return !boost::equals(ver, "3") && !boost::ends_with(ver, "5") && !boost::equals(ver, "5") && !boost::starts_with(ver, "3.");
 }
 
 size_t ComplexGeoData::getElementMapSize(bool flush) const
@@ -271,21 +271,27 @@ ComplexGeoData::getElementName(const char* name, ElementIDRefs* sid, bool copy)
     }
 
     MappedElement result;
-    // Strip out the trailing '.XXXX' if any
-    const char* dot = strchr(name, '.');
-    if (dot) {
-        result.name = MappedName(name, static_cast<int>(dot - name));
-    }
-    else if (copy) {
-        result.name = name;
-    }
-    else {
-        result.name = MappedName(name);
+
+    flushElementMap();
+    if (_elementMap) {
+        const char* dot = strchr(name, '.');
+        MappedName mappedName = MappedName(name);
+
+        if (dot) {
+            mappedName = MappedName(name, static_cast<int>(dot - name));
+        } 
+
+        result = _elementMap->findMappedElement(mappedName, sid);
+
+        if (result.name.empty() || copy) {
+            result.name = mappedName;
+        }
     }
-    result.index = getIndexedName(result.name, sid);
+
     return result;
 }
 
+
 std::vector<std::pair<MappedName, ElementIDRefs>>
 ComplexGeoData::getElementMappedNames(const IndexedName& element, bool needUnmapped) const
 {