X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FOBJECT%2FSMESH_ObjectDef.h;h=a0d9fa895745354b427cb705c52b8fb09ab1a6e6;hb=88a6b8d690a5410a9097c2f924d4a63be6db5e77;hp=4532a019744afe2d85f07320114755601a7bd19b;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6;p=modules%2Fsmesh.git diff --git a/src/OBJECT/SMESH_ObjectDef.h b/src/OBJECT/SMESH_ObjectDef.h index 4532a0197..a0d9fa895 100644 --- a/src/OBJECT/SMESH_ObjectDef.h +++ b/src/OBJECT/SMESH_ObjectDef.h @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -6,7 +6,7 @@ // 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. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -24,7 +24,6 @@ // File : SMESH_Object.h // Author : Nicolas REJNERI // Module : SMESH -// $Header$ // #ifndef SMESH_OBJECTDEF_H #define SMESH_OBJECTDEF_H @@ -70,6 +69,7 @@ public: virtual int GetEntities( const SMDSAbs_ElementType, TEntityList& ) const = 0; virtual bool IsNodePrs() const = 0; virtual SMDS_Mesh* GetMesh() const = 0; + virtual SMESH::SMESH_Mesh_ptr GetMeshServer() = 0; virtual bool IsValid() const; @@ -135,10 +135,11 @@ public: virtual void UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunctor ); - SMESH::SMESH_Mesh_ptr GetMeshServer() { return myClient.GetMeshServer(); } - SMDS_Mesh* GetMesh() const { return myClient.GetMesh(); } + virtual SMESH::SMESH_Mesh_ptr GetMeshServer() { return myClient.GetMeshServer(); } + virtual SMDS_Mesh* GetMesh() const { return myClient.GetMesh(); } protected: + SMESH_Client myClient; vtkUnstructuredGrid* myEmptyGrid; }; @@ -161,6 +162,7 @@ public: virtual void UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunctor ); virtual int GetElemDimension( const int theObjId ); virtual SMDS_Mesh* GetMesh() const { return myMeshObj->GetMesh(); } + virtual SMESH::SMESH_Mesh_ptr GetMeshServer() { return myMeshObj->GetMeshServer(); } protected: