X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Mesh_i.hxx;h=831b7ba20adef5625256a78cea5c270293e0acdb;hb=95a58b5ecfaaf32f9c4a7d2689ab72f8f9331b68;hp=ca7e1af646faa6248de9f82c6d2272215c066860;hpb=1067ffa6e7e5c394e3a1b17219d8b355a57607cd;p=modules%2Fsmesh.git diff --git a/src/SMESH_I/SMESH_Mesh_i.hxx b/src/SMESH_I/SMESH_Mesh_i.hxx index ca7e1af64..831b7ba20 100644 --- a/src/SMESH_I/SMESH_Mesh_i.hxx +++ b/src/SMESH_I/SMESH_Mesh_i.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 @@ -34,7 +34,6 @@ #include CORBA_SERVER_HEADER(SMESH_Group) #include CORBA_SERVER_HEADER(SMESH_Hypothesis) #include CORBA_CLIENT_HEADER(GEOM_Gen) -#include CORBA_CLIENT_HEADER(MED) #include "SMESH_Hypothesis.hxx" #include "SMESH_Mesh.hxx" @@ -63,6 +62,7 @@ public: virtual ~SMESH_Mesh_i(); // --- CORBA + void SetShape( GEOM::GEOM_Object_ptr theShapeObject ) throw (SALOME::SALOME_Exception); @@ -155,38 +155,34 @@ public: SMESH::SMESH_Group_ptr CutListOfGroups( const SMESH::ListOfGroups& theMainGroups, const SMESH::ListOfGroups& theToolGroups, const char* theName ) - throw (SALOME::SALOME_Exception); + throw (SALOME::SALOME_Exception); SMESH::SMESH_Group_ptr CreateDimGroup( const SMESH::ListOfGroups& theGroups, SMESH::ElementType theElemType, const char* theName ) - throw (SALOME::SALOME_Exception); - + throw (SALOME::SALOME_Exception); - SMESH::SMESH_Group_ptr ConvertToStandalone( SMESH::SMESH_GroupBase_ptr theGroupOn ); -// SMESH::string_array* GetLog(CORBA::Boolean clearAfterGet) -// throw (SALOME::SALOME_Exception); + SMESH::SMESH_Group_ptr ConvertToStandalone( SMESH::SMESH_GroupBase_ptr theGroupOn ) + throw (SALOME::SALOME_Exception); SMESH::log_array* GetLog(CORBA::Boolean clearAfterGet) throw (SALOME::SALOME_Exception); - SMESH::SMESH_MeshEditor_ptr GetMeshEditor(); + SMESH::SMESH_MeshEditor_ptr GetMeshEditor() throw (SALOME::SALOME_Exception); - SMESH::SMESH_MeshEditor_ptr GetMeshEditPreviewer(); + SMESH::SMESH_MeshEditor_ptr GetMeshEditPreviewer() throw (SALOME::SALOME_Exception); CORBA::Boolean HasModificationsToDiscard() throw (SALOME::SALOME_Exception); - void ClearLog() - throw (SALOME::SALOME_Exception); + void ClearLog() throw (SALOME::SALOME_Exception); - CORBA::Long GetId() - throw (SALOME::SALOME_Exception); + CORBA::Long GetId() throw (SALOME::SALOME_Exception); - CORBA::Long GetStudyId() - throw (SALOME::SALOME_Exception); + CORBA::Long GetStudyId() throw (SALOME::SALOME_Exception); // --- C++ interface + void SetImpl(::SMESH_Mesh* impl); ::SMESH_Mesh& GetImpl(); // :: force no namespace here @@ -234,7 +230,8 @@ public: void ExportToMEDX( const char* file, CORBA::Boolean auto_groups, SMESH::MED_VERSION version, - CORBA::Boolean overwrite ) throw (SALOME::SALOME_Exception); + CORBA::Boolean overwrite, + CORBA::Boolean autoDimension=true) throw (SALOME::SALOME_Exception); void ExportToMED ( const char* file, CORBA::Boolean auto_groups, SMESH::MED_VERSION version ) throw (SALOME::SALOME_Exception); @@ -257,7 +254,8 @@ public: const char* file, CORBA::Boolean auto_groups, SMESH::MED_VERSION version, - CORBA::Boolean overwrite) throw (SALOME::SALOME_Exception); + CORBA::Boolean overwrite, + CORBA::Boolean autoDim=true) throw (SALOME::SALOME_Exception); void ExportPartToDAT(SMESH::SMESH_IDSource_ptr meshPart, const char* file) throw (SALOME::SALOME_Exception); void ExportPartToUNV(SMESH::SMESH_IDSource_ptr meshPart, @@ -266,9 +264,6 @@ public: const char* file, CORBA::Boolean isascii) throw (SALOME::SALOME_Exception); - SALOME_MED::MESH_ptr GetMEDMesh() - throw (SALOME::SALOME_Exception); - CORBA::Long NbNodes() throw (SALOME::SALOME_Exception); @@ -299,6 +294,9 @@ public: CORBA::Long NbTrianglesOfOrder(SMESH::ElementOrder order) throw (SALOME::SALOME_Exception); + CORBA::Long NbBiQuadTriangles() + throw (SALOME::SALOME_Exception); + CORBA::Long NbQuadrangles() throw (SALOME::SALOME_Exception); @@ -390,6 +388,11 @@ public: char* Dump(); + // Create groups of elements preventing computation of a sub-shape + SMESH::ListOfGroups* MakeGroupsOfBadInputElements( int theSubShapeID, + const char* theGroupName) + throw (SALOME::SALOME_Exception); + // Internal methods not available through CORBA // They are called by corresponding interface methods SMESH_Hypothesis::Hypothesis_Status addHypothesis(GEOM::GEOM_Object_ptr aSubShapeObject, @@ -421,7 +424,7 @@ public: // return an existing subMesh object for the shapeID. shapeID == submeshID. const std::map& getGroups() { return _mapGroups; } - // return an existing group object. + // return existing group objects void onHypothesisModified(); // callback from _impl to forget not loaded mesh data (issue 0021208) @@ -464,6 +467,11 @@ public: */ SMESH::NodePosition* GetNodePosition(CORBA::Long NodeID); + /*! + * \brief Return position of an element on shape + */ + SMESH::ElementPosition GetElementPosition(CORBA::Long ElemID); + /*! * If given element is node returns IDs of shape from position * If there is not node for given ID - returns -1 @@ -550,7 +558,7 @@ public: /*! * Returns information about imported MED file */ - virtual SALOME_MED::MedFileInfo* GetMEDFileInfo(); + virtual SMESH::MedFileInfo* GetMEDFileInfo(); /*! * Sets list of notebook variables used for Mesh operations separated by ":" symbol @@ -636,8 +644,8 @@ private: std::map _mapSubMeshIor; std::map _mapGroups; std::map _mapHypo; - SALOME_MED::MedFileInfo_var _medFileInfo; - SMESH_PreMeshInfo* _preMeshInfo; // mesh info before full loading from study file + SMESH::MedFileInfo_var _medFileInfo; + SMESH_PreMeshInfo* _preMeshInfo; // mesh info before full loading from study file SMESH_PreMeshInfo* & changePreMeshInfo() { return _preMeshInfo; } friend class SMESH_PreMeshInfo;