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 remote branch 'origin/V8_5_asterstudy'
[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 8cddc28e2e01fba19373a9fb01d5ad4b61354bda..867949a9d1df28f1f6741a16d6a9e75a96d83ab9 100644
(file)
--- a/
src/SMESH_I/SMESH_Mesh_i.hxx
+++ b/
src/SMESH_I/SMESH_Mesh_i.hxx
@@
-225,9
+225,14
@@
public:
* Consider maximum group name length stored in MED file.
*/
CORBA::Boolean HasDuplicatedGroupNamesMED();
* Consider maximum group name length stored in MED file.
*/
CORBA::Boolean HasDuplicatedGroupNamesMED();
+ /*!
+ * Return string representation of a MED file version comprising nbDigits
+ */
+ char* GetVersionString(CORBA::Long minor, CORBA::Short nbDigits);
void ExportMED( const char* file,
CORBA::Boolean auto_groups,
void ExportMED( const char* file,
CORBA::Boolean auto_groups,
+ CORBA::Long minor,
CORBA::Boolean overwrite,
CORBA::Boolean autoDimension = true) throw (SALOME::SALOME_Exception);
CORBA::Boolean overwrite,
CORBA::Boolean autoDimension = true) throw (SALOME::SALOME_Exception);
@@
-247,6
+252,7
@@
public:
void ExportPartToMED(SMESH::SMESH_IDSource_ptr meshPart,
const char* file,
CORBA::Boolean auto_groups,
void ExportPartToMED(SMESH::SMESH_IDSource_ptr meshPart,
const char* file,
CORBA::Boolean auto_groups,
+ CORBA::Long minor,
CORBA::Boolean overwrite,
CORBA::Boolean autoDim,
const GEOM::ListOfFields& fields,
CORBA::Boolean overwrite,
CORBA::Boolean autoDim,
const GEOM::ListOfFields& fields,
@@
-396,8
+402,11
@@
public:
const char* theGroupName)
throw (SALOME::SALOME_Exception);
const char* theGroupName)
throw (SALOME::SALOME_Exception);
+ // ===================================================
// Internal methods not available through CORBA
// They are called by corresponding interface methods
// Internal methods not available through CORBA
// They are called by corresponding interface methods
+ // ===================================================
+
SMESH_Hypothesis::Hypothesis_Status addHypothesis(GEOM::GEOM_Object_ptr aSubShape,
SMESH::SMESH_Hypothesis_ptr anHyp,
std::string* anErrorText=0);
SMESH_Hypothesis::Hypothesis_Status addHypothesis(GEOM::GEOM_Object_ptr aSubShape,
SMESH::SMESH_Hypothesis_ptr anHyp,
std::string* anErrorText=0);
@@
-455,6
+464,16
@@
public:
*/
void CreateGroupServants();
*/
void CreateGroupServants();
+ /*!
+ * \brief Return true if all sub-meshes are computed OK - to update an icon
+ */
+ bool IsComputedOK();
+
+
+ // ====================================
+ // SMESH_Mesh interface (continuation)
+ // ====================================
+
/*!
* \brief Return groups cantained in _mapGroups by their IDs
*/
/*!
* \brief Return groups cantained in _mapGroups by their IDs
*/
@@
-581,6
+600,12
@@
public:
*/
virtual SMESH::MedFileInfo* GetMEDFileInfo();
*/
virtual SMESH::MedFileInfo* GetMEDFileInfo();
+ /*!
+ * Persistence of file info
+ */
+ std::string FileInfoToString();
+ void FileInfoFromString(const std::string& info);
+
/*!
* Sets list of notebook variables used for Mesh operations separated by ":" symbol
*/
/*!
* Sets list of notebook variables used for Mesh operations separated by ":" symbol
*/
@@
-649,10
+674,11
@@
public:
* happen if mesh data is not yet fully loaded from the file of study.
*/
bool IsMeshInfoCorrect();
* happen if mesh data is not yet fully loaded from the file of study.
*/
bool IsMeshInfoCorrect();
- /*!
- * Returns mesh unstructed grid information.
- */
- virtual SALOMEDS::TMPFile* GetVtkUgStream();
+ /*!
+ * Returns mesh unstructed grid information.
+ */
+ virtual SALOMEDS::TMPFile* GetVtkUgStream();
+
std::map<int, SMESH_subMesh_i*> _mapSubMesh_i; //NRI
std::map<int, ::SMESH_subMesh*> _mapSubMesh; //NRI
std::map<int, SMESH_subMesh_i*> _mapSubMesh_i; //NRI
std::map<int, ::SMESH_subMesh*> _mapSubMesh; //NRI