X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FOBJECT%2FSMESH_Object.h;h=c4a45106968b5bace94859a43e43bca5917367c3;hb=d053feed93e0bb188a734b5e811a1341a6439435;hp=5ce10b850076b6a3e73507336d4e6e188b0cdd0f;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6;p=modules%2Fsmesh.git diff --git a/src/OBJECT/SMESH_Object.h b/src/OBJECT/SMESH_Object.h index 5ce10b850..c4a451069 100644 --- a/src/OBJECT/SMESH_Object.h +++ b/src/OBJECT/SMESH_Object.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,12 +24,11 @@ // File : SMESH_Object.h // Author : Nicolas REJNERI // Module : SMESH -// $Header$ // #ifndef SMESH_OBJECT_H #define SMESH_OBJECT_H -#ifdef WNT +#ifdef WIN32 #if defined SMESHOBJECT_EXPORTS || defined SMESHObject_EXPORTS #define SMESHOBJECT_EXPORT __declspec( dllexport ) #else @@ -45,6 +44,9 @@ #include "SMESH_Controls.hxx" #include "SMDSAbs_ElementType.hxx" +#include +#include CORBA_SERVER_HEADER(SMESH_Mesh) + class SMDS_Mesh; class vtkUnstructuredGrid; @@ -55,6 +57,7 @@ class vtkUnstructuredGrid; class SMESHOBJECT_EXPORT SMESH_VisualObj { public: + virtual ~SMESH_VisualObj() {} virtual bool Update( int theIsClear = true ) = 0; virtual bool NulData() = 0; virtual void UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunctor ) = 0; @@ -62,6 +65,7 @@ public: virtual int GetNbEntities( const SMDSAbs_ElementType theType) const = 0; virtual SMDS_Mesh* GetMesh() const = 0; + virtual SMESH::SMESH_Mesh_ptr GetMeshServer() = 0; virtual bool GetEdgeNodes( const int theElemId, const int theEdgeNum,