Merge branch 'FreeCAD:main' into main

Author: trilbytim

src/3rdParty/salomesmesh/inc/MED_Wrapper.hxx

@@ -38,7 +38,7 @@ namespace MED
   struct MEDWRAPPER_EXPORT TWrapper
   {
     typedef boost::mutex TMutex;
-    //! This is a syncronization primitive which allow to support thread safety for the MED access
+    //! This is a synchronization primitive which allows one to support thread safety for the MED access
     TMutex myMutex;
 
     virtual

src/3rdParty/salomesmesh/inc/SMESH_Array1.hxx

@@ -29,7 +29,7 @@
 *              The range of the index is user defined.
 *              An array1 can be constructed with a "C array".
 *              This functionality is useful to call methods expecting
-*              an Array1. It allows to carry the bounds inside the arrays.
+*              an Array1. It allows one to carry the bounds inside the arrays.
 *              
 * Examples:    Item tab[100]; //  An example with a C array
 *              Array1OfItem ttab (tab[0],1,100);

src/3rdParty/salomesmesh/src/SMDS/SMDS_PolyhedralVolumeOfNodes.cpp

@@ -69,7 +69,7 @@ bool SMDS_PolyhedralVolumeOfNodes::ChangeNodes (const vector<const SMDS_MeshNode
   myNodesByFaces = nodes;
   myQuantities = quantities;
 
-  // Init fields of parent class, it allows to get only unique nodes(?)
+  // Init fields of parent class, it allows one to get only unique nodes(?)
 
   set<const SMDS_MeshNode *> aSet;
   aSet.insert( nodes.begin(), nodes.end());

src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Cartesian_3D.cpp

@@ -3512,7 +3512,7 @@ bool StdMeshers_Cartesian_3D::Compute(SMESH_Mesh &         theMesh,
   // The algorithm generates the mesh in following steps:
 
   // 1) Intersection of grid lines with the geometry boundary.
-  // This step allows to find out if a given node of the initial grid is
+  // This step allows one to find out if a given node of the initial grid is
   // inside or outside the geometry.
 
   // 2) For each cell of the grid, check how many of it's nodes are outside

src/App/Application.cpp

@@ -63,6 +63,7 @@
 #include <Base/BaseClass.h>
 #include <Base/BoundBoxPy.h>
 #include <Base/ConsoleObserver.h>
+#include <Base/ServiceProvider.h>
 #include <Base/CoordinateSystemPy.h>
 #include <Base/Exception.h>
 #include <Base/ExceptionFactory.h>
@@ -89,6 +90,7 @@
 #include "Application.h"
 #include "CleanupProcess.h"
 #include "ComplexGeoData.h"
+#include "Services.h"
 #include "DocumentObjectFileIncluded.h"
 #include "DocumentObjectGroup.h"
 #include "DocumentObjectGroupPy.h"
@@ -2217,6 +2219,8 @@ void Application::initTypes()
     new Base::ExceptionProducer<Base::CADKernelError>;
     new Base::ExceptionProducer<Base::RestoreError>;
     new Base::ExceptionProducer<Base::PropertyError>;
+
+    Base::registerServiceImplementation<CenterOfMassProvider>(new NullCenterOfMass);
 }
 
 namespace {

src/App/CMakeLists.txt

@@ -289,6 +289,7 @@ SET(FreeCADApp_CPP_SRCS
     MetadataPyImp.cpp
     ElementNamingUtils.cpp
     SafeMode.cpp
+    Services.cpp
     StringHasher.cpp
     StringHasherPyImp.cpp
     StringIDPyImp.cpp
@@ -313,6 +314,7 @@ SET(FreeCADApp_HPP_SRCS
     MeasureManager.h
     Metadata.h
     ElementNamingUtils.h
+    Services.h
     StringHasher.h
 )
 

src/App/ComplexGeoData.cpp

@@ -184,6 +184,17 @@ bool ComplexGeoData::getCenterOfGravity(Base::Vector3d& unused) const
     return false;
 }
 
+std::optional<Base::Vector3d> ComplexGeoData::centerOfGravity() const
+{
+    Base::Vector3d centerOfGravity;
+
+    if (getCenterOfGravity(centerOfGravity)) {
+        return centerOfGravity;
+    }
+
+    return {};
+}
+
 const std::string& ComplexGeoData::elementMapPrefix()
 {
     static std::string prefix(ELEMENT_MAP_PREFIX);

src/App/ComplexGeoData.h

@@ -28,6 +28,8 @@
 #define APP_COMPLEX_GEO_DATA_H
 
 #include <algorithm>
+#include <optional>
+
 #include <Base/Handle.h>
 #include <Base/Matrix.h>
 #include <Base/Persistence.h>
@@ -200,6 +202,7 @@ class AppExport ComplexGeoData: public Base::Persistence, public Base::Handled
      * The default implementation only returns false.
      */
     virtual bool getCenterOfGravity(Base::Vector3d& center) const;
+    virtual std::optional<Base::Vector3d> centerOfGravity() const;
     //@}
 
     static const std::string& elementMapPrefix();

src/App/DocumentPyImp.cpp

@@ -353,7 +353,7 @@ PyObject* DocumentPy::addObject(PyObject* args, PyObject* kwd)
         str << "No document object found of type '" << sType << "'" << std::ends;
         throw Py::TypeError(str.str());
     }
-    // Allows to hide the handling with Proxy in client python code
+    // Allows one to hide the handling with Proxy in client python code
     if (obj) {
         try {
             // the python binding class to the document object

src/App/ExtensionContainer.h

@@ -39,7 +39,7 @@ class Extension;
  * impossible to handle multiple inheritance in the C-API for python extensions. Also using multiple
  * parent classes in python is currently not possible with the default object approach.
  *
- * The concept of extensions allow to circumvent those problems. Extensions are FreeCAD objects
+ * The concept of extensions allows one to circumvent those problems. Extensions are FreeCAD objects
  * which work like normal objects in the sense that they use properties and class methods to define
  * their functionality. However, they are not exposed as individual usable entities but are used to
  * extend other objects. A extended object gets all the properties and methods of the extension.