Allow creating smeshBuilder before geomBuilder

diff --git a/doc/salome/gui/SMESH/input/smesh_module.rst b/doc/salome/gui/SMESH/input/smesh_module.rst
index ba2ab87697ae587ed7ca1315d97b9b1da72ff561..8c2fda6e6b0996beb175b0eacbecc99e7d106114 100644 (file)
--- a/doc/salome/gui/SMESH/input/smesh_module.rst
+++ b/doc/salome/gui/SMESH/input/smesh_module.rst
@@ -195,7 +195,7 @@ PolySegment
 .. py:class:: PolySegment
 
    Define a cutting plane passing through two points. 
 .. py:class:: PolySegment
 
    Define a cutting plane passing through two points. 

-   Used in :meth:`smeshBuilder.Mesh.MakePolyLine`
+   Used in :meth:`~smeshBuilder.Mesh.MakePolyLine`

 
    .. py:attribute:: node1ID1, node1ID2
 
 
    .. py:attribute:: node1ID1, node1ID2
 


@@ -545,7 +545,7 @@ Filter
       Return satisfying elements
 
       :param SMESH.SMESH_Mesh mesh: the mesh; 
       Return satisfying elements
 
       :param SMESH.SMESH_Mesh mesh: the mesh; 

-                                    it can be obtained via :meth:`smeshBuilder.Mesh.GetMesh`
+                                    it can be obtained via :meth:`~smeshBuilder.Mesh.GetMesh`

 
       :return: list of IDs
                                     
 
       :return: list of IDs
                                     


@@ -553,7 +553,7 @@ Filter
 
       Return satisfying elements. 
       A mesh to filter must be already set, either via :meth:`SetMesh` method 
 
       Return satisfying elements. 
       A mesh to filter must be already set, either via :meth:`SetMesh` method 

-      or via ``mesh`` argument of :meth:`smeshBuilder.smeshBuilder.GetFilter`
+      or via ``mesh`` argument of :meth:`~smeshBuilder.smeshBuilder.GetFilter`

 
       :return: list of IDs
                                     
 
       :return: list of IDs
                                     


@@ -562,7 +562,7 @@ Filter
       Set mesh to filter
 
       :param SMESH.SMESH_Mesh mesh: the mesh;
       Set mesh to filter
 
       :param SMESH.SMESH_Mesh mesh: the mesh;

-                                    it can be obtained via :meth:`smeshBuilder.Mesh.GetMesh`
+                                    it can be obtained via :meth:`~smeshBuilder.Mesh.GetMesh`

 
    .. py:function:: SetCriteria( criteria )
 
 
    .. py:function:: SetCriteria( criteria )
 


@@ -605,7 +605,7 @@ SMESH_MeshEditor
 
    .. py:class:: Extrusion_Error
 
 
    .. py:class:: Extrusion_Error
 

-      Enumeration of errors of :meth:`smeshBuilder.Mesh.ExtrusionAlongPathObjects`
+      Enumeration of errors of :meth:`~smeshBuilder.Mesh.ExtrusionAlongPathObjects`

 
       .. py:attribute::
          EXTR_OK
 
       .. py:attribute::
          EXTR_OK


@@ -777,7 +777,7 @@ SMESH_subMesh
    .. py:function:: GetMeshInfo()
 
       Return number of mesh elements of each :class:`SMESH.EntityType`.
    .. py:function:: GetMeshInfo()
 
       Return number of mesh elements of each :class:`SMESH.EntityType`.

-      Use :meth:`smeshBuilder.smeshBuilder.EnumToLong` to get an integer from 
+      Use :meth:`~smeshBuilder.smeshBuilder.EnumToLong` to get an integer from 

       an item of :class:`SMESH.EntityType`.
 
       :return: array of number of elements per :class:`SMESH.EntityType`
       an item of :class:`SMESH.EntityType`.
 
       :return: array of number of elements per :class:`SMESH.EntityType`


@@ -912,7 +912,7 @@ SMESH_IDSource
    * :class:`SMESH.SMESH_subMesh`
    * :class:`SMESH.SMESH_GroupBase`
    * :class:`SMESH.Filter`
    * :class:`SMESH.SMESH_subMesh`
    * :class:`SMESH.SMESH_GroupBase`
    * :class:`SMESH.Filter`

-   * temporal ID source created by :meth:`smeshBuilder.Mesh.GetIDSource`
+   * temporal ID source created by :meth:`~smeshBuilder.Mesh.GetIDSource`

 
    .. py:function:: GetIDs()
 
 
    .. py:function:: GetIDs()
 


@@ -921,13 +921,13 @@ SMESH_IDSource
    .. py:function:: GetMeshInfo()
 
       Return number of mesh elements of each :class:`SMESH.EntityType`.
    .. py:function:: GetMeshInfo()
 
       Return number of mesh elements of each :class:`SMESH.EntityType`.

-      Use :meth:`smeshBuilder.smeshBuilder.EnumToLong` to get an integer from 
+      Use :meth:`~smeshBuilder.smeshBuilder.EnumToLong` to get an integer from 

       an item of :class:`SMESH.EntityType`.
 
    .. py:function:: GetNbElementsByType()
 
       Return number of mesh elements of each :class:`SMESH.ElementType`.
       an item of :class:`SMESH.EntityType`.
 
    .. py:function:: GetNbElementsByType()
 
       Return number of mesh elements of each :class:`SMESH.ElementType`.

-      Use :meth:`smeshBuilder.smeshBuilder.EnumToLong` to get an integer from 
+      Use :meth:`~smeshBuilder.smeshBuilder.EnumToLong` to get an integer from 

       an item of :class:`SMESH.ElementType`.
 
 
       an item of :class:`SMESH.ElementType`.
 
 

diff --git a/src/SMESH_SWIG/smeshBuilder.py b/src/SMESH_SWIG/smeshBuilder.py
index 025fa021defce909a11227559b53472ed81d5e18..e38c0c71a1cde07b54bf642ecd26af3d3124ec33 100644 (file)
--- a/src/SMESH_SWIG/smeshBuilder.py
+++ b/src/SMESH_SWIG/smeshBuilder.py
@@ -619,6 +619,8 @@ class smeshBuilder( SMESH._objref_SMESH_Gen, object ):
         if not geompyD:
             from salome.geom import geomBuilder
             geompyD = geomBuilder.geom
         if not geompyD:
             from salome.geom import geomBuilder
             geompyD = geomBuilder.geom

+            if not geompyD:
+                geompyD = geomBuilder.New()

             pass
         self.geompyD=geompyD
         self.SetGeomEngine(geompyD)
             pass
         self.geompyD=geompyD
         self.SetGeomEngine(geompyD)