From: Nicolas Rechatin <nicolas.rechatin@cea.fr>
Date: Tue, 28 Jun 2022 14:27:40 +0000 (+0200)
Subject: merge master 9.9.0 into OPERA 9.7.0 (cgt/opera_970)
X-Git-Tag: OPERA_v0.5-s990~1^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b0d4ccad7a278686b6b31935638fcf3dacdb1b81;p=modules%2Fshaper.git

merge master 9.9.0 into OPERA 9.7.0 (cgt/opera_970)
---

b0d4ccad7a278686b6b31935638fcf3dacdb1b81
diff --cc src/ExchangePlugin/CMakeLists.txt
index aa8e054b0,36f0a39df..3dc9bd5f5
mode 100755,100644..100755
--- a/src/ExchangePlugin/CMakeLists.txt
+++ b/src/ExchangePlugin/CMakeLists.txt
@@@ -32,12 -31,10 +32,14 @@@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DI
                      ${PROJECT_SOURCE_DIR}/src/XAO
                      ${PROJECT_SOURCE_DIR}/src/ConstructionPlugin
                      ${PROJECT_SOURCE_DIR}/src/PartSetPlugin
 +                    ${QT_INCLUDES}
+                     ${PROJECT_SOURCE_DIR}/src/PrimitivesPlugin
+                     ${OpenCASCADE_INCLUDE_DIR}
  )
  
 +# additional preprocessor / compiler flags
 +ADD_DEFINITIONS(${QT_DEFINITIONS})
 +
  SET(PROJECT_HEADERS
      ExchangePlugin.h
      ExchangePlugin_Plugin.h
diff --cc src/GeomAlgoAPI/CMakeLists.txt
index ef574969c,de027193c..964443c46
--- a/src/GeomAlgoAPI/CMakeLists.txt
+++ b/src/GeomAlgoAPI/CMakeLists.txt
@@@ -91,9 -91,8 +91,10 @@@ SET(PROJECT_HEADER
      GeomAlgoAPI_Chamfer.h
      GeomAlgoAPI_Defeaturing.h
      GeomAlgoAPI_BoundingBox.h
 +    GeomAlgoAPI_NormalToFace.h
-     GeomAlgoAPI_Tube.h
 +    GeomAlgoAPI_ShapeInfo.h
+     GeomAlgoAPI_Tube.h
+     GeomAlgoAPI_ROOTExport.h
  )
  
  SET(PROJECT_SOURCES
@@@ -164,9 -163,8 +165,10 @@@
      GeomAlgoAPI_Chamfer.cpp
      GeomAlgoAPI_Defeaturing.cpp
      GeomAlgoAPI_BoundingBox.cpp
 +    GeomAlgoAPI_NormalToFace.cpp
-     GeomAlgoAPI_Tube.cpp
 +    GeomAlgoAPI_ShapeInfo.cpp
+     GeomAlgoAPI_Tube.cpp
+     GeomAlgoAPI_ROOTExport.cpp
  )
  
  SET(PROJECT_LIBRARIES
diff --cc src/PrimitivesPlugin/PrimitivesPlugin_Tube.h
index d0b525edb,c3af279e1..db8933f26
--- a/src/PrimitivesPlugin/PrimitivesPlugin_Tube.h
+++ b/src/PrimitivesPlugin/PrimitivesPlugin_Tube.h
@@@ -28,7 -28,7 +28,7 @@@
   * \ingroup Plugins
   * \brief Feature for creation of a tube primitive using various methods.
   *
-- * Tube creates a tuboid - Holed cylinder. It can be built via two methods : 
++ * Tube creates a tuboid - Holed cylinder. It can be built via two methods :
   * using an inner raidus, an outer radius and a heigth or radii (inner and outer)
   * and angles.
   */
diff --cc src/PrimitivesPlugin/doc/TUI_sphereFeature.rst
index 45a63db54,31aee5680..a055d6312
--- a/src/PrimitivesPlugin/doc/TUI_sphereFeature.rst
+++ b/src/PrimitivesPlugin/doc/TUI_sphereFeature.rst
@@@ -8,4 -8,4 +8,4 @@@ Create Spher
      :linenos:
      :language: python
  
--:download:`Download this script <examples/sphere1.py>` 
++:download:`Download this script <examples/sphere1.py>`
diff --cc src/PrimitivesPlugin/doc/TUI_spherePart.rst
index 56b3447b4,c38cbe40f..8c3c47a53
--- a/src/PrimitivesPlugin/doc/TUI_spherePart.rst
+++ b/src/PrimitivesPlugin/doc/TUI_spherePart.rst
@@@ -8,4 -8,4 +8,4 @@@ Create Part of spher
      :linenos:
      :language: python
  
--:download:`Download this script <examples/sphere2.py>` 
++:download:`Download this script <examples/sphere2.py>`
diff --cc src/PrimitivesPlugin/doc/TUI_tubeFeature.rst
index 551c85415,7b871a1e2..d3b8044f0
--- a/src/PrimitivesPlugin/doc/TUI_tubeFeature.rst
+++ b/src/PrimitivesPlugin/doc/TUI_tubeFeature.rst
@@@ -8,5 -8,5 +8,5 @@@ Create Tub
      :linenos:
      :language: python
  
--:download:`Download this script <examples/tube.py>` 
--   
++:download:`Download this script <examples/tube.py>`
++
diff --cc src/PythonAPI/model/__init__.py
index 869da9767,eb043c97f..b221f2622
--- a/src/PythonAPI/model/__init__.py
+++ b/src/PythonAPI/model/__init__.py
@@@ -42,16 -42,6 +42,17 @@@ from .collection import 
  from .parameter import *
  from .partset import *
  from .primitives import *
+ from .opera import *
  from .gdml import *
  from .tests import *
 +
 +# Add-on features
 +
 +from .addons import *
 +# move functions from .addons to top level (model) package
 +import inspect
 +for attribute_name in dir(addons):
 +    attribute = getattr(addons, attribute_name)
 +    if inspect.isfunction(attribute):
 +        globals()[attribute_name] = attribute
 +del inspect