Update copyrights

[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 4e809d7a35ef15a5f992e1eea5d4ffda6f660c1f..27c6142b573ab861e604c22537f742ee0fe87cbc 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-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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
@@ -167,6 +167,10 @@ public:
                                          CORBA::Boolean                theUnderlyingOnly )
     throw (SALOME::SALOME_Exception);
 
+  SMESH::ListOfGroups* FaceGroupsSeparatedByEdges( CORBA::Double  theSharpAngle,
+                                                   CORBA::Boolean theCreateEdges,
+                                                   CORBA::Boolean theUseExistingEdges )
+    throw (SALOME::SALOME_Exception);
 
   SMESH::SMESH_Group_ptr ConvertToStandalone( SMESH::SMESH_GroupBase_ptr theGroupOn )
     throw (SALOME::SALOME_Exception);
@@ -226,8 +230,20 @@ public:
    */
   CORBA::Boolean HasDuplicatedGroupNamesMED();
 
+  /*!
+   * Return string representation of a MED file version comprising nbDigits
+   */
+  char* GetVersionString(CORBA::Long minor, CORBA::Short nbDigits);
+
+  /*!
+   *  Return the list of med versions compatibles for write/append,
+   *  encoded in 10*major+minor (for instance, code for med 3.2.1 is 32)
+   */
+  SMESH::long_array* GetMEDVersionsCompatibleForAppend();
+
   void ExportMED( const char*        file,
                   CORBA::Boolean     auto_groups,
+                  CORBA::Long        version,
                   CORBA::Boolean     overwrite,
                   CORBA::Boolean     autoDimension = true) throw (SALOME::SALOME_Exception);
 
@@ -238,7 +254,8 @@ public:
   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);
+                  CORBA::Boolean            overwrite,
+                  CORBA::Boolean            groupElemsByType) throw (SALOME::SALOME_Exception);
   void ExportGMF(SMESH::SMESH_IDSource_ptr meshPart,
                  const char*               file,
                  CORBA::Boolean            withRequiredGroups) throw (SALOME::SALOME_Exception);
@@ -246,10 +263,12 @@ public:
   void ExportPartToMED(SMESH::SMESH_IDSource_ptr meshPart,
                        const char*               file,
                        CORBA::Boolean            auto_groups,
+                       CORBA::Long               version,
                        CORBA::Boolean            overwrite,
                        CORBA::Boolean            autoDim,
                        const GEOM::ListOfFields& fields,
-                       const char*               geomAssocFields) throw (SALOME::SALOME_Exception);
+                       const char*               geomAssocFields,
+                       CORBA::Double             ZTolerance) 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,
@@ -395,8 +414,11 @@ public:
                                                      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       aSubShape,
                                                     SMESH::SMESH_Hypothesis_ptr anHyp,
                                                     std::string*                anErrorText=0);
@@ -418,6 +440,7 @@ public:
 
   SMESH::SMESH_GroupBase_ptr createGroup(SMESH::ElementType        theElemType,
                                          const char*               theName,
+                                         const int                 theID = -1,
                                          const TopoDS_Shape&       theShape = TopoDS_Shape(),
                                          const SMESH_PredicatePtr& thePred = SMESH_PredicatePtr());
 
@@ -429,7 +452,7 @@ public:
   const std::map<int, SMESH::SMESH_GroupBase_ptr>& getGroups() { return _mapGroups; }
   // return existing group objects
 
-  void onHypothesisModified();
+  void onHypothesisModified(int theHypID);
   // callback from _impl to forget not loaded mesh data (issue 0021208)
 
   void checkMeshLoaded();
@@ -443,7 +466,7 @@ public:
   /*!
    * \brief Update hypotheses assigned to geom groups if the latter change
    *
-   * NPAL16168: "geometrical group edition from a submesh don't modifiy mesh computation"
+   * NPAL16168: "geometrical group edition from a submesh don't modify mesh computation"
    */
   void CheckGeomGroupModif();
 
@@ -454,6 +477,16 @@ public:
    */
   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
    */
@@ -469,7 +502,8 @@ public:
    * For given node returns list of IDs of inverse elements
    * If there is not node for given ID - returns empty list
    */
-  SMESH::long_array* GetNodeInverseElements(CORBA::Long id);
+  SMESH::long_array* GetNodeInverseElements(CORBA::Long        id,
+                                            SMESH::ElementType elemType);
 
   /*!
    * \brief Return position of a node on shape
@@ -580,6 +614,12 @@ public:
    */
   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
    */
@@ -648,10 +688,11 @@ public:
    * 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