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
0020982: EDF 1547 SMESH: Creation of non-conformal quadratic pyramids
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_Mesh_i.hxx
diff --git
a/src/SMESH_I/SMESH_Mesh_i.hxx
b/src/SMESH_I/SMESH_Mesh_i.hxx
index 399659d2a833615f9b08006505e352c463d52fba..8963687d2641145f11386bd21351a1eff9b4b36d 100644
(file)
--- a/
src/SMESH_I/SMESH_Mesh_i.hxx
+++ b/
src/SMESH_I/SMESH_Mesh_i.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
1
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
2
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
@@
-37,7
+37,6
@@
#include "SMESH_Hypothesis.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESH_Hypothesis.hxx"
#include "SMESH_Mesh.hxx"
-//#include "SMESH_subMesh_i.hxx"
#include "SMESH_subMesh.hxx"
#include "SALOME_GenericObj_i.hh"
#include "SMESH_subMesh.hxx"
#include "SALOME_GenericObj_i.hh"
@@
-45,6
+44,7
@@
class SMESH_Gen_i;
class SMESH_GroupBase_i;
class SMESH_subMesh_i;
class SMESH_Gen_i;
class SMESH_GroupBase_i;
class SMESH_subMesh_i;
+class SMESH_PreMeshInfo;
#include <map>
#include <map>
@@
-71,6
+71,12
@@
public:
GEOM::GEOM_Object_ptr GetShapeToMesh()
throw (SALOME::SALOME_Exception);
GEOM::GEOM_Object_ptr GetShapeToMesh()
throw (SALOME::SALOME_Exception);
+ CORBA::Boolean IsLoaded()
+ throw (SALOME::SALOME_Exception);
+
+ void Load()
+ throw (SALOME::SALOME_Exception);
+
void Clear()
throw (SALOME::SALOME_Exception);
void Clear()
throw (SALOME::SALOME_Exception);
@@
-88,6
+94,9
@@
public:
SMESH::ListOfHypothesis* GetHypothesisList(GEOM::GEOM_Object_ptr aSubShapeObject)
throw (SALOME::SALOME_Exception);
SMESH::ListOfHypothesis* GetHypothesisList(GEOM::GEOM_Object_ptr aSubShapeObject)
throw (SALOME::SALOME_Exception);
+ SMESH::submesh_array* GetSubMeshes()
+ throw (SALOME::SALOME_Exception);
+
SMESH::SMESH_subMesh_ptr GetSubMesh(GEOM::GEOM_Object_ptr aSubShapeObject, const char* theName)
throw (SALOME::SALOME_Exception);
SMESH::SMESH_subMesh_ptr GetSubMesh(GEOM::GEOM_Object_ptr aSubShapeObject, const char* theName)
throw (SALOME::SALOME_Exception);
@@
-102,6
+111,11
@@
public:
GEOM::GEOM_Object_ptr theGeomObj )
throw (SALOME::SALOME_Exception);
GEOM::GEOM_Object_ptr theGeomObj )
throw (SALOME::SALOME_Exception);
+ SMESH::SMESH_GroupOnFilter_ptr CreateGroupFromFilter(SMESH::ElementType theElemType,
+ const char* theName,
+ SMESH::Filter_ptr theFilter )
+ throw (SALOME::SALOME_Exception);
+
void RemoveGroup( SMESH::SMESH_GroupBase_ptr theGroup )
throw (SALOME::SALOME_Exception);
void RemoveGroup( SMESH::SMESH_GroupBase_ptr theGroup )
throw (SALOME::SALOME_Exception);
@@
-148,7
+162,7
@@
public:
throw (SALOME::SALOME_Exception);
throw (SALOME::SALOME_Exception);
- SMESH::SMESH_Group_ptr ConvertToStandalone( SMESH::SMESH_Group
OnGeom_ptr theGeomGroup
);
+ SMESH::SMESH_Group_ptr ConvertToStandalone( SMESH::SMESH_Group
Base_ptr theGroupOn
);
// SMESH::string_array* GetLog(CORBA::Boolean clearAfterGet)
// throw (SALOME::SALOME_Exception);
// SMESH::string_array* GetLog(CORBA::Boolean clearAfterGet)
// throw (SALOME::SALOME_Exception);
@@
-189,6
+203,11
@@
public:
SMESH::DriverMED_ReadStatus ImportMEDFile( const char* theFileName, const char* theMeshName )
throw (SALOME::SALOME_Exception);
SMESH::DriverMED_ReadStatus ImportMEDFile( const char* theFileName, const char* theMeshName )
throw (SALOME::SALOME_Exception);
+ SMESH::DriverMED_ReadStatus ImportCGNSFile( const char* theFileName,
+ const int theMeshIndex,
+ std::string& theMeshName)
+ throw (SALOME::SALOME_Exception);
+
/*!
* Auto color
*/
/*!
* Auto color
*/
@@
-217,9
+236,14
@@
public:
void ExportMED ( const char* file,
CORBA::Boolean auto_groups ) throw (SALOME::SALOME_Exception);
void ExportMED ( const char* file,
CORBA::Boolean auto_groups ) throw (SALOME::SALOME_Exception);
+ void ExportSAUV( const char* file, CORBA::Boolean auto_groups ) throw (SALOME::SALOME_Exception);
+
void ExportDAT( const char* file ) throw (SALOME::SALOME_Exception);
void ExportUNV( const char* file ) throw (SALOME::SALOME_Exception);
void ExportSTL( const char* file, bool isascii ) throw (SALOME::SALOME_Exception);
void ExportDAT( const char* file ) throw (SALOME::SALOME_Exception);
void ExportUNV( const char* file ) throw (SALOME::SALOME_Exception);
void ExportSTL( const char* file, bool isascii ) throw (SALOME::SALOME_Exception);
+ void ExportCGNS(SMESH::SMESH_IDSource_ptr meshPart,
+ const char* file,
+ CORBA::Boolean overwrite) throw (SALOME::SALOME_Exception);
void ExportPartToMED(SMESH::SMESH_IDSource_ptr meshPart,
const char* file,
void ExportPartToMED(SMESH::SMESH_IDSource_ptr meshPart,
const char* file,
@@
-246,6
+270,9
@@
public:
CORBA::Long Nb0DElements()
throw (SALOME::SALOME_Exception);
CORBA::Long Nb0DElements()
throw (SALOME::SALOME_Exception);
+ CORBA::Long NbBalls()
+ throw (SALOME::SALOME_Exception);
+
CORBA::Long NbEdges()
throw (SALOME::SALOME_Exception);
CORBA::Long NbEdges()
throw (SALOME::SALOME_Exception);
@@
-270,6
+297,9
@@
public:
CORBA::Long NbQuadranglesOfOrder(SMESH::ElementOrder order)
throw (SALOME::SALOME_Exception);
CORBA::Long NbQuadranglesOfOrder(SMESH::ElementOrder order)
throw (SALOME::SALOME_Exception);
+ CORBA::Long NbBiQuadQuadrangles()
+ throw (SALOME::SALOME_Exception);
+
CORBA::Long NbPolygons()
throw (SALOME::SALOME_Exception);
CORBA::Long NbPolygons()
throw (SALOME::SALOME_Exception);
@@
-291,6
+321,9
@@
public:
CORBA::Long NbHexasOfOrder(SMESH::ElementOrder order)
throw (SALOME::SALOME_Exception);
CORBA::Long NbHexasOfOrder(SMESH::ElementOrder order)
throw (SALOME::SALOME_Exception);
+ CORBA::Long NbTriQuadraticHexas()
+ throw (SALOME::SALOME_Exception);
+
CORBA::Long NbPyramids()
throw (SALOME::SALOME_Exception);
CORBA::Long NbPyramids()
throw (SALOME::SALOME_Exception);
@@
-303,6
+336,9
@@
public:
CORBA::Long NbPrismsOfOrder(SMESH::ElementOrder order)
throw (SALOME::SALOME_Exception);
CORBA::Long NbPrismsOfOrder(SMESH::ElementOrder order)
throw (SALOME::SALOME_Exception);
+ CORBA::Long NbHexagonalPrisms()
+ throw (SALOME::SALOME_Exception);
+
CORBA::Long NbPolyhedrons()
throw (SALOME::SALOME_Exception);
CORBA::Long NbPolyhedrons()
throw (SALOME::SALOME_Exception);
@@
-363,12
+399,13
@@
public:
SMESH::SMESH_subMesh_ptr createSubMesh( GEOM::GEOM_Object_ptr theSubShapeObject );
SMESH::SMESH_subMesh_ptr createSubMesh( GEOM::GEOM_Object_ptr theSubShapeObject );
-
void
removeSubMesh(SMESH::SMESH_subMesh_ptr theSubMesh,
+
bool
removeSubMesh(SMESH::SMESH_subMesh_ptr theSubMesh,
GEOM::GEOM_Object_ptr theSubShapeObject );
GEOM::GEOM_Object_ptr theSubShapeObject );
- SMESH::SMESH_GroupBase_ptr createGroup(SMESH::ElementType theElemType,
- const char* theName,
- const TopoDS_Shape& theShape = TopoDS_Shape());
+ SMESH::SMESH_GroupBase_ptr createGroup(SMESH::ElementType theElemType,
+ const char* theName,
+ const TopoDS_Shape& theShape = TopoDS_Shape(),
+ const SMESH_PredicatePtr& thePred = SMESH_PredicatePtr());
void removeGroup( const int theId );
void removeGroup( const int theId );
@@
-378,6
+415,11
@@
public:
const std::map<int, SMESH::SMESH_GroupBase_ptr>& getGroups() { return _mapGroups; }
// return an existing group object.
const std::map<int, SMESH::SMESH_GroupBase_ptr>& getGroups() { return _mapGroups; }
// return an existing group object.
+ void onHypothesisModified();
+ // callback from _impl to forget not loaded mesh data (issue 0021208)
+
+ void checkMeshLoaded();
+
/*!
* \brief Update hypotheses assigned to geom groups if the latter change
*
/*!
* \brief Update hypotheses assigned to geom groups if the latter change
*
@@
-487,6
+529,11
@@
public:
*/
CORBA::Boolean IsQuadratic(CORBA::Long id);
*/
CORBA::Boolean IsQuadratic(CORBA::Long id);
+ /*!
+ * Returns diameter of ball discrete element or zero in case of an invalid \a id
+ */
+ CORBA::Double GetBallDiameter(CORBA::Long id);
+
/*!
* Returns bary center for given element
*/
/*!
* Returns bary center for given element
*/
@@
-547,12
+594,18
@@
public:
* Returns self
*/
virtual SMESH::SMESH_Mesh_ptr GetMesh();
* Returns self
*/
virtual SMESH::SMESH_Mesh_ptr GetMesh();
-
+ /*!
+ * Returns false if GetMeshInfo() returns incorrect information that may
+ * happen if mesh data is not yet fully loaded from the file of study.
+ */
+ bool IsMeshInfoCorrect();
std::map<int, SMESH_subMesh_i*> _mapSubMesh_i; //NRI
std::map<int, ::SMESH_subMesh*> _mapSubMesh; //NRI
private:
std::map<int, SMESH_subMesh_i*> _mapSubMesh_i; //NRI
std::map<int, ::SMESH_subMesh*> _mapSubMesh; //NRI
private:
+ std::string prepareMeshNameAndGroups( const char* file, CORBA::Boolean overwrite );
+
/*!
* Check and correct names of mesh groups
*/
/*!
* Check and correct names of mesh groups
*/
@@
-567,21
+620,25
@@
private:
private:
private:
- static int
myI
dGenerator;
- ::SMESH_Mesh* _impl; // :: force no namespace here
- SMESH_Gen_i* _gen_i;
- int _id; // id given by creator (unique within the creator instance)
- int _studyId;
+ static int
_i
dGenerator;
+ ::SMESH_Mesh* _impl;
// :: force no namespace here
+ SMESH_Gen_i*
_gen_i;
+ int
_id; // id given by creator (unique within the creator instance)
+ int
_studyId;
std::map<int, SMESH::SMESH_subMesh_ptr> _mapSubMeshIor;
std::map<int, SMESH::SMESH_GroupBase_ptr> _mapGroups;
std::map<int, SMESH::SMESH_Hypothesis_ptr> _mapHypo;
std::map<int, SMESH::SMESH_subMesh_ptr> _mapSubMeshIor;
std::map<int, SMESH::SMESH_GroupBase_ptr> _mapGroups;
std::map<int, SMESH::SMESH_Hypothesis_ptr> _mapHypo;
- SALOME_MED::MedFileInfo_var myFileInfo;
+ SALOME_MED::MedFileInfo_var _medFileInfo;
+ SMESH_PreMeshInfo* _preMeshInfo; // mesh info before full loading from study file
+
+ SMESH_PreMeshInfo* & changePreMeshInfo() { return _preMeshInfo; }
+ friend class SMESH_PreMeshInfo;
private:
// Data used to track changes of GEOM groups
struct TGeomGroupData {
private:
// Data used to track changes of GEOM groups
struct TGeomGroupData {
- // keep study entry
and
not ior because GEOM_Object actually changes if
+ // keep study entry
but
not ior because GEOM_Object actually changes if
// number of items in a group varies (1) <-> (>1)
std::string _groupEntry;
std::set<int> _indices; // indices of group items within group's main shape
// number of items in a group varies (1) <-> (>1)
std::string _groupEntry;
std::set<int> _indices; // indices of group items within group's main shape