X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHOMARD%2FHOMARD_Hypothesis.hxx;h=a528ad6749d1df8c2dcbbbad26591508088b3b35;hb=refs%2Ftags%2FV9_13_0b1;hp=c641cf9b21adb7b9fdb4ecc55809c9db04176bd6;hpb=a9189d870ff98f06dc5577c5fc37102ee5337aea;p=modules%2Fhomard.git

diff --git a/src/HOMARD/HOMARD_Hypothesis.hxx b/src/HOMARD/HOMARD_Hypothesis.hxx
index c641cf9b..a528ad67 100644
--- a/src/HOMARD/HOMARD_Hypothesis.hxx
+++ b/src/HOMARD/HOMARD_Hypothesis.hxx
@@ -1,11 +1,11 @@
-//  HOMARD HOMARD : implementaion of HOMARD idl descriptions
+//  HOMARD HOMARD : implementation of HOMARD idl descriptions
 //
-// Copyright (C) 2011-2012  CEA/DEN, EDF R&D
+// Copyright (C) 2011-2024  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,80 +19,109 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  File   : HOMARD_Hypothesis.hxx
-//  Author : Paul RASCLE, EDF
+//  Author : Gerald NICOLAS, EDF
 //  Module : HOMARD
+//
+// Remarques :
+// L'ordre de description des fonctions est le meme dans tous les fichiers
+// HOMARD_aaaa.idl, HOMARD_aaaa.hxx, HOMARD_aaaa.cxx, HOMARD_aaaa_i.hxx, HOMARD_aaaa_i.cxx :
+// 1. Les generalites : Name, Delete, DumpPython, Dump, Restore
+// 2. Les caracteristiques
+// 3. Le lien avec les autres structures
+//
+// Quand les 2 fonctions Setxxx et Getxxx sont presentes, Setxxx est decrit en premier
 
 #ifndef _HOMARD_HYPOTHESIS_HXX_
 #define _HOMARD_HYPOTHESIS_HXX_
 
+#include "HOMARD.hxx"
+
 #include <string>
 #include <list>
 
-class HOMARD_Hypothesis
+#if defined WIN32
+#pragma warning ( disable: 4251 )
+#endif
+
+class HOMARDIMPL_EXPORT HOMARD_Hypothesis
 {
 public:
   HOMARD_Hypothesis();
   ~HOMARD_Hypothesis();
 
-  void                          SetName( const char* NomHypo );
+// Generalites
+  void                          SetName( const char* Name );
   std::string                   GetName() const;
-  void                          SetCaseCreation( const char* NomCasCreation );
-  std::string                   GetCaseCreation() const;
+
   std::string                   GetDumpPython() const;
 
+// Caracteristiques
   void                          SetAdapType( int TypeAdap );
   int                           GetAdapType() const;
-
   void                          SetRefinTypeDera( int TypeRaff, int TypeDera );
   int                           GetRefinType() const;
   int                           GetUnRefType() const;
 
   void                          SetField( const char* FieldName );
-  void                          SetRefinThr( int TypeThR, double ThreshR );
-  void                          SetUnRefThr( int TypeThC, double ThreshC );
-  void                          SetUseComp( int UsCmpI );
-  void                          SetUseField( int UsField );
   std::string                   GetFieldName() const;
+  void                          SetUseField( int UsField );
+  int                           GetUseField()    const;
+
+  void                          SetUseComp( int UsCmpI );
+  int                           GetUseComp()    const;
+  void                          AddComp( const char* NomComp );
+  void                          SupprComp( const char* NomComp );
+  void                          SupprComps();
+  const std::list<std::string>& GetComps() const;
+
+  void                          SetRefinThr( int TypeThR, double ThreshR );
   int                           GetRefinThrType()   const;
   double                        GetThreshR()   const;
+  void                          SetUnRefThr( int TypeThC, double ThreshC );
   int                           GetUnRefThrType()   const;
   double                        GetThreshC()   const;
-  int                           GetUseField()    const;
-  int                           GetUseCompI()    const;
 
-  void                          AddComp( const char* NomComposant );
-  void                          SupprComp();
-  const std::list<std::string>& GetListComp() const;
+  void                          SetNivMax( int NivMax );
+  const int                     GetNivMax() const;
 
-  void                          AddIteration( const char* NomIter );
-  void                          SupprIterations();
-  const std::list<std::string>& GetIterations() const;
+  void                          SetDiamMin( double DiamMin );
+  const double                  GetDiamMin() const;
 
-  void                          AddZone( const char* NomZone, int TypeUse );
-  void                          SupprZone( const char* NomZone );
-  void                          SupprZones();
-  const std::list<std::string>& GetZones() const;
+  void                          SetAdapInit( int AdapInit );
+  const int                     GetAdapInit() const;
+
+  void                          SetExtraOutput( int ExtraOutput );
+  const int                     GetExtraOutput() const;
 
-  void                          AddGroup( const char* LeGroupe);
+  void                          AddGroup( const char* Group);
+  void                          SupprGroup( const char* Group );
+  void                          SupprGroups();
   void                          SetGroups(const std::list<std::string>& ListGroup );
   const std::list<std::string>& GetGroups() const;
 
   void                          SetTypeFieldInterp( int TypeFieldInterp );
   int                           GetTypeFieldInterp() const;
-  void                          AddFieldInterp( const char* FieldInterp );
-  void                          SupprFieldInterp();
-  const std::list<std::string>& GetListFieldInterp() const;
+  void                          AddFieldInterpType( const char* FieldInterp, int TypeInterp );
+  void                          SupprFieldInterp( const char* FieldInterp );
+  void                          SupprFieldInterps();
+  const std::list<std::string>& GetFieldInterps() const;
 
-  void                          SetNivMax( int NivMax );
-  const int                     GetNivMax() const;
-  void                          SetDiamMin( double DiamMin );
-  const double                  GetDiamMin() const;
-  void                          SetAdapInit( int AdapInit );
-  const int                     GetAdapInit() const;
+// Liens avec les autres structures
+  void                          SetCaseCreation( const char* NomCasCreation );
+  std::string                   GetCaseCreation() const;
+
+  void                          LinkIteration( const char* NomIter );
+  void                          UnLinkIteration( const char* NomIter );
+  void                          UnLinkIterations();
+  const std::list<std::string>& GetIterations() const;
 
+  void                          AddZone( const char* NomZone, int TypeUse );
+  void                          SupprZone( const char* NomZone );
+  void                          SupprZones();
+  const std::list<std::string>& GetZones() const;
 
 private:
-  std::string                   _NomHypo;
+  std::string                   _Name;
   std::string                   _NomCasCreation;
 
   int                           _TypeAdap; // -1 pour une adapation Uniforme,
@@ -115,12 +144,14 @@ private:
   int                           _NivMax;
   double                        _DiamMin;
   int                           _AdapInit;
+  int                           _ExtraOutput;
 
   std::list<std::string>        _ListIter;
   std::list<std::string>        _ListZone;
-  std::list<std::string>        _ListComposant;
+  std::list<std::string>        _ListComp;
   std::list<std::string>        _ListGroupSelected;
   std::list<std::string>        _ListFieldInterp;
+
 };
 
 #endif