X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FOBJECT%2FSMESH_ObjectDef.h;h=094504f33adae44e735ae4507141a1e47f2df5fc;hb=2e5ccf9f57aa7b20827ac99c8554c5203f1e183d;hp=134b47b10ba6ae6a714b10d252ba6c69ad4d7a0e;hpb=c38c10811a065cf5b13e8807ed71864d92ca7d80;p=modules%2Fsmesh.git diff --git a/src/OBJECT/SMESH_ObjectDef.h b/src/OBJECT/SMESH_ObjectDef.h index 134b47b10..094504f33 100644 --- a/src/OBJECT/SMESH_ObjectDef.h +++ b/src/OBJECT/SMESH_ObjectDef.h @@ -1,34 +1,37 @@ -// SMESH OBJECT : interactive object for SMESH visualization +// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// 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 +// 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 +// +// SMESH OBJECT : interactive object for SMESH visualization // File : SMESH_Object.h // Author : Nicolas REJNERI // Module : SMESH // $Header$ - +// #ifndef SMESH_OBJECTDEF_H #define SMESH_OBJECTDEF_H +#include "SMESH_Controls.hxx" +#include "SMESH_Object.h" +#include "SMESH_Client.hxx" + // IDL Headers #include #include CORBA_SERVER_HEADER(SMESH_Mesh) @@ -37,9 +40,6 @@ #include #include -#include "SMESH_Controls.hxx" -#include "SMESH_Object.h" - class vtkPoints; class SALOME_ExtractUnstructuredGrid; @@ -51,7 +51,7 @@ class SMDS_MeshElement; Class : SMESH_VisualObj Description : Base class for all mesh objects to be visuilised */ -class SMESH_VisualObjDef: public SMESH_VisualObj +class SMESHOBJECT_EXPORT SMESH_VisualObjDef: public SMESH_VisualObj { public: typedef std::list TEntityList; @@ -60,7 +60,7 @@ public: SMESH_VisualObjDef(); virtual ~SMESH_VisualObjDef(); - virtual void Update( int theIsClear = true ) = 0; + virtual bool Update( int theIsClear = true ) = 0; virtual void UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunctor ) = 0; virtual int GetElemDimension( const int theObjId ) = 0; @@ -104,14 +104,14 @@ private: Description : Class for visualisation of mesh */ -class SMESH_MeshObj: public SMESH_VisualObjDef +class SMESHOBJECT_EXPORT SMESH_MeshObj: public SMESH_VisualObjDef { public: SMESH_MeshObj( SMESH::SMESH_Mesh_ptr ); virtual ~SMESH_MeshObj(); - virtual void Update( int theIsClear = true ); + virtual bool Update( int theIsClear = true ); virtual int GetNbEntities( const SMDSAbs_ElementType) const; virtual int GetEntities( const SMDSAbs_ElementType, TEntityList& ) const; @@ -121,13 +121,11 @@ public: virtual void UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunctor ); - SMESH::SMESH_Mesh_ptr GetMeshServer() { return myMeshServer.in(); } - SMDS_Mesh* GetMesh() const { return myMesh; } + SMESH::SMESH_Mesh_ptr GetMeshServer() { return myClient.GetMeshServer(); } + SMDS_Mesh* GetMesh() const { return myClient.GetMesh(); } protected: - - SMESH::SMESH_Mesh_var myMeshServer; - SMDS_Mesh* myMesh; + SMESH_Client myClient; }; @@ -136,14 +134,14 @@ protected: Description : Base class for visualisation of submeshes and groups */ -class SMESH_SubMeshObj: public SMESH_VisualObjDef +class SMESHOBJECT_EXPORT SMESH_SubMeshObj: public SMESH_VisualObjDef { public: SMESH_SubMeshObj(SMESH_MeshObj* theMeshObj); virtual ~SMESH_SubMeshObj(); - virtual void Update( int theIsClear = true ); + virtual bool Update( int theIsClear = true ); virtual void UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunctor ); virtual int GetElemDimension( const int theObjId ); @@ -160,7 +158,7 @@ protected: Description : Class for visualisation of groups */ -class SMESH_GroupObj: public SMESH_SubMeshObj +class SMESHOBJECT_EXPORT SMESH_GroupObj: public SMESH_SubMeshObj { public: SMESH_GroupObj( SMESH::SMESH_GroupBase_ptr, SMESH_MeshObj* ); @@ -170,6 +168,8 @@ public: virtual int GetEntities( const SMDSAbs_ElementType, TEntityList& ) const; virtual bool IsNodePrs() const; + virtual SMDSAbs_ElementType GetElementType() const; + private: SMESH::SMESH_GroupBase_var myGroupServer; @@ -181,7 +181,7 @@ private: Description : Class for visualisation of submeshes */ -class SMESH_subMeshObj : public SMESH_SubMeshObj +class SMESHOBJECT_EXPORT SMESH_subMeshObj : public SMESH_SubMeshObj { public: