From 265538828f80f16096278be16c9fe9ab48b7f53c Mon Sep 17 00:00:00 2001 From: gdd Date: Fri, 28 Oct 2011 08:06:05 +0000 Subject: [PATCH] GDD: temporaly remove sphynx doc generation --- doc/Makefile.am | 3 ++- src/GEOM_PY/geomtools.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index b2d61e363..f48046a3c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -22,7 +22,8 @@ # Date : 30/11/2001 # Modified by : Alexander BORODIN (OCN) - autotools usage # -SUBDIRS = salome docutils +#SUBDIRS = salome docutils +SUBDIRS = salome usr_docs: (cd salome && $(MAKE) $(AM_MAKEFLAGS) usr_docs) diff --git a/src/GEOM_PY/geomtools.py b/src/GEOM_PY/geomtools.py index 9f10c4c26..8b243a9b6 100644 --- a/src/GEOM_PY/geomtools.py +++ b/src/GEOM_PY/geomtools.py @@ -31,7 +31,7 @@ from salome.kernel import termcolor logger = Logger("salome.geom.geomtools", color = termcolor.RED) from salome.kernel.studyedit import getActiveStudyId, getStudyEditor -from salome.gui.helper import getSObjectSelected +from salome.gui import helper from salome.kernel.services import IDToObject _geompys = {} @@ -88,7 +88,7 @@ class GeomStudyTools: if GEOM is None: GEOM = __import__("GEOM") if studyEditor is None: - studyEditor = getStudyEditor() + studyEditor = helper.getStudyEditor() self.editor = studyEditor def displayShapeByName(self, shapeName, color = None): @@ -124,7 +124,7 @@ class GeomStudyTools: ''' Returns the GEOM object currently selected in the objects browser. ''' - sobject, entry = getSObjectSelected() + sobject, entry = helper.getSObjectSelected() geomObject = self.getGeomObjectFromEntry(entry) return geomObject -- 2.39.2