Modification dans SMESH pour obtenir directement les shapes lorsque GEOM et SMESH sont colocalisees

This commit is contained in:
fkl 2004-02-23 10:25:53 +00:00
parent 0d30056185
commit c29a9bebad
2 changed files with 2 additions and 4 deletions

View File

@ -76,7 +76,6 @@ using namespace std;
#include "OCCViewer_ViewPort3d.h" #include "OCCViewer_ViewPort3d.h"
#include "OCCViewer_Viewer3d.h" #include "OCCViewer_Viewer3d.h"
#include "GEOM_Client.hxx"
#include "GEOM_InteractiveObject.hxx" #include "GEOM_InteractiveObject.hxx"
#include "SALOME_NamingService.hxx" #include "SALOME_NamingService.hxx"
@ -116,7 +115,6 @@ using namespace std;
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <gp_Vec.hxx> #include <gp_Vec.hxx>
static GEOM_Client ShapeReader;
static SMESHGUI *smeshGUI = 0; static SMESHGUI *smeshGUI = 0;
static CORBA::ORB_var _orb; static CORBA::ORB_var _orb;

View File

@ -196,7 +196,7 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::Init(GEOM::GEOM_Gen_ptr geomEngine,
SMESH_Mesh_i* meshServant = 0; SMESH_Mesh_i* meshServant = 0;
try try
{ {
if (! _ShapeReader) _ShapeReader = new GEOM_Client(); if (! _ShapeReader) _ShapeReader = new GEOM_Client(GetContainerRef());
ASSERT(_ShapeReader); ASSERT(_ShapeReader);
// explore main Shape, get local TopoDS_Shapes of all subShapes // explore main Shape, get local TopoDS_Shapes of all subShapes
@ -283,7 +283,7 @@ CORBA::Boolean SMESH_Gen_i::IsReadyToCompute(SMESH::SMESH_Mesh_ptr aMesh,
try try
{ {
if (! _ShapeReader) _ShapeReader = new GEOM_Client(); if (! _ShapeReader) _ShapeReader = new GEOM_Client(GetContainerRef());
ASSERT(_ShapeReader); ASSERT(_ShapeReader);
TopoDS_Shape myMainShape = _ShapeReader->GetShape(geom,myShape); TopoDS_Shape myMainShape = _ShapeReader->GetShape(geom,myShape);
TopTools_IndexedMapOfShape myIndexToShape; TopTools_IndexedMapOfShape myIndexToShape;