Merge branch 'FreeCAD:master' into master

.github/workflows/sub_buildWindows.yml

@@ -118,7 +118,7 @@ jobs:
  -DFREECAD_COPY_LIBPACK_BIN_TO_BUILD=OFF
  -DFREECAD_COPY_PLUGINS_BIN_TO_BUILD=ON
  - name: Add msbuild to PATH
- uses: microsoft/setup-msbuild@v1.1
+ uses: microsoft/setup-msbuild@v1.3
  - name: Compiling sources
  run: |
  cd $env:builddir

.gitignore

@@ -40,6 +40,7 @@ install_manifest.txt
 /cmake-build*/
 /src/Tools/offlinedoc/localwiki/
 /src/Tools/offlinedoc/*.txt
+/conda/environment.yml
 OpenSCAD_rc.py
 tags
 

cMake/FindEigen3.cmake

@@ -17,10 +17,10 @@
 
 if(NOT Eigen3_FIND_VERSION)
  if(NOT Eigen3_FIND_VERSION_MAJOR)
- set(Eigen3_FIND_VERSION_MAJOR 2)
+ set(Eigen3_FIND_VERSION_MAJOR 3)
  endif(NOT Eigen3_FIND_VERSION_MAJOR)
  if(NOT Eigen3_FIND_VERSION_MINOR)
- set(Eigen3_FIND_VERSION_MINOR 91)
+ set(Eigen3_FIND_VERSION_MINOR 0)
  endif(NOT Eigen3_FIND_VERSION_MINOR)
  if(NOT Eigen3_FIND_VERSION_PATCH)
  set(Eigen3_FIND_VERSION_PATCH 0)

cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake

@@ -31,7 +31,6 @@ macro(CheckInterModuleDependencies)
  REQUIRES_MODS(BUILD_PART_DESIGN BUILD_SKETCHER)
  # REQUIRES_MODS(BUILD_PATH BUILD_PART BUILD_MESH BUILD_ROBOT)
  REQUIRES_MODS(BUILD_PATH BUILD_PART BUILD_MESH)
- REQUIRES_MODS(BUILD_RAYTRACING BUILD_PART)
  REQUIRES_MODS(BUILD_REVERSEENGINEERING BUILD_PART BUILD_MESH)
  REQUIRES_MODS(BUILD_ROBOT BUILD_PART)
  REQUIRES_MODS(BUILD_SANDBOX BUILD_PART BUILD_MESH)

cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake

@@ -54,7 +54,7 @@ macro(InitializeFreeCADBuildOptions)
  endif()
  else()
  message("Libpack NOT found.\nIf you intend to use a Windows libpack, set the FREECAD_LIBPACK_DIR to the libpack directory.")
- message(STATUS "Visit: https://github.com/apeltauer/FreeCAD/releases/ for Windows libpack downloads.")
+ message(STATUS "Visit: https://github.com/FreeCAD/FreeCAD-Libpack/releases/ for Windows libpack downloads.")
  endif()
  else(MSVC)
  option(FREECAD_LIBPACK_USE "Use the LibPack to Build FreeCAD (only Win32 so far)." OFF)
@@ -119,7 +119,6 @@ macro(InitializeFreeCADBuildOptions)
  option(BUILD_PATH "Build the FreeCAD path module" ON)
  option(BUILD_PLOT "Build the FreeCAD plot module" ON)
  option(BUILD_POINTS "Build the FreeCAD points module" ON)
- option(BUILD_RAYTRACING "Build the FreeCAD ray tracing module" ON)
  option(BUILD_REVERSEENGINEERING "Build the FreeCAD reverse engineering module" ON)
  option(BUILD_ROBOT "Build the FreeCAD robot module" ON)
  option(BUILD_SHOW "Build the FreeCAD Show module (helper module for visibility automation)" ON)

requirements.txt

@@ -16,7 +16,7 @@ pyshp==2.3.1
 PySide2==5.15.2.1
 pysolar==0.10
 PyYAML==6.0
-requests==2.28.2
+requests==2.31.0
 rpdb2==2.0.0.1.2
 sets==0.3.2
 vermin==1.5.1

src/App/CMakeLists.txt

@@ -266,6 +266,7 @@ SET(FreeCADApp_CPP_SRCS
  ColorModel.cpp
  ComplexGeoData.cpp
  ComplexGeoDataPyImp.cpp
+ ElementMap.cpp
  Enumeration.cpp
  IndexedName.cpp
  MappedElement.cpp
@@ -274,6 +275,7 @@ SET(FreeCADApp_CPP_SRCS
  MaterialPyImp.cpp
  Metadata.cpp
  MetadataPyImp.cpp
+ ElementNamingUtils.cpp
  StringHasher.cpp
  StringHasherPyImp.cpp
  StringIDPyImp.cpp
@@ -295,6 +297,7 @@ SET(FreeCADApp_HPP_SRCS
  MappedElement.h
  Material.h
  Metadata.h
+ ElementNamingUtils.h
  StringHasher.h
 )
 

src/App/ComplexGeoData.cpp

@@ -27,10 +27,10 @@
 # include <cstdlib>
 #endif
 
-#include <boost/algorithm/string/predicate.hpp>
 #include <boost/regex.hpp>
 
 #include "ComplexGeoData.h"
+
 #include <Base/BoundBox.h>
 #include <Base/Placement.h>
 #include <Base/Rotation.h>
@@ -166,102 +166,3 @@ bool ComplexGeoData::getCenterOfGravity(Base::Vector3d&) const
  return false;
 }
 
-const std::string &ComplexGeoData::elementMapPrefix() {
- static std::string prefix(";");
- return prefix;
-}
-
-const char *ComplexGeoData::isMappedElement(const char *name) {
- if(name && boost::starts_with(name,elementMapPrefix()))
- return name+elementMapPrefix().size();
- return nullptr;
-}
-
-std::string ComplexGeoData::newElementName(const char *name) {
- if(!name)
- return std::string();
- const char *dot = strrchr(name,'.');
- if(!dot || dot==name)
- return name;
- const char *c = dot-1;
- for(;c!=name;--c) {
- if(*c == '.') {
- ++c;
- break;
- }
- }
- if(isMappedElement(c))
- return std::string(name,dot-name);
- return name;
-}
-
-std::string ComplexGeoData::oldElementName(const char *name) {
- if(!name)
- return std::string();
- const char *dot = strrchr(name,'.');
- if(!dot || dot==name)
- return name;
- const char *c = dot-1;
- for(;c!=name;--c) {
- if(*c == '.') {
- ++c;
- break;
- }
- }
- if(isMappedElement(c))
- return std::string(name,c-name)+(dot+1);
- return name;
-}
-
-std::string ComplexGeoData::noElementName(const char *name) {
- if(!name)
- return std::string();
- auto element = findElementName(name);
- if(element)
- return std::string(name,element-name);
- return name;
-}
-
-const char *ComplexGeoData::findElementName(const char *subname) {
- if(!subname || !subname[0] || isMappedElement(subname))
- return subname;
- const char *dot = strrchr(subname,'.');
- if(!dot)
- return subname;
- const char *element = dot+1;
- if(dot==subname || isMappedElement(element))
- return element;
- for(--dot;dot!=subname;--dot) {
- if(*dot == '.') {
- ++dot;
- break;
- }
- }
- if(isMappedElement(dot))
- return dot;
- return element;
-}
-
-const std::string &ComplexGeoData::tagPostfix() {
- static std::string postfix(elementMapPrefix() + ":T");
- return postfix;
-}
-
-const std::string &ComplexGeoData::indexPostfix() {
- static std::string postfix(elementMapPrefix() + ":I");
- return postfix;
-}
-
-const std::string &ComplexGeoData::missingPrefix() {
- static std::string prefix("?");
- return prefix;
-}
-
-bool ComplexGeoData::hasMissingElement(const char *subname) {
- if(!subname)
- return false;
- auto dot = strrchr(subname,'.');
- if(dot)
- subname = dot+1;
- return boost::starts_with(subname,missingPrefix());
-}

src/App/ComplexGeoData.h

@@ -164,41 +164,6 @@ class AppExport ComplexGeoData: public Base::Persistence, public Base::Handled
  virtual bool getCenterOfGravity(Base::Vector3d& center) const;
  //@}
 
- /** @name Element name mapping */
- //@{
- /// Special prefix to mark the beginning of a mapped sub-element name
- static const std::string &elementMapPrefix();
- /// Special postfix to mark the following tag
- static const std::string &tagPostfix();
- /// Special postfix to mark the index of an array element
- static const std::string &indexPostfix();
- /// Special prefix to mark a missing element
- static const std::string &missingPrefix();
- /// Check if a subname contains missing element
- static bool hasMissingElement(const char *subname);
- /** Check if the name starts with elementMapPrefix()
- *
- * @param name: input name
- * @return Returns the name stripped with elementMapPrefix(), or 0 if not
- * start with the prefix
- */
- static const char *isMappedElement(const char *name);
-
- /// Strip out the trailing element name if there is mapped element name precedes it.
- static std::string newElementName(const char *name);
- /// Strip out the mapped element name if there is one.
- static std::string oldElementName(const char *name);
- /// Strip out the old and new element name if there is one.
- static std::string noElementName(const char *name);
-
- /// Find the start of an element name in a subname
- static const char *findElementName(const char *subname);
-
- static inline const char *hasMappedElementName(const char *subname) {
- return isMappedElement(findElementName(subname));
- }
- //@}
-
 protected:
 
  /// from local to outside

