Changements de noms HOMARD ==> ADAPT

idl/ADAPT_Gen.idl

@@ -17,8 +17,8 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __HOMARD_GEN__
+#ifndef __ADAPT_GEN__
-#define __HOMARD_GEN__
+#define __ADAPT_GEN__
 
 #include "SALOME_Component.idl"
 #include "SALOME_Exception.idl"
@@ -40,7 +40,7 @@ module ADAPT
   typedef sequence<string> listeBoundarys;
   typedef sequence<string> listeYACSs;
 
-  interface HOMARD_Gen : Engines::EngineComponent, SALOMEDS::Driver
+  interface ADAPT_Gen : Engines::EngineComponent, SALOMEDS::Driver
   {
 //
 // A. Les methodes qui suivent sont celles que l'on retrouvera dans

idl/CMakeLists.txt

@@ -38,7 +38,7 @@ SET(SalomeIDLSMESH_IDLSOURCES
   SMESH_Measurements.idl
   HOMARD_Boundary.idl
   HOMARD_Cas.idl
-  HOMARD_Gen.idl
+  ADAPT_Gen.idl
   HOMARD_Hypothesis.idl
   HOMARD_Iteration.idl
   HOMARD_YACS.idl

src/ADAPT/ADAPT_Gen.cxx

@@ -18,24 +18,24 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-//  File   : HOMARD_Gen.cxx
+//  File   : ADAPT_Gen.cxx
 //  Author : Gerald NICOLAS, EDF
 //  Module : HOMARD
 
-#include "HOMARD_Gen.hxx"
+#include "ADAPT_Gen.hxx"
 #include "utilities.h"
 
 //=============================================================================
 //=============================================================================
-HOMARD_Gen::HOMARD_Gen()
+ADAPT_Gen::ADAPT_Gen()
 {
-  MESSAGE("HOMARD_Gen");
+  MESSAGE("ADAPT_Gen");
 }
 
 //=============================================================================
 //=============================================================================
-HOMARD_Gen::~HOMARD_Gen()
+ADAPT_Gen::~ADAPT_Gen()
 {
-  MESSAGE("~HOMARD_Gen");
+  MESSAGE("~ADAPT_Gen");
 }
 //=============================================================================

src/ADAPT/ADAPT_Gen.hxx

@@ -18,20 +18,20 @@
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-//  File   : HOMARD_Gen.hxx
+//  File   : ADAPT_Gen.hxx
 //  Author : Gerald NICOLAS, EDF
 //  Module : HOMARD
 
-#ifndef _HOMARD_GEN_HXX_
+#ifndef _ADAPT_GEN_HXX_
-#define _HOMARD_GEN_HXX_
+#define _ADAPT_GEN_HXX_
 
 #include "HOMARD.hxx"
 
-class HOMARDIMPL_EXPORT HOMARD_Gen
+class HOMARDIMPL_EXPORT ADAPT_Gen
 {
 public :
-  HOMARD_Gen();
+  ADAPT_Gen();
-  ~HOMARD_Gen();
+  ~ADAPT_Gen();
 };
 
 #endif

src/ADAPT/CMakeLists.txt

@@ -43,7 +43,7 @@ SET(ADAPTImpl_HEADERS
   HOMARD_Hypothesis.hxx
   HOMARD_Iteration.hxx
   HOMARD_Zone.hxx
-  HOMARD_Gen.hxx
+  ADAPT_Gen.hxx
   HOMARD_DriverTools.hxx
   HOMARD_YACS.hxx
   HomardDriver.hxx
@@ -59,7 +59,7 @@ SET(ADAPTImpl_SOURCES
   HOMARD_Hypothesis.cxx
   HOMARD_Iteration.cxx
   HOMARD_Zone.cxx
-  HOMARD_Gen.cxx
+  ADAPT_Gen.cxx
   HOMARD_DriverTools.cxx
   HOMARD_YACS.cxx
   HomardDriver.cxx

src/ADAPT/HOMARD_DriverTools.cxx

@@ -32,7 +32,7 @@
 #include <cstdlib>
 #include "utilities.h"
 
-namespace HOMARD
+namespace ADAPT
 {
 
   std::string SEPARATOR = "|" ;
@@ -837,4 +837,4 @@ namespace HOMARD
     return true;
   }
 
-} // namespace HOMARD /end/
+} // namespace ADAPT /end/

src/ADAPT/HOMARD_DriverTools.hxx

@@ -35,7 +35,7 @@ class HOMARD_Hypothesis;
 class HOMARD_Zone;
 class HOMARD_YACS;
 
-namespace HOMARD
+namespace ADAPT
 {
   //! persistence entity type
   typedef enum { Case, Zone, Hypothesis, Iteration, Boundary, YACS } SignatureType;

src/ADAPT/YACSDriver.cxx

@@ -144,7 +144,7 @@ std::string YACSDriver::Texte_Iter_1_Zone( int ZoneType, const std::string pytho
   _Texte += Texte_inport( "string", "ZoneName" ) ;
    TexteParametre( node, "ZoneName", "string", ZoneName ) ;
 // 4.2. Les valeurs numeriques
-//      ATTENTION : les noms doivent etre les memes que dans Gen.xml, donc HOMARD_Gen.idl
+//      ATTENTION : les noms doivent etre les memes que dans Gen.xml, donc ADAPT_Gen.idl
 // 4.2.1. Decodage des valeurs
 // La chaine pythonStructure est de ce genre :
 //   CreateZoneBox( "Zone_1", 0.144, 0.216, 0.096, 0.1464, 0.076, 0.12)
@@ -312,7 +312,7 @@ std::string YACSDriver::Texte_Iter_1_Boundary( int BoundaryType, const std::stri
   _Texte += "                              <node>" + motcle + ".UpdateStudy</node>\n" ;
   _Texte += "                              <method>" + methode + "</method>\n" ;
 // 4. Les inports
-//    ATTENTION : les noms doivent etre les memes que dans Gen.xml, donc HOMARD_Gen.idl
+//    ATTENTION : les noms doivent etre les memes que dans Gen.xml, donc ADAPT_Gen.idl
 // 4.1. Le nom de la frontiere
   _Texte += Texte_inport( "string", "BoundaryName" ) ;
   TexteParametre( node, "BoundaryName", "string", BoundaryName ) ;
@@ -658,7 +658,7 @@ void YACSDriver::CreeFichier( )
 //
 }
 //===============================================================================
-// REMARQUE : on devrait utiliser le GetStringInTexte de HOMARD_Gen_i mais je ne sais pas
+// REMARQUE : on devrait utiliser le GetStringInTexte de ADAPT_Gen_i mais je ne sais pas
 //            comment l'appeler. ALors je clone.
 // Recuperation de la chaine de caracteres par rapport l'apparition d'un texte
 // ligne : la ligne a manipuler

src/ADAPTGUI/ADAPTGUI.cxx

@@ -103,10 +103,10 @@ ADAPTGUI::~ADAPTGUI()
 // function : InitHOMARDGen
 // launch HOMARD component and return a handle
 //=======================================================================
-HOMARD::HOMARD_Gen_var ADAPTGUI::InitHOMARDGen(SalomeApp_Application* app)
+ADAPT::ADAPT_Gen_var ADAPTGUI::InitHOMARDGen(SalomeApp_Application* app)
 {
   Engines::EngineComponent_var comp = app->lcc()->FindOrLoad_Component( "FactoryServer","HOMARD" );
-  HOMARD::HOMARD_Gen_var clr = HOMARD::HOMARD_Gen::_narrow(comp);
+  ADAPT::ADAPT_Gen_var clr = ADAPT::ADAPT_Gen::_narrow(comp);
   ASSERT(!CORBA::is_nil(clr));
   return clr;
 }
@@ -261,10 +261,10 @@ void ADAPTGUI::createMenus()
 
 //================================================
 // function : recupPreferences
-// Pour chaque valeur, le defaut est la valeur definie dans HOMARD_Gen
+// Pour chaque valeur, le defaut est la valeur definie dans ADAPT_Gen
-// . Si la recuperation dans config/salome s'est bien passee a la creation de HOMARD_Gen,
+// . Si la recuperation dans config/salome s'est bien passee a la creation de ADAPT_Gen,
 //   ces valeurs sont les valeurs definies.
-// . Si cela ne s'est pas bien passe, ce sont les valeurs par defaut de HOMARD_Gen
+// . Si cela ne s'est pas bien passe, ce sont les valeurs par defaut de ADAPT_Gen
 //================================================
 void ADAPTGUI::recupPreferences()
 {
@@ -273,7 +273,7 @@ void ADAPTGUI::recupPreferences()
 // A. Declarations
 //
   SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( application() );
-  HOMARD::HOMARD_Gen_var homardGen = ADAPTGUI::InitHOMARDGen(app);
+  ADAPT::ADAPT_Gen_var homardGen = ADAPTGUI::InitHOMARDGen(app);
   int defaut_i ;
   std::string defaut_s ;
   QString QString_v ;
@@ -370,7 +370,7 @@ bool ADAPTGUI::OnGUIEvent (int theCommandID)
 
   SUIT_Desktop* parent = application()->desktop();
 
-  HOMARD::HOMARD_Gen_var homardGen = ADAPTGUI::InitHOMARDGen(app);
+  ADAPT::ADAPT_Gen_var homardGen = ADAPTGUI::InitHOMARDGen(app);
 
   if (!CORBA::is_nil(homardGen))
     homardGen->UpdateStudy();
@@ -385,7 +385,7 @@ bool ADAPTGUI::OnGUIEvent (int theCommandID)
     {
       MESSAGE("command " << theCommandID << " activated");
       MonCreateCase *aDlg = new MonCreateCase( true,
-                            HOMARD::HOMARD_Gen::_duplicate(homardGen) ) ;
+                            ADAPT::ADAPT_Gen::_duplicate(homardGen) ) ;
       aDlg->show();
       break;
     }
@@ -394,7 +394,7 @@ bool ADAPTGUI::OnGUIEvent (int theCommandID)
     {
       MESSAGE("command " << theCommandID << " activated");
       MonPursueIteration *aDlg = new MonPursueIteration( true,
-                                HOMARD::HOMARD_Gen::_duplicate(homardGen) ) ;
+                                ADAPT::ADAPT_Gen::_duplicate(homardGen) ) ;
       aDlg->show();
       break;
     }
@@ -403,7 +403,7 @@ bool ADAPTGUI::OnGUIEvent (int theCommandID)
     {
       MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() );
       MonCreateIteration *IterDlg = new MonCreateIteration( parent, true,
-                                     HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ;
+                                     ADAPT::ADAPT_Gen::_duplicate(homardGen), _ObjectName ) ;
       IterDlg->show();
       break;
     }
@@ -439,7 +439,7 @@ bool ADAPTGUI::OnGUIEvent (int theCommandID)
     case 1121: // Information sur le maillage de l'iteration
     {
       MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() );
-      MonIterInfo *IterDlg = new MonIterInfo( parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ;
+      MonIterInfo *IterDlg = new MonIterInfo( parent, true, ADAPT::ADAPT_Gen::_duplicate(homardGen), _ObjectName ) ;
       IterDlg->show();
       break;
     }
@@ -469,50 +469,50 @@ bool ADAPTGUI::OnGUIEvent (int theCommandID)
         // Edition d'une frontiere CAO
         if (HOMARD_UTILS::isBoundaryCAO(obj))
         {
-          MonEditBoundaryCAO *aDlg = new MonEditBoundaryCAO(0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
+          MonEditBoundaryCAO *aDlg = new MonEditBoundaryCAO(0, true, ADAPT::ADAPT_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
           aDlg->show();
         }
         // Edition d'une frontiere discrete
         else if (HOMARD_UTILS::isBoundaryDi(obj))
         {
-          MonEditBoundaryDi *aDlg = new MonEditBoundaryDi(0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
+          MonEditBoundaryDi *aDlg = new MonEditBoundaryDi(0, true, ADAPT::ADAPT_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
           aDlg->show();
         }
         // Edition d'une frontiere analytique
         else if (HOMARD_UTILS::isBoundaryAn(obj))
         {
-          MonEditBoundaryAn *aDlg = new MonEditBoundaryAn(0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
+          MonEditBoundaryAn *aDlg = new MonEditBoundaryAn(0, true, ADAPT::ADAPT_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
           aDlg->show();
         }
         // Edition d'un cas
         else if (HOMARD_UTILS::isCase(obj))
         {
-          MonEditCase *aDlg = new MonEditCase(true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ;
+          MonEditCase *aDlg = new MonEditCase(true, ADAPT::ADAPT_Gen::_duplicate(homardGen), _ObjectName ) ;
           aDlg->show();
         }
         // Edition d'une hypothese
         else if (HOMARD_UTILS::isHypo(obj))
         {
-          MonEditHypothesis *aDlg = new MonEditHypothesis(0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen),  _ObjectName, QString(""), QString("")) ;
+          MonEditHypothesis *aDlg = new MonEditHypothesis(0, true, ADAPT::ADAPT_Gen::_duplicate(homardGen),  _ObjectName, QString(""), QString("")) ;
           aDlg->show();
         }
         // Edition d'une iteration
         else if (HOMARD_UTILS::isIter(obj))
         {
-          MonEditIteration *aDlg = new MonEditIteration(parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
+          MonEditIteration *aDlg = new MonEditIteration(parent, true, ADAPT::ADAPT_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
           aDlg->show();
         }
         // Edition d'un schema YACS
         else if (HOMARD_UTILS::isYACS(obj))
         {
           MESSAGE("appel de MonEditYACS");
-          MonEditYACS *aDlg = new MonEditYACS(true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName) ;
+          MonEditYACS *aDlg = new MonEditYACS(true, ADAPT::ADAPT_Gen::_duplicate(homardGen), _ObjectName) ;
           aDlg->show();
         }
         // Edition d'une zone
         else if (HOMARD_UTILS::isZone(obj))
         {
-          MonEditZone *aDlg = new MonEditZone(0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
+          MonEditZone *aDlg = new MonEditZone(0, true, ADAPT::ADAPT_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
           aDlg->show();
         }
       }
@@ -613,7 +613,7 @@ bool ADAPTGUI::OnGUIEvent (int theCommandID)
     {
       MESSAGE("etape 1301")
       MESSAGE("command " << theCommandID << " activated");
-      MonMeshInfo *aDlg = new MonMeshInfo( parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen) ) ;
+      MonMeshInfo *aDlg = new MonMeshInfo( parent, true, ADAPT::ADAPT_Gen::_duplicate(homardGen) ) ;
       aDlg->show();
       break;
     }
@@ -624,7 +624,7 @@ bool ADAPTGUI::OnGUIEvent (int theCommandID)
       _PTR(SObject) obj = chercheMonObjet();
       if ( (obj) && ( HOMARD_UTILS::isFileType(obj,QString("log")) || HOMARD_UTILS::isFileType(obj,QString("Summary")) || HOMARD_UTILS::isFileType(obj,QString("xml")) ) )
       {
-          MonEditFile *aDlg = new MonEditFile( 0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName, 0 ) ;
+          MonEditFile *aDlg = new MonEditFile( 0, true, ADAPT::ADAPT_Gen::_duplicate(homardGen), _ObjectName, 0 ) ;
           if ( aDlg->_codret == 0 ) { aDlg->show(); }
       }
       break;
@@ -634,7 +634,7 @@ bool ADAPTGUI::OnGUIEvent (int theCommandID)
     {
       MESSAGE("etape 1401")
       MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() );
-      MonCreateYACS *aDlg = new MonCreateYACS( true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ;
+      MonCreateYACS *aDlg = new MonCreateYACS( true, ADAPT::ADAPT_Gen::_duplicate(homardGen), _ObjectName ) ;
       aDlg->show();
       break;
     }

src/ADAPTGUI/ADAPTGUI.h

@@ -30,7 +30,7 @@
 
 #include <SALOMEconfig.h>
 #include <SALOME_LifeCycleCORBA.hxx>
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 #include CORBA_CLIENT_HEADER(HOMARD_Cas)
 #include CORBA_CLIENT_HEADER(HOMARD_Hypothesis)
 
@@ -53,7 +53,7 @@ public:
   QString engineIOR() const;
   void    windows( QMap<int, int>& ) const;
 
-  static HOMARD::HOMARD_Gen_var InitHOMARDGen(SalomeApp_Application* );
+  static ADAPT::ADAPT_Gen_var InitHOMARDGen(SalomeApp_Application* );
 
 
 public slots:
@@ -89,7 +89,7 @@ private:
    _PTR(SObject)  chercheMonObjet();
 
    virtual void createPreferences();
-   HOMARD::HOMARD_Gen_var myComponentHomard;
+   ADAPT::ADAPT_Gen_var myComponentHomard;
 
    int anId;
    QString _ObjectName;

src/ADAPTGUI/HOMARDGUI_Utils.cxx

@@ -90,7 +90,7 @@ void HOMARD_UTILS::updateObjBrowser()
         appMod->updateObjBrowser( true );
       }
       else
-        MESSAGE( "---   HOMARD::updateObjBrowser: appMod = NULL");
+        MESSAGE( "---   ADAPT::updateObjBrowser: appMod = NULL");
     }
 }
 

src/ADAPTGUI/HOMARDGUI_Utils.h

@@ -26,7 +26,7 @@
 
 #include <omniORB4/CORBA.h>
 #include CORBA_CLIENT_HEADER(HOMARD_Cas)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 
 #include "SALOMEDSClient_definitions.hxx"
 #include "SALOME_InteractiveObject.hxx"

src/ADAPTGUI/HomardQtCommun.h

@@ -29,7 +29,7 @@
 #include <med.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 #include CORBA_CLIENT_HEADER(HOMARD_Cas)
 
 #include <qstring.h>

src/ADAPTGUI/MonCreateBoundaryAn.cxx

@@ -41,7 +41,7 @@ using namespace std;
 
 // ------------------------------------------------------------------------------------------------------------------------
 MonCreateBoundaryAn::MonCreateBoundaryAn(MonCreateCase* parent, bool modal,
-                             HOMARD::HOMARD_Gen_var myHomardGen0,
+                             ADAPT::ADAPT_Gen_var myHomardGen0,
                              QString caseName) :
 // ------------------------------------------------------------------------------------------------------------------------------
 /* Constructs a MonCreateBoundaryAn
@@ -67,7 +67,7 @@ MonCreateBoundaryAn::MonCreateBoundaryAn(MonCreateCase* parent, bool modal,
     Chgt (false)
     {
       MESSAGE("Constructeur") ;
-      myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0);
+      myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
       setupUi(this);
       setModal(modal);
 
@@ -103,7 +103,7 @@ MonCreateBoundaryAn::MonCreateBoundaryAn(MonCreateCase* parent, bool modal,
     }
 // --------------------------------------------------------------------------------------------------------------
 MonCreateBoundaryAn::MonCreateBoundaryAn(MonCreateCase* parent,
-                             HOMARD::HOMARD_Gen_var myHomardGen0,
+                             ADAPT::ADAPT_Gen_var myHomardGen0,
                              QString caseName):
 // --------------------------------------------------------------------------------------------------------------
 //
@@ -172,8 +172,8 @@ void MonCreateBoundaryAn::InitValBoundaryAn()
 //
     if (_aCaseName == QString("")) { return; }
 
-    HOMARD::HOMARD_Cas_var aCas = myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+    ADAPT::HOMARD_Cas_var aCas = myHomardGen->GetCase(_aCaseName.toStdString().c_str());
-    HOMARD::extrema_var  MesExtremes = aCas->GetBoundingBox();
+    ADAPT::extrema_var  MesExtremes = aCas->GetBoundingBox();
     int num = MesExtremes->length() ;
     ASSERT(num == 10);
     _Xmin=MesExtremes[0]; _Xmax=MesExtremes[1]; _Xincr=MesExtremes[2];
@@ -521,7 +521,7 @@ void MonCreateBoundaryAn::SetNewName()
 {
 // Recherche d'un nom par defaut qui n'existe pas encore
 
-  HOMARD::listeBoundarys_var MyObjects = myHomardGen->GetAllBoundarysName();
+  ADAPT::listeBoundarys_var MyObjects = myHomardGen->GetAllBoundarysName();
   int num = 0; QString aName="";
   while (aName=="" )
   {

src/ADAPTGUI/MonCreateBoundaryAn.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 #include CORBA_CLIENT_HEADER(HOMARD_Boundary)
 
 #include "ui_CreateBoundaryAn.h"
@@ -39,13 +39,13 @@ class HOMARD_EXPORT MonCreateBoundaryAn : public QDialog, public Ui_CreateBounda
 
 public:
     MonCreateBoundaryAn( MonCreateCase* parent, bool modal,
-                   HOMARD::HOMARD_Gen_var myHomardGen,
+                   ADAPT::ADAPT_Gen_var myHomardGen,
                    QString caseName);
     virtual ~MonCreateBoundaryAn();
 
 protected :
     MonCreateBoundaryAn( MonCreateCase* parent,
-                   HOMARD::HOMARD_Gen_var myHomardGen,
+                   ADAPT::ADAPT_Gen_var myHomardGen,
                    QString caseName);
 
     MonCreateCase * _parent;
@@ -70,8 +70,8 @@ protected :
 
     bool Chgt;
 
-    HOMARD::HOMARD_Boundary_var aBoundaryAn ;
+    ADAPT::HOMARD_Boundary_var aBoundaryAn ;
-    HOMARD::HOMARD_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myHomardGen;
 
     virtual void InitConnect();
     virtual void InitValBoundaryAn();

src/ADAPTGUI/MonCreateBoundaryCAO.cxx

@@ -33,14 +33,14 @@ using namespace std;
 
 // -------------------------------------------------------------------------------
 MonCreateBoundaryCAO::MonCreateBoundaryCAO(MonCreateCase* parent, bool modal,
-                                         HOMARD::HOMARD_Gen_var myHomardGen0,
+                                         ADAPT::ADAPT_Gen_var myHomardGen0,
                                          QString caseName, QString aName)
 // ---------------------------------------------------------------------------------
 /* Constructs a MonCreateBoundaryCAO */
     :
     QDialog(0), Ui_CreateBoundaryCAO(),
     _parent(parent), _aName(aName),
-    myHomardGen(HOMARD::HOMARD_Gen::_duplicate(myHomardGen0)),
+    myHomardGen(ADAPT::ADAPT_Gen::_duplicate(myHomardGen0)),
     _aCaseName(caseName)
     {
       MESSAGE("Constructeur") ;
@@ -137,7 +137,7 @@ void MonCreateBoundaryCAO::PushOnHelp()
 void MonCreateBoundaryCAO::AssocieLesGroupes()
 // ------------------------------------------------------------------------
 {
-  HOMARD::ListGroupType_var aSeqGroupe = new HOMARD::ListGroupType;
+  ADAPT::ListGroupType_var aSeqGroupe = new ADAPT::ListGroupType;
   aSeqGroupe->length(_listeGroupesBoundary.size());
   QStringList::const_iterator it;
   int i=0;
@@ -152,7 +152,7 @@ void MonCreateBoundaryCAO::SetNewName()
 // --------------------------------------------------
 {
 
-  HOMARD::listeBoundarys_var  MyObjects = myHomardGen->GetAllBoundarysName();
+  ADAPT::listeBoundarys_var  MyObjects = myHomardGen->GetAllBoundarysName();
   int num = 0; QString aName="";
   while (aName == QString("") )
   {
@@ -195,7 +195,7 @@ void MonCreateBoundaryCAO::SetFiltrage()
     return;
   }
 
-  MonCreateListGroupCAO *aDlg = new MonCreateListGroupCAO(NULL, this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),
+  MonCreateListGroupCAO *aDlg = new MonCreateListGroupCAO(NULL, this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),
                             _aCaseName, _listeGroupesBoundary) ;
   aDlg->show();
 }

src/ADAPTGUI/MonCreateBoundaryCAO.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 #include CORBA_CLIENT_HEADER(HOMARD_Boundary)
 
 #include "ui_CreateBoundaryCAO.h"
@@ -39,7 +39,7 @@ class HOMARD_EXPORT MonCreateBoundaryCAO : public QDialog, public Ui_CreateBound
 
 public:
     MonCreateBoundaryCAO( MonCreateCase* parent, bool modal,
-                         HOMARD::HOMARD_Gen_var myHomardGen,
+                         ADAPT::ADAPT_Gen_var myHomardGen,
                          QString caseName, QString BoundaryName );
     ~MonCreateBoundaryCAO();
     virtual void setGroups (QStringList listGroup);
@@ -52,8 +52,8 @@ protected :
     QString _aCaseName;
 
 
-    HOMARD::HOMARD_Boundary_var aBoundary;
+    ADAPT::HOMARD_Boundary_var aBoundary;
-    HOMARD::HOMARD_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myHomardGen;
 
     QStringList  _listeGroupesBoundary;
 

src/ADAPTGUI/MonCreateBoundaryDi.cxx

@@ -33,14 +33,14 @@ using namespace std;
 
 // -------------------------------------------------------------------------------
 MonCreateBoundaryDi::MonCreateBoundaryDi(MonCreateCase* parent, bool modal,
-                                         HOMARD::HOMARD_Gen_var myHomardGen0,
+                                         ADAPT::ADAPT_Gen_var myHomardGen0,
                                          QString caseName, QString aName)
 // ---------------------------------------------------------------------------------
 /* Constructs a MonCreateBoundaryDi */
     :
     QDialog(0), Ui_CreateBoundaryDi(),
     _parent(parent), _aName(aName),
-    myHomardGen(HOMARD::HOMARD_Gen::_duplicate(myHomardGen0)),
+    myHomardGen(ADAPT::ADAPT_Gen::_duplicate(myHomardGen0)),
     _aCaseName(caseName)
     {
       MESSAGE("Constructeur") ;
@@ -146,7 +146,7 @@ void MonCreateBoundaryDi::PushOnHelp()
 void MonCreateBoundaryDi::AssocieLesGroupes()
 // ------------------------------------------------------------------------
 {
-  HOMARD::ListGroupType_var aSeqGroupe = new HOMARD::ListGroupType;
+  ADAPT::ListGroupType_var aSeqGroupe = new ADAPT::ListGroupType;
   aSeqGroupe->length(_listeGroupesBoundary.size());
   QStringList::const_iterator it;
   int i=0;
@@ -161,7 +161,7 @@ void MonCreateBoundaryDi::SetNewName()
 // --------------------------------------------------
 {
 
-  HOMARD::listeBoundarys_var  MyObjects = myHomardGen->GetAllBoundarysName();
+  ADAPT::listeBoundarys_var  MyObjects = myHomardGen->GetAllBoundarysName();
   int num = 0; QString aName="";
   while (aName == QString("") )
   {
@@ -204,7 +204,7 @@ void MonCreateBoundaryDi::SetFiltrage()
     return;
   }
 
-  MonCreateListGroup *aDlg = new MonCreateListGroup(NULL, this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),
+  MonCreateListGroup *aDlg = new MonCreateListGroup(NULL, this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),
                             _aCaseName, _listeGroupesBoundary) ;
   aDlg->show();
 }

src/ADAPTGUI/MonCreateBoundaryDi.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 #include CORBA_CLIENT_HEADER(HOMARD_Boundary)
 
 #include "ui_CreateBoundaryDi.h"
@@ -39,7 +39,7 @@ class HOMARD_EXPORT MonCreateBoundaryDi : public QDialog, public Ui_CreateBounda
 
 public:
     MonCreateBoundaryDi( MonCreateCase* parent, bool modal,
-                         HOMARD::HOMARD_Gen_var myHomardGen,
+                         ADAPT::ADAPT_Gen_var myHomardGen,
                          QString caseName, QString BoundaryName );
     ~MonCreateBoundaryDi();
     virtual void setGroups (QStringList listGroup);
@@ -52,8 +52,8 @@ protected :
     QString _aCaseName;
 
 
-    HOMARD::HOMARD_Boundary_var aBoundary;
+    ADAPT::HOMARD_Boundary_var aBoundary;
-    HOMARD::HOMARD_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myHomardGen;
 
     QStringList  _listeGroupesBoundary;
 

src/ADAPTGUI/MonCreateCase.cxx

@@ -46,7 +46,7 @@ using namespace std;
  * Sets attributes to default values
  */
 // -----------------------------------------------------------------------------------------
-MonCreateCase::MonCreateCase( bool modal, HOMARD::HOMARD_Gen_var myHomardGen0 )
+MonCreateCase::MonCreateCase( bool modal, ADAPT::ADAPT_Gen_var myHomardGen0 )
     :
     Ui_CreateCase(),
     _aCaseName(""),_aDirName(""),
@@ -55,7 +55,7 @@ MonCreateCase::MonCreateCase( bool modal, HOMARD::HOMARD_Gen_var myHomardGen0 )
     _Pyram(0)
 {
   MESSAGE("Debut du constructeur de MonCreateCase");
-  myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0);
+  myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
   setupUi(this);
   setModal(modal);
   InitConnect();
@@ -132,7 +132,7 @@ void MonCreateCase::InitBoundarys()
 {
   MESSAGE("InitBoundarys");
 // Pour les frontieres analytiques : la colonne des groupes
-  HOMARD::ListGroupType_var _listeGroupesCas = aCase->GetGroups();
+  ADAPT::ListGroupType_var _listeGroupesCas = aCase->GetGroups();
   QTableWidgetItem *__colItem = new QTableWidgetItem();
   __colItem->setText(QApplication::translate("CreateCase", "", 0));
   TWBoundary->setHorizontalHeaderItem(0, __colItem);
@@ -145,8 +145,8 @@ void MonCreateCase::InitBoundarys()
 // Pour les frontieres CAO : la liste a saisir
 // Pour les frontieres discretes : la liste a saisir
 // Pour les frontieres analytiques : les colonnes de chaque frontiere
-  HOMARD::HOMARD_Boundary_var myBoundary ;
+  ADAPT::HOMARD_Boundary_var myBoundary ;
-  HOMARD::listeBoundarys_var  mesBoundarys = myHomardGen->GetAllBoundarysName();
+  ADAPT::listeBoundarys_var  mesBoundarys = myHomardGen->GetAllBoundarysName();
 //   MESSAGE("Nombre de frontieres enregistrees : "<<mesBoundarys->length());
   for (int i=0; i<mesBoundarys->length(); i++)
   {
@@ -352,7 +352,7 @@ void MonCreateCase::PushOnHelp()
 void MonCreateCase::SetNewName()
 // ------------------------------
 {
-  HOMARD::listeCases_var  MyCases = myHomardGen->GetAllCasesName();
+  ADAPT::listeCases_var  MyCases = myHomardGen->GetAllCasesName();
   int num = 0; QString aCaseName="";
   while (aCaseName=="" )
   {
@@ -507,7 +507,7 @@ void MonCreateCase::PushBoundaryCAONew()
 // ------------------------------------------------------------------------
 {
    MonCreateBoundaryCAO *BoundaryDlg = new MonCreateBoundaryCAO(this, true,
-                HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, "") ;
+                ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, "") ;
    BoundaryDlg->show();
 }
 // ------------------------------------------------------------------------
@@ -516,7 +516,7 @@ void MonCreateCase::PushBoundaryCAOEdit()
 {
   if (CBBoundaryCAO->currentText() == QString(""))  return;
   MonEditBoundaryCAO *BoundaryDlg = new MonEditBoundaryCAO(this, true,
-       HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, CBBoundaryCAO->currentText() ) ;
+       ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, CBBoundaryCAO->currentText() ) ;
   BoundaryDlg->show();
 }
 // ------------------------------------------------------------------------
@@ -555,7 +555,7 @@ void MonCreateCase::PushBoundaryDiNew()
 // ------------------------------------------------------------------------
 {
    MonCreateBoundaryDi *BoundaryDlg = new MonCreateBoundaryDi(this, true,
-                HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, "") ;
+                ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, "") ;
    BoundaryDlg->show();
 }
 // ------------------------------------------------------------------------
@@ -564,7 +564,7 @@ void MonCreateCase::PushBoundaryDiEdit()
 {
   if (CBBoundaryDi->currentText() == QString(""))  return;
   MonEditBoundaryDi *BoundaryDlg = new MonEditBoundaryDi(this, true,
-       HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, CBBoundaryDi->currentText() ) ;
+       ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, CBBoundaryDi->currentText() ) ;
   BoundaryDlg->show();
 }
 // ------------------------------------------------------------------------
@@ -624,7 +624,7 @@ void MonCreateCase::PushBoundaryAnNew()
 // ------------------------------------------------------------------------
 {
    MonCreateBoundaryAn *BoundaryDlg = new MonCreateBoundaryAn(this, true,
-                HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName) ;
+                ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName) ;
    BoundaryDlg->show();
 }
 // ------------------------------------------------------------------------
@@ -641,7 +641,7 @@ void MonCreateCase::PushBoundaryAnEdit()
     MESSAGE("nom "<<nom.toStdString().c_str());
     if (nom != QString(""))
     { MonEditBoundaryAn *BoundaryDlg = new MonEditBoundaryAn(this, true,
-        HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, nom ) ;
+        ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, nom ) ;
       BoundaryDlg->show(); }
   }
 }

src/ADAPTGUI/MonCreateCase.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 #include CORBA_CLIENT_HEADER(HOMARD_Cas)
 
 #include "ui_CreateCase.h"
@@ -37,7 +37,7 @@ class HOMARD_EXPORT MonCreateCase : public QDialog, public Ui_CreateCase
     Q_OBJECT
 
 public:
-    MonCreateCase( bool modal, HOMARD::HOMARD_Gen_var myHomardGen );
+    MonCreateCase( bool modal, ADAPT::ADAPT_Gen_var myHomardGen );
     ~MonCreateCase();
 
     void AddBoundaryCAO(QString newBoundary);
@@ -53,8 +53,8 @@ protected :
 
     int _Pyram;
 
-    HOMARD::HOMARD_Cas_var aCase ;
+    ADAPT::HOMARD_Cas_var aCase ;
-    HOMARD::HOMARD_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myHomardGen;
 
     virtual void InitConnect();
     virtual void InitBoundarys();

src/ADAPTGUI/MonCreateHypothesis.cxx

@@ -35,7 +35,7 @@ using namespace std;
 
 // -------------------------------------------------------------------------------
 MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal,
-                                         HOMARD::HOMARD_Gen_var myHomardGen0,
+                                         ADAPT::ADAPT_Gen_var myHomardGen0,
                                          QString Name,
                                          QString caseName, QString aFieldFile)
 // ---------------------------------------------------------------------------------
@@ -56,7 +56,7 @@ MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal,
 
 {
       MESSAGE("Constructeur") ;
-      myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0);
+      myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
       setupUi(this);
       if ( modal ) { setWindowModality(Qt::WindowModal); }
       else         { setWindowModality(Qt::NonModal); }
@@ -231,7 +231,7 @@ void MonCreateHypothesis::SetNewName()
 // --------------------------------------------------
 {
 
-  HOMARD::listeHypotheses_var  MyObjects = myHomardGen->GetAllHypothesesName();
+  ADAPT::listeHypotheses_var  MyObjects = myHomardGen->GetAllHypothesesName();
   int num = 0;//
   QString aName="";
   while (aName=="" )
@@ -318,7 +318,7 @@ void MonCreateHypothesis::PushZoneNew()
 // ------------------------------------------------------------------------
 {
   MESSAGE("Debut de MonCreateHypothesis::PushZoneNew")
-  MonCreateZone *aDlg = new MonCreateZone(this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName) ;
+  MonCreateZone *aDlg = new MonCreateZone(this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName) ;
   aDlg->show();
 }
 
@@ -336,7 +336,7 @@ void MonCreateHypothesis::PushZoneEdit()
     return;
   }
   QString zoneName = monItem->text().trimmed();
-  MonEditZone *aDlg = new MonEditZone(this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, zoneName) ;
+  MonEditZone *aDlg = new MonEditZone(this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, zoneName) ;
   aDlg->show();
 }
 // ------------------------------------------------------------------------
@@ -357,7 +357,7 @@ void MonCreateHypothesis::GetAllZones()
 // Par defaut, aucune n'est selectionnee
 {
   MESSAGE("Debut de GetAllZones") ;
-  HOMARD::listeZones_var mesZones = myHomardGen->GetAllZonesName();
+  ADAPT::listeZones_var mesZones = myHomardGen->GetAllZonesName();
   int nbrow=TWZone->rowCount();
   for ( int row=0; row< nbrow; row++)
   {
@@ -711,7 +711,7 @@ void MonCreateHypothesis::SetFiltrage()
 // ------------------------------------------------------------------------
 {
   if (!CBGroupe->isChecked()) return;
-  MonCreateListGroup *aDlg = new MonCreateListGroup(this, NULL, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ;
+  MonCreateListGroup *aDlg = new MonCreateListGroup(this, NULL, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ;
   aDlg->show();
 }
 
@@ -805,7 +805,7 @@ void MonCreateHypothesis::AssocieComposants()
 void MonCreateHypothesis::AssocieLesGroupes()
 // ------------------------------------------------------------------------
 {
-  HOMARD::ListGroupType_var aSeqGroupe = new HOMARD::ListGroupType;
+  ADAPT::ListGroupType_var aSeqGroupe = new ADAPT::ListGroupType;
   aSeqGroupe->length(_aListeGroupes.size());
   QStringList::const_iterator it;
   int i=0;

src/ADAPTGUI/MonCreateHypothesis.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 #include CORBA_CLIENT_HEADER(HOMARD_Hypothesis)
 
 #include "ui_CreateHypothesis.h"
@@ -38,7 +38,7 @@ class HOMARD_EXPORT MonCreateHypothesis : public QScrollArea, public Ui_CreateHy
     Q_OBJECT
 
 public:
-    MonCreateHypothesis( MonCreateIteration* parent, bool modal, HOMARD::HOMARD_Gen_var myHomardGen,
+    MonCreateHypothesis( MonCreateIteration* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen,
                          QString aHypotheseName, QString caseName, QString aFieldFile);
     ~MonCreateHypothesis();
 
@@ -46,7 +46,7 @@ public:
     virtual void setGroups(QStringList listGroup);
 
 protected :
-   // MonCreateHypothesis( MonCreateIteration* parent, HOMARD::HOMARD_Gen_var myHomardGen,
+   // MonCreateHypothesis( MonCreateIteration* parent, ADAPT::ADAPT_Gen_var myHomardGen,
    //                      QString caseName, QString aFieldFile);
 
     MonCreateIteration *_parent;
@@ -74,8 +74,8 @@ protected :
     int _AdapInit;
     int _ExtraOutput;
 
-    HOMARD::HOMARD_Hypothesis_var aHypothesis;
+    ADAPT::HOMARD_Hypothesis_var aHypothesis;
-    HOMARD::HOMARD_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myHomardGen;
 
     QStringList _aListeZone;
     QStringList _aListeComposant;

src/ADAPTGUI/MonCreateIteration.cxx

@@ -33,7 +33,7 @@ using namespace std;
 
 // -----------------------------------------------------------------------------------------------------
 MonCreateIteration::MonCreateIteration(QWidget* parent, bool modal,
-                                       HOMARD::HOMARD_Gen_var myHomardGen0, QString IterParentName ):
+                                       ADAPT::ADAPT_Gen_var myHomardGen0, QString IterParentName ):
 // -----------------------------------------------------------------------------------------------------
 /* Constructs a MonCreateIteration
  * Inherits from CasHomard
@@ -46,7 +46,7 @@ MonCreateIteration::MonCreateIteration(QWidget* parent, bool modal,
     _CaseName("")
     {
       MESSAGE("Constructeur");
-      myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0);
+      myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
       setupUi(this);
       if ( modal ) { setWindowModality(Qt::WindowModal); }
       else         { setWindowModality(Qt::NonModal); }
@@ -87,7 +87,7 @@ void MonCreateIteration::InitConnect()
 void MonCreateIteration::GetHypotheses()
 // ------------------------------------------------------------------------
 {
-     HOMARD::listeHypotheses_var  mesHypotheses = myHomardGen->GetAllHypothesesName();
+     ADAPT::listeHypotheses_var  mesHypotheses = myHomardGen->GetAllHypothesesName();
      for (int i=0; i<mesHypotheses->length(); i++)
      {
          CBHypothese->addItem(QString(mesHypotheses[i]));
@@ -128,8 +128,8 @@ bool MonCreateIteration::PushOnApply()
                               QObject::tr("HOM_ITER_HYPO") );
     return false;
   }
-  HOMARD::HOMARD_Hypothesis_var _myHypothesis = myHomardGen->GetHypothesis(monHypoName.toStdString().c_str());
+  ADAPT::HOMARD_Hypothesis_var _myHypothesis = myHomardGen->GetHypothesis(monHypoName.toStdString().c_str());
-  HOMARD::listeTypes_var ListTypes (_myHypothesis->GetAdapRefinUnRef());
+  ADAPT::listeTypes_var ListTypes (_myHypothesis->GetAdapRefinUnRef());
   int TypeAdap = ListTypes[0];
   if ( TypeAdap == 1 && LEFieldFile->text().trimmed() == QString("") )
   {
@@ -202,7 +202,7 @@ void MonCreateIteration::SetIterParentName()
     if (_IterParentName == QString("")) { raise();return;};
   }
   _CaseName=HOMARD_QT_COMMUN::SelectionCasEtude();
-  HOMARD::HOMARD_Iteration_var aIterParent = myHomardGen->GetIteration(_IterParentName.toStdString().c_str()) ;
+  ADAPT::HOMARD_Iteration_var aIterParent = myHomardGen->GetIteration(_IterParentName.toStdString().c_str()) ;
   QString MeshName = aIterParent->GetMeshName();
 
   LEMeshName_n->setText(MeshName);
@@ -217,7 +217,7 @@ void MonCreateIteration::SetNewName()
 {
 // Recherche d'un nom par defaut qui n'existe pas encore
 
-  HOMARD::listeIterations_var  MyObjects=myHomardGen->GetAllIterationsName();
+  ADAPT::listeIterations_var  MyObjects=myHomardGen->GetAllIterationsName();
   int num = 0;//
   QString aName="";
   while (aName=="" )
@@ -249,7 +249,7 @@ void MonCreateIteration::PushHypoEdit()
     return;
   }
   QString aFieldFile=LEFieldFile->text().trimmed();
-  MonEditHypothesis *HypoDlg = new MonEditHypothesis(this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),CBHypothese->currentText(), _CaseName, aFieldFile) ;
+  MonEditHypothesis *HypoDlg = new MonEditHypothesis(this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),CBHypothese->currentText(), _CaseName, aFieldFile) ;
   HypoDlg->show();
 }
 
@@ -273,11 +273,11 @@ void MonCreateIteration::PushHypoNew()
   }
   if ( _CaseName == QString(""))
   {
-    HOMARD::HOMARD_Iteration_var aIterParent = myHomardGen->GetIteration(_IterParentName.toStdString().c_str()) ;
+    ADAPT::HOMARD_Iteration_var aIterParent = myHomardGen->GetIteration(_IterParentName.toStdString().c_str()) ;
     _CaseName = aIterParent->GetCaseName();
   }
   QString aFieldFile=LEFieldFile->text().trimmed();
-  MonCreateHypothesis *HypoDlg = new MonCreateHypothesis(this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), QString(""), _CaseName, aFieldFile) ;
+  MonCreateHypothesis *HypoDlg = new MonCreateHypothesis(this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), QString(""), _CaseName, aFieldFile) ;
   HypoDlg->show();
 }
 // ------------------------------------------------------------------------

src/ADAPTGUI/MonCreateIteration.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 #include CORBA_CLIENT_HEADER(HOMARD_Cas)
 
 #include "ui_CreateIteration.h"
@@ -37,24 +37,24 @@ class HOMARD_EXPORT MonCreateIteration : public QScrollArea, public Ui_CreateIte
     Q_OBJECT
 
 public:
-    MonCreateIteration( QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myHomardGen, QString IterParentName );
+    MonCreateIteration( QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString IterParentName );
     ~MonCreateIteration();
 
     void addHypothese(QString newHypothese);
 
 
 protected :
-    MonCreateIteration( QWidget* parent, HOMARD::HOMARD_Gen_var myHomardGen, QString IterParentName );
+    MonCreateIteration( QWidget* parent, ADAPT::ADAPT_Gen_var myHomardGen, QString IterParentName );
 
     QString _Name;
     QString _IterParentName;
     QString _CaseName;
 
 
-    HOMARD::HOMARD_Iteration_var aIter ;
+    ADAPT::HOMARD_Iteration_var aIter ;
-    HOMARD::HOMARD_Iteration_var aIterParent ;
+    ADAPT::HOMARD_Iteration_var aIterParent ;
-    HOMARD::HOMARD_Cas_var aCas ;
+    ADAPT::HOMARD_Cas_var aCas ;
-    HOMARD::HOMARD_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myHomardGen;
 
 
     virtual void InitConnect();

src/ADAPTGUI/MonCreateListGroup.cxx

@@ -38,7 +38,7 @@ using namespace std;
 
 // --------------------------------------------------------------------------------------------------------------
 MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal,
-                                       HOMARD::HOMARD_Gen_var myHomardGen0, QString aCaseName,  QStringList listeGroupesHypo) :
+                                       ADAPT::ADAPT_Gen_var myHomardGen0, QString aCaseName,  QStringList listeGroupesHypo) :
 // --------------------------------------------------------------------------------------------------------------
 //
     QDialog(0), Ui_CreateListGroup(),
@@ -48,7 +48,7 @@ MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreate
     _parentBound(parentBound)
 {
     MESSAGE("Debut de  MonCreateListGroup")
-     myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0);
+     myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
     setupUi(this);
     setModal(modal);
     InitConnect();
@@ -56,7 +56,7 @@ MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreate
 }
 // --------------------------------------------------------------------------------------------------------------
 MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound,
-                                       HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName,  QStringList listeGroupesHypo) :
+                                       ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName,  QStringList listeGroupesHypo) :
 // --------------------------------------------------------------------------------------------------------------
 //
     QDialog(0), Ui_CreateListGroup(),
@@ -65,7 +65,7 @@ MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreate
     _parentHyp(parentHyp),
     _parentBound(parentBound)
 {
-    myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
+    myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen);
     setupUi(this);
     InitConnect();
 }
@@ -130,8 +130,8 @@ void MonCreateListGroup::InitGroupes()
       TWGroupe->removeRow(row);
   TWGroupe->setRowCount(0);
   if (_aCaseName == QString("")) { return; };
-  HOMARD::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+  ADAPT::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str());
-  HOMARD::ListGroupType_var _listeGroupesCas = monCas->GetGroups();
+  ADAPT::ListGroupType_var _listeGroupesCas = monCas->GetGroups();
   for ( int i = 0; i < _listeGroupesCas->length(); i++ )
   {
     TWGroupe->insertRow(i);

src/ADAPTGUI/MonCreateListGroup.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 
 #include "ui_CreateListGroup.h"
 #include <QDialog>
@@ -38,13 +38,13 @@ class HOMARD_EXPORT MonCreateListGroup : public QDialog, public Ui_CreateListGro
     Q_OBJECT
 
 public:
-    MonCreateListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName,  QStringList listeGroupesHypo);
+    MonCreateListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName,  QStringList listeGroupesHypo);
-    MonCreateListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo);
+    MonCreateListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo);
     virtual ~MonCreateListGroup();
 
 protected :
 
-    HOMARD::HOMARD_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myHomardGen;
 
     MonCreateHypothesis * _parentHyp;
     MonCreateBoundaryDi * _parentBound;

src/ADAPTGUI/MonCreateListGroupCAO.cxx

@@ -38,7 +38,7 @@ using namespace std;
 
 // --------------------------------------------------------------------------------------------------------------
 MonCreateListGroupCAO::MonCreateListGroupCAO(MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal,
-                                       HOMARD::HOMARD_Gen_var myHomardGen0, QString aCaseName,  QStringList listeGroupesHypo) :
+                                       ADAPT::ADAPT_Gen_var myHomardGen0, QString aCaseName,  QStringList listeGroupesHypo) :
 // --------------------------------------------------------------------------------------------------------------
 //
     QDialog(0), Ui_CreateListGroup(),
@@ -48,7 +48,7 @@ MonCreateListGroupCAO::MonCreateListGroupCAO(MonCreateHypothesis* parentHyp, Mon
     _parentBound(parentBound)
 {
     MESSAGE("Debut de  MonCreateListGroupCAO")
-     myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0);
+     myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
     setupUi(this);
     setModal(modal);
     InitConnect();
@@ -56,7 +56,7 @@ MonCreateListGroupCAO::MonCreateListGroupCAO(MonCreateHypothesis* parentHyp, Mon
 }
 // --------------------------------------------------------------------------------------------------------------
 MonCreateListGroupCAO::MonCreateListGroupCAO(MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound,
-                                       HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName,  QStringList listeGroupesHypo) :
+                                       ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName,  QStringList listeGroupesHypo) :
 // --------------------------------------------------------------------------------------------------------------
 //
     QDialog(0), Ui_CreateListGroup(),
@@ -65,7 +65,7 @@ MonCreateListGroupCAO::MonCreateListGroupCAO(MonCreateHypothesis* parentHyp, Mon
     _parentHyp(parentHyp),
     _parentBound(parentBound)
 {
-    myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen);
+    myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen);
     setupUi(this);
     InitConnect();
 }
@@ -127,8 +127,8 @@ void MonCreateListGroupCAO::InitGroupes()
       TWGroupe->removeRow(row);
   TWGroupe->setRowCount(0);
   if (_aCaseName == QString("")) { return; };
-  HOMARD::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+  ADAPT::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str());
-  HOMARD::ListGroupType_var _listeGroupesCas = monCas->GetGroups();
+  ADAPT::ListGroupType_var _listeGroupesCas = monCas->GetGroups();
   for ( int i = 0; i < _listeGroupesCas->length(); i++ )
   {
     TWGroupe->insertRow(i);

src/ADAPTGUI/MonCreateListGroupCAO.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 
 #include "ui_CreateListGroup.h"
 #include <QDialog>
@@ -38,13 +38,13 @@ class HOMARD_EXPORT MonCreateListGroupCAO : public QDialog, public Ui_CreateList
     Q_OBJECT
 
 public:
-    MonCreateListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal, HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName,  QStringList listeGroupesHypo);
+    MonCreateListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName,  QStringList listeGroupesHypo);
-    MonCreateListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo);
+    MonCreateListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo);
     virtual ~MonCreateListGroupCAO();
 
 protected :
 
-    HOMARD::HOMARD_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myHomardGen;
 
     MonCreateHypothesis * _parentHyp;
     MonCreateBoundaryCAO * _parentBound;

src/ADAPTGUI/MonCreateYACS.cxx

@@ -34,7 +34,7 @@
 using namespace std;
 
 // ----------------------------------------------------------------------
-MonCreateYACS::MonCreateYACS (bool modal, HOMARD::HOMARD_Gen_var myHomardGen0, QString CaseName ):
+MonCreateYACS::MonCreateYACS (bool modal, ADAPT::ADAPT_Gen_var myHomardGen0, QString CaseName ):
 // ----------------------------------------------------------------------
 /* Constructs a MonCreateYACS
  * Sets attributes to default values
@@ -46,11 +46,11 @@ MonCreateYACS::MonCreateYACS (bool modal, HOMARD::HOMARD_Gen_var myHomardGen0, Q
   _aDirName(""),
   _aMeshFile(""),
   _Type(1)
-  // Les valeurs de _Type, _MaxIter, _MaxNode, _MaxElem doivent etre les memes que celles dans HOMARD_Gen_i::CreateYACSSchema
+  // Les valeurs de _Type, _MaxIter, _MaxNode, _MaxElem doivent etre les memes que celles dans ADAPT_Gen_i::CreateYACSSchema
   // et doivent correspondre aux defauts des boutons
   {
 //     MESSAGE("Debut du constructeur de MonCreateYACS");
-    myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0);
+    myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
     setupUi(this);
     if ( modal ) { setWindowModality(Qt::WindowModal); }
     else         { setWindowModality(Qt::NonModal); }
@@ -75,7 +75,7 @@ MonCreateYACS::MonCreateYACS (bool modal, HOMARD::HOMARD_Gen_var myHomardGen0, Q
   }
 
 // ----------------------------------------------------------------------
-MonCreateYACS::MonCreateYACS(HOMARD::HOMARD_Gen_var myHomardGen0,
+MonCreateYACS::MonCreateYACS(ADAPT::ADAPT_Gen_var myHomardGen0,
                              QString caseName):
 // ----------------------------------------------------------------------
 // Constructeur appele par MonEditYACS
@@ -273,7 +273,7 @@ void MonCreateYACS::SetNewName()
 // --------------------------------------------------
 {
 
-  HOMARD::listeYACSs_var MyObjects = myHomardGen->GetAllYACSsName();
+  ADAPT::listeYACSs_var MyObjects = myHomardGen->GetAllYACSsName();
   int num = 0; QString aName="";
   while (aName == QString("") )
   {

src/ADAPTGUI/MonCreateYACS.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 #include CORBA_CLIENT_HEADER(HOMARD_Cas)
 
 #include "ui_CreateYACS.h"
@@ -37,11 +37,11 @@ class HOMARD_EXPORT MonCreateYACS : public QScrollArea, public Ui_CreateYACS
     Q_OBJECT
 
   public:
-    MonCreateYACS( bool modal, HOMARD::HOMARD_Gen_var myHomardGen, QString CaseName);
+    MonCreateYACS( bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString CaseName);
     virtual ~MonCreateYACS();
 
   protected :
-    MonCreateYACS( HOMARD::HOMARD_Gen_var myHomardGen, QString CaseName);
+    MonCreateYACS( ADAPT::ADAPT_Gen_var myHomardGen, QString CaseName);
 
     QString _Name;
     QString _aCaseName;
@@ -56,8 +56,8 @@ class HOMARD_EXPORT MonCreateYACS : public QScrollArea, public Ui_CreateYACS
 
     bool Chgt;
 
-    HOMARD::HOMARD_YACS_var aYACS;
+    ADAPT::HOMARD_YACS_var aYACS;
-    HOMARD::HOMARD_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myHomardGen;
 
     virtual void InitConnect();
     virtual bool CreateOrUpdate();

src/ADAPTGUI/MonCreateZone.cxx

@@ -38,7 +38,7 @@ using namespace std;
 
 // ----------------------------------------------------------------------
 MonCreateZone::MonCreateZone(MonCreateHypothesis* parent, bool modal,
-                             HOMARD::HOMARD_Gen_var myHomardGen0,
+                             ADAPT::ADAPT_Gen_var myHomardGen0,
                              QString caseName) :
 // ----------------------------------------------------------------------
 /* Constructs a MonCreateZone
@@ -61,7 +61,7 @@ MonCreateZone::MonCreateZone(MonCreateHypothesis* parent, bool modal,
     Chgt (false)
     {
       MESSAGE("Constructeur") ;
-      myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0) ;
+      myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0) ;
       setupUi(this) ;
       setModal(modal) ;
       InitConnect( ) ;
@@ -74,7 +74,7 @@ MonCreateZone::MonCreateZone(MonCreateHypothesis* parent, bool modal,
     }
 // ----------------------------------------------------------------------
 MonCreateZone::MonCreateZone(MonCreateHypothesis* parent,
-                             HOMARD::HOMARD_Gen_var myHomardGen0,
+                             ADAPT::ADAPT_Gen_var myHomardGen0,
                              QString caseName):
 // ----------------------------------------------------------------------
 // Constructeur appele par MonEditZone
@@ -131,8 +131,8 @@ void MonCreateZone::InitValZone()
 //
   if (_aCaseName == QString("")) { return; }
 
-  HOMARD::HOMARD_Cas_var aCas = myHomardGen->GetCase(_aCaseName.toStdString().c_str()) ;
+  ADAPT::HOMARD_Cas_var aCas = myHomardGen->GetCase(_aCaseName.toStdString().c_str()) ;
-  HOMARD::extrema_var  MesExtremes = aCas->GetBoundingBox() ;
+  ADAPT::extrema_var  MesExtremes = aCas->GetBoundingBox() ;
   int num = MesExtremes->length() ;
   ASSERT(num == 10) ;
   _Xmin=MesExtremes[0]; _Xmax=MesExtremes[1]; _Xincr=MesExtremes[2];
@@ -600,7 +600,7 @@ void MonCreateZone::SetNewName()
   MESSAGE("SetNewName");
 // Recherche d'un nom par defaut qui n'existe pas encore
 
-  HOMARD::listeZones_var  MyObjects = myHomardGen->GetAllZonesName() ;
+  ADAPT::listeZones_var  MyObjects = myHomardGen->GetAllZonesName() ;
   int num = 0; QString aName="";
   while (aName=="" )
   {

src/ADAPTGUI/MonCreateZone.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 
 #include "ui_CreateZone.h"
 #include <QDialog>
@@ -38,13 +38,13 @@ class HOMARD_EXPORT MonCreateZone : public QDialog, public Ui_CreateZone
 
 public:
     MonCreateZone( MonCreateHypothesis* parent, bool modal,
-                   HOMARD::HOMARD_Gen_var myHomardGen,
+                   ADAPT::ADAPT_Gen_var myHomardGen,
                    QString caseName);
     virtual ~MonCreateZone();
 
 protected :
     MonCreateZone( MonCreateHypothesis* parent,
-                   HOMARD::HOMARD_Gen_var myHomardGen,
+                   ADAPT::ADAPT_Gen_var myHomardGen,
                    QString caseName);
 
     MonCreateHypothesis * _parent;
@@ -64,8 +64,8 @@ protected :
 
     bool Chgt;
 
-    HOMARD::HOMARD_Zone_var aZone ;
+    ADAPT::HOMARD_Zone_var aZone ;
-    HOMARD::HOMARD_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myHomardGen;
 
     virtual void InitConnect();
     virtual void InitValZone();

src/ADAPTGUI/MonEditBoundaryAn.cxx

@@ -27,7 +27,7 @@ using namespace std;
 
 // ------------------------------------------------------------------------
 MonEditBoundaryAn::MonEditBoundaryAn( MonCreateCase* parent, bool modal,
-                          HOMARD::HOMARD_Gen_var myHomardGen,
+                          ADAPT::ADAPT_Gen_var myHomardGen,
                           QString caseName, QString Name ):
 // ------------------------------------------------------------------------
 /* Constructs a MonEditBoundaryAn
@@ -95,7 +95,7 @@ void MonEditBoundaryAn::InitValEdit()
 void MonEditBoundaryAn::InitValBoundaryAnLimit()
 // ------------------------------------------------------------------------
 {
-  HOMARD::double_array_var  mesCoordLimits = aBoundaryAn->GetLimit();
+  ADAPT::double_array_var  mesCoordLimits = aBoundaryAn->GetLimit();
   ASSERT(mesCoordLimits->length() == 3 );
   _Xincr=mesCoordLimits[0];
   _Yincr=mesCoordLimits[1];
@@ -105,7 +105,7 @@ void MonEditBoundaryAn::InitValBoundaryAnLimit()
 void MonEditBoundaryAn::InitValBoundaryAnCylindre()
 // ------------------------------------------------------------------------
 {
-  HOMARD::double_array_var  mesCoordBoundary = aBoundaryAn->GetCoords();
+  ADAPT::double_array_var  mesCoordBoundary = aBoundaryAn->GetCoords();
   ASSERT(mesCoordBoundary->length() == 7 );
   _BoundaryAnXcentre=mesCoordBoundary[0];
   _BoundaryAnYcentre=mesCoordBoundary[1];
@@ -119,7 +119,7 @@ void MonEditBoundaryAn::InitValBoundaryAnCylindre()
 void MonEditBoundaryAn::InitValBoundaryAnSphere()
 // ------------------------------------------------------------------------
 {
-  HOMARD::double_array_var  mesCoordBoundary = aBoundaryAn->GetCoords();
+  ADAPT::double_array_var  mesCoordBoundary = aBoundaryAn->GetCoords();
   ASSERT(mesCoordBoundary->length() == 4 );
   _BoundaryAnXcentre=mesCoordBoundary[0];
   _BoundaryAnYcentre=mesCoordBoundary[1];
@@ -130,7 +130,7 @@ void MonEditBoundaryAn::InitValBoundaryAnSphere()
 void MonEditBoundaryAn::InitValBoundaryAnConeA()
 // ------------------------------------------------------------------------
 {
-  HOMARD::double_array_var  mesCoordBoundary = aBoundaryAn->GetCoords();
+  ADAPT::double_array_var  mesCoordBoundary = aBoundaryAn->GetCoords();
   ASSERT(mesCoordBoundary->length() == 7 );
   _BoundaryAnXaxisCone=mesCoordBoundary[0];
   _BoundaryAnYaxisCone=mesCoordBoundary[1];
@@ -145,7 +145,7 @@ void MonEditBoundaryAn::InitValBoundaryAnConeA()
 void MonEditBoundaryAn::InitValBoundaryAnConeR()
 // ------------------------------------------------------------------------
 {
-  HOMARD::double_array_var  mesCoordBoundary = aBoundaryAn->GetCoords();
+  ADAPT::double_array_var  mesCoordBoundary = aBoundaryAn->GetCoords();
   ASSERT(mesCoordBoundary->length() == 8 );
   _BoundaryAnXcone1=mesCoordBoundary[0];
   _BoundaryAnYcone1=mesCoordBoundary[1];
@@ -161,7 +161,7 @@ void MonEditBoundaryAn::InitValBoundaryAnConeR()
 void MonEditBoundaryAn::InitValBoundaryAnTore()
 // ------------------------------------------------------------------------
 {
-  HOMARD::double_array_var  mesCoordBoundary = aBoundaryAn->GetCoords();
+  ADAPT::double_array_var  mesCoordBoundary = aBoundaryAn->GetCoords();
   ASSERT(mesCoordBoundary->length() == 8 );
   _BoundaryAnXcentre=mesCoordBoundary[0];
   _BoundaryAnYcentre=mesCoordBoundary[1];

src/ADAPTGUI/MonEditBoundaryAn.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 
 #include <MonCreateBoundaryAn.h>
 
@@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditBoundaryAn : public MonCreateBoundaryAn
     Q_OBJECT
 public:
     MonEditBoundaryAn( MonCreateCase* parent, bool modal,
-                 HOMARD::HOMARD_Gen_var myHomardGen,
+                 ADAPT::ADAPT_Gen_var myHomardGen,
                  QString caseName, QString Name);
     virtual ~MonEditBoundaryAn();
 

src/ADAPTGUI/MonEditBoundaryCAO.cxx

@@ -31,7 +31,7 @@ using namespace std;
 
 // -------------------------------------------------------------------------------------------------------------------------------------
 MonEditBoundaryCAO::MonEditBoundaryCAO( MonCreateCase* parent, bool modal,
-                                      HOMARD::HOMARD_Gen_var myHomardGen,
+                                      ADAPT::ADAPT_Gen_var myHomardGen,
                                       QString caseName, QString Name):
 // -------------------------------------------------------------------------------------------------------------------------------------
 /* Constructs a MonEditBoundaryCAO
@@ -54,7 +54,7 @@ MonEditBoundaryCAO::MonEditBoundaryCAO( MonCreateCase* parent, bool modal,
       return;
     }
 
-    HOMARD::ListGroupType_var maListe = aBoundary->GetGroups();
+    ADAPT::ListGroupType_var maListe = aBoundary->GetGroups();
     for ( int i = 0; i < maListe->length(); i++ )
        _listeGroupesBoundary << QString(maListe[i]);
 
@@ -95,10 +95,10 @@ void MonEditBoundaryCAO::SetFiltrage()
                               QObject::tr("HOM_BOUN_CASE") );
     return;
   }
-  HOMARD::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+  ADAPT::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str());
-  HOMARD::ListGroupType_var _listeGroupesCas = monCas->GetGroups();
+  ADAPT::ListGroupType_var _listeGroupesCas = monCas->GetGroups();
 
-  MonEditListGroupCAO *aDlg = new MonEditListGroupCAO(NULL, this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),
+  MonEditListGroupCAO *aDlg = new MonEditListGroupCAO(NULL, this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),
                             _aCaseName, _listeGroupesBoundary) ;
   aDlg->show();
 }

src/ADAPTGUI/MonEditBoundaryCAO.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 
 #include <MonCreateBoundaryCAO.h>
 
@@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditBoundaryCAO : public MonCreateBoundaryCAO
     Q_OBJECT
 public:
     MonEditBoundaryCAO( MonCreateCase* parent, bool modal,
-                       HOMARD::HOMARD_Gen_var myHomardGen,
+                       ADAPT::ADAPT_Gen_var myHomardGen,
                        QString caseName, QString Name );
     virtual ~MonEditBoundaryCAO();
 

src/ADAPTGUI/MonEditBoundaryDi.cxx

@@ -31,7 +31,7 @@ using namespace std;
 
 // -------------------------------------------------------------------------------------------------------------------------------------
 MonEditBoundaryDi::MonEditBoundaryDi( MonCreateCase* parent, bool modal,
-                                      HOMARD::HOMARD_Gen_var myHomardGen,
+                                      ADAPT::ADAPT_Gen_var myHomardGen,
                                       QString caseName, QString Name):
 // -------------------------------------------------------------------------------------------------------------------------------------
 /* Constructs a MonEditBoundaryDi
@@ -54,7 +54,7 @@ MonEditBoundaryDi::MonEditBoundaryDi( MonCreateCase* parent, bool modal,
       return;
     }
 
-    HOMARD::ListGroupType_var maListe = aBoundary->GetGroups();
+    ADAPT::ListGroupType_var maListe = aBoundary->GetGroups();
     for ( int i = 0; i < maListe->length(); i++ )
        _listeGroupesBoundary << QString(maListe[i]);
 
@@ -95,10 +95,10 @@ void MonEditBoundaryDi::SetFiltrage()
                               QObject::tr("HOM_BOUN_CASE") );
     return;
   }
-  HOMARD::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+  ADAPT::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str());
-  HOMARD::ListGroupType_var _listeGroupesCas = monCas->GetGroups();
+  ADAPT::ListGroupType_var _listeGroupesCas = monCas->GetGroups();
 
-  MonEditListGroup *aDlg = new MonEditListGroup(NULL, this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),
+  MonEditListGroup *aDlg = new MonEditListGroup(NULL, this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),
                             _aCaseName, _listeGroupesBoundary) ;
   aDlg->show();
 }

src/ADAPTGUI/MonEditBoundaryDi.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 
 #include <MonCreateBoundaryDi.h>
 
@@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditBoundaryDi : public MonCreateBoundaryDi
     Q_OBJECT
 public:
     MonEditBoundaryDi( MonCreateCase* parent, bool modal,
-                       HOMARD::HOMARD_Gen_var myHomardGen,
+                       ADAPT::ADAPT_Gen_var myHomardGen,
                        QString caseName, QString Name );
     virtual ~MonEditBoundaryDi();
 

src/ADAPTGUI/MonEditCase.cxx

@@ -32,7 +32,7 @@ using namespace std;
 */
 // -------------------------------------------------------------
 MonEditCase::MonEditCase ( bool modal,
-                           HOMARD::HOMARD_Gen_var myHomardGen,
+                           ADAPT::ADAPT_Gen_var myHomardGen,
                            QString CaseName ):
    MonCreateCase(modal, myHomardGen)
 {
@@ -61,7 +61,7 @@ void MonEditCase::InitValEdit()
   PushDir->setVisible(0);
 
   QString _aitername=aCase->GetIter0Name();
-  HOMARD::HOMARD_Iteration_var aIter = myHomardGen->GetIteration(_aitername.toStdString().c_str());
+  ADAPT::HOMARD_Iteration_var aIter = myHomardGen->GetIteration(_aitername.toStdString().c_str());
   QString aFileName = aIter->GetMeshFile();
   LEFileName->setText(aFileName);
   LEFileName->setReadOnly(true);
@@ -84,7 +84,7 @@ void MonEditCase::InitValEdit()
   GBBoundaryD->setVisible(0);
   GBBoundaryA->setVisible(0);
 //    On passe en revue tous les couples (frontiere,groupe) du cas
-  HOMARD::ListBoundaryGroupType_var mesBoundarys = aCase->GetBoundaryGroup();
+  ADAPT::ListBoundaryGroupType_var mesBoundarys = aCase->GetBoundaryGroup();
   if (mesBoundarys->length()>0)
   {
     QStringList ListeFron ;
@@ -98,7 +98,7 @@ void MonEditCase::InitValEdit()
       NomFron = mesBoundarys[i++];
       MESSAGE("NomFron "<<NomFron.toStdString().c_str());
 //    L'objet associe pour en deduire le type
-      HOMARD::HOMARD_Boundary_var myBoundary = myHomardGen->GetBoundary(NomFron.toStdString().c_str());
+      ADAPT::HOMARD_Boundary_var myBoundary = myHomardGen->GetBoundary(NomFron.toStdString().c_str());
       int type_obj = myBoundary->GetType() ;
       MESSAGE("type_obj "<<type_obj);
 //        C'est une frontiere CAO

src/ADAPTGUI/MonEditCase.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 
 #include <MonCreateCase.h>
 
@@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditCase : public MonCreateCase
     Q_OBJECT
 public:
     MonEditCase( bool modal,
-                 HOMARD::HOMARD_Gen_var myHomardGen,
+                 ADAPT::ADAPT_Gen_var myHomardGen,
                  QString Name );
     virtual ~MonEditCase();
 

src/ADAPTGUI/MonEditFile.cxx

@@ -43,7 +43,7 @@ using namespace std;
  * ---------------------------------------------------------
  */
 MonEditFile::MonEditFile( QWidget* parent,  bool modal,
-                          HOMARD::HOMARD_Gen_var myHomardGen,
+                          ADAPT::ADAPT_Gen_var myHomardGen,
                           QString aFileName, int option):
 //    QWidget(0),
     Ui_EditFile(),

src/ADAPTGUI/MonEditFile.h

@@ -27,7 +27,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 #include CORBA_CLIENT_HEADER(HOMARD_Cas)
 
 #include "ui_EditFile.h"
@@ -42,14 +42,14 @@ class HOMARD_EXPORT MonEditFile : public QWidget, public Ui_EditFile
 
 public:
     MonEditFile( QWidget* parent,  bool modal,
-                 HOMARD::HOMARD_Gen_var myHomardGen,
+                 ADAPT::ADAPT_Gen_var myHomardGen,
                  QString FileName, int option );
     ~MonEditFile();
     int _codret ;
 
 protected :
 
-    HOMARD::HOMARD_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myHomardGen;
     QString _aFileName ;
     int _option ;
 

src/ADAPTGUI/MonEditHypothesis.cxx

@@ -30,7 +30,7 @@ using namespace std;
 
 // ----------------------------------------------------------------------------
 MonEditHypothesis::MonEditHypothesis( MonCreateIteration* parent, bool modal,
-                                      HOMARD::HOMARD_Gen_var myHomardGen,
+                                      ADAPT::ADAPT_Gen_var myHomardGen,
                                       QString Name,
                                       QString caseName,  QString aFieldFile ):
 // ----------------------------------------------------------------------------
@@ -55,7 +55,7 @@ MonEditHypothesis::~MonEditHypothesis()
 void MonEditHypothesis::InitGroupes()
 // ------------------------------
 {
-    HOMARD::ListGroupType_var maListe = aHypothesis->GetGroups();
+    ADAPT::ListGroupType_var maListe = aHypothesis->GetGroups();
     for ( int i = 0; i < maListe->length(); i++ )
        _aListeGroupes << QString(maListe[i]);
 
@@ -69,7 +69,7 @@ void MonEditHypothesis::InitValEdit()
   MESSAGE("Debut de InitValEdit");
   LEName->setText(_Name);
   LEName->setReadOnly(true);
-  HOMARD::listeTypes_var ListTypes (aHypothesis->GetAdapRefinUnRef());
+  ADAPT::listeTypes_var ListTypes (aHypothesis->GetAdapRefinUnRef());
   ASSERT( ListTypes->length()==3) ;
   _aTypeAdap = ListTypes[0];
   _aTypeRaff = ListTypes[1];
@@ -214,7 +214,7 @@ void MonEditHypothesis::InitAdaptZone()
 
 //  Recuperation de toutes les zones decrites et notation de celles retenues
   GetAllZones();
-  HOMARD::listeZonesHypo_var mesZonesAvant = aHypothesis->GetZones();
+  ADAPT::listeZonesHypo_var mesZonesAvant = aHypothesis->GetZones();
   for (int i=0; i<mesZonesAvant->length(); i++)
   {
     MESSAGE ("i"<<i<<", zone :"<<string(mesZonesAvant[i])<<", type :"<<string(mesZonesAvant[i+1]));
@@ -270,7 +270,7 @@ void MonEditHypothesis::InitAdaptChamps()
     RBChamp->setEnabled(false);
     RBZone->setEnabled(false);
 
-    HOMARD::InfosHypo_var  aInfosHypo = aHypothesis->GetField();
+    ADAPT::InfosHypo_var  aInfosHypo = aHypothesis->GetField();
     _aFieldName =  aInfosHypo->FieldName;
     _TypeThR = aInfosHypo->TypeThR;
     _ThreshR = aInfosHypo->ThreshR;
@@ -284,7 +284,7 @@ void MonEditHypothesis::InitAdaptChamps()
     CBFieldName->setEnabled(false);
     //SetFieldName(Qt::Unchecked);
 
-    HOMARD::listeComposantsHypo_var mesComposantsAvant = aHypothesis->GetComps();
+    ADAPT::listeComposantsHypo_var mesComposantsAvant = aHypothesis->GetComps();
     TWCMP->clear();
     TWCMP->setRowCount(0);
     TWCMP->resizeRowsToContents();
@@ -397,7 +397,7 @@ void MonEditHypothesis::InitFieldInterp()
       RBFieldChosen->setChecked(true);
 //
       TWField->setVisible(1);
-      HOMARD::listeFieldInterpsHypo_var mesChampsAvant = aHypothesis->GetFieldInterps();
+      ADAPT::listeFieldInterpsHypo_var mesChampsAvant = aHypothesis->GetFieldInterps();
       TWField->clear();
       TWField->setRowCount(0);
       TWField->resizeRowsToContents();
@@ -456,7 +456,7 @@ void MonEditHypothesis::SetFiltrage()
 {
   if (CBGroupe->isChecked())
   {
-    MonEditListGroup *aDlg = new MonEditListGroup(this, NULL, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ;
+    MonEditListGroup *aDlg = new MonEditListGroup(this, NULL, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ;
     aDlg->show();
   }
 }

src/ADAPTGUI/MonEditHypothesis.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 
 #include <MonCreateHypothesis.h>
 
@@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditHypothesis : public MonCreateHypothesis
     Q_OBJECT
 public:
     MonEditHypothesis( MonCreateIteration* parent, bool modal,
-                       HOMARD::HOMARD_Gen_var myHomardGen,
+                       ADAPT::ADAPT_Gen_var myHomardGen,
                        QString caseName, QString Name, QString aFieldFile );
     virtual ~MonEditHypothesis();
 

src/ADAPTGUI/MonEditIteration.cxx

@@ -28,7 +28,7 @@ using namespace std;
 
 // -------------------------------------------------------------------------------------------------------------------------------------
 MonEditIteration::MonEditIteration ( QWidget* parent, bool modal,
-                                     HOMARD::HOMARD_Gen_var myHomardGen,
+                                     ADAPT::ADAPT_Gen_var myHomardGen,
                                      QString IterParentName, QString IterName ):
 // -------------------------------------------------------------------------------------------------------------------------------------
 /* Constructs a MonEditIteration
@@ -118,7 +118,7 @@ void MonEditIteration::InitValEdit()
   PBHypoNew->setVisible(0);
 
   //    Pour une adaptation selon un champ
-  HOMARD::HOMARD_Hypothesis_var myHypo = myHomardGen->GetHypothesis(HypoName.toStdString().c_str()) ;
+  ADAPT::HOMARD_Hypothesis_var myHypo = myHomardGen->GetHypothesis(HypoName.toStdString().c_str()) ;
   _aTypeAdap = myHypo->GetAdapType() ;
   if ( _aTypeAdap == 1 )
   {

src/ADAPTGUI/MonEditIteration.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 
 #include <MonCreateIteration.h>
 
@@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditIteration : public MonCreateIteration
     Q_OBJECT
 public:
     MonEditIteration( QWidget* parent, bool modal,
-                      HOMARD::HOMARD_Gen_var myHomardGen,
+                      ADAPT::ADAPT_Gen_var myHomardGen,
                       QString IterParentName, QString Name );
     virtual ~MonEditIteration();
 

src/ADAPTGUI/MonEditListGroup.cxx

@@ -25,7 +25,7 @@ using namespace std;
 MonEditListGroup::MonEditListGroup( MonCreateHypothesis* parentHyp,
                                     MonCreateBoundaryDi* parentBound,
                                     bool modal,
-                                    HOMARD::HOMARD_Gen_var myHomardGen,
+                                    ADAPT::ADAPT_Gen_var myHomardGen,
                                     QString aCaseName,
                                     QStringList listeGroupesHypo):
 //---------------------------------------------------------------------

src/ADAPTGUI/MonEditListGroup.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 
 #include <MonCreateListGroup.h>
 
@@ -37,7 +37,7 @@ class HOMARD_EXPORT MonEditListGroup : public MonCreateListGroup
     Q_OBJECT
 
 public:
-    MonEditListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName,  QStringList listeGroupesHypo);
+    MonEditListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName,  QStringList listeGroupesHypo);
     virtual ~MonEditListGroup();
 
 protected :

src/ADAPTGUI/MonEditListGroupCAO.cxx

@@ -25,7 +25,7 @@ using namespace std;
 MonEditListGroupCAO::MonEditListGroupCAO( MonCreateHypothesis* parentHyp,
                                     MonCreateBoundaryCAO* parentBound,
                                     bool modal,
-                                    HOMARD::HOMARD_Gen_var myHomardGen,
+                                    ADAPT::ADAPT_Gen_var myHomardGen,
                                     QString aCaseName,
                                     QStringList listeGroupesHypo):
 //---------------------------------------------------------------------

src/ADAPTGUI/MonEditListGroupCAO.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 
 #include <MonCreateListGroupCAO.h>
 
@@ -37,7 +37,7 @@ class HOMARD_EXPORT MonEditListGroupCAO : public MonCreateListGroupCAO
     Q_OBJECT
 
 public:
-    MonEditListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal, HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName,  QStringList listeGroupesHypo);
+    MonEditListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName,  QStringList listeGroupesHypo);
     virtual ~MonEditListGroupCAO();
 
 protected :

src/ADAPTGUI/MonEditYACS.cxx

@@ -32,7 +32,7 @@ using namespace std;
 */
 // -------------------------------------------------------------
 MonEditYACS::MonEditYACS ( bool modal,
-                           HOMARD::HOMARD_Gen_var myHomardGen,
+                           ADAPT::ADAPT_Gen_var myHomardGen,
                            QString Name ):
    MonCreateYACS(myHomardGen, Name)
 {

src/ADAPTGUI/MonEditYACS.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 
 #include <MonCreateYACS.h>
 
@@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditYACS : public MonCreateYACS
     Q_OBJECT
 public:
     MonEditYACS( bool modal,
-                 HOMARD::HOMARD_Gen_var myHomardGen,
+                 ADAPT::ADAPT_Gen_var myHomardGen,
                  QString Name );
     virtual ~MonEditYACS();
 

src/ADAPTGUI/MonEditZone.cxx

@@ -32,7 +32,7 @@ using namespace std;
 
 // ------------------------------------------------------------------------
 MonEditZone::MonEditZone( MonCreateHypothesis* parent, bool modal,
-                          HOMARD::HOMARD_Gen_var myHomardGen,
+                          ADAPT::ADAPT_Gen_var myHomardGen,
                           QString caseName, QString Name ):
 // ------------------------------------------------------------------------
 /* Constructs a MonEditZone
@@ -113,7 +113,7 @@ void MonEditZone::InitValEdit()
 void MonEditZone::InitValZoneLimit()
 // ------------------------------------------------------------------------
 {
-  HOMARD::double_array_var  mesCoordLimits = aZone->GetLimit();
+  ADAPT::double_array_var  mesCoordLimits = aZone->GetLimit();
   ASSERT(mesCoordLimits->length() == 3 );
   _Xincr=mesCoordLimits[0];
   _Yincr=mesCoordLimits[1];
@@ -123,7 +123,7 @@ void MonEditZone::InitValZoneLimit()
 void MonEditZone::InitValZoneBox()
 // ------------------------------------------------------------------------
 {
-  HOMARD::double_array_var  mesCoordZones = aZone->GetCoords();
+  ADAPT::double_array_var  mesCoordZones = aZone->GetCoords();
   ASSERT(mesCoordZones->length() == 6 );
   _ZoneXmin=mesCoordZones[0];
   _ZoneXmax=mesCoordZones[1];
@@ -136,7 +136,7 @@ void MonEditZone::InitValZoneBox()
 void MonEditZone::InitValZoneSphere()
 // ------------------------------------------------------------------------
 {
-  HOMARD::double_array_var  mesCoordZones = aZone->GetCoords();
+  ADAPT::double_array_var  mesCoordZones = aZone->GetCoords();
   ASSERT(mesCoordZones->length() == 4 );
   _ZoneXcentre=mesCoordZones[0];
   _ZoneYcentre=mesCoordZones[1];
@@ -148,7 +148,7 @@ void MonEditZone::InitValZoneSphere()
 void MonEditZone::InitValZoneCylinder()
 // ------------------------------------------------------------------------
 {
-  HOMARD::double_array_var  mesCoordZones = aZone->GetCoords();
+  ADAPT::double_array_var  mesCoordZones = aZone->GetCoords();
   ASSERT(mesCoordZones->length() == 8 );
   _ZoneXcentre=mesCoordZones[0];
   _ZoneYcentre=mesCoordZones[1];
@@ -163,7 +163,7 @@ void MonEditZone::InitValZoneCylinder()
 void MonEditZone::InitValZonePipe()
 // ------------------------------------------------------------------------
 {
-  HOMARD::double_array_var  mesCoordZones = aZone->GetCoords();
+  ADAPT::double_array_var  mesCoordZones = aZone->GetCoords();
   ASSERT(mesCoordZones->length() == 9 );
   _ZoneXcentre=mesCoordZones[0];
   _ZoneYcentre=mesCoordZones[1];

src/ADAPTGUI/MonEditZone.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 
 #include <MonCreateZone.h>
 
@@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditZone : public MonCreateZone
     Q_OBJECT
 public:
     MonEditZone( MonCreateHypothesis* parent, bool modal,
-                 HOMARD::HOMARD_Gen_var myHomardGen,
+                 ADAPT::ADAPT_Gen_var myHomardGen,
                  QString caseName, QString Name);
     virtual ~MonEditZone();
 

src/ADAPTGUI/MonIterInfo.cxx

@@ -33,7 +33,7 @@
 using namespace std;
 
 // -----------------------------------------------------------------------------------------
-MonIterInfo::MonIterInfo(QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myHomardGen0, QString IterName)
+MonIterInfo::MonIterInfo(QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen0, QString IterName)
 // -----------------------------------------------------------------------------------------
 /* Constructs a MonIterInfo
  * Inherits from CasHomard
@@ -51,7 +51,7 @@ MonIterInfo::MonIterInfo(QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myH
     _Option(-1)
 {
     MESSAGE("appel de _duplicate");
-      myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0);
+      myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
       setupUi(this);
       setModal(modal);
       InitConnect();
@@ -112,7 +112,7 @@ bool MonIterInfo::PushOnApply()
 
   // Le bilan de l'analyse a afficher
   QString aFileName = aIter->GetFileInfo() ;
-  MonEditFile *aDlg = new MonEditFile( 0, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), aFileName, 0 ) ;
+  MonEditFile *aDlg = new MonEditFile( 0, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), aFileName, 0 ) ;
   if ( aDlg->_codret == 0 ) { aDlg->show(); }
 
 

src/ADAPTGUI/MonIterInfo.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 #include CORBA_CLIENT_HEADER(HOMARD_Cas)
 
 #include "ui_IterInfo.h"
@@ -40,11 +40,11 @@ class HOMARD_EXPORT MonIterInfo : public QDialog, public Ui_IterInfo
     Q_OBJECT
 
 public:
-    MonIterInfo( QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myHomardGen, QString IterName);
+    MonIterInfo( QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString IterName);
     ~MonIterInfo();
 
 protected :
-    MonIterInfo( QWidget* parent, HOMARD::HOMARD_Gen_var myHomardGen, QString IterName );
+    MonIterInfo( QWidget* parent, ADAPT::ADAPT_Gen_var myHomardGen, QString IterName );
 
     QString _IterName;
     QString _aCaseName;
@@ -56,8 +56,8 @@ protected :
     int _Quality;
     int _Option;
 
-    HOMARD::HOMARD_Iteration_var aIter ;
+    ADAPT::HOMARD_Iteration_var aIter ;
-    HOMARD::HOMARD_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myHomardGen;
 
     virtual void InitConnect();
 

src/ADAPTGUI/MonMeshInfo.cxx

@@ -36,7 +36,7 @@
 using namespace std;
 
 // -----------------------------------------------------------------------------------------
-MonMeshInfo::MonMeshInfo(QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myHomardGen0)
+MonMeshInfo::MonMeshInfo(QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen0)
 // -----------------------------------------------------------------------------------------
 /* Constructs a MonMeshInfo
  * Inherits from CasHomard
@@ -51,7 +51,7 @@ MonMeshInfo::MonMeshInfo(QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myH
     _Entanglement(0),
     _Quality(0)
 {
-      myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0);
+      myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
       setupUi(this);
       setModal(modal);
       InitConnect();
@@ -168,9 +168,9 @@ bool MonMeshInfo::PushOnApply()
   // Le bilan de l'analyse a afficher
   aCase = myHomardGen->GetCase(_aCaseName.toStdString().c_str());
   string iter0 = aCase->GetIter0Name();
-  HOMARD::HOMARD_Iteration_var aIter =  myHomardGen->GetIteration(iter0.c_str());
+  ADAPT::HOMARD_Iteration_var aIter =  myHomardGen->GetIteration(iter0.c_str());
   aFileName = aIter->GetFileInfo() ;
-  MonEditFile *aDlg = new MonEditFile( 0, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), aFileName, 1 ) ;
+  MonEditFile *aDlg = new MonEditFile( 0, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), aFileName, 1 ) ;
   if ( aDlg->_codret == 0 ) { aDlg->show(); }
 
 HOMARD_UTILS::updateObjBrowser();
@@ -194,7 +194,7 @@ void MonMeshInfo::PushOnHelp()
 void MonMeshInfo::SetNewCaseName()
 // ------------------------------
 {
-  HOMARD::listeCases_var  MyCases = myHomardGen->GetAllCasesName();
+  ADAPT::listeCases_var  MyCases = myHomardGen->GetAllCasesName();
   int num = 0; QString aCaseName="";
   while (aCaseName=="" )
   {

src/ADAPTGUI/MonMeshInfo.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 #include CORBA_CLIENT_HEADER(HOMARD_Cas)
 
 #include "ui_MeshInfo.h"
@@ -37,7 +37,7 @@ class HOMARD_EXPORT MonMeshInfo : public QDialog, public Ui_MeshInfo
     Q_OBJECT
 
 public:
-    MonMeshInfo( QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myHomardGen);
+    MonMeshInfo( QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen);
     ~MonMeshInfo();
 
 protected :
@@ -50,8 +50,8 @@ protected :
     int _Entanglement;
     int _Quality;
 
-    HOMARD::HOMARD_Cas_var aCase ;
+    ADAPT::HOMARD_Cas_var aCase ;
-    HOMARD::HOMARD_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myHomardGen;
 
     virtual void InitConnect();
     virtual void SetNewCaseName();

src/ADAPTGUI/MonPursueIteration.cxx

@@ -39,13 +39,13 @@ using namespace std;
  * Sets attributes to default values
  */
 // -----------------------------------------------------------------------------------------
-MonPursueIteration::MonPursueIteration ( bool modal, HOMARD::HOMARD_Gen_var myHomardGen0 )
+MonPursueIteration::MonPursueIteration ( bool modal, ADAPT::ADAPT_Gen_var myHomardGen0 )
     :
     Ui_PursueIteration(),
     _aCaseName(""), _aDirName(""), _aDirNameStart("")
 {
   MESSAGE("Debut du constructeur de MonPursueIteration");
-  myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0);
+  myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
   setupUi(this);
   setModal(modal);
 
@@ -221,7 +221,7 @@ void MonPursueIteration::PushOnHelp()
 void MonPursueIteration::SetNewCaseName()
 // ------------------------------
 {
-  HOMARD::listeCases_var  MyCases = myHomardGen->GetAllCasesName();
+  ADAPT::listeCases_var  MyCases = myHomardGen->GetAllCasesName();
   int num = 0; QString aCaseName="";
   while (aCaseName=="" )
   {

src/ADAPTGUI/MonPursueIteration.h

@@ -26,7 +26,7 @@
 #include <SalomeApp_Module.h>
 
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(HOMARD_Gen)
+#include CORBA_CLIENT_HEADER(ADAPT_Gen)
 #include CORBA_CLIENT_HEADER(HOMARD_Cas)
 
 #include "ui_PursueIteration.h"
@@ -37,7 +37,7 @@ class HOMARD_EXPORT MonPursueIteration : public QDialog, public Ui_PursueIterati
     Q_OBJECT
 
   public:
-    MonPursueIteration( bool modal, HOMARD::HOMARD_Gen_var myHomardGen );
+    MonPursueIteration( bool modal, ADAPT::ADAPT_Gen_var myHomardGen );
     virtual ~MonPursueIteration();
 
   protected :
@@ -47,8 +47,8 @@ class HOMARD_EXPORT MonPursueIteration : public QDialog, public Ui_PursueIterati
 
     int _Type ;
 
-    HOMARD::HOMARD_Cas_var aCase ;
+    ADAPT::HOMARD_Cas_var aCase ;
-    HOMARD::HOMARD_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myHomardGen;
 
     virtual void InitConnect();
     virtual void SetNewCaseName();

src/ADAPT_I/ADAPT_Gen_i.hxx

@@ -17,11 +17,11 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef _HOMARD_GEN_I_HXX_
+#ifndef _ADAPT_GEN_I_HXX_
-#define _HOMARD_GEN_I_HXX_
+#define _ADAPT_GEN_I_HXX_
 
 #include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(HOMARD_Gen)
+#include CORBA_SERVER_HEADER(ADAPT_Gen)
 #include CORBA_SERVER_HEADER(HOMARD_Cas)
 #include CORBA_SERVER_HEADER(HOMARD_Hypothesis)
 #include CORBA_SERVER_HEADER(HOMARD_Iteration)
@@ -32,7 +32,7 @@
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
 
 #include "HOMARD_i.hxx"
-#include "HOMARD_Gen.hxx"
+#include "ADAPT_Gen.hxx"
 #include "HomardDriver.hxx"
 #include "YACSDriver.hxx"
 #include "FrontTrack.hxx"
@@ -43,104 +43,104 @@
 #include <string>
 #include <map>
 
-class HOMARDENGINE_EXPORT HOMARD_Gen_i:
+class HOMARDENGINE_EXPORT ADAPT_Gen_i:
   public virtual Engines_Component_i,
-  public virtual POA_HOMARD::HOMARD_Gen
+  public virtual POA_ADAPT::ADAPT_Gen
 {
 public:
-  HOMARD_Gen_i( CORBA::ORB_ptr orb,
+  ADAPT_Gen_i( CORBA::ORB_ptr orb,
                 PortableServer::POA_ptr poa,
                 PortableServer::ObjectId* contId,
                 const char* instanceName,
                 const char* interfaceName );
-  virtual ~HOMARD_Gen_i();
+  virtual ~ADAPT_Gen_i();
 
 
 // Generalites
 
 // Les creations
-  HOMARD::HOMARD_Boundary_ptr     CreateBoundary (const char* nomBoundary, CORBA::Long typeBoundary);
+  ADAPT::HOMARD_Boundary_ptr     CreateBoundary (const char* nomBoundary, CORBA::Long typeBoundary);
-  HOMARD::HOMARD_Boundary_ptr     CreateBoundaryCAO(const char* nomBoundary,
+  ADAPT::HOMARD_Boundary_ptr     CreateBoundaryCAO(const char* nomBoundary,
                                                     const char* DataFile);
-  HOMARD::HOMARD_Boundary_ptr     CreateBoundaryDi (const char* nomBoundary,
+  ADAPT::HOMARD_Boundary_ptr     CreateBoundaryDi (const char* nomBoundary,
                                                     const char* MeshName, const char* DataFile);
-  HOMARD::HOMARD_Boundary_ptr     CreateBoundaryCylinder (const char* nomBoundary,
+  ADAPT::HOMARD_Boundary_ptr     CreateBoundaryCylinder (const char* nomBoundary,
                                       CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre,
                                       CORBA::Double Xaxis, CORBA::Double Yaxis, CORBA::Double Zaxis,
                                       CORBA::Double Rayon);
-  HOMARD::HOMARD_Boundary_ptr     CreateBoundarySphere (const char* nomBoundary,
+  ADAPT::HOMARD_Boundary_ptr     CreateBoundarySphere (const char* nomBoundary,
                                       CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre,
                                       CORBA::Double Rayon);
-  HOMARD::HOMARD_Boundary_ptr     CreateBoundaryConeR (const char* nomBoundary,
+  ADAPT::HOMARD_Boundary_ptr     CreateBoundaryConeR (const char* nomBoundary,
                                       CORBA::Double Xcentre1, CORBA::Double Ycentre1, CORBA::Double Zcentre1, CORBA::Double Rayon1,
                                       CORBA::Double Xcentre2, CORBA::Double Ycentre2, CORBA::Double Zcentre2, CORBA::Double Rayon2);
-  HOMARD::HOMARD_Boundary_ptr     CreateBoundaryConeA (const char* nomBoundary,
+  ADAPT::HOMARD_Boundary_ptr     CreateBoundaryConeA (const char* nomBoundary,
                                       CORBA::Double Xaxis, CORBA::Double Yaxis, CORBA::Double Zaxis, CORBA::Double Angle,
                                       CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre);
-  HOMARD::HOMARD_Boundary_ptr     CreateBoundaryTorus (const char* nomBoundary,
+  ADAPT::HOMARD_Boundary_ptr     CreateBoundaryTorus (const char* nomBoundary,
                                       CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre,
                                       CORBA::Double Xaxis, CORBA::Double Yaxis, CORBA::Double Zaxis,
                                       CORBA::Double RayonRev, CORBA::Double RayonPri);
 
-  HOMARD::HOMARD_Cas_ptr          CreateCase (const char* nomCas, const char* MeshName, const char* FileName);
+  ADAPT::HOMARD_Cas_ptr          CreateCase (const char* nomCas, const char* MeshName, const char* FileName);
-  HOMARD::HOMARD_Cas_ptr          CreateCaseFromIteration (const char* nomCas, const char* DirNameStart);
+  ADAPT::HOMARD_Cas_ptr          CreateCaseFromIteration (const char* nomCas, const char* DirNameStart);
-  HOMARD::HOMARD_Cas_ptr          CreateCaseFromCaseLastIteration (const char* nomCas, const char* DirNameStart);
+  ADAPT::HOMARD_Cas_ptr          CreateCaseFromCaseLastIteration (const char* nomCas, const char* DirNameStart);
-  HOMARD::HOMARD_Cas_ptr          CreateCaseFromCaseIteration (const char* nomCas, const char* DirNameStart, CORBA::Long Number);
+  ADAPT::HOMARD_Cas_ptr          CreateCaseFromCaseIteration (const char* nomCas, const char* DirNameStart, CORBA::Long Number);
-  HOMARD::HOMARD_Cas_ptr          CreateCase0 (const char* nomCas, const char* MeshName, const char* FileName, CORBA::Long MeshOption, CORBA::Long NumeIter, CORBA::Long Option);
+  ADAPT::HOMARD_Cas_ptr          CreateCase0 (const char* nomCas, const char* MeshName, const char* FileName, CORBA::Long MeshOption, CORBA::Long NumeIter, CORBA::Long Option);
   std::string                     CreateCase1 (const char* DirNameStart, CORBA::Long Number);
 
-  HOMARD::HOMARD_Hypothesis_ptr   CreateHypothesis(const char* nomHypothesis);
+  ADAPT::HOMARD_Hypothesis_ptr   CreateHypothesis(const char* nomHypothesis);
 
-  HOMARD::HOMARD_Iteration_ptr    CreateIteration (const char* nomIter, const char* nomIterParent);
+  ADAPT::HOMARD_Iteration_ptr    CreateIteration (const char* nomIter, const char* nomIterParent);
 
-  HOMARD::HOMARD_Zone_ptr         CreateZone (const char* nomZone, CORBA::Long typeZone);
+  ADAPT::HOMARD_Zone_ptr         CreateZone (const char* nomZone, CORBA::Long typeZone);
-  HOMARD::HOMARD_Zone_ptr         CreateZoneBox (const char* nomZone,
+  ADAPT::HOMARD_Zone_ptr         CreateZoneBox (const char* nomZone,
                                       CORBA::Double Xmini, CORBA::Double Xmaxi,
                                       CORBA::Double Ymini, CORBA::Double Ymaxi,
                                       CORBA::Double Zmini, CORBA::Double Zmaxi);
-  HOMARD::HOMARD_Zone_ptr         CreateZoneBox2D (const char* nomZone,
+  ADAPT::HOMARD_Zone_ptr         CreateZoneBox2D (const char* nomZone,
                                       CORBA::Double Umini, CORBA::Double Umaxi,
                                       CORBA::Double Vmini, CORBA::Double Vmaxi,
                                       CORBA::Long Orient);
-  HOMARD::HOMARD_Zone_ptr         CreateZoneCylinder (const char* nomZone,
+  ADAPT::HOMARD_Zone_ptr         CreateZoneCylinder (const char* nomZone,
                                       CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre,
                                       CORBA::Double Xaxe, CORBA::Double Yaxe, CORBA::Double Zaxe,
                                       CORBA::Double Rayon, CORBA::Double Haut);
-  HOMARD::HOMARD_Zone_ptr         CreateZoneDisk (const char* nomZone,
+  ADAPT::HOMARD_Zone_ptr         CreateZoneDisk (const char* nomZone,
                                       CORBA::Double Ucentre, CORBA::Double Vcentre,
                                       CORBA::Double Rayon,
                                       CORBA::Long Orient);
-  HOMARD::HOMARD_Zone_ptr         CreateZoneDiskWithHole (const char* nomZone,
+  ADAPT::HOMARD_Zone_ptr         CreateZoneDiskWithHole (const char* nomZone,
                                       CORBA::Double Ucentre, CORBA::Double Vcentre,
                                       CORBA::Double Rayon, CORBA::Double Rayonint,
                                       CORBA::Long Orient);
-  HOMARD::HOMARD_Zone_ptr         CreateZonePipe (const char* nomZone,
+  ADAPT::HOMARD_Zone_ptr         CreateZonePipe (const char* nomZone,
                                       CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre,
                                       CORBA::Double Xaxe, CORBA::Double Yaxe, CORBA::Double Zaxe,
                                       CORBA::Double Rayon, CORBA::Double Haut, CORBA::Double Rayonint);
-  HOMARD::HOMARD_Zone_ptr         CreateZoneSphere (const char* nomZone,
+  ADAPT::HOMARD_Zone_ptr         CreateZoneSphere (const char* nomZone,
                                       CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre, CORBA::Double Rayon);
 
 // Les informations
-  HOMARD::HOMARD_Boundary_ptr     GetBoundary   (const char* nomBoundary);
+  ADAPT::HOMARD_Boundary_ptr     GetBoundary   (const char* nomBoundary);
-  HOMARD::HOMARD_Cas_ptr          GetCase       (const char* nomCas);
+  ADAPT::HOMARD_Cas_ptr          GetCase       (const char* nomCas);
-  HOMARD::HOMARD_Hypothesis_ptr   GetHypothesis (const char* nomHypothesis);
+  ADAPT::HOMARD_Hypothesis_ptr   GetHypothesis (const char* nomHypothesis);
-  HOMARD::HOMARD_Iteration_ptr    GetIteration  (const char* nomIteration);
+  ADAPT::HOMARD_Iteration_ptr    GetIteration  (const char* nomIteration);
-  HOMARD::HOMARD_YACS_ptr         GetYACS       (const char* nomYACS);
+  ADAPT::HOMARD_YACS_ptr         GetYACS       (const char* nomYACS);
-  HOMARD::HOMARD_Zone_ptr         GetZone       (const char* nomZone);
+  ADAPT::HOMARD_Zone_ptr         GetZone       (const char* nomZone);
 
-  HOMARD::listeBoundarys*         GetAllBoundarysName();
+  ADAPT::listeBoundarys*         GetAllBoundarysName();
-  HOMARD::listeCases*             GetAllCasesName();
+  ADAPT::listeCases*             GetAllCasesName();
-  HOMARD::listeHypotheses*        GetAllHypothesesName();
+  ADAPT::listeHypotheses*        GetAllHypothesesName();
-  HOMARD::listeIterations*        GetAllIterationsName();
+  ADAPT::listeIterations*        GetAllIterationsName();
-  HOMARD::listeYACSs*             GetAllYACSsName();
+  ADAPT::listeYACSs*             GetAllYACSsName();
-  HOMARD::listeZones*             GetAllZonesName();
+  ADAPT::listeZones*             GetAllZonesName();
 
   void                            MeshInfo      (const char* nomCas,
                                                  const char* MeshName, const char* FileName, const char* DirName,
                                                  CORBA::Long Qual, CORBA::Long Diam, CORBA::Long Conn, CORBA::Long Tail, CORBA::Long Inte);
 
-  HOMARD::HOMARD_Iteration_ptr    LastIteration  (const char* nomCas);
+  ADAPT::HOMARD_Iteration_ptr    LastIteration  (const char* nomCas);
 
 // L'etude
   void                            UpdateStudy();
@@ -176,15 +176,15 @@ public:
   char*                           CreateDirNameIter(const char* nomrep, CORBA::Long num );
 
   CORBA::Long                     Compute(const char* nomIteration, CORBA::Long etatMenage, CORBA::Long modeHOMARD, CORBA::Long Option1, CORBA::Long Option2);
-  CORBA::Long                     ComputeAdap(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long etatMenage, HomardDriver* myDriver, CORBA::Long Option1, CORBA::Long Option2);
+  CORBA::Long                     ComputeAdap(ADAPT::HOMARD_Cas_var myCase, ADAPT::HOMARD_Iteration_var myIteration, CORBA::Long etatMenage, HomardDriver* myDriver, CORBA::Long Option1, CORBA::Long Option2);
-  CORBA::Long                     ComputeCAO(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long Option1, CORBA::Long Option2);
+  CORBA::Long                     ComputeCAO(ADAPT::HOMARD_Cas_var myCase, ADAPT::HOMARD_Iteration_var myIteration, CORBA::Long Option1, CORBA::Long Option2);
-  CORBA::Long                     ComputeCAObis(HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long Option1, CORBA::Long Option2);
+  CORBA::Long                     ComputeCAObis(ADAPT::HOMARD_Iteration_var myIteration, CORBA::Long Option1, CORBA::Long Option2);
-  char*                           ComputeDirManagement(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long etatMenage);
+  char*                           ComputeDirManagement(ADAPT::HOMARD_Cas_var myCase, ADAPT::HOMARD_Iteration_var myIteration, CORBA::Long etatMenage);
-  char*                           ComputeDirPaManagement(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration);
+  char*                           ComputeDirPaManagement(ADAPT::HOMARD_Cas_var myCase, ADAPT::HOMARD_Iteration_var myIteration);
-  void                            DriverTexteZone(HOMARD::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver);
+  void                            DriverTexteZone(ADAPT::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver);
-  void                            DriverTexteField(HOMARD::HOMARD_Iteration_var myIteration, HOMARD::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver);
+  void                            DriverTexteField(ADAPT::HOMARD_Iteration_var myIteration, ADAPT::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver);
-  int                             DriverTexteBoundary(HOMARD::HOMARD_Cas_var myCase, HomardDriver* myDriver);
+  int                             DriverTexteBoundary(ADAPT::HOMARD_Cas_var myCase, HomardDriver* myDriver);
-  void                            DriverTexteFieldInterp(HOMARD::HOMARD_Iteration_var myIteration, HOMARD::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver);
+  void                            DriverTexteFieldInterp(ADAPT::HOMARD_Iteration_var myIteration, ADAPT::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver);
 
   char*                           VerifieDir(const char* nomDir);
 
@@ -197,11 +197,11 @@ public:
   void                            PublishMeshIterInSmesh(const char* NomIter);
 
 // YACS
-  HOMARD::HOMARD_YACS_ptr         CreateYACSSchema (const char* YACSName, const char* nomCas, const char* ScriptFile, const char* DirName, const char* MeshFile);
+  ADAPT::HOMARD_YACS_ptr         CreateYACSSchema (const char* YACSName, const char* nomCas, const char* ScriptFile, const char* DirName, const char* MeshFile);
   CORBA::Long                     YACSWrite(const char* nomYACS);
   CORBA::Long                     YACSWriteOnFile(const char* nomYACS, const char* XMLFile);
-  std::string                     YACSDriverTexteZone(HOMARD::HOMARD_Hypothesis_var myHypo, YACSDriver* myDriver);
+  std::string                     YACSDriverTexteZone(ADAPT::HOMARD_Hypothesis_var myHypo, YACSDriver* myDriver);
-  std::string                     YACSDriverTexteBoundary(HOMARD::HOMARD_Cas_var myCase, YACSDriver* myDriver);
+  std::string                     YACSDriverTexteBoundary(ADAPT::HOMARD_Cas_var myCase, YACSDriver* myDriver);
 
 // Preferences
   void                            SetPreferences() ;
@@ -278,27 +278,27 @@ public:
 
 private:
   SALOMEDS::SObject_ptr           PublishBoundaryInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder,
-                                                     HOMARD::HOMARD_Boundary_ptr theObject, const char* theName);
+                                                     ADAPT::HOMARD_Boundary_ptr theObject, const char* theName);
   SALOMEDS::SObject_ptr           PublishCaseInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder,
-                                                     HOMARD::HOMARD_Cas_ptr theObject, const char* theName);
+                                                     ADAPT::HOMARD_Cas_ptr theObject, const char* theName);
   SALOMEDS::SObject_ptr           PublishHypotheseInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder,
-                                                     HOMARD::HOMARD_Hypothesis_ptr theObject, const char* theName);
+                                                     ADAPT::HOMARD_Hypothesis_ptr theObject, const char* theName);
   SALOMEDS::SObject_ptr           PublishYACSInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder,
-                                                     HOMARD::HOMARD_YACS_ptr theObject, const char* theName);
+                                                     ADAPT::HOMARD_YACS_ptr theObject, const char* theName);
   SALOMEDS::SObject_ptr           PublishZoneInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder,
-                                                     HOMARD::HOMARD_Zone_ptr theObject, const char* theName);
+                                                     ADAPT::HOMARD_Zone_ptr theObject, const char* theName);
   virtual void                    PublishInStudyAttr(SALOMEDS::StudyBuilder_var aStudyBuilder,
                                                      SALOMEDS::SObject_var aResultSO,
                                                      const char* theName, const char* comment, const char* icone, const char* ior);
 
   PortableServer::ServantBase_var GetServant(CORBA::Object_ptr theObject);
 
-  HOMARD::HOMARD_Boundary_ptr     newBoundary();
+  ADAPT::HOMARD_Boundary_ptr     newBoundary();
-  HOMARD::HOMARD_Cas_ptr          newCase();
+  ADAPT::HOMARD_Cas_ptr          newCase();
-  HOMARD::HOMARD_Hypothesis_ptr   newHypothesis();
+  ADAPT::HOMARD_Hypothesis_ptr   newHypothesis();
-  HOMARD::HOMARD_Iteration_ptr    newIteration();
+  ADAPT::HOMARD_Iteration_ptr    newIteration();
-  HOMARD::HOMARD_YACS_ptr         newYACS();
+  ADAPT::HOMARD_YACS_ptr         newYACS();
-  HOMARD::HOMARD_Zone_ptr         newZone();
+  ADAPT::HOMARD_Zone_ptr         newZone();
 
 
   virtual Engines::TMPFile*       DumpPython(CORBA::Boolean isPublished,
@@ -311,16 +311,16 @@ private:
 private:
   struct StudyContext
   {
-    std::map<std::string, HOMARD::HOMARD_Boundary_var>   _mesBoundarys;
+    std::map<std::string, ADAPT::HOMARD_Boundary_var>   _mesBoundarys;
-    std::map<std::string, HOMARD::HOMARD_Cas_var>        _mesCas;
+    std::map<std::string, ADAPT::HOMARD_Cas_var>        _mesCas;
-    std::map<std::string, HOMARD::HOMARD_Hypothesis_var> _mesHypotheses;
+    std::map<std::string, ADAPT::HOMARD_Hypothesis_var> _mesHypotheses;
-    std::map<std::string, HOMARD::HOMARD_Iteration_var>  _mesIterations;
+    std::map<std::string, ADAPT::HOMARD_Iteration_var>  _mesIterations;
-    std::map<std::string, HOMARD::HOMARD_YACS_var>       _mesYACSs;
+    std::map<std::string, ADAPT::HOMARD_YACS_var>       _mesYACSs;
-    std::map<std::string, HOMARD::HOMARD_Zone_var>       _mesZones;
+    std::map<std::string, ADAPT::HOMARD_Zone_var>       _mesZones;
     std::map<int, PortableServer::ServantBase*>          _idmap;
   };
 
-  ::HOMARD_Gen*                 myHomard;
+  ::ADAPT_Gen*                 myHomard;
   SALOMEDS::Study_var           myStudy;
   StudyContext                  myStudyContext;
   SALOME_NamingService*         _NS;

src/ADAPT_I/CMakeLists.txt

@@ -68,7 +68,7 @@ SET(ADAPTEngine_HEADERS
   HOMARD_Hypothesis_i.hxx
   HOMARD_Iteration_i.hxx
   HOMARD_Zone_i.hxx
-  HOMARD_Gen_i.hxx
+  ADAPT_Gen_i.hxx
   HOMARD_Boundary_i.hxx
   HOMARD_YACS_i.hxx
   HomardMedCommun.h
@@ -82,7 +82,7 @@ SET(ADAPTEngine_SOURCES
   HOMARD_Cas_i.cxx
   HOMARD_Hypothesis_i.cxx
   HOMARD_Iteration_i.cxx
-  HOMARD_Gen_i.cxx
+  ADAPT_Gen_i.cxx
   HOMARD_Zone_i.cxx
   HOMARD_Boundary_i.cxx
   HOMARD_YACS_i.cxx

src/ADAPT_I/HOMARD_Boundary_i.cxx

@@ -27,7 +27,7 @@
 // Quand les 2 fonctions Setxxx et Getxxx sont presentes, Setxxx est decrit en premier
 //
 #include "HOMARD_Boundary_i.hxx"
-#include "HOMARD_Gen_i.hxx"
+#include "ADAPT_Gen_i.hxx"
 #include "HOMARD_Boundary.hxx"
 #include "HOMARD_DriverTools.hxx"
 
@@ -49,7 +49,7 @@ HOMARD_Boundary_i::HOMARD_Boundary_i()
  */
 //=============================================================================
 HOMARD_Boundary_i::HOMARD_Boundary_i( CORBA::ORB_ptr orb,
-			      HOMARD::HOMARD_Gen_var engine )
+			      ADAPT::ADAPT_Gen_var engine )
 {
   MESSAGE( "HOMARD_Boundary_i" );
   _gen_i = engine;
@@ -98,12 +98,12 @@ char* HOMARD_Boundary_i::GetDumpPython()
 //=============================================================================
 std::string HOMARD_Boundary_i::Dump() const
 {
-  return HOMARD::Dump( *myHomardBoundary );
+  return ADAPT::Dump( *myHomardBoundary );
 }
 //=============================================================================
 bool HOMARD_Boundary_i::Restore( const std::string& stream )
 {
-  return HOMARD::Restore( *myHomardBoundary, stream );
+  return ADAPT::Restore( *myHomardBoundary, stream );
 }
 //=============================================================================
 //=============================================================================
@@ -178,10 +178,10 @@ void HOMARD_Boundary_i::SetTorus( double X0, double X1, double X2, double X3, do
   myHomardBoundary->SetTorus( X0, X1, X2, X3, X4, X5, X6, X7 );
 }
 //=============================================================================
-HOMARD::double_array* HOMARD_Boundary_i::GetCoords()
+ADAPT::double_array* HOMARD_Boundary_i::GetCoords()
 {
   ASSERT( myHomardBoundary );
-  HOMARD::double_array_var aResult = new HOMARD::double_array();
+  ADAPT::double_array_var aResult = new ADAPT::double_array();
   std::vector<double> mesCoor = myHomardBoundary->GetCoords();
   aResult->length( mesCoor .size() );
   std::vector<double>::const_iterator it;
@@ -197,10 +197,10 @@ void HOMARD_Boundary_i::SetLimit( double Xincr, double Yincr, double Zincr )
   myHomardBoundary->SetLimit( Xincr, Yincr, Zincr );
 }
 //=============================================================================
-HOMARD::double_array* HOMARD_Boundary_i::GetLimit()
+ADAPT::double_array* HOMARD_Boundary_i::GetLimit()
 {
   ASSERT( myHomardBoundary );
-  HOMARD::double_array_var aResult = new HOMARD::double_array();
+  ADAPT::double_array_var aResult = new ADAPT::double_array();
   std::vector<double> mesCoor = myHomardBoundary->GetLimit();
   aResult->length( mesCoor .size() );
   std::vector<double>::const_iterator it;
@@ -216,7 +216,7 @@ void HOMARD_Boundary_i::AddGroup( const char* Group)
   myHomardBoundary->AddGroup( Group );
 }
 //=============================================================================
-void HOMARD_Boundary_i::SetGroups(const HOMARD::ListGroupType& ListGroup)
+void HOMARD_Boundary_i::SetGroups(const ADAPT::ListGroupType& ListGroup)
 {
   ASSERT( myHomardBoundary );
   std::list<std::string> ListString;
@@ -227,11 +227,11 @@ void HOMARD_Boundary_i::SetGroups(const HOMARD::ListGroupType& ListGroup)
   myHomardBoundary->SetGroups( ListString );
 }
 //=============================================================================
-HOMARD::ListGroupType*  HOMARD_Boundary_i::GetGroups()
+ADAPT::ListGroupType*  HOMARD_Boundary_i::GetGroups()
 {
   ASSERT( myHomardBoundary );
   const std::list<std::string>& ListString = myHomardBoundary->GetGroups();
-  HOMARD::ListGroupType_var aResult = new HOMARD::ListGroupType;
+  ADAPT::ListGroupType_var aResult = new ADAPT::ListGroupType;
   aResult->length( ListString.size() );
   std::list<std::string>::const_iterator it;
   int i = 0;

src/ADAPT_I/HOMARD_Boundary_i.hxx

@@ -31,7 +31,7 @@
 #define _HOMARD_Boundary_I_HXX_
 
 #include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(HOMARD_Gen)
+#include CORBA_SERVER_HEADER(ADAPT_Gen)
 #include CORBA_SERVER_HEADER(HOMARD_Boundary)
 
 #include "HOMARD_i.hxx"
@@ -45,11 +45,11 @@ class HOMARD_Boundary;
 
 class HOMARDENGINE_EXPORT HOMARD_Boundary_i:
   public virtual Engines_Component_i,
-  public virtual POA_HOMARD::HOMARD_Boundary,
+  public virtual POA_ADAPT::HOMARD_Boundary,
   public virtual PortableServer::ServantBase
 {
 public:
-  HOMARD_Boundary_i( CORBA::ORB_ptr orb, HOMARD::HOMARD_Gen_var gen_i );
+  HOMARD_Boundary_i( CORBA::ORB_ptr orb, ADAPT::ADAPT_Gen_var gen_i );
   HOMARD_Boundary_i();
 
   virtual ~HOMARD_Boundary_i();
@@ -88,14 +88,14 @@ public:
                                       double Xaxe, double Yaxe, double Zaxe,
                                       double rayonRev, double rayonPri );
 
-  HOMARD::double_array*  GetCoords();
+  ADAPT::double_array*  GetCoords();
 
   void                   SetLimit( double Xincr, double Yincr, double Zincr);
-  HOMARD::double_array*  GetLimit();
+  ADAPT::double_array*  GetLimit();
 
   void                   AddGroup( const char* Group);
-  void                   SetGroups(const HOMARD::ListGroupType& ListGroup);
+  void                   SetGroups(const ADAPT::ListGroupType& ListGroup);
-  HOMARD::ListGroupType* GetGroups();
+  ADAPT::ListGroupType* GetGroups();
 
 // Liens avec les autres structures
   void                   SetCaseCreation( const char* NomCaseCreation );
@@ -106,7 +106,7 @@ private:
   ::HOMARD_Boundary*     myHomardBoundary;
 
   CORBA::ORB_ptr         _orb;
-  HOMARD::HOMARD_Gen_var _gen_i;
+  ADAPT::ADAPT_Gen_var _gen_i;
 };
 
 #endif

src/ADAPT_I/HOMARD_Cas_i.cxx

@@ -28,7 +28,7 @@
 //
 
 #include "HOMARD_Cas_i.hxx"
-#include "HOMARD_Gen_i.hxx"
+#include "ADAPT_Gen_i.hxx"
 #include "HOMARD_Cas.hxx"
 #include "HOMARD_DriverTools.hxx"
 #include "HOMARD.hxx"
@@ -58,7 +58,7 @@ HOMARD_Cas_i::HOMARD_Cas_i()
  */
 //=============================================================================
 HOMARD_Cas_i::HOMARD_Cas_i( CORBA::ORB_ptr orb,
-                            HOMARD::HOMARD_Gen_var engine )
+                            ADAPT::ADAPT_Gen_var engine )
 {
   MESSAGE( "HOMARD_Cas_i" );
   _gen_i = engine;
@@ -108,12 +108,12 @@ char* HOMARD_Cas_i::GetDumpPython()
 //=============================================================================
 std::string HOMARD_Cas_i::Dump() const
 {
-  return HOMARD::Dump( *myHomardCas );
+  return ADAPT::Dump( *myHomardCas );
 }
 //=============================================================================
 bool HOMARD_Cas_i::Restore( const std::string& stream )
 {
-  return HOMARD::Restore( *myHomardCas, stream );
+  return ADAPT::Restore( *myHomardCas, stream );
 }
 //=============================================================================
 //=============================================================================
@@ -161,7 +161,7 @@ void HOMARD_Cas_i::SetDirName( const char* NomDir )
   {
     MESSAGE ( "etat : " << GetState() ) ;
     // D.1. Nom local du repertoire de l'iteration de depart dans le repertoire actuel du cas
-    HOMARD::HOMARD_Iteration_ptr Iter = GetIter0() ;
+    ADAPT::HOMARD_Iteration_ptr Iter = GetIter0() ;
     char* DirNameIter = Iter->GetDirNameLoc() ;
     MESSAGE ( "SetDirName : nom actuel pour le repertoire de l iteration, DirNameIter = "<< DirNameIter);
     // D.2. Recherche d'un nom local pour l'iteration de depart dans le futur repertoire du cas
@@ -223,7 +223,7 @@ CORBA::Long HOMARD_Cas_i::GetState()
   ASSERT( myHomardCas );
 // Nom de l'iteration initiale
   char* Iter0Name = GetIter0Name() ;
-  HOMARD::HOMARD_Iteration_ptr Iter = _gen_i->GetIteration(Iter0Name) ;
+  ADAPT::HOMARD_Iteration_ptr Iter = _gen_i->GetIteration(Iter0Name) ;
   int state = Iter->GetNumber() ;
   return state ;
 }
@@ -260,7 +260,7 @@ CORBA::Long HOMARD_Cas_i::GetExtType()
   return myHomardCas->GetExtType();
 }
 //=============================================================================
-void HOMARD_Cas_i::SetBoundingBox( const HOMARD::extrema& LesExtrema )
+void HOMARD_Cas_i::SetBoundingBox( const ADAPT::extrema& LesExtrema )
 {
   ASSERT( myHomardCas );
   std::vector<double> VExtrema;
@@ -273,10 +273,10 @@ void HOMARD_Cas_i::SetBoundingBox( const HOMARD::extrema& LesExtrema )
   myHomardCas->SetBoundingBox( VExtrema );
 }
 //=============================================================================
-HOMARD::extrema* HOMARD_Cas_i::GetBoundingBox()
+ADAPT::extrema* HOMARD_Cas_i::GetBoundingBox()
 {
   ASSERT(myHomardCas );
-  HOMARD::extrema_var aResult = new HOMARD::extrema();
+  ADAPT::extrema_var aResult = new ADAPT::extrema();
   std::vector<double> LesExtremes = myHomardCas->GetBoundingBox();
   ASSERT( LesExtremes.size() == 10 );
   aResult->length( 10 );
@@ -293,7 +293,7 @@ void HOMARD_Cas_i::AddGroup( const char* Group)
   myHomardCas->AddGroup( Group );
 }
 //=============================================================================
-void HOMARD_Cas_i::SetGroups( const HOMARD::ListGroupType& ListGroup )
+void HOMARD_Cas_i::SetGroups( const ADAPT::ListGroupType& ListGroup )
 {
   ASSERT( myHomardCas );
   std::list<std::string> ListString ;
@@ -304,11 +304,11 @@ void HOMARD_Cas_i::SetGroups( const HOMARD::ListGroupType& ListGroup )
   myHomardCas->SetGroups( ListString );
 }
 //=============================================================================
-HOMARD::ListGroupType* HOMARD_Cas_i::GetGroups()
+ADAPT::ListGroupType* HOMARD_Cas_i::GetGroups()
 {
   ASSERT(myHomardCas );
   const std::list<std::string>& ListString = myHomardCas->GetGroups();
-  HOMARD::ListGroupType_var aResult = new HOMARD::ListGroupType();
+  ADAPT::ListGroupType_var aResult = new ADAPT::ListGroupType();
   aResult->length( ListString.size() );
   std::list<std::string>::const_iterator it;
   int i = 0;
@@ -332,7 +332,7 @@ void HOMARD_Cas_i::AddBoundaryGroup( const char* BoundaryName, const char* Group
   ASSERT( myHomardCas );
   // A. Préalables
   // A.1. Caractéristiques de la frontière à ajouter
-  HOMARD::HOMARD_Boundary_ptr myBoundary = _gen_i->GetBoundary(BoundaryName) ;
+  ADAPT::HOMARD_Boundary_ptr myBoundary = _gen_i->GetBoundary(BoundaryName) ;
   ASSERT(!CORBA::is_nil(myBoundary));
   int BoundaryType = myBoundary->GetType();
   MESSAGE ( ". BoundaryType = " << BoundaryType );
@@ -366,7 +366,7 @@ void HOMARD_Cas_i::AddBoundaryGroup( const char* BoundaryName, const char* Group
       {
         boun = (*it).c_str() ;
         MESSAGE ("..  Frontiere enregistrée : "<< boun );
-        HOMARD::HOMARD_Boundary_ptr myBoundary_0 = _gen_i->GetBoundary(boun) ;
+        ADAPT::HOMARD_Boundary_ptr myBoundary_0 = _gen_i->GetBoundary(boun) ;
         int BoundaryType_0 = myBoundary_0->GetType();
         MESSAGE ( ".. BoundaryType_0 = " << BoundaryType_0 );
         if ( BoundaryType_0 == -1 )
@@ -386,7 +386,7 @@ void HOMARD_Cas_i::AddBoundaryGroup( const char* BoundaryName, const char* Group
         MESSAGE ("..  Frontiere enregistrée : "<< boun );
         if ( boun != BoundaryName )
         {
-          HOMARD::HOMARD_Boundary_ptr myBoundary_0 = _gen_i->GetBoundary(boun) ;
+          ADAPT::HOMARD_Boundary_ptr myBoundary_0 = _gen_i->GetBoundary(boun) ;
           int BoundaryType_0 = myBoundary_0->GetType();
           MESSAGE ( ".. BoundaryType_0 = " << BoundaryType_0 );
           if ( BoundaryType_0 == 0 )
@@ -455,12 +455,12 @@ void HOMARD_Cas_i::AddBoundaryGroup( const char* BoundaryName, const char* Group
   }
 }
 //=============================================================================
-HOMARD::ListBoundaryGroupType* HOMARD_Cas_i::GetBoundaryGroup()
+ADAPT::ListBoundaryGroupType* HOMARD_Cas_i::GetBoundaryGroup()
 {
   MESSAGE ("GetBoundaryGroup");
   ASSERT(myHomardCas );
   const std::list<std::string>& ListBoundaryGroup = myHomardCas->GetBoundaryGroup();
-  HOMARD::ListBoundaryGroupType_var aResult = new HOMARD::ListBoundaryGroupType();
+  ADAPT::ListBoundaryGroupType_var aResult = new ADAPT::ListBoundaryGroupType();
   aResult->length( ListBoundaryGroup.size() );
   std::list<std::string>::const_iterator it;
   int i = 0;
@@ -523,7 +523,7 @@ char* HOMARD_Cas_i::GetIter0Name()
   return CORBA::string_dup( myHomardCas->GetIter0Name().c_str() );
 }
 //=============================================================================
-HOMARD::HOMARD_Iteration_ptr HOMARD_Cas_i::GetIter0()
+ADAPT::HOMARD_Iteration_ptr HOMARD_Cas_i::GetIter0()
 {
 // Nom de l'iteration initiale
   char* Iter0Name = GetIter0Name() ;
@@ -531,7 +531,7 @@ HOMARD::HOMARD_Iteration_ptr HOMARD_Cas_i::GetIter0()
   return _gen_i->GetIteration(Iter0Name) ;
 }
 //=============================================================================
-HOMARD::HOMARD_Iteration_ptr HOMARD_Cas_i::NextIteration( const char* IterName )
+ADAPT::HOMARD_Iteration_ptr HOMARD_Cas_i::NextIteration( const char* IterName )
 {
 // Nom de l'iteration parent
   char* NomIterParent = GetIter0Name() ;
@@ -540,10 +540,10 @@ HOMARD::HOMARD_Iteration_ptr HOMARD_Cas_i::NextIteration( const char* IterName )
   return _gen_i->CreateIteration(IterName, NomIterParent) ;
 }
 //=============================================================================
-HOMARD::HOMARD_Iteration_ptr HOMARD_Cas_i::LastIteration( )
+ADAPT::HOMARD_Iteration_ptr HOMARD_Cas_i::LastIteration( )
 {
-  HOMARD::HOMARD_Iteration_ptr Iter ;
+  ADAPT::HOMARD_Iteration_ptr Iter ;
-  HOMARD::listeIterFilles_var ListeIterFilles ;
+  ADAPT::listeIterFilles_var ListeIterFilles ;
   char* IterName ;
 // Iteration initiale du cas
   IterName = GetIter0Name() ;
@@ -586,7 +586,7 @@ void HOMARD_Cas_i::AddIteration( const char* NomIteration )
 // DirName : le repertoire de lancement des calculs du sch?ma
 // MeshFile : nom du fichier contenant le maillage pour le premier calcul
 //=============================================================================
-HOMARD::HOMARD_YACS_ptr HOMARD_Cas_i::CreateYACSSchema( const char* YACSName, const char* ScriptFile, const char* DirName, const char* MeshFile )
+ADAPT::HOMARD_YACS_ptr HOMARD_Cas_i::CreateYACSSchema( const char* YACSName, const char* ScriptFile, const char* DirName, const char* MeshFile )
 {
 // Nom du cas
   const char* CaseName = GetName() ;

src/ADAPT_I/HOMARD_Cas_i.hxx

@@ -31,7 +31,7 @@
 #define _HOMARD_CAS_I_HXX_
 
 #include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(HOMARD_Gen)
+#include CORBA_SERVER_HEADER(ADAPT_Gen)
 #include CORBA_SERVER_HEADER(HOMARD_Cas)
 
 #include "HOMARD_i.hxx"
@@ -45,11 +45,11 @@ class HOMARD_Cas;
 
 class HOMARDENGINE_EXPORT HOMARD_Cas_i:
   public virtual Engines_Component_i,
-  public virtual POA_HOMARD::HOMARD_Cas,
+  public virtual POA_ADAPT::HOMARD_Cas,
   public virtual PortableServer::ServantBase
 {
 public:
-  HOMARD_Cas_i( CORBA::ORB_ptr orb, HOMARD::HOMARD_Gen_var gen_i );
+  HOMARD_Cas_i( CORBA::ORB_ptr orb, ADAPT::ADAPT_Gen_var gen_i );
   HOMARD_Cas_i();
 
   virtual ~HOMARD_Cas_i();
@@ -79,16 +79,16 @@ public:
   void                   SetExtType( CORBA::Long ExtType );
   CORBA::Long            GetExtType();
 
-  void                   SetBoundingBox( const HOMARD::extrema& LesExtremes );
+  void                   SetBoundingBox( const ADAPT::extrema& LesExtremes );
-  HOMARD::extrema*       GetBoundingBox();
+  ADAPT::extrema*       GetBoundingBox();
 
   void                   AddGroup( const char* Group);
-  void                   SetGroups(const HOMARD::ListGroupType& ListGroup);
+  void                   SetGroups(const ADAPT::ListGroupType& ListGroup);
-  HOMARD::ListGroupType* GetGroups();
+  ADAPT::ListGroupType* GetGroups();
 
   void                   AddBoundary(const char* Boundary);
   void                   AddBoundaryGroup(const char* Boundary, const char* Group);
-  HOMARD::ListBoundaryGroupType*  GetBoundaryGroup();
+  ADAPT::ListBoundaryGroupType*  GetBoundaryGroup();
   void                   SupprBoundaryGroup( );
 
   void                   SetPyram( CORBA::Long Pyram );
@@ -98,22 +98,22 @@ public:
 
 // Liens avec les autres structures
   char*                  GetIter0Name();
-  HOMARD::HOMARD_Iteration_ptr GetIter0() ;
+  ADAPT::HOMARD_Iteration_ptr GetIter0() ;
 
-  HOMARD::HOMARD_Iteration_ptr  NextIteration( const char* Name ) ;
+  ADAPT::HOMARD_Iteration_ptr  NextIteration( const char* Name ) ;
 
-  HOMARD::HOMARD_Iteration_ptr  LastIteration() ;
+  ADAPT::HOMARD_Iteration_ptr  LastIteration() ;
 
   void                   AddIteration( const char* NomIteration );
 
 // YACS
-  HOMARD::HOMARD_YACS_ptr CreateYACSSchema( const char* YACSName, const char* ScriptFile, const char* DirName, const char* MeshFile );
+  ADAPT::HOMARD_YACS_ptr CreateYACSSchema( const char* YACSName, const char* ScriptFile, const char* DirName, const char* MeshFile );
 
 private:
   ::HOMARD_Cas*          myHomardCas;
 
   CORBA::ORB_ptr         _orb;
-  HOMARD::HOMARD_Gen_var _gen_i;
+  ADAPT::ADAPT_Gen_var _gen_i;
 };
 
 #endif

src/ADAPT_I/HOMARD_Hypothesis_i.cxx

@@ -28,7 +28,7 @@
 //
 
 #include "HOMARD_Hypothesis_i.hxx"
-#include "HOMARD_Gen_i.hxx"
+#include "ADAPT_Gen_i.hxx"
 #include "HOMARD_Hypothesis.hxx"
 #include "HOMARD_DriverTools.hxx"
 
@@ -51,7 +51,7 @@ HOMARD_Hypothesis_i::HOMARD_Hypothesis_i()
  */
 //=============================================================================
 HOMARD_Hypothesis_i::HOMARD_Hypothesis_i( CORBA::ORB_ptr orb,
-                                          HOMARD::HOMARD_Gen_var engine )
+                                          ADAPT::ADAPT_Gen_var engine )
 {
   MESSAGE( "standard constructor" );
   _gen_i = engine;
@@ -101,12 +101,12 @@ char* HOMARD_Hypothesis_i::GetDumpPython()
 //=============================================================================
 std::string HOMARD_Hypothesis_i::Dump() const
 {
-  return HOMARD::Dump( *myHomardHypothesis );
+  return ADAPT::Dump( *myHomardHypothesis );
 }
 //=============================================================================
 bool HOMARD_Hypothesis_i::Restore( const std::string& stream )
 {
-  return HOMARD::Restore( *myHomardHypothesis, stream );
+  return ADAPT::Restore( *myHomardHypothesis, stream );
 }
 //=============================================================================
 //=============================================================================
@@ -132,10 +132,10 @@ void HOMARD_Hypothesis_i::SetUnifRefinUnRef( CORBA::Long TypeRaffDera )
   myHomardHypothesis->SetRefinTypeDera( TypeRaff, TypeDera );
 }
 //=============================================================================
-HOMARD::listeTypes* HOMARD_Hypothesis_i::GetAdapRefinUnRef()
+ADAPT::listeTypes* HOMARD_Hypothesis_i::GetAdapRefinUnRef()
 {
   ASSERT( myHomardHypothesis );
-  HOMARD::listeTypes_var aResult = new HOMARD::listeTypes;
+  ADAPT::listeTypes_var aResult = new ADAPT::listeTypes;
   aResult->length( 3 );
   aResult[0] = CORBA::Long( myHomardHypothesis->GetAdapType() );
   aResult[1] = CORBA::Long( myHomardHypothesis->GetRefinType() );
@@ -177,10 +177,10 @@ void HOMARD_Hypothesis_i::SetUseField( CORBA::Long UsField )
   myHomardHypothesis->SetUseField( UsField );
 }
 //=============================================================================
-HOMARD::InfosHypo* HOMARD_Hypothesis_i::GetField()
+ADAPT::InfosHypo* HOMARD_Hypothesis_i::GetField()
 {
   ASSERT( myHomardHypothesis );
-  HOMARD::InfosHypo* aInfosHypo = new HOMARD::InfosHypo();
+  ADAPT::InfosHypo* aInfosHypo = new ADAPT::InfosHypo();
   aInfosHypo->FieldName  = CORBA::string_dup( myHomardHypothesis->GetFieldName().c_str() );
   aInfosHypo->TypeThR    = CORBA::Long( myHomardHypothesis->GetRefinThrType() );
   aInfosHypo->ThreshR    = CORBA::Double( myHomardHypothesis->GetThreshR() );
@@ -214,11 +214,11 @@ void HOMARD_Hypothesis_i::SupprComps()
   myHomardHypothesis->SupprComps();
 }
 //=============================================================================
-HOMARD::listeComposantsHypo* HOMARD_Hypothesis_i::GetComps()
+ADAPT::listeComposantsHypo* HOMARD_Hypothesis_i::GetComps()
 {
   ASSERT( myHomardHypothesis );
   const std::list<std::string>& ListString = myHomardHypothesis->GetComps();
-  HOMARD::listeComposantsHypo_var aResult = new HOMARD::listeComposantsHypo;
+  ADAPT::listeComposantsHypo_var aResult = new ADAPT::listeComposantsHypo;
   aResult->length( ListString.size() );
   std::list<std::string>::const_iterator it;
   int i = 0;
@@ -329,7 +329,7 @@ void HOMARD_Hypothesis_i::SupprGroups()
   myHomardHypothesis->SupprGroups();
 }
 //=============================================================================
-void HOMARD_Hypothesis_i::SetGroups(const HOMARD::ListGroupType& ListGroup)
+void HOMARD_Hypothesis_i::SetGroups(const ADAPT::ListGroupType& ListGroup)
 {
   ASSERT( myHomardHypothesis );
   std::list<std::string> ListString;
@@ -340,11 +340,11 @@ void HOMARD_Hypothesis_i::SetGroups(const HOMARD::ListGroupType& ListGroup)
   myHomardHypothesis->SetGroups( ListString );
 }
 //=============================================================================
-HOMARD::ListGroupType*  HOMARD_Hypothesis_i::GetGroups()
+ADAPT::ListGroupType*  HOMARD_Hypothesis_i::GetGroups()
 {
   ASSERT( myHomardHypothesis );
   const std::list<std::string>& ListString = myHomardHypothesis->GetGroups();
-  HOMARD::ListGroupType_var aResult = new HOMARD::ListGroupType;
+  ADAPT::ListGroupType_var aResult = new ADAPT::ListGroupType;
   aResult->length( ListString.size() );
   std::list<std::string>::const_iterator it;
   int i = 0;
@@ -391,11 +391,11 @@ void HOMARD_Hypothesis_i::SupprFieldInterps()
   myHomardHypothesis->SupprFieldInterps();
 }
 //=============================================================================
-HOMARD::listeFieldInterpsHypo* HOMARD_Hypothesis_i::GetFieldInterps()
+ADAPT::listeFieldInterpsHypo* HOMARD_Hypothesis_i::GetFieldInterps()
 {
   ASSERT( myHomardHypothesis );
   const std::list<std::string>& ListString = myHomardHypothesis->GetFieldInterps();
-  HOMARD::listeFieldInterpsHypo_var aResult = new HOMARD::listeFieldInterpsHypo;
+  ADAPT::listeFieldInterpsHypo_var aResult = new ADAPT::listeFieldInterpsHypo;
   aResult->length( ListString.size() );
   std::list<std::string>::const_iterator it;
   int i = 0;
@@ -434,11 +434,11 @@ void HOMARD_Hypothesis_i::UnLinkIteration( const char* NomIteration )
   myHomardHypothesis->UnLinkIteration( NomIteration );
 }
 //=============================================================================
-HOMARD::listeIters* HOMARD_Hypothesis_i::GetIterations()
+ADAPT::listeIters* HOMARD_Hypothesis_i::GetIterations()
 {
   ASSERT( myHomardHypothesis );
   const std::list<std::string>& ListString = myHomardHypothesis->GetIterations();
-  HOMARD::listeIters_var aResult = new HOMARD::listeIters;
+  ADAPT::listeIters_var aResult = new ADAPT::listeIters;
   aResult->length( ListString.size() );
   std::list<std::string>::const_iterator it;
   int i = 0;
@@ -490,11 +490,11 @@ void HOMARD_Hypothesis_i::SupprZones()
   myHomardHypothesis->SupprZones();
 }
 //=============================================================================
-HOMARD::listeZonesHypo* HOMARD_Hypothesis_i::GetZones()
+ADAPT::listeZonesHypo* HOMARD_Hypothesis_i::GetZones()
 {
   ASSERT( myHomardHypothesis );
   const std::list<std::string>& ListString = myHomardHypothesis->GetZones();
-  HOMARD::listeZonesHypo_var aResult = new HOMARD::listeZonesHypo;
+  ADAPT::listeZonesHypo_var aResult = new ADAPT::listeZonesHypo;
   aResult->length( ListString.size() );
   std::list<std::string>::const_iterator it;
   int i = 0;

src/ADAPT_I/HOMARD_Hypothesis_i.hxx

@@ -31,7 +31,7 @@
 #define _HOMARD_HYPOTHESIS_I_HXX_
 
 #include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(HOMARD_Gen)
+#include CORBA_SERVER_HEADER(ADAPT_Gen)
 #include CORBA_SERVER_HEADER(HOMARD_Hypothesis)
 
 #include "HOMARD_i.hxx"
@@ -45,11 +45,11 @@ class HOMARD_Hypothesis;
 
 class HOMARDENGINE_EXPORT HOMARD_Hypothesis_i:
   public virtual Engines_Component_i,
-  public virtual POA_HOMARD::HOMARD_Hypothesis,
+  public virtual POA_ADAPT::HOMARD_Hypothesis,
   public virtual PortableServer::ServantBase
 {
 public:
-  HOMARD_Hypothesis_i( CORBA::ORB_ptr orb, HOMARD::HOMARD_Gen_var gen_i );
+  HOMARD_Hypothesis_i( CORBA::ORB_ptr orb, ADAPT::ADAPT_Gen_var gen_i );
   HOMARD_Hypothesis_i();
 
   virtual ~HOMARD_Hypothesis_i();
@@ -67,7 +67,7 @@ public:
 
 // Caracteristiques
   void                   SetUnifRefinUnRef( CORBA::Long TypeRaffDera );
-  HOMARD::listeTypes*    GetAdapRefinUnRef();
+  ADAPT::listeTypes*    GetAdapRefinUnRef();
   CORBA::Long            GetAdapType();
   CORBA::Long            GetRefinType();
   CORBA::Long            GetUnRefType();
@@ -75,13 +75,13 @@ public:
   void                   SetField( const char* FieldName );
   char*                  GetFieldName();
   void                   SetUseField(CORBA::Long UsField);
-  HOMARD::InfosHypo*     GetField();
+  ADAPT::InfosHypo*     GetField();
 
   void                   SetUseComp(CORBA::Long UsCmpI);
   void                   AddComp( const char* NomComp );
   void                   SupprComp( const char* NomComp );
   void                   SupprComps();
-  HOMARD::listeComposantsHypo* GetComps();
+  ADAPT::listeComposantsHypo* GetComps();
 
   void                   SetRefinThr(CORBA::Long TypeThR, CORBA::Double ThreshR);
   CORBA::Long            GetRefinThrType();
@@ -103,8 +103,8 @@ public:
   void                   AddGroup( const char* Group);
   void                   SupprGroup( const char* Group );
   void                   SupprGroups();
-  void                   SetGroups(const HOMARD::ListGroupType& ListGroup);
+  void                   SetGroups(const ADAPT::ListGroupType& ListGroup);
-  HOMARD::ListGroupType* GetGroups();
+  ADAPT::ListGroupType* GetGroups();
 
   void                   SetTypeFieldInterp( CORBA::Long TypeFieldInterp );
   CORBA::Long            GetTypeFieldInterp();
@@ -112,7 +112,7 @@ public:
   void                   AddFieldInterpType( const char* FieldInterp, CORBA::Long TypeInterp );
   void                   SupprFieldInterp( const char* FieldInterp );
   void                   SupprFieldInterps();
-  HOMARD::listeFieldInterpsHypo* GetFieldInterps();
+  ADAPT::listeFieldInterpsHypo* GetFieldInterps();
 
 // Liens avec les autres structures
   void                   SetCaseCreation( const char* NomCaseCreation );
@@ -120,19 +120,19 @@ public:
 
   void                   LinkIteration( const char* NomIteration );
   void                   UnLinkIteration( const char* NomIteration );
-  HOMARD::listeIters*    GetIterations();
+  ADAPT::listeIters*    GetIterations();
 
   void                   AddZone( const char* NomZone, CORBA::Long TypeUse );
   void                   AddZone0( const char* NomZone, CORBA::Long TypeUse );
   void                   SupprZone( const char* NomZone );
   void                   SupprZones();
-  HOMARD::listeZonesHypo* GetZones();
+  ADAPT::listeZonesHypo* GetZones();
 
 private:
   ::HOMARD_Hypothesis*         myHomardHypothesis;
 
   CORBA::ORB_ptr               _orb;
-  HOMARD::HOMARD_Gen_var       _gen_i;
+  ADAPT::ADAPT_Gen_var       _gen_i;
 };
 
 #endif

src/ADAPT_I/HOMARD_Iteration_i.cxx

@@ -28,7 +28,7 @@
 //
 
 #include "HOMARD_Iteration_i.hxx"
-#include "HOMARD_Gen_i.hxx"
+#include "ADAPT_Gen_i.hxx"
 #include "HOMARD_Iteration.hxx"
 #include "HOMARD_DriverTools.hxx"
 
@@ -52,7 +52,7 @@ HOMARD_Iteration_i::HOMARD_Iteration_i()
  */
 //=============================================================================
 HOMARD_Iteration_i::HOMARD_Iteration_i( CORBA::ORB_ptr orb,
-                                        HOMARD::HOMARD_Gen_var engine )
+                                        ADAPT::ADAPT_Gen_var engine )
 {
   MESSAGE("constructor");
   _gen_i = engine;
@@ -101,12 +101,12 @@ char* HOMARD_Iteration_i::GetDumpPython()
 //=============================================================================
 std::string HOMARD_Iteration_i::Dump() const
 {
-  return HOMARD::Dump( *myHomardIteration );
+  return ADAPT::Dump( *myHomardIteration );
 }
 //=============================================================================
 bool HOMARD_Iteration_i::Restore( const std::string& stream )
 {
-  return HOMARD::Restore( *myHomardIteration, stream );
+  return ADAPT::Restore( *myHomardIteration, stream );
 }
 //=============================================================================
 //=============================================================================
@@ -129,7 +129,7 @@ char* HOMARD_Iteration_i::GetDirName()
 {
   ASSERT( myHomardIteration );
   std::string casename = myHomardIteration->GetCaseName() ;
-  HOMARD::HOMARD_Cas_ptr caseiter = _gen_i->GetCase(casename.c_str()) ;
+  ADAPT::HOMARD_Cas_ptr caseiter = _gen_i->GetCase(casename.c_str()) ;
   std::string dirnamecase = caseiter->GetDirName() ;
   std::string dirname = dirnamecase + "/" +  GetDirNameLoc() ;
   return CORBA::string_dup( dirname.c_str() );
@@ -240,11 +240,11 @@ void HOMARD_Iteration_i::SetFieldInterpTimeStepRank( const char* FieldInterp, CO
   myHomardIteration->SetFieldInterpTimeStepRank( FieldInterp, TimeStep, Rank );
 }
 //=============================================================================
-HOMARD::listeFieldInterpTSRsIter* HOMARD_Iteration_i::GetFieldInterpsTimeStepRank()
+ADAPT::listeFieldInterpTSRsIter* HOMARD_Iteration_i::GetFieldInterpsTimeStepRank()
 {
   ASSERT( myHomardIteration );
   const std::list<std::string>& ListString = myHomardIteration->GetFieldInterpsTimeStepRank();
-  HOMARD::listeFieldInterpTSRsIter_var aResult = new HOMARD::listeFieldInterpTSRsIter;
+  ADAPT::listeFieldInterpTSRsIter_var aResult = new ADAPT::listeFieldInterpTSRsIter;
   aResult->length( ListString.size() );
   std::list<std::string>::const_iterator it;
   int i = 0;
@@ -260,11 +260,11 @@ void HOMARD_Iteration_i::SetFieldInterp( const char* FieldInterp )
   myHomardIteration->SetFieldInterp( FieldInterp );
 }
 //=============================================================================
-HOMARD::listeFieldInterpsIter* HOMARD_Iteration_i::GetFieldInterps()
+ADAPT::listeFieldInterpsIter* HOMARD_Iteration_i::GetFieldInterps()
 {
   ASSERT( myHomardIteration );
   const std::list<std::string>& ListString = myHomardIteration->GetFieldInterps();
-  HOMARD::listeFieldInterpsIter_var aResult = new HOMARD::listeFieldInterpsIter;
+  ADAPT::listeFieldInterpsIter_var aResult = new ADAPT::listeFieldInterpsIter;
   aResult->length( ListString.size() );
   std::list<std::string>::const_iterator it;
   int i = 0;
@@ -355,7 +355,7 @@ char* HOMARD_Iteration_i::GetFileInfo()
 // Liens avec les autres iterations
 //=============================================================================
 //=============================================================================
-HOMARD::HOMARD_Iteration_ptr HOMARD_Iteration_i::NextIteration( const char* IterName )
+ADAPT::HOMARD_Iteration_ptr HOMARD_Iteration_i::NextIteration( const char* IterName )
 {
 // Nom de l'iteration parent
   char* NomIterParent = GetName() ;
@@ -375,11 +375,11 @@ void HOMARD_Iteration_i::UnLinkNextIteration( const char* NomIteration )
   myHomardIteration->UnLinkNextIteration( NomIteration );
 }
 //=============================================================================
-HOMARD::listeIterFilles* HOMARD_Iteration_i::GetIterations()
+ADAPT::listeIterFilles* HOMARD_Iteration_i::GetIterations()
 {
   ASSERT( myHomardIteration );
   const std::list<std::string>& maListe = myHomardIteration->GetIterations();
-  HOMARD::listeIterFilles_var aResult = new HOMARD::listeIterFilles;
+  ADAPT::listeIterFilles_var aResult = new ADAPT::listeIterFilles;
   aResult->length( maListe.size() );
   std::list<std::string>::const_iterator it;
   int i = 0;
@@ -402,7 +402,7 @@ char* HOMARD_Iteration_i::GetIterParentName()
   return CORBA::string_dup( myHomardIteration->GetIterParentName().c_str() );
 }
 //=============================================================================
-HOMARD::HOMARD_Iteration_ptr HOMARD_Iteration_i::GetIterParent()
+ADAPT::HOMARD_Iteration_ptr HOMARD_Iteration_i::GetIterParent()
 {
 // Nom de l'iteration parent
   char* NomIterParent = GetIterParentName() ;

src/ADAPT_I/HOMARD_Iteration_i.hxx

@@ -31,7 +31,7 @@
 #define _HOMARD_ITERATION_I_HXX_
 
 #include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(HOMARD_Gen)
+#include CORBA_SERVER_HEADER(ADAPT_Gen)
 #include CORBA_SERVER_HEADER(HOMARD_Iteration)
 
 #include "HOMARD_i.hxx"
@@ -45,12 +45,12 @@ class HOMARD_Iteration;
 
 class HOMARDENGINE_EXPORT HOMARD_Iteration_i:
   public virtual Engines_Component_i,
-  public virtual POA_HOMARD::HOMARD_Iteration,
+  public virtual POA_ADAPT::HOMARD_Iteration,
   public virtual PortableServer::ServantBase
 {
 public:
   HOMARD_Iteration_i( CORBA::ORB_ptr orb,
-                      HOMARD::HOMARD_Gen_var gen_i );
+                      ADAPT::ADAPT_Gen_var gen_i );
   HOMARD_Iteration_i();
 
   virtual ~HOMARD_Iteration_i();
@@ -95,9 +95,9 @@ public:
 // Instants pour un champ a interpoler
   void                   SetFieldInterpTimeStep( const char* FieldInterp, CORBA::Long TimeStep );
   void                   SetFieldInterpTimeStepRank( const char* FieldInterp, CORBA::Long TimeStep, CORBA::Long Rank );
-  HOMARD::listeFieldInterpTSRsIter* GetFieldInterpsTimeStepRank();
+  ADAPT::listeFieldInterpTSRsIter* GetFieldInterpsTimeStepRank();
   void                   SetFieldInterp( const char* FieldInterp );
-  HOMARD::listeFieldInterpsIter* GetFieldInterps();
+  ADAPT::listeFieldInterpsIter* GetFieldInterps();
   void                   SupprFieldInterps();
 
   void                   SetLogFile( const char* LogFile );
@@ -113,15 +113,15 @@ public:
   char*                  GetFileInfo();
 
   // Liens avec les autres iterations
-  HOMARD::HOMARD_Iteration_ptr NextIteration( const char* Name) ;
+  ADAPT::HOMARD_Iteration_ptr NextIteration( const char* Name) ;
 
   void                   LinkNextIteration( const char* NomIteration );
   void                   UnLinkNextIteration( const char* NomIteration );
-  HOMARD::listeIterFilles* GetIterations();
+  ADAPT::listeIterFilles* GetIterations();
 
   void                   SetIterParentName( const char* NomIterParent );
   char*                  GetIterParentName();
-  HOMARD::HOMARD_Iteration_ptr GetIterParent() ;
+  ADAPT::HOMARD_Iteration_ptr GetIterParent() ;
 
 // Liens avec les autres structures
   void                   SetCaseName( const char* NomCas );
@@ -139,7 +139,7 @@ private:
   ::HOMARD_Iteration*    myHomardIteration;
 
   CORBA::ORB_ptr         _orb;
-  HOMARD::HOMARD_Gen_var _gen_i;
+  ADAPT::ADAPT_Gen_var _gen_i;
 };
 
 #endif

src/ADAPT_I/HOMARD_YACS_i.cxx

@@ -28,7 +28,7 @@
 //
 
 #include "HOMARD_YACS_i.hxx"
-#include "HOMARD_Gen_i.hxx"
+#include "ADAPT_Gen_i.hxx"
 #include "HOMARD_YACS.hxx"
 #include "HOMARD_DriverTools.hxx"
 
@@ -52,7 +52,7 @@ HOMARD_YACS_i::HOMARD_YACS_i()
  */
 //=============================================================================
 HOMARD_YACS_i::HOMARD_YACS_i( CORBA::ORB_ptr orb,
-                                        HOMARD::HOMARD_Gen_var engine )
+                                        ADAPT::ADAPT_Gen_var engine )
 {
   MESSAGE("constructor");
   _gen_i = engine;
@@ -101,12 +101,12 @@ char* HOMARD_YACS_i::GetDumpPython()
 //=============================================================================
 std::string HOMARD_YACS_i::Dump() const
 {
-  return HOMARD::Dump( *myHomardYACS );
+  return ADAPT::Dump( *myHomardYACS );
 }
 //=============================================================================
 bool HOMARD_YACS_i::Restore( const std::string& stream )
 {
-  return HOMARD::Restore( *myHomardYACS, stream );
+  return ADAPT::Restore( *myHomardYACS, stream );
 }
 //=============================================================================
 //=============================================================================

src/ADAPT_I/HOMARD_YACS_i.hxx

@@ -31,7 +31,7 @@
 #define _HOMARD_YACS_I_HXX_
 
 #include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(HOMARD_Gen)
+#include CORBA_SERVER_HEADER(ADAPT_Gen)
 #include CORBA_SERVER_HEADER(HOMARD_YACS)
 
 #include "HOMARD_i.hxx"
@@ -45,12 +45,12 @@ class HOMARD_YACS;
 
 class HOMARDENGINE_EXPORT HOMARD_YACS_i:
   public virtual Engines_Component_i,
-  public virtual POA_HOMARD::HOMARD_YACS,
+  public virtual POA_ADAPT::HOMARD_YACS,
   public virtual PortableServer::ServantBase
 {
 public:
   HOMARD_YACS_i( CORBA::ORB_ptr orb,
-                      HOMARD::HOMARD_Gen_var gen_i );
+                      ADAPT::ADAPT_Gen_var gen_i );
   HOMARD_YACS_i();
 
   virtual ~HOMARD_YACS_i();
@@ -106,7 +106,7 @@ private:
   ::HOMARD_YACS*    myHomardYACS;
 
   CORBA::ORB_ptr         _orb;
-  HOMARD::HOMARD_Gen_var _gen_i;
+  ADAPT::ADAPT_Gen_var _gen_i;
 };
 
 #endif

src/ADAPT_I/HOMARD_Zone_i.cxx

@@ -28,7 +28,7 @@
 //
 
 #include "HOMARD_Zone_i.hxx"
-#include "HOMARD_Gen_i.hxx"
+#include "ADAPT_Gen_i.hxx"
 #include "HOMARD_Zone.hxx"
 #include "HOMARD_DriverTools.hxx"
 
@@ -51,7 +51,7 @@ HOMARD_Zone_i::HOMARD_Zone_i()
  */
 //=============================================================================
 HOMARD_Zone_i::HOMARD_Zone_i( CORBA::ORB_ptr orb,
-			      HOMARD::HOMARD_Gen_var engine )
+			      ADAPT::ADAPT_Gen_var engine )
 {
   MESSAGE( "HOMARD_Zone_i" );
   _gen_i = engine;
@@ -101,12 +101,12 @@ char* HOMARD_Zone_i::GetDumpPython()
 //=============================================================================
 std::string HOMARD_Zone_i::Dump() const
 {
-  return HOMARD::Dump( *myHomardZone );
+  return ADAPT::Dump( *myHomardZone );
 }
 //=============================================================================
 bool HOMARD_Zone_i::Restore( const std::string& stream )
 {
-  return HOMARD::Restore( *myHomardZone, stream );
+  return ADAPT::Restore( *myHomardZone, stream );
 }
 //=============================================================================
 //=============================================================================
@@ -153,10 +153,10 @@ void HOMARD_Zone_i::SetSphere( double Xcentre, double Ycentre, double Zcentre, d
   myHomardZone->SetSphere( Xcentre, Ycentre, Zcentre, Rayon );
 }
 //=============================================================================
-HOMARD::double_array* HOMARD_Zone_i::GetCoords()
+ADAPT::double_array* HOMARD_Zone_i::GetCoords()
 {
   ASSERT( myHomardZone );
-  HOMARD::double_array_var aResult = new HOMARD::double_array();
+  ADAPT::double_array_var aResult = new ADAPT::double_array();
   std::vector<double> mesCoor = myHomardZone->GetCoords();
   aResult->length( mesCoor .size() );
   std::vector<double>::const_iterator it;
@@ -173,10 +173,10 @@ void HOMARD_Zone_i::SetLimit( double Xincr, double Yincr, double Zincr )
   myHomardZone->SetLimit( Xincr, Yincr, Zincr );
 }
 //=============================================================================
-HOMARD::double_array* HOMARD_Zone_i::GetLimit()
+ADAPT::double_array* HOMARD_Zone_i::GetLimit()
 {
   ASSERT( myHomardZone );
-  HOMARD::double_array_var aResult = new HOMARD::double_array();
+  ADAPT::double_array_var aResult = new ADAPT::double_array();
   std::vector<double> mesCoor = myHomardZone->GetLimit();
   aResult->length( mesCoor .size() );
   std::vector<double>::const_iterator it;
@@ -197,11 +197,11 @@ void HOMARD_Zone_i::AddHypo( const char* NomHypo )
   myHomardZone->AddHypo( NomHypo );
 }
 //=============================================================================
-HOMARD::listeHypo* HOMARD_Zone_i::GetHypo()
+ADAPT::listeHypo* HOMARD_Zone_i::GetHypo()
 {
   ASSERT( myHomardZone );
   const std::list<std::string>& maListe = myHomardZone->GetHypo();
-  HOMARD::listeHypo_var aResult = new HOMARD::listeHypo;
+  ADAPT::listeHypo_var aResult = new ADAPT::listeHypo;
   aResult->length( maListe.size() );
   std:: list<std::string>::const_iterator it;
   int i = 0;

src/ADAPT_I/HOMARD_Zone_i.hxx

@@ -31,7 +31,7 @@
 #define _HOMARD_Zone_I_HXX_
 
 #include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(HOMARD_Gen)
+#include CORBA_SERVER_HEADER(ADAPT_Gen)
 #include CORBA_SERVER_HEADER(HOMARD_Zone)
 
 #include "HOMARD_i.hxx"
@@ -45,11 +45,11 @@ class HOMARD_Zone;
 
 class HOMARDENGINE_EXPORT HOMARD_Zone_i:
   public virtual Engines_Component_i,
-  public virtual POA_HOMARD::HOMARD_Zone,
+  public virtual POA_ADAPT::HOMARD_Zone,
   public virtual PortableServer::ServantBase
 {
 public:
-  HOMARD_Zone_i( CORBA::ORB_ptr orb, HOMARD::HOMARD_Gen_var gen_i );
+  HOMARD_Zone_i( CORBA::ORB_ptr orb, ADAPT::ADAPT_Gen_var gen_i );
   HOMARD_Zone_i();
 
   virtual ~HOMARD_Zone_i();
@@ -84,21 +84,21 @@ public:
   void                   SetSphere( double Xcentre, double Ycentre, double ZCentre,
                                     double Rayon );
 
-  HOMARD::double_array*  GetCoords();
+  ADAPT::double_array*  GetCoords();
 
   void                   SetLimit( double Xincr, double Yincr, double Zincr);
-  HOMARD::double_array*  GetLimit();
+  ADAPT::double_array*  GetLimit();
 
 // Liens avec les autres structures
   void                   AddHypo( const char *NomHypo );
-  HOMARD::listeHypo*     GetHypo();
+  ADAPT::listeHypo*     GetHypo();
   void                   SupprHypo( const char *NomHypo );
 
 private:
   ::HOMARD_Zone*         myHomardZone;
 
   CORBA::ORB_ptr         _orb;
-  HOMARD::HOMARD_Gen_var _gen_i;
+  ADAPT::ADAPT_Gen_var _gen_i;
 };
 
 #endif