PR: fix dump and compatibility with previous scripts

diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx
index 7d06054bb217ed12d37b6f49e44510fb4b218f9a..e9254db52c41f1fc55468351c41f96b4f6b69cab 100644 (file)
--- a/src/GEOM/GEOM_Engine.cxx
+++ b/src/GEOM/GEOM_Engine.cxx
@@ -602,13 +602,13 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID,
   }
 
   aScript  = "import GEOM\n";
-  aScript += "import geompyDC\n";
+  aScript += "from salome.geom import geomBuilder\n";
   aScript += "import math\n";
   aScript += "import SALOMEDS\n\n";
   if( isMultiFile )
     aScript += "def RebuildData(theStudy):";
 
-  aScript += "\n\tgeompy = geompyDC.geomInstance(theStudy)\n";
+  aScript += "\n\tgeompy = geomBuilder.New(theStudy)\n";
 
   AddTextures(theDocID, aScript);
 

diff --git a/src/GEOM_SWIG/geompy.py b/src/GEOM_SWIG/geompy.py
index 3c6f09fa980c1ab9909fcae8bbfc6a16aabc7f10..d92c2a19ca67b066ec00c1adbafd99f1c30ec045 100644 (file)
--- a/src/GEOM_SWIG/geompy.py
+++ b/src/GEOM_SWIG/geompy.py
@@ -35,7 +35,7 @@ from salome import *
 try:
     # get GEOM engine and initialize GEOM with current study
     engineGeom = lcc.FindOrLoadComponent( "FactoryServer", "GEOM" )
-    geom = geomBuilder.geomInstance(salome.myStudy, engineGeom)
+    geom = geomBuilder.New(salome.myStudy, engineGeom)
 
     # export the methods of geomBuilder
     for k in dir( geom ):

diff --git a/src/GEOM_SWIG/gsketcher.py b/src/GEOM_SWIG/gsketcher.py
index bb6dc9c95e35da1c0f1005694a248f7afebc1338..d2e69a97e6dfe46e1c0ace912237f2bf8c892d6d 100644 (file)
--- a/src/GEOM_SWIG/gsketcher.py
+++ b/src/GEOM_SWIG/gsketcher.py
@@ -275,7 +275,7 @@ class Sketcher3D:
             sk.addPointsRelative(0,0,130, 70,0,-130)
             a3D_Sketcher_1 = sk.wire()
         """
-        from geomBuilder import ParseSketcherCommand, RaiseIfFailed
+        from salome.geom.geomBuilder import ParseSketcherCommand, RaiseIfFailed
         Command,Parameters = ParseSketcherCommand(self.myCommand)
         wire = self.geompyD.CurvesOp.Make3DSketcherCommand(Command)
         self.myCommand = "3DSketcher"