src/App/DocumentObject.cpp

@@ -34,7 +34,7 @@
 #include <Base/Writer.h>
 
 #include "Application.h"
-#include "ComplexGeoData.h"
+#include "ElementNamingUtils.h"
 #include "Document.h"
 #include "DocumentObject.h"
 #include "DocumentObjectExtension.h"
@@ -1094,7 +1094,7 @@ DocumentObject *DocumentObject::resolve(const char *subname,
  // following it. So finding the last dot will give us the end of the last
  // object name.
  const char *dot=nullptr;
- if(Data::ComplexGeoData::isMappedElement(subname) ||
+ if(Data::isMappedElement(subname) ||
  !(dot=strrchr(subname,'.')) ||
  dot == subname) 
  {
@@ -1117,7 +1117,7 @@ DocumentObject *DocumentObject::resolve(const char *subname,
  if(!elementMapChecked) {
  elementMapChecked = true;
  const char *sub = dot==subname?dot:dot+1;
- if(Data::ComplexGeoData::isMappedElement(sub)) {
+ if(Data::isMappedElement(sub)) {
  lastDot = dot;
  if(dot==subname) 
  break;

src/App/DocumentObserver.cpp

@@ -26,7 +26,7 @@
 #include <Base/Tools.h>
 
 #include "Application.h"
-#include "ComplexGeoData.h"
+#include "ElementNamingUtils.h"
 #include "Document.h"
 #include "DocumentObserver.h"
 #include "GeoFeature.h"
@@ -353,11 +353,11 @@ const std::string &SubObjectT::getSubName() const {
 }
 
 std::string SubObjectT::getSubNameNoElement() const {
- return Data::ComplexGeoData::noElementName(subname.c_str());
+ return Data::noElementName(subname.c_str());
 }
 
 const char *SubObjectT::getElementName() const {
- return Data::ComplexGeoData::findElementName(subname.c_str());
+ return Data::findElementName(subname.c_str());
 }
 
 std::string SubObjectT::getNewElementName() const {