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 from BR_WIN_INDUS_514 04/10/2010
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_Group_i.hxx
diff --git
a/src/SMESH_I/SMESH_Group_i.hxx
b/src/SMESH_I/SMESH_Group_i.hxx
index 5ad6b10c8ffb1ff41b99689ecbef3b6a8f760dc6..3b1b08eaa28adbc43d79297dfb07b45b00956ff6 100644
(file)
--- a/
src/SMESH_I/SMESH_Group_i.hxx
+++ b/
src/SMESH_I/SMESH_Group_i.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
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
@@
-19,6
+19,7
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// SMESH SMESH_I : idl implementation based on 'SMESH' unit's classes
// File : SMESH_Group_i.hxx
// Author : Sergey ANIKIN, OCC
// SMESH SMESH_I : idl implementation based on 'SMESH' unit's classes
// File : SMESH_Group_i.hxx
// Author : Sergey ANIKIN, OCC
@@
-64,9
+65,22
@@
class SMESH_I_EXPORT SMESH_GroupBase_i:
SMESH::long_array* GetListOfID();
SMESH::SMESH_Mesh_ptr GetMesh();
SMESH::long_array* GetListOfID();
SMESH::SMESH_Mesh_ptr GetMesh();
+ /*!
+ * Returns statistic of mesh elements
+ * Result array of number enityties
+ * Inherited from SMESH_IDSource
+ */
+ virtual SMESH::long_array* GetMeshInfo();
+
// Inherited from SMESH_IDSource interface
virtual SMESH::long_array* GetIDs();
// Inherited from SMESH_IDSource interface
virtual SMESH::long_array* GetIDs();
+ /*!
+ * Returns types of elements it contains
+ * Inherited from SMESH_IDSource interface
+ */
+ virtual SMESH::array_of_ElementType* GetTypes();
+
// Internal C++ interface
int GetLocalID() const { return myLocalID; }
SMESH_Mesh_i* GetMeshServant() const { return myMeshServant; }
// Internal C++ interface
int GetLocalID() const { return myLocalID; }
SMESH_Mesh_i* GetMeshServant() const { return myMeshServant; }
@@
-84,7
+98,7
@@
private:
int myLocalID;
void changeLocalId(int localId) { myLocalID = localId; }
int myLocalID;
void changeLocalId(int localId) { myLocalID = localId; }
- friend
void SMESH_Mesh_i::CheckGeomGroupModif()
;
+ friend
class SMESH_Mesh_i
;
};
// ======
};
// ======
@@
-105,6
+119,8
@@
class SMESH_I_EXPORT SMESH_Group_i:
CORBA::Long AddByPredicate( SMESH::Predicate_ptr thePredicate );
CORBA::Long RemoveByPredicate( SMESH::Predicate_ptr thePredicate );
CORBA::Long AddByPredicate( SMESH::Predicate_ptr thePredicate );
CORBA::Long RemoveByPredicate( SMESH::Predicate_ptr thePredicate );
+
+ CORBA::Long AddFrom( SMESH::SMESH_IDSource_ptr theSource );
};
// =========================
};
// =========================