From: nri <nri@opencascade.com>
Date: Tue, 20 May 2003 07:18:29 +0000 (+0000)
Subject: NRI : Use GEOM instead of Geometry.
X-Git-Tag: Start-v1_1a~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=602e9e7a7a2f96072ff92ec93b4d2d45d888ee83;p=modules%2Fsmesh.git

NRI : Use GEOM instead of Geometry.
---

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 72e66bf00..46c064580 100644
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -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 */
diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index 113b80eb0..aeed1e4b8 100644
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -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);
 
 
diff --git a/src/SMESH_I/SMESH_test.py b/src/SMESH_I/SMESH_test.py
index 412905767..a2bdc2da9 100644
--- a/src/SMESH_I/SMESH_test.py
+++ b/src/SMESH_I/SMESH_test.py
@@ -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
 
diff --git a/src/SMESH_I/smeshpy.py b/src/SMESH_I/smeshpy.py
index 986ffca7d..26585e8b0 100644
--- a/src/SMESH_I/smeshpy.py
+++ b/src/SMESH_I/smeshpy.py
@@ -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
diff --git a/src/SMESH_SWIG/SMESH_fixation.py b/src/SMESH_SWIG/SMESH_fixation.py
index 2864e93b2..5d5b71cfb 100644
--- a/src/SMESH_SWIG/SMESH_fixation.py
+++ b/src/SMESH_SWIG/SMESH_fixation.py
@@ -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
diff --git a/src/SMESH_SWIG/SMESH_mechanic.py b/src/SMESH_SWIG/SMESH_mechanic.py
index c7ed695c7..7d695d7a3 100644
--- a/src/SMESH_SWIG/SMESH_mechanic.py
+++ b/src/SMESH_SWIG/SMESH_mechanic.py
@@ -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
 
diff --git a/src/SMESH_SWIG/SMESH_test0.py b/src/SMESH_SWIG/SMESH_test0.py
index efa887ea2..c5de8b950 100644
--- a/src/SMESH_SWIG/SMESH_test0.py
+++ b/src/SMESH_SWIG/SMESH_test0.py
@@ -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
 
diff --git a/src/SMESH_SWIG/SMESH_test1.py b/src/SMESH_SWIG/SMESH_test1.py
index d36f7bec4..fa05215e9 100644
--- a/src/SMESH_SWIG/SMESH_test1.py
+++ b/src/SMESH_SWIG/SMESH_test1.py
@@ -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
 
diff --git a/src/SMESH_SWIG/SMESH_test3.py b/src/SMESH_SWIG/SMESH_test3.py
index f2267a112..6d2b10b66 100644
--- a/src/SMESH_SWIG/SMESH_test3.py
+++ b/src/SMESH_SWIG/SMESH_test3.py
@@ -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