Improve interface

[modules/smesh.git] / src / SMESH_I / SMESH_Homard_i.hxx

diff --git a/src/SMESH_I/SMESH_Homard_i.hxx b/src/SMESH_I/SMESH_Homard_i.hxx
index 3f08b4d2ff3b5476e1d45a2e8aa4ab9f36133682..ad0ea90b27f6b50cc96ae006bd241e3fd747eecb 100644 (file)
--- a/src/SMESH_I/SMESH_Homard_i.hxx
+++ b/src/SMESH_I/SMESH_Homard_i.hxx
@@ -116,9 +116,6 @@ public:
   void  SetDirName(const char* NomDir);
   char* GetDirName();
 
-  void        SetConfType(CORBA::Long ConfType);
-  CORBA::Long GetConfType();
-
   void                  SetBoundingBox(const SMESHHOMARD::extrema& LesExtremes);
   SMESHHOMARD::extrema* GetBoundingBox();
 
@@ -138,27 +135,6 @@ private:
   SMESHHOMARD::HOMARD_Gen_var _gen_i;
 };
 
-class SMESH_I_EXPORT HOMARD_Hypothesis_i : public virtual SALOME::GenericObj_i,
-                                           public virtual POA_SMESHHOMARD::HOMARD_Hypothesis
-{
-public:
-  HOMARD_Hypothesis_i(SMESHHOMARD::HOMARD_Gen_var gen_i);
-  HOMARD_Hypothesis_i();
-
-  virtual ~HOMARD_Hypothesis_i();
-
-  // Generalites
-  void SetExtraOutput(CORBA::Long ExtraOutput);
-  CORBA::Long GetExtraOutput();
-
-  void LinkIteration(const char* NomIteration);
-  void UnLinkIteration(const char* NomIteration);
-
-private:
-  SMESHHOMARDImpl::HOMARD_Hypothesis* myHomardHypothesis;
-  SMESHHOMARD::HOMARD_Gen_var  _gen_i;
-};
-
 class SMESH_I_EXPORT HOMARD_Iteration_i : public virtual SALOME::GenericObj_i,
                                           public virtual POA_SMESHHOMARD::HOMARD_Iteration
 {
@@ -200,15 +176,10 @@ public:
   void                   LinkNextIteration(const char* NomIteration);
   void                   UnLinkNextIteration(const char* NomIteration);
 
-  void                   SetIterParentName(const char* NomIterParent);
-  char*                  GetIterParentName();
-
   // Liens avec les autres structures
   void                   SetCaseName(const char* NomCas);
   char*                  GetCaseName();
 
-  void                   SetHypoName(const char* NomHypo);
-
   // Drivers
   void                   SetInfoCompute(CORBA::Long MessInfo);
   CORBA::Long            GetInfoCompute();
@@ -280,22 +251,18 @@ public:
   CORBA::Long DeleteCase();
   CORBA::Long DeleteIteration(int numIter);
 
+  void AddBoundaryGroup(const char* Boundary, const char* Group);
+
   void AssociateCaseIter(int numIter, const char* labelIter);
   char* CreateDirNameIter(const char* nomrep, CORBA::Long num);
 
   CORBA::Long Compute();
-  CORBA::Long ComputeAdap(SMESHHOMARD::HOMARD_Cas_var myCase,
-                          SMESHHOMARD::HOMARD_Iteration_var myIteration,
-                          SMESHHOMARDImpl::HomardDriver* myDriver);
-  CORBA::Long ComputeCAO(SMESHHOMARD::HOMARD_Cas_var myCase,
-                         SMESHHOMARD::HOMARD_Iteration_var myIteration);
-  CORBA::Long ComputeCAObis(SMESHHOMARD::HOMARD_Iteration_var myIteration);
-  char* ComputeDirManagement(SMESHHOMARD::HOMARD_Cas_var myCase,
-                             SMESHHOMARD::HOMARD_Iteration_var myIteration);
-  char* ComputeDirPaManagement(SMESHHOMARD::HOMARD_Cas_var myCase,
-                               SMESHHOMARD::HOMARD_Iteration_var myIteration);
-  int   DriverTexteBoundary(SMESHHOMARD::HOMARD_Cas_var myCase,
-                            SMESHHOMARDImpl::HomardDriver* myDriver);
+  CORBA::Long ComputeAdap(SMESHHOMARDImpl::HomardDriver* myDriver);
+  CORBA::Long ComputeCAO();
+  CORBA::Long ComputeCAObis();
+  char* ComputeDirManagement();
+  char* ComputeDirPaManagement();
+  int   DriverTexteBoundary(SMESHHOMARDImpl::HomardDriver* myDriver);
 
   void PublishResultInSmesh(const char* NomFich, CORBA::Long Option);
   void DeleteResultInSmesh(std::string NomFich, std::string MeshName);
@@ -303,8 +270,9 @@ public:
   void PythonDump();
 
   // Preferences
-  void SetKeepMedOUT(bool theKeepMedOUT);
-  void SetPublishMeshOUT(bool thePublishMeshOUT);
+  void SetConfType (CORBA::Long theConfType);
+  void SetKeepMedOUT (bool theKeepMedOUT);
+  void SetPublishMeshOUT (bool thePublishMeshOUT);
   void SetMeshNameOUT (const char* theMeshNameOUT);
   void SetMeshFileOUT (const char* theMeshFileOUT);
 
@@ -323,12 +291,12 @@ private:
 private:
   SMESHHOMARDImpl::HOMARD_Gen* myHomard;
   std::map<std::string, SMESHHOMARD::HOMARD_Boundary_var> _mesBoundarys;
-  SMESHHOMARD::HOMARD_Hypothesis_var myHypothesis;
   SMESHHOMARD::HOMARD_Iteration_var  myIteration0;
   SMESHHOMARD::HOMARD_Iteration_var  myIteration1;
   SMESHHOMARD::HOMARD_Cas_var        myCase;
 
   // Preferences
+  int  _ConfType; // Le type de conformite ou non conformite
   bool _KeepMedOUT;
   bool _PublishMeshOUT;
   bool _KeepWorkingFiles;
@@ -342,6 +310,7 @@ private:
   // Input data type
   bool _CaseOnMedFile;
   SMESH::SMESH_Mesh_var _SmeshMesh;
+  std::string _TmpMeshFile;
 };
 
 SMESH_I_EXPORT std::vector<double>   GetBoundingBoxInMedFile(const char * aFile);