PAL10196. Rename GetGroupNames() -> GetGroupNamesAndTypes(), add checkFamilyId()

[modules/smesh.git] / src / DriverMED / DriverMED_R_SMESHDS_Mesh.h

diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h
index fe1322b12df7fe02aa0628301a099ce6438fb30b..cb72bccdfb911e3ad16cb42ee7ed462d4c71501b 100644 (file)
--- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h
+++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.h
@@ -36,12 +36,14 @@ class SMESHDS_Mesh;
 class SMESHDS_Group;
 class SMESHDS_SubMesh;
 
 class SMESHDS_Group;
 class SMESHDS_SubMesh;
 

+typedef std::pair< std::string, SMDSAbs_ElementType > TNameAndType;
+

 class DriverMED_R_SMESHDS_Mesh: public Driver_SMESHDS_Mesh
 {
  public:
   virtual Status Perform();
 
 class DriverMED_R_SMESHDS_Mesh: public Driver_SMESHDS_Mesh
 {
  public:
   virtual Status Perform();
 

-  std::list<std::string> GetGroupNames();
+  std::list< TNameAndType > GetGroupNamesAndTypes();

   void GetGroup(SMESHDS_Group* theGroup);
   void CreateAllSubMeshes();
   void GetSubMesh(SMESHDS_SubMesh* theSubMesh, const int theId);
   void GetGroup(SMESHDS_Group* theGroup);
   void CreateAllSubMeshes();
   void GetSubMesh(SMESHDS_SubMesh* theSubMesh, const int theId);


@@ -49,6 +51,15 @@ class DriverMED_R_SMESHDS_Mesh: public Driver_SMESHDS_Mesh
   std::list<std::string> GetMeshNames(Status& theStatus);
   void SetMeshName(std::string theMeshName);
 
   std::list<std::string> GetMeshNames(Status& theStatus);
   void SetMeshName(std::string theMeshName);
 

+ private:
+  /*!
+   * \brief Ensure aFamily has required ID
+    * \param aFamily - a family to check
+    * \param anID - an ID aFamily should have
+    * \retval bool  - true if successful
+   */
+  bool checkFamilyID(DriverMED_FamilyPtr & aFamily, int anID) const;
+

  private:
   std::string myMeshName;
   std::map<int, DriverMED_FamilyPtr> myFamilies;
  private:
   std::string myMeshName;
   std::map<int, DriverMED_FamilyPtr> myFamilies;