merge master 9.9.0 into OPERA 9.7.0 (cgt/opera_970)

diff --cc CMakeLists.txt
Simple merge

diff --cc src/CTestTestfileInstall.cmake
Simple merge

diff --cc src/ExchangePlugin/CMakeLists.txt
index aa8e054b007aea97b44cf4236731083491569ddc,36f0a39dfe42e19410ace85c3f7b9715756ad39e..3dc9bd5f5c7277e4aaca9be2032f9a0b7e186614
mode 100755,100644..100755
--- 1/src/ExchangePlugin/CMakeLists.txt
--- 2/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/ExchangePlugin/ExchangePlugin_ExportFeature.cpp
Simple merge

diff --cc src/ExchangePlugin/ExchangePlugin_ExportFeature.h
Simple merge

diff --cc src/GeomAlgoAPI/CMakeLists.txt
index ef574969ce2bffa2ec7e5d47e5cdf4e633ea2754,de027193c591a36daf7cb85c8ba065b23197ee74..964443c468913f67cc3ff2ddb9922e76bca959cb
--- 1/src/GeomAlgoAPI/CMakeLists.txt
--- 2/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_Tube.h
 +    GeomAlgoAPI_NormalToFace.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_Tube.cpp
 +    GeomAlgoAPI_NormalToFace.cpp
 +    GeomAlgoAPI_ShapeInfo.cpp
+     GeomAlgoAPI_Tube.cpp
+     GeomAlgoAPI_ROOTExport.cpp
  )
  
  SET(PROJECT_LIBRARIES

diff --cc src/GeomAlgoAPI/GeomAlgoAPI_Sphere.cpp
Simple merge

diff --cc src/PrimitivesPlugin/PrimitivesPlugin_Tube.h
index d0b525edb9c3a51c42f5769155e94c2f7a2cc2d8,c3af279e1396f5921f606cd6aa950fafa7f4f38f..db8933f269ccba035a87f777bfd9fa0fa4e98d4e
--- 1/src/PrimitivesPlugin/PrimitivesPlugin_Tube.h
--- 2/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 45a63db54c9f62686a24d8978f5ca1c6177b1f32,31aee568029ea7465dec06202809a52ce4cb0851..a055d63122b15139131596ade6642210758b5e28
--- 1/src/PrimitivesPlugin/doc/TUI_sphereFeature.rst
--- 2/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 56b3447b42aa0eb00c1a73ae2c6386526bf3d9e1,c38cbe40f7a42fc419bffe83c4d1ae3deed128f6..8c3c47a53dffc4a3dd5a7507b41cd667790703fe
--- 1/src/PrimitivesPlugin/doc/TUI_spherePart.rst
--- 2/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 551c85415eb9aa277d1e99ae9eba51b7b38a5a45,7b871a1e24386ea417f98343771afad3bc6eff93..d3b8044f0be0e4912462c632b2a34ed08aa7bb85
--- 1/src/PrimitivesPlugin/doc/TUI_tubeFeature.rst
--- 2/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/Test/TestFeatures.py
Simple merge

diff --cc src/PythonAPI/model/__init__.py
index 869da976742b41c5c7f2c30c808aaaf819760236,eb043c97f50f50f53413c3a981bb7a61be6369d6..b221f2622b1ed0659bca5f6f20e5cbd707767080
--- 1/src/PythonAPI/model/__init__.py
--- 2/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