Salome HOME
NRI : Use GEOM instead of Geometry.
authornri <nri@opencascade.com>
Tue, 20 May 2003 07:18:29 +0000 (07:18 +0000)
committernri <nri@opencascade.com>
Tue, 20 May 2003 07:18:29 +0000 (07:18 +0000)
src/SMESHGUI/SMESHGUI.cxx
src/SMESH_I/SMESH_Gen_i.cxx
src/SMESH_I/SMESH_test.py
src/SMESH_I/smeshpy.py
src/SMESH_SWIG/SMESH_fixation.py
src/SMESH_SWIG/SMESH_mechanic.py
src/SMESH_SWIG/SMESH_test0.py
src/SMESH_SWIG/SMESH_test1.py
src/SMESH_SWIG/SMESH_test3.py

index 72e66bf..46c0645 100644 (file)
@@ -215,7 +215,7 @@ SMESHGUI* SMESHGUI::GetOrCreateSMESHGUI( QAD_Desktop* desktop )
     Engines::Component_var comp = desktop->getEngine("FactoryServer", "SMESH");
     smeshGUI->myComponentMesh = SMESH::SMESH_Gen::_narrow(comp);
     
-    Engines::Component_var comp1 = desktop->getEngine("FactoryServer", "Geometry");    
+    Engines::Component_var comp1 = desktop->getEngine("FactoryServer", "GEOM");    
     smeshGUI->myComponentGeom = GEOM::GEOM_Gen::_narrow(comp1);
       
     /* GetCurrentStudy */
index 113b80e..aeed1e4 100644 (file)
@@ -877,7 +877,7 @@ bool SMESH_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
   _NS->init_orb( _orb ) ;
   SALOME_LifeCycleCORBA* myEnginesLifeCycle = new SALOME_LifeCycleCORBA(_NS);
   Engines::Component_var geomEngine =
-    myEnginesLifeCycle->FindOrLoad_Component("FactoryServer","Geometry");
+    myEnginesLifeCycle->FindOrLoad_Component("FactoryServer","GEOM");
   GEOM::GEOM_Gen_var myGeomEngine = GEOM::GEOM_Gen::_narrow(geomEngine);
 
 
index 4129057..a2bdc2d 100644 (file)
@@ -9,7 +9,7 @@ import math
 
 import geompy
 
-geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry")
+geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 myBuilder = salome.myStudy.NewBuilder()
 from geompy import gg
 
index 986ffca..26585e8 100644 (file)
@@ -15,7 +15,7 @@ class smeshpy:
 
     def __init__(self):
         try:
-            self._geom = salome.lcc.FindOrLoadComponent("FactoryServer","Geometry")
+            self._geom = salome.lcc.FindOrLoadComponent("FactoryServer","GEOM")
             self._smesh = salome.lcc.FindOrLoadComponent("FactoryServer","SMESH")
         except:
             MESSAGE( "exception in smeshpy:__init__" )
@@ -59,7 +59,7 @@ class smeshpy:
 ##def SmeshInit(shapeId):
 ##    import salome
 ##    import SMESH
-##    geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry")
+##    geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 ##    smesh = salome.lcc.FindOrLoadComponent("FactoryServer", "SMESH")
 ##    shape = salome.IDToObject(shapeId)
 ##    studyId = salome.myStudyId
index 2864e93..5d5b71c 100644 (file)
@@ -60,7 +60,7 @@ def MakeCompound(lstShells) :
 
 # -----------------------------------------------------------------------------
 
-geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry")
+geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 myBuilder = salome.myStudy.NewBuilder()
 
 ShapeTypeCompSolid = 1
index c7ed695..7d695d7 100644 (file)
@@ -19,7 +19,7 @@ import geompy
 
 
 # ---------------------------- GEOM --------------------------------------
-geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry")
+geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 myBuilder = salome.myStudy.NewBuilder()
 #from geompy import gg
 
index efa887e..c5de8b9 100644 (file)
@@ -7,7 +7,7 @@ import math
 
 import geompy
 
-geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry")
+geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 myBuilder = salome.myStudy.NewBuilder()
 from geompy import gg
 
index d36f7be..fa05215 100644 (file)
@@ -7,7 +7,7 @@ import math
 
 import geompy
 
-geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry")
+geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 myBuilder = salome.myStudy.NewBuilder()
 from geompy import gg
 
index f2267a1..6d2b10b 100644 (file)
@@ -7,7 +7,7 @@ import math
 
 import geompy
 
-geom = salome.lcc.FindOrLoadComponent("FactoryServer", "Geometry")
+geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 myBuilder = salome.myStudy.NewBuilder()
 from geompy import gg