From 2611ba88e39f01313ad533ede897ce1f4019afb7 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 5 Apr 2013 09:24:23 +0000 Subject: [PATCH] Restore documentation of methods dynamically added by plug-ins to the Mesh class, killed by previous integration --- doc/salome/gui/SMESH/Makefile.am | 2 +- doc/salome/gui/SMESH/collect_mesh_methods.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/salome/gui/SMESH/Makefile.am b/doc/salome/gui/SMESH/Makefile.am index 463b91e2f..32df83656 100755 --- a/doc/salome/gui/SMESH/Makefile.am +++ b/doc/salome/gui/SMESH/Makefile.am @@ -36,7 +36,7 @@ DOC_LD_LIBRARY_PATH=$(prefix)lib/salome:${MED_ROOT_DIR}/lib/salome:${GEOM_ROOT_D DOC_SMESH_MeshersList=StdMeshers tmp/smeshBuilder.py: $(top_srcdir)/src/SMESH_SWIG/StdMeshersBuilder.py $(srcdir)/collect_mesh_methods.py - mkdir -p tmp && PYTHONPATH=$(DOC_PYTHONPATH):${PYTHONPATH} LD_LIBRARY_PATH=$(DOC_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} SMESH_MeshersList=$(DOC_SMESH_MeshersList) $(PYTHON) $(srcdir)/collect_mesh_methods.py -o $@ StdMeshers + @mkdir -p tmp && PYTHONPATH=$(DOC_PYTHONPATH):${PYTHONPATH} LD_LIBRARY_PATH=$(DOC_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} SMESH_MeshersList=$(DOC_SMESH_MeshersList) $(PYTHON) $(srcdir)/collect_mesh_methods.py -o $@ StdMeshers usr_docs: doxyfile_py doxyfile tmp/smeshBuilder.py @$(DOXYGEN) doxyfile_py ; \ diff --git a/doc/salome/gui/SMESH/collect_mesh_methods.py b/doc/salome/gui/SMESH/collect_mesh_methods.py index ab26414c8..8f524bc2d 100755 --- a/doc/salome/gui/SMESH/collect_mesh_methods.py +++ b/doc/salome/gui/SMESH/collect_mesh_methods.py @@ -51,7 +51,11 @@ import sys def main(plugin_name, dummymeshhelp = True, output_file = "smeshBuilder.py"): plugin_module_name = plugin_name + "Builder" plugin_module = "salome.%s.%s" % (plugin_name, plugin_module_name) - plugin_module_short = "SMESH_SWIG.%s" % (plugin_module_name) + if dummymeshhelp: + namespace = plugin_name + else: + namespace = "SMESH_SWIG" + plugin_module_short = "%s.%s" % (namespace, plugin_module_name) try: exec( "from salome.smesh.smeshBuilder import *") exec( "import %s" % plugin_module ) -- 2.30.2