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
Merge branch 'V9_9_BR'
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_ObjectDef.h
diff --git
a/src/OBJECT/SMESH_ObjectDef.h
b/src/OBJECT/SMESH_ObjectDef.h
index 5f3733447907befde075a32fca45e9e06cc1c1c5..1dba64e98738031bd2fb0d30415961c48c2115fe 100644
(file)
--- a/
src/OBJECT/SMESH_ObjectDef.h
+++ b/
src/OBJECT/SMESH_ObjectDef.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
13
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
22
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
@@
-64,27
+63,27
@@
public:
virtual bool Update( int theIsClear = true ) = 0;
virtual bool NulData() {return 0; };
virtual void UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunctor ) = 0;
virtual bool Update( int theIsClear = true ) = 0;
virtual bool NulData() {return 0; };
virtual void UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunctor ) = 0;
- virtual int GetElemDimension( const
int
theObjId ) = 0;
+ virtual int GetElemDimension( const
smIdType
theObjId ) = 0;
- virtual
int
GetNbEntities( const SMDSAbs_ElementType theType) const = 0;
- virtual
int
GetEntities( const SMDSAbs_ElementType, TEntityList& ) const = 0;
+ virtual
smIdType
GetNbEntities( const SMDSAbs_ElementType theType) const = 0;
+ virtual
smIdType
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 IsNodePrs() const = 0;
virtual SMDS_Mesh* GetMesh() const = 0;
virtual SMESH::SMESH_Mesh_ptr GetMeshServer() = 0;
virtual bool IsValid() const;
- virtual bool GetEdgeNodes( const
int
theElemId,
- const int theEdgeNum,
-
int
& theNodeId1,
-
int
& theNodeId2 ) const;
+ virtual bool GetEdgeNodes( const
smIdType
theElemId,
+ const int
theEdgeNum,
+
smIdType
& theNodeId1,
+
smIdType
& theNodeId2 ) const;
virtual vtkUnstructuredGrid* GetUnstructuredGrid();
virtual vtkUnstructuredGrid* GetUnstructuredGrid();
- virtual vtkIdType GetNodeObjId(
int
theVTKID );
- virtual vtkIdType GetNodeVTKId(
int
theObjID );
- virtual vtkIdType GetElemObjId(
int
theVTKID );
- virtual vtkIdType GetElemVTKId(
int
theObjID );
+ virtual vtkIdType GetNodeObjId(
vtkIdType
theVTKID );
+ virtual vtkIdType GetNodeVTKId(
vtkIdType
theObjID );
+ virtual vtkIdType GetElemObjId(
vtkIdType
theVTKID );
+ virtual vtkIdType GetElemVTKId(
vtkIdType
theObjID );
virtual void ClearEntitiesFlags();
virtual bool GetEntitiesFlag();
virtual void ClearEntitiesFlags();
virtual bool GetEntitiesFlag();
@@
-109,7
+108,7
@@
protected:
unsigned int myEntitiesState;
vtkUnstructuredGrid* myGrid;
unsigned int myEntitiesState;
vtkUnstructuredGrid* myGrid;
- std::map<SMDSAbs_ElementType,
int
> myEntitiesCache;
+ std::map<SMDSAbs_ElementType,
smIdType
> myEntitiesCache;
};
};
@@
-128,11
+127,11
@@
public:
virtual bool Update( int theIsClear = true );
virtual bool NulData();
virtual bool Update( int theIsClear = true );
virtual bool NulData();
- virtual
int
GetNbEntities( const SMDSAbs_ElementType) const;
- virtual
int
GetEntities( const SMDSAbs_ElementType, TEntityList& ) const;
+ virtual
smIdType
GetNbEntities( const SMDSAbs_ElementType) const;
+ virtual
smIdType
GetEntities( const SMDSAbs_ElementType, TEntityList& ) const;
virtual bool IsNodePrs() const;
virtual bool IsNodePrs() const;
- virtual int GetElemDimension( const
int
theObjId );
+ virtual int GetElemDimension( const
smIdType
theObjId );
virtual void UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunctor );
virtual void UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunctor );
@@
-161,7
+160,7
@@
public:
virtual bool Update( int theIsClear = true );
virtual void UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunctor );
virtual bool Update( int theIsClear = true );
virtual void UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunctor );
- virtual int GetElemDimension( const
int
theObjId );
+ virtual int GetElemDimension( const
smIdType
theObjId );
virtual SMDS_Mesh* GetMesh() const { return myMeshObj->GetMesh(); }
virtual SMESH::SMESH_Mesh_ptr GetMeshServer() { return myMeshObj->GetMeshServer(); }
virtual SMDS_Mesh* GetMesh() const { return myMeshObj->GetMesh(); }
virtual SMESH::SMESH_Mesh_ptr GetMeshServer() { return myMeshObj->GetMeshServer(); }
@@
-182,8
+181,8
@@
public:
SMESH_GroupObj( SMESH::SMESH_GroupBase_ptr, SMESH_MeshObj* );
virtual ~SMESH_GroupObj();
SMESH_GroupObj( SMESH::SMESH_GroupBase_ptr, SMESH_MeshObj* );
virtual ~SMESH_GroupObj();
- virtual
int
GetNbEntities( const SMDSAbs_ElementType) const;
- virtual
int
GetEntities( const SMDSAbs_ElementType, TEntityList& ) const;
+ virtual
smIdType
GetNbEntities( const SMDSAbs_ElementType) const;
+ virtual
smIdType
GetEntities( const SMDSAbs_ElementType, TEntityList& ) const;
virtual bool IsNodePrs() const;
virtual SMDSAbs_ElementType GetElementType() const;
virtual bool IsNodePrs() const;
virtual SMDSAbs_ElementType GetElementType() const;
@@
-207,8
+206,8
@@
public:
SMESH_MeshObj* );
virtual ~SMESH_subMeshObj();
SMESH_MeshObj* );
virtual ~SMESH_subMeshObj();
- virtual
int
GetNbEntities( const SMDSAbs_ElementType) const;
- virtual
int
GetEntities( const SMDSAbs_ElementType, TEntityList& ) const;
+ virtual
smIdType
GetNbEntities( const SMDSAbs_ElementType) const;
+ virtual
smIdType
GetEntities( const SMDSAbs_ElementType, TEntityList& ) const;
virtual bool IsNodePrs() const;
protected:
virtual bool IsNodePrs() const;
protected: