Deleted Study parameter

diff --git a/doc/salome/examples/hexoticdemo.py b/doc/salome/examples/hexoticdemo.py
index f346bb803a80183056e103f81078d3642e422194..f221c72c6f706e234749caf62e17ae6d2c0226fb 100644 (file)
--- a/doc/salome/examples/hexoticdemo.py
+++ b/doc/salome/examples/hexoticdemo.py
@@ -21,10 +21,10 @@ import salome
 salome.salome_init()
 
 from salome.geom import geomBuilder
-geompy = geomBuilder.New(salome.myStudy)
+geompy = geomBuilder.New()
 
 from salome.smesh import smeshBuilder
-smesh =  smeshBuilder.New(salome.myStudy)
+smesh =  smeshBuilder.New()
 
 
 # create a sphere

diff --git a/doc/salome/examples/hexoticdemo_vl.py b/doc/salome/examples/hexoticdemo_vl.py
index 2ae8e11cb759007932eaaad9e60ac877993b20c4..c28dc83639cc9ab89893128649b20668b3757ff9 100644 (file)
--- a/doc/salome/examples/hexoticdemo_vl.py
+++ b/doc/salome/examples/hexoticdemo_vl.py
@@ -19,14 +19,13 @@
 
 import salome
 salome.salome_init()
-theStudy = salome.myStudy
 
 from salome.geom import geomBuilder
-geompy = geomBuilder.New(salome.myStudy)
+geompy = geomBuilder.New()
 
 import SMESH, SALOMEDS
 from salome.smesh import smeshBuilder
-smesh =  smeshBuilder.New(salome.myStudy)
+smesh =  smeshBuilder.New()
 
 # Create geometry
 Box_1 = geompy.MakeBoxDXDYDZ(50, 50, 50)

diff --git a/doc/salome/examples/hexoticsubdom1.py b/doc/salome/examples/hexoticsubdom1.py
index 8781911393d14d79f0627d59931498acec96943f..c570ec56c6b99ea30e279550cb70470b4b94a566 100644 (file)
--- a/doc/salome/examples/hexoticsubdom1.py
+++ b/doc/salome/examples/hexoticsubdom1.py
@@ -21,11 +21,11 @@ import salome
 salome.salome_init()
 
 from salome.geom import geomBuilder
-geompy = geomBuilder.New(salome.myStudy)
+geompy = geomBuilder.New()
 
 import SMESH, SALOMEDS
 from salome.smesh import smeshBuilder
-smesh =  smeshBuilder.New(salome.myStudy)
+smesh =  smeshBuilder.New()
 
 
 # Create geometry: a box cut by a holed sphere

diff --git a/doc/salome/examples/hexoticsubdom2.py b/doc/salome/examples/hexoticsubdom2.py
index 500270ae6633e0b5b0baf1e649773b12395f584a..1217806596fba6830a30d04fa2ff91f7a42024d0 100644 (file)
--- a/doc/salome/examples/hexoticsubdom2.py
+++ b/doc/salome/examples/hexoticsubdom2.py
@@ -21,11 +21,11 @@ import salome
 salome.salome_init()
 
 from salome.geom import geomBuilder
-geompy = geomBuilder.New(salome.myStudy)
+geompy = geomBuilder.New()
 
 import SMESH, SALOMEDS
 from salome.smesh import smeshBuilder
-smesh =  smeshBuilder.New(salome.myStudy)
+smesh =  smeshBuilder.New()
 
 # Create geometry: a box cut by a holed sphere
 Box_1 = geompy.MakeBoxDXDYDZ(200, 200, 200)

diff --git a/doc/salome/examples/hexoticsubdom3.py b/doc/salome/examples/hexoticsubdom3.py
index ef7cc20328eaf4a08b77a735388ff6963d75e2f6..0f6898e89222a69ecdfd73551bebfda1e5dd9c22 100644 (file)
--- a/doc/salome/examples/hexoticsubdom3.py
+++ b/doc/salome/examples/hexoticsubdom3.py
@@ -21,11 +21,11 @@ import salome
 salome.salome_init()
 
 from salome.geom import geomBuilder
-geompy = geomBuilder.New(salome.myStudy)
+geompy = geomBuilder.New()
 
 import SMESH, SALOMEDS
 from salome.smesh import smeshBuilder
-smesh =  smeshBuilder.New(salome.myStudy)
+smesh =  smeshBuilder.New()
 
 # Create geometry: a box cut by a holed sphere
 Box_1 = geompy.MakeBoxDXDYDZ(200, 200, 200)

diff --git a/doc/salome/examples/hexoticsubdom4.py b/doc/salome/examples/hexoticsubdom4.py
index 8683d378eec3fc0831e57a313bc1c6ad4e5750a0..ee3bb5fbc9a3613c059d3a0dfef96a53e179e994 100644 (file)
--- a/doc/salome/examples/hexoticsubdom4.py
+++ b/doc/salome/examples/hexoticsubdom4.py
@@ -21,10 +21,10 @@ import salome
 salome.salome_init()
 
 from salome.geom import geomBuilder
-geompy = geomBuilder.New(salome.myStudy)
+geompy = geomBuilder.New()
 
 from salome.smesh import smeshBuilder
-smesh =  smeshBuilder.New(salome.myStudy)
+smesh =  smeshBuilder.New()
 
 # Create geometry: a box cut by a plane
 Box_1 = geompy.MakeBoxDXDYDZ(200, 200, 200)

diff --git a/src/GUI/HexoticPluginGUI_HypothesisCreator.cxx b/src/GUI/HexoticPluginGUI_HypothesisCreator.cxx
index 9fee2cf4c9921ca39132b485eaed3f232f970fa2..3eee367dc6827644c03d397bc6ec03bf4f84365e 100644 (file)
--- a/src/GUI/HexoticPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/HexoticPluginGUI_HypothesisCreator.cxx
@@ -741,10 +741,8 @@ bool HexoticPluginGUI_HypothesisCreator::readSizeMapsFromWidgets( HexoticHypothe
 
 GEOM::GEOM_Object_var HexoticPluginGUI_HypothesisCreator::entryToObject( std::string entry) const
 {
-  SMESH_Gen_i* smeshGen_i = SMESH_Gen_i::GetSMESHGen();
-  SALOMEDS::Study_var myStudy = smeshGen_i->GetStudy();
   GEOM::GEOM_Object_var aGeomObj;
-  SALOMEDS::SObject_var aSObj = myStudy->FindObjectID( entry.c_str() );
+   SALOMEDS::SObject_var aSObj = SMESH_Gen_i::getStudyServant()->FindObjectID( entry.c_str() );
   if (!aSObj->_is_nil()) {
     CORBA::Object_var obj = aSObj->GetObject();
     aGeomObj = GEOM::GEOM_Object::_narrow(obj);

diff --git a/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx b/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx
index f56c997a5ba700943c2109957ff6b580215bd876..350cf09eab023d29a0d553f7e3bfc823b1fe3f03 100644 (file)
--- a/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx
+++ b/src/HexoticPlugin/HexoticPlugin_Hexotic.cxx
@@ -108,13 +108,6 @@ HexoticPlugin_Hexotic::HexoticPlugin_Hexotic(int hypId, SMESH_Gen* gen)
 #endif
   _computeCanceled = false;
   
-  // Copy of what is done in BLSURFPLugin TODO : share the code
-  smeshGen_i = SMESH_Gen_i::GetSMESHGen();
-  CORBA::Object_var anObject = smeshGen_i->GetNS()->Resolve("/Study");
-  
-  myStudy = SALOMEDS::Study::_narrow(anObject);;
-  if ( !myStudy->_is_nil() )
-    MESSAGE("myStudy not empty");
 }
 
 //=============================================================================
@@ -900,18 +893,17 @@ std::string HexoticPlugin_Hexotic::getHexoticCommand(const TCollection_AsciiStri
 TopoDS_Shape HexoticPlugin_Hexotic::entryToShape(std::string entry)
 {
   MESSAGE("HexoticPlugin_Hexotic::entryToShape "<<entry );
-  if ( myStudy->_is_nil() )
-    throw SALOME_Exception("MG-Hexa plugin can't work w/o publishing in the study");
+
   GEOM::GEOM_Object_var aGeomObj;
   TopoDS_Shape S = TopoDS_Shape();
-  SALOMEDS::SObject_var aSObj = myStudy->FindObjectID( entry.c_str() );
+  SALOMEDS::SObject_var aSObj = SMESH_Gen_i::getStudyServant()->FindObjectID( entry.c_str() );
   if (!aSObj->_is_nil()) {
     CORBA::Object_var obj = aSObj->GetObject();
     aGeomObj = GEOM::GEOM_Object::_narrow(obj);
     aSObj->UnRegister();
   }
   if ( !aGeomObj->_is_nil() )
-    S = smeshGen_i->GeomObjectToShape( aGeomObj.in() );
+    S = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( aGeomObj.in() );
   return S;
 }
 

diff --git a/src/HexoticPlugin/HexoticPlugin_Hexotic.hxx b/src/HexoticPlugin/HexoticPlugin_Hexotic.hxx
index 0eef149c082a1f99f9fec9b8c7a547e6f848bb8b..065d8aef3512bbcf65d0451072964c7d2c679431 100644 (file)
--- a/src/HexoticPlugin/HexoticPlugin_Hexotic.hxx
+++ b/src/HexoticPlugin/HexoticPlugin_Hexotic.hxx
@@ -122,10 +122,6 @@ private:
   const BLSURFPlugin_Hypothesis* _blsurfHypo;
 #endif
 
-
-  SALOMEDS::Study_var myStudy;
-  SMESH_Gen_i*        smeshGen_i;
-
 };
 
 #endif