X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_GEOMGenUtils.cxx;h=52049930119cde5a5b2d086c20359b389a25c746;hp=a7dc4011ba122233aa8fc31853e0370d561fad86;hb=c63ee099ad2b149bd70136839c973e8910137bc5;hpb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f

diff --git a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
index a7dc4011b..520499301 100644
--- a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
@@ -1,48 +1,55 @@
 //  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
-
-
-#include "QAD_Desktop.h"
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+
+#include <boost/shared_ptr.hpp>
 
 #include "SMESHGUI_GEOMGenUtils.h"
 #include "SMESHGUI_Utils.h"
+
+#include <GeometryGUI.h>
+
+#include <SALOMEDSClient_SObject.hxx>
+#include <SALOMEDSClient_ChildIterator.hxx>
+#include <SALOMEDS_SObject.hxx>
+
 #include CORBA_CLIENT_HEADER(SMESH_Mesh)
 
-namespace SMESH{
+
+namespace SMESH {
 
   GEOM::GEOM_Gen_var GetGEOMGen()
   {
     static GEOM::GEOM_Gen_var aGEOMGen;
-    if(CORBA::is_nil(aGEOMGen)){
-      if(QAD_Desktop* aDesktop = QAD_Application::getDesktop()){
-	Engines::Component_var aComponent = aDesktop->getEngine("FactoryServer","GEOM");
-	aGEOMGen = GEOM::GEOM_Gen::_narrow(aComponent);
-      }
+
+    if(CORBA::is_nil(aGEOMGen)) {
+      if ( GeometryGUI::GetGeomGen()->_is_nil() )
+        GeometryGUI::InitGeomGen();
+      aGEOMGen = GeometryGUI::GetGeomGen();
     }
     return aGEOMGen;
   }
 
-
-  GEOM::GEOM_Object_var GetShapeOnMeshOrSubMesh(SALOMEDS::SObject_ptr theMeshOrSubmesh)
+  GEOM::GEOM_Object_var GetShapeOnMeshOrSubMesh(_PTR(SObject) theMeshOrSubmesh)
   {
-    if(!theMeshOrSubmesh->_is_nil()) {
-      CORBA::Object_var Obj = theMeshOrSubmesh->GetObject();
+    SALOMEDS_SObject* aMeshOrSubmesh = _CAST(SObject,theMeshOrSubmesh);
+    if(aMeshOrSubmesh) {
+      CORBA::Object_var Obj = aMeshOrSubmesh->GetObject();
       if ( !CORBA::is_nil( Obj ) ) {
         SMESH::SMESH_Mesh_var aMesh =
           SObjectToInterface<SMESH::SMESH_Mesh>( theMeshOrSubmesh );
@@ -57,4 +64,32 @@ namespace SMESH{
     return GEOM::GEOM_Object::_nil();
   }
 
+  GEOM::GEOM_Object_ptr GetGeom (_PTR(SObject) theSO)
+  {
+    if (!theSO)
+      return GEOM::GEOM_Object::_nil();
+
+    _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
+    if (!aStudy)
+      return GEOM::GEOM_Object::_nil();
+
+    _PTR(ChildIterator) anIter (aStudy->NewChildIterator(theSO));
+    for (; anIter->More(); anIter->Next()) {
+      _PTR(SObject) aSObject = anIter->Value();
+      _PTR(SObject) aRefSOClient;
+      GEOM::GEOM_Object_var aMeshShape;
+
+      if (aSObject->ReferencedObject(aRefSOClient)) {
+        SALOMEDS_SObject* aRefSO = _CAST(SObject,aRefSOClient);
+        aMeshShape = GEOM::GEOM_Object::_narrow(aRefSO->GetObject());
+      } else {
+	SALOMEDS_SObject* aSO = _CAST(SObject,aSObject);
+        aMeshShape = GEOM::GEOM_Object::_narrow(aSO->GetObject());
+      }
+
+      if (!aMeshShape->_is_nil())
+        return aMeshShape._retn();
+    }
+    return GEOM::GEOM_Object::_nil();
+  }
 }