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
bos #20256: [CEA 18523] Porting SMESH to int 64 bits
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_Object.h
diff --git
a/src/OBJECT/SMESH_Object.h
b/src/OBJECT/SMESH_Object.h
index 84d42dd258cb540725e73266cc782448e7cef7a5..f92f19cca0e625f566db6172fef7c2e9d9bcda61 100644
(file)
--- a/
src/OBJECT/SMESH_Object.h
+++ b/
src/OBJECT/SMESH_Object.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
13
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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,12
+24,11
@@
// File : SMESH_Object.h
// Author : Nicolas REJNERI
// Module : SMESH
// File : SMESH_Object.h
// Author : Nicolas REJNERI
// Module : SMESH
-// $Header$
//
#ifndef SMESH_OBJECT_H
#define SMESH_OBJECT_H
//
#ifndef SMESH_OBJECT_H
#define SMESH_OBJECT_H
-#ifdef W
NT
+#ifdef W
IN32
#if defined SMESHOBJECT_EXPORTS || defined SMESHObject_EXPORTS
#define SMESHOBJECT_EXPORT __declspec( dllexport )
#else
#if defined SMESHOBJECT_EXPORTS || defined SMESHObject_EXPORTS
#define SMESHOBJECT_EXPORT __declspec( dllexport )
#else
@@
-46,6
+45,7
@@
#include "SMDSAbs_ElementType.hxx"
#include <SALOMEconfig.h>
#include "SMDSAbs_ElementType.hxx"
#include <SALOMEconfig.h>
+#include <smIdType.hxx>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
class SMDS_Mesh;
#include CORBA_SERVER_HEADER(SMESH_Mesh)
class SMDS_Mesh;
@@
-58,27
+58,28
@@
class vtkUnstructuredGrid;
class SMESHOBJECT_EXPORT SMESH_VisualObj
{
public:
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;
virtual bool Update( int theIsClear = true ) = 0;
virtual bool NulData() = 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
smIdType
GetNbEntities( const SMDSAbs_ElementType theType) const = 0;
virtual SMDS_Mesh* GetMesh() const = 0;
virtual SMESH::SMESH_Mesh_ptr GetMeshServer() = 0;
virtual SMDS_Mesh* GetMesh() const = 0;
virtual SMESH::SMESH_Mesh_ptr GetMeshServer() = 0;
- virtual bool GetEdgeNodes( const
int
theElemId,
- const int theEdgeNum,
-
int
& theNodeId1,
-
int
& theNodeId2 ) const = 0;
+ virtual bool GetEdgeNodes( const
smIdType
theElemId,
+ const int
theEdgeNum,
+
smIdType
& theNodeId1,
+
smIdType
& theNodeId2 ) const = 0;
virtual bool IsValid() const = 0;
virtual vtkUnstructuredGrid* GetUnstructuredGrid() = 0;
virtual bool IsValid() const = 0;
virtual vtkUnstructuredGrid* GetUnstructuredGrid() = 0;
- virtual vtkIdType GetNodeObjId(
int
theVTKID ) = 0;
- virtual vtkIdType GetNodeVTKId(
int
theObjID ) = 0;
- virtual vtkIdType GetElemObjId(
int
theVTKID ) = 0;
- virtual vtkIdType GetElemVTKId(
int
theObjID ) = 0;
+ virtual vtkIdType GetNodeObjId(
vtkIdType
theVTKID ) = 0;
+ virtual vtkIdType GetNodeVTKId(
vtkIdType
theObjID ) = 0;
+ virtual vtkIdType GetElemObjId(
vtkIdType
theVTKID ) = 0;
+ virtual vtkIdType GetElemVTKId(
vtkIdType
theObjID ) = 0;
virtual void ClearEntitiesFlags() = 0;
virtual bool GetEntitiesFlag() = 0;
virtual unsigned int GetEntitiesState() = 0;
virtual void ClearEntitiesFlags() = 0;
virtual bool GetEntitiesFlag() = 0;
virtual unsigned int GetEntitiesState() = 0;