Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix regressions bugs_14/P9 (Prism 3D) and bugs_19/X1 (Projection 2D)
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_ObjectDef.h
diff --git
a/src/OBJECT/SMESH_ObjectDef.h
b/src/OBJECT/SMESH_ObjectDef.h
index 4532a019744afe2d85f07320114755601a7bd19b..916978abb90309f25517cee86fecfa336af260a5 100644
(file)
--- a/
src/OBJECT/SMESH_ObjectDef.h
+++ b/
src/OBJECT/SMESH_ObjectDef.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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-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
// 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
//
// 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
// File : SMESH_Object.h
// Author : Nicolas REJNERI
// Module : SMESH
-// $Header$
//
#ifndef SMESH_OBJECTDEF_H
#define SMESH_OBJECTDEF_H
//
#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 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;
virtual bool IsValid() const;
@@
-135,10
+135,11
@@
public:
virtual void UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunctor );
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:
protected:
+
SMESH_Client myClient;
vtkUnstructuredGrid* myEmptyGrid;
};
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 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:
protected: