Restore documentation of methods dynamically added by plug-ins to the Mesh class...

diff --git a/doc/salome/gui/HexoticPLUGIN/Makefile.am b/doc/salome/gui/HexoticPLUGIN/Makefile.am
index cbf39306b289b78b2f0bc94a55e1837256d4aa35..cf826ccad0e6e26473cc92b36950024543beaca1 100755 (executable)
--- a/doc/salome/gui/HexoticPLUGIN/Makefile.am
+++ b/doc/salome/gui/HexoticPLUGIN/Makefile.am
@@ -29,11 +29,14 @@ EXTRA_DIST += images input static/footer.html static/doxygen.css
 guidocdir = $(docdir)/gui/HexoticPLUGIN
 guidoc_DATA = images/head.png
 
-DOC_PYTHONPATH=$(prefix)/bin/salome:$(SMESH_ROOT_DIR)/bin/salome:$(SMESH_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(MED_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(GEOM_ROOT_DIR)/bin/salome:$(GEOM_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/python$(PYTHON_VERSION)/site-packages
+DOC_PYTHONPATH=$(prefix)/bin/salome:$(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(SMESH_ROOT_DIR)/bin/salome:$(SMESH_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(MED_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(GEOM_ROOT_DIR)/bin/salome:$(GEOM_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/python$(PYTHON_VERSION)/site-packages
 DOC_LD_LIBRARY_PATH=$(prefix)/lib/salome:${SMESH_ROOT_DIR}/lib/salome:${MED_ROOT_DIR}/lib/salome:${GEOM_ROOT_DIR}/lib/salome:${KERNEL_ROOT_DIR}/lib/salome
 DOC_SMESH_MeshersList=HexoticPLUGIN
 
-usr_docs: doxyfile_py doxyfile
+smeshBuilder.py: $(top_srcdir)/src/HexoticPlugin/HexoticPLUGINBuilder.py
+       @PYTHONPATH=$(DOC_PYTHONPATH):${PYTHONPATH} LD_LIBRARY_PATH=$(DOC_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} SMESH_MeshersList=$(DOC_SMESH_MeshersList) $(PYTHON) $(SMESH_ROOT_DIR)/bin/salome/collect_mesh_methods.py -d -o $@ HexoticPLUGIN
+
+usr_docs: doxyfile_py doxyfile smeshBuilder.py
        @$(DOXYGEN) doxyfile_py ; \
        $(DOXYGEN) doxyfile
 

diff --git a/doc/salome/gui/HexoticPLUGIN/doxyfile_py.in b/doc/salome/gui/HexoticPLUGIN/doxyfile_py.in
index 58d85f807f1747d9a0667be5abc7c21ceb82ec24..1ab0c3a78e8924ac1ee270138ba0de02b675b658 100755 (executable)
--- a/doc/salome/gui/HexoticPLUGIN/doxyfile_py.in
+++ b/doc/salome/gui/HexoticPLUGIN/doxyfile_py.in
@@ -97,7 +97,7 @@ EXAMPLE_RECURSIVE      = NO
 #Input related options
 #---------------------------------------------------------------------------
 INPUT             = @top_srcdir@/src/HexoticPlugin/HexoticPLUGINBuilder.py \
-                    @SMESH_ROOT_DIR@/lib/python@PYTHON_VERSION@/site-packages/salome/salome/smesh/smeshBuilder.py \
+                    smeshBuilder.py \
                     @SMESH_ROOT_DIR@/lib/python@PYTHON_VERSION@/site-packages/salome/salome/smesh/smesh_algorithm.py
 FILE_PATTERNS     = 
 IMAGE_PATH        = @srcdir@/images

diff --git a/src/HexoticPlugin/HexoticPLUGINBuilder.py b/src/HexoticPlugin/HexoticPLUGINBuilder.py
index 552658d4b5bdcc8142a0b16ba074b2bafa82275f..b23978cbdb22e07c79d776df73a166a03459aa14 100644 (file)
--- a/src/HexoticPlugin/HexoticPLUGINBuilder.py
+++ b/src/HexoticPlugin/HexoticPLUGINBuilder.py
@@ -45,16 +45,16 @@ Hexotic = "Hexotic_3D"
 
 ## Defines a hexahedron 3D algorithm
 #
-#  It is created by calling smesh.Mesh.Hexahedron( smesh.Hexotic, geom=0 )
+#  It is created by calling smeshBuilder.Mesh.Hexahedron( smeshBuilder.Hexotic, geom=0 )
 class Hexotic_Algorithm(Mesh_Algorithm):
 
-    ## name of the dynamic method in smesh.Mesh class
+    ## name of the dynamic method in smeshBuilder.Mesh class
     #  @internal
     meshMethod = "Hexahedron"
-    ## type of algorithm used with helper function in smesh.Mesh class
+    ## type of algorithm used with helper function in smeshBuilder.Mesh class
     #  @internal
     algoType   = Hexotic
-    ## doc string of the method in smesh.Mesh class
+    ## doc string of the method in smeshBuilder.Mesh class
     #  @internal
     docHelper  = "Creates hexahedron 3D algorithm for volumes"