Merge from V7_2_BR 09/08/2013

This commit is contained in:
vsr 2013-08-12 09:34:06 +00:00
parent e688f2b77f
commit b87a6c3f3b
2 changed files with 16 additions and 7 deletions

View File

@ -32,8 +32,13 @@ logger = Logger("salome.geom.geomtools", color = termcolor.RED)
from salome.kernel.studyedit import getActiveStudyId, getStudyEditor
from salome.kernel.services import IDToObject, IDToSObject
from salome.kernel.deprecation import is_called_by_sphinx
try:
from salome.gui import helper as guihelper
if not is_called_by_sphinx():
from salome.gui import helper as guihelper
pass
pass
except:
pass

View File

@ -47,14 +47,18 @@ Additionnal examples can be found as unit tests in the source code.
geompyEnable = True
try:
import salome
salome.salome_init()
import GEOM
from salome.geom import geomBuilder
geompy = geomBuilder.New(salome.myStudy)
from salome.kernel.deprecation import is_called_by_sphinx
if not is_called_by_sphinx():
import salome
salome.salome_init()
import GEOM
from salome.geom import geomBuilder
geompy = geomBuilder.New(salome.myStudy)
pass
pass
except:
geompyEnable = False
pass
class Sketcher: