changement homardGen ==> adaptGen

diff --git a/src/ADAPTGUI/MonCreateBoundaryAn.cxx b/src/ADAPTGUI/MonCreateBoundaryAn.cxx
index a9a4880ee031290d6cce395c792a2c2feb640f4e..c7f79c43695a047519259ce29b73a8b82a4c7e48 100644 (file)
--- a/src/ADAPTGUI/MonCreateBoundaryAn.cxx
+++ b/src/ADAPTGUI/MonCreateBoundaryAn.cxx
@@ -41,7 +41,7 @@ using namespace std;
 
 // ------------------------------------------------------------------------------------------------------------------------
 MonCreateBoundaryAn::MonCreateBoundaryAn(MonCreateCase* parent, bool modal,
-                             ADAPT::ADAPT_Gen_var myHomardGen0,
+                             ADAPT::ADAPT_Gen_var myAdaptGen0,
                              QString caseName) :
 // ------------------------------------------------------------------------------------------------------------------------------
 /* Constructs a MonCreateBoundaryAn
@@ -67,7 +67,7 @@ MonCreateBoundaryAn::MonCreateBoundaryAn(MonCreateCase* parent, bool modal,
     Chgt (false)
     {
       MESSAGE("Constructeur") ;
-      myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
+      myAdaptGen=ADAPT::ADAPT_Gen::_duplicate(myAdaptGen0);
       setupUi(this);
       setModal(modal);
 
@@ -103,12 +103,12 @@ MonCreateBoundaryAn::MonCreateBoundaryAn(MonCreateCase* parent, bool modal,
     }
 // --------------------------------------------------------------------------------------------------------------
 MonCreateBoundaryAn::MonCreateBoundaryAn(MonCreateCase* parent,
-                             ADAPT::ADAPT_Gen_var myHomardGen0,
+                             ADAPT::ADAPT_Gen_var myAdaptGen0,
                              QString caseName):
 // --------------------------------------------------------------------------------------------------------------
 //
     QDialog(0), Ui_CreateBoundaryAn(),
-     myHomardGen(myHomardGen0),
+     myAdaptGen(myAdaptGen0),
     _parent(parent),
     _Name (""),
     _aCaseName(caseName),
@@ -172,7 +172,7 @@ void MonCreateBoundaryAn::InitValBoundaryAn()
 //
     if (_aCaseName == QString("")) { return; }
 
-    ADAPT::HOMARD_Cas_var aCas = myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+    ADAPT::HOMARD_Cas_var aCas = myAdaptGen->GetCase(_aCaseName.toStdString().c_str());
     ADAPT::extrema_var  MesExtremes = aCas->GetBoundingBox();
     int num = MesExtremes->length() ;
     ASSERT(num == 10);
@@ -456,29 +456,29 @@ bool MonCreateBoundaryAn::CreateOrUpdateBoundaryAn()
       switch (_Type)
       {
         case 1 : // il s agit d un cylindre
-        { aBoundaryAn = myHomardGen->CreateBoundaryCylinder(CORBA::string_dup(_Name.toStdString().c_str()), \
+        { aBoundaryAn = myAdaptGen->CreateBoundaryCylinder(CORBA::string_dup(_Name.toStdString().c_str()), \
             _BoundaryAnXcentre, _BoundaryAnYcentre, _BoundaryAnZcentre, _BoundaryAnXaxis, _BoundaryAnYaxis, _BoundaryAnZaxis, _BoundaryAnRayon );
           break;
         }
         case 2 : // il s agit d une sphere
-        { aBoundaryAn = myHomardGen->CreateBoundarySphere(CORBA::string_dup(_Name.toStdString().c_str()), \
+        { aBoundaryAn = myAdaptGen->CreateBoundarySphere(CORBA::string_dup(_Name.toStdString().c_str()), \
             _BoundaryAnXcentre, _BoundaryAnYcentre, _BoundaryAnZcentre, _BoundaryAnRayon);
           break;
        }
         case 3 : // il s agit d un cone defini par un axe et un angle
-        { aBoundaryAn = myHomardGen->CreateBoundaryConeA(CORBA::string_dup(_Name.toStdString().c_str()), \
+        { aBoundaryAn = myAdaptGen->CreateBoundaryConeA(CORBA::string_dup(_Name.toStdString().c_str()), \
             _BoundaryAnXaxisCone, _BoundaryAnYaxisCone, _BoundaryAnZaxisCone, _BoundaryAngle, \
             _BoundaryAnXorigCone, _BoundaryAnYorigCone, _BoundaryAnYorigCone);
           break;
         }
         case 4 : // il s agit d un cone defini par les 2 rayons
-        { aBoundaryAn = myHomardGen->CreateBoundaryConeR(CORBA::string_dup(_Name.toStdString().c_str()), \
+        { aBoundaryAn = myAdaptGen->CreateBoundaryConeR(CORBA::string_dup(_Name.toStdString().c_str()), \
             _BoundaryAnXcone1, _BoundaryAnYcone1, _BoundaryAnZcone1, _BoundaryAnRayon1, \
             _BoundaryAnXcone2, _BoundaryAnYcone2, _BoundaryAnZcone2, _BoundaryAnRayon2);
           break;
         }
         case 5 : // il s agit d un tore
-        { aBoundaryAn = myHomardGen->CreateBoundaryTorus(CORBA::string_dup(_Name.toStdString().c_str()), \
+        { aBoundaryAn = myAdaptGen->CreateBoundaryTorus(CORBA::string_dup(_Name.toStdString().c_str()), \
             _BoundaryAnToreXcentre, _BoundaryAnToreYcentre, _BoundaryAnToreZcentre, _BoundaryAnToreXaxe, _BoundaryAnToreYaxe, _BoundaryAnToreZaxe, _BoundaryAnToreRRev, _BoundaryAnToreRPri );
           break;
         }
@@ -511,7 +511,7 @@ void MonCreateBoundaryAn::PushOnOK()
 void MonCreateBoundaryAn::PushOnHelp()
 // ------------------------------------------------------------------------
 {
-  std::string LanguageShort = myHomardGen->GetLanguageShort();
+  std::string LanguageShort = myAdaptGen->GetLanguageShort();
   HOMARD_UTILS::PushOnHelp(QString("gui_create_boundary.html"), QString("un-cylindre"), QString(LanguageShort.c_str()));
 }
 
@@ -521,7 +521,7 @@ void MonCreateBoundaryAn::SetNewName()
 {
 // Recherche d'un nom par defaut qui n'existe pas encore
 
-  ADAPT::listeBoundarys_var MyObjects = myHomardGen->GetAllBoundarysName();
+  ADAPT::listeBoundarys_var MyObjects = myAdaptGen->GetAllBoundarysName();
   int num = 0; QString aName="";
   while (aName=="" )
   {

diff --git a/src/ADAPTGUI/MonCreateBoundaryAn.h b/src/ADAPTGUI/MonCreateBoundaryAn.h
index 2576d14fd402b3cb036080cb9e092c2f0d568440..daadd656014ea147a1c33fd2d071d152f95b6aca 100644 (file)
--- a/src/ADAPTGUI/MonCreateBoundaryAn.h
+++ b/src/ADAPTGUI/MonCreateBoundaryAn.h
@@ -39,13 +39,13 @@ class HOMARD_EXPORT MonCreateBoundaryAn : public QDialog, public Ui_CreateBounda
 
 public:
     MonCreateBoundaryAn( MonCreateCase* parent, bool modal,
-                   ADAPT::ADAPT_Gen_var myHomardGen,
+                   ADAPT::ADAPT_Gen_var myAdaptGen,
                    QString caseName);
     virtual ~MonCreateBoundaryAn();
 
 protected :
     MonCreateBoundaryAn( MonCreateCase* parent,
-                   ADAPT::ADAPT_Gen_var myHomardGen,
+                   ADAPT::ADAPT_Gen_var myAdaptGen,
                    QString caseName);
 
     MonCreateCase * _parent;
@@ -71,7 +71,7 @@ protected :
     bool Chgt;
 
     ADAPT::HOMARD_Boundary_var aBoundaryAn ;
-    ADAPT::ADAPT_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myAdaptGen;
 
     virtual void InitConnect();
     virtual void InitValBoundaryAn();

diff --git a/src/ADAPTGUI/MonCreateBoundaryCAO.cxx b/src/ADAPTGUI/MonCreateBoundaryCAO.cxx
index da3f9d31e09dac4b49cc4bb2e40893773384b337..aa3246e43b8d5a16cf4cb3ce6ba0b5f5a7b2e57a 100644 (file)
--- a/src/ADAPTGUI/MonCreateBoundaryCAO.cxx
+++ b/src/ADAPTGUI/MonCreateBoundaryCAO.cxx
@@ -33,14 +33,14 @@ using namespace std;
 
 // -------------------------------------------------------------------------------
 MonCreateBoundaryCAO::MonCreateBoundaryCAO(MonCreateCase* parent, bool modal,
-                                         ADAPT::ADAPT_Gen_var myHomardGen0,
+                                         ADAPT::ADAPT_Gen_var myAdaptGen0,
                                          QString caseName, QString aName)
 // ---------------------------------------------------------------------------------
 /* Constructs a MonCreateBoundaryCAO */
     :
     QDialog(0), Ui_CreateBoundaryCAO(),
     _parent(parent), _aName(aName),
-    myHomardGen(ADAPT::ADAPT_Gen::_duplicate(myHomardGen0)),
+    myAdaptGen(ADAPT::ADAPT_Gen::_duplicate(myAdaptGen0)),
     _aCaseName(caseName)
     {
       MESSAGE("Constructeur") ;
@@ -99,7 +99,7 @@ bool MonCreateBoundaryCAO::PushOnApply()
    try
    {
      _aName=aName;
-     aBoundary=myHomardGen->CreateBoundaryCAO(CORBA::string_dup(_aName.toStdString().c_str()), aCAOFile.toStdString().c_str());
+     aBoundary=myAdaptGen->CreateBoundaryCAO(CORBA::string_dup(_aName.toStdString().c_str()), aCAOFile.toStdString().c_str());
      _parent->AddBoundaryCAO(_aName);
      aBoundary->SetCaseCreation(_aCaseName.toStdString().c_str());
    }
@@ -130,7 +130,7 @@ void MonCreateBoundaryCAO::PushOnOK()
 void MonCreateBoundaryCAO::PushOnHelp()
 // ------------------------------------------------------------------------
 {
-  std::string LanguageShort = myHomardGen->GetLanguageShort();
+  std::string LanguageShort = myAdaptGen->GetLanguageShort();
   HOMARD_UTILS::PushOnHelp(QString("gui_create_boundary.html"), QString("CAO"), QString(LanguageShort.c_str()));
 }
 // ------------------------------------------------------------------------
@@ -152,7 +152,7 @@ void MonCreateBoundaryCAO::SetNewName()
 // --------------------------------------------------
 {
 
-  ADAPT::listeBoundarys_var  MyObjects = myHomardGen->GetAllBoundarysName();
+  ADAPT::listeBoundarys_var  MyObjects = myAdaptGen->GetAllBoundarysName();
   int num = 0; QString aName="";
   while (aName == QString("") )
   {
@@ -195,7 +195,7 @@ void MonCreateBoundaryCAO::SetFiltrage()
     return;
   }
 
-  MonCreateListGroupCAO *aDlg = new MonCreateListGroupCAO(NULL, this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),
+  MonCreateListGroupCAO *aDlg = new MonCreateListGroupCAO(NULL, this, true, ADAPT::ADAPT_Gen::_duplicate(myAdaptGen),
                             _aCaseName, _listeGroupesBoundary) ;
   aDlg->show();
 }

diff --git a/src/ADAPTGUI/MonCreateBoundaryCAO.h b/src/ADAPTGUI/MonCreateBoundaryCAO.h
index 1d5b646e172de543c13a4c7be7841d1b0202219e..26b11f88314c554d1d2547fcb4b8fcd23c68b7ff 100644 (file)
--- a/src/ADAPTGUI/MonCreateBoundaryCAO.h
+++ b/src/ADAPTGUI/MonCreateBoundaryCAO.h
@@ -39,7 +39,7 @@ class HOMARD_EXPORT MonCreateBoundaryCAO : public QDialog, public Ui_CreateBound
 
 public:
     MonCreateBoundaryCAO( MonCreateCase* parent, bool modal,
-                         ADAPT::ADAPT_Gen_var myHomardGen,
+                         ADAPT::ADAPT_Gen_var myAdaptGen,
                          QString caseName, QString BoundaryName );
     ~MonCreateBoundaryCAO();
     virtual void setGroups (QStringList listGroup);
@@ -53,7 +53,7 @@ protected :
 
 
     ADAPT::HOMARD_Boundary_var aBoundary;
-    ADAPT::ADAPT_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myAdaptGen;
 
     QStringList  _listeGroupesBoundary;
 

diff --git a/src/ADAPTGUI/MonCreateBoundaryDi.cxx b/src/ADAPTGUI/MonCreateBoundaryDi.cxx
index 8d1158c725be56dc1a7c18f95f9502c391771afd..5d551a1e506e27018f930c337fb72b06ca40250c 100644 (file)
--- a/src/ADAPTGUI/MonCreateBoundaryDi.cxx
+++ b/src/ADAPTGUI/MonCreateBoundaryDi.cxx
@@ -33,14 +33,14 @@ using namespace std;
 
 // -------------------------------------------------------------------------------
 MonCreateBoundaryDi::MonCreateBoundaryDi(MonCreateCase* parent, bool modal,
-                                         ADAPT::ADAPT_Gen_var myHomardGen0,
+                                         ADAPT::ADAPT_Gen_var myAdaptGen0,
                                          QString caseName, QString aName)
 // ---------------------------------------------------------------------------------
 /* Constructs a MonCreateBoundaryDi */
     :
     QDialog(0), Ui_CreateBoundaryDi(),
     _parent(parent), _aName(aName),
-    myHomardGen(ADAPT::ADAPT_Gen::_duplicate(myHomardGen0)),
+    myAdaptGen(ADAPT::ADAPT_Gen::_duplicate(myAdaptGen0)),
     _aCaseName(caseName)
     {
       MESSAGE("Constructeur") ;
@@ -108,7 +108,7 @@ bool MonCreateBoundaryDi::PushOnApply()
    try
    {
      _aName=aName;
-     aBoundary=myHomardGen->CreateBoundaryDi(CORBA::string_dup(_aName.toStdString().c_str()), aMeshName.toStdString().c_str(), aMeshFile.toStdString().c_str());
+     aBoundary=myAdaptGen->CreateBoundaryDi(CORBA::string_dup(_aName.toStdString().c_str()), aMeshName.toStdString().c_str(), aMeshFile.toStdString().c_str());
      _parent->AddBoundaryDi(_aName);
      aBoundary->SetCaseCreation(_aCaseName.toStdString().c_str());
    }
@@ -139,7 +139,7 @@ void MonCreateBoundaryDi::PushOnOK()
 void MonCreateBoundaryDi::PushOnHelp()
 // ------------------------------------------------------------------------
 {
-  std::string LanguageShort = myHomardGen->GetLanguageShort();
+  std::string LanguageShort = myAdaptGen->GetLanguageShort();
   HOMARD_UTILS::PushOnHelp(QString("gui_create_boundary.html"), QString("frontiere-discrete"), QString(LanguageShort.c_str()));
 }
 // ------------------------------------------------------------------------
@@ -161,7 +161,7 @@ void MonCreateBoundaryDi::SetNewName()
 // --------------------------------------------------
 {
 
-  ADAPT::listeBoundarys_var  MyObjects = myHomardGen->GetAllBoundarysName();
+  ADAPT::listeBoundarys_var  MyObjects = myAdaptGen->GetAllBoundarysName();
   int num = 0; QString aName="";
   while (aName == QString("") )
   {
@@ -204,7 +204,7 @@ void MonCreateBoundaryDi::SetFiltrage()
     return;
   }
 
-  MonCreateListGroup *aDlg = new MonCreateListGroup(NULL, this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),
+  MonCreateListGroup *aDlg = new MonCreateListGroup(NULL, this, true, ADAPT::ADAPT_Gen::_duplicate(myAdaptGen),
                             _aCaseName, _listeGroupesBoundary) ;
   aDlg->show();
 }

diff --git a/src/ADAPTGUI/MonCreateBoundaryDi.h b/src/ADAPTGUI/MonCreateBoundaryDi.h
index de99a11205c98755384e46e8a00a046b440f15cd..b26496321f7899bd23a50dfea6ab707196f2f403 100644 (file)
--- a/src/ADAPTGUI/MonCreateBoundaryDi.h
+++ b/src/ADAPTGUI/MonCreateBoundaryDi.h
@@ -39,7 +39,7 @@ class HOMARD_EXPORT MonCreateBoundaryDi : public QDialog, public Ui_CreateBounda
 
 public:
     MonCreateBoundaryDi( MonCreateCase* parent, bool modal,
-                         ADAPT::ADAPT_Gen_var myHomardGen,
+                         ADAPT::ADAPT_Gen_var myAdaptGen,
                          QString caseName, QString BoundaryName );
     ~MonCreateBoundaryDi();
     virtual void setGroups (QStringList listGroup);
@@ -53,7 +53,7 @@ protected :
 
 
     ADAPT::HOMARD_Boundary_var aBoundary;
-    ADAPT::ADAPT_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myAdaptGen;
 
     QStringList  _listeGroupesBoundary;
 

diff --git a/src/ADAPTGUI/MonCreateCase.cxx b/src/ADAPTGUI/MonCreateCase.cxx
index 3943d3ed44ea780d138e56515021ab26c0cd34e5..5a980d4b38ce29efc4ca937470c48d6b84d9c91e 100644 (file)
--- a/src/ADAPTGUI/MonCreateCase.cxx
+++ b/src/ADAPTGUI/MonCreateCase.cxx
@@ -46,7 +46,7 @@ using namespace std;
  * Sets attributes to default values
  */
 // -----------------------------------------------------------------------------------------
-MonCreateCase::MonCreateCase( bool modal, ADAPT::ADAPT_Gen_var myHomardGen0 )
+MonCreateCase::MonCreateCase( bool modal, ADAPT::ADAPT_Gen_var myAdaptGen0 )
     :
     Ui_CreateCase(),
     _aCaseName(""),_aDirName(""),
@@ -54,8 +54,8 @@ MonCreateCase::MonCreateCase( bool modal, ADAPT::ADAPT_Gen_var myHomardGen0 )
     _ExtType(0),
     _Pyram(0)
 {
-  MESSAGE("Debut du constructeur de MonCreateCase");
-  myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
+  INFOS("Debut du constructeur de MonCreateCase");
+  myAdaptGen=ADAPT::ADAPT_Gen::_duplicate(myAdaptGen0);
   setupUi(this);
   setModal(modal);
   InitConnect();
@@ -75,7 +75,7 @@ MonCreateCase::MonCreateCase( bool modal, ADAPT::ADAPT_Gen_var myHomardGen0 )
 //
   adjustSize();
 
-//   MESSAGE("Fin du constructeur de MonCreateCase");
+  INFOS("Fin du constructeur de MonCreateCase");
 }
 // ------------------------------------------------------------------------
 MonCreateCase::~MonCreateCase()
@@ -87,6 +87,7 @@ MonCreateCase::~MonCreateCase()
 void MonCreateCase::InitConnect()
 // ------------------------------------------------------------------------
 {
+    INFOS("Debut de InitConnect");
     connect( LEName,      SIGNAL(textChanged(QString)), this, SLOT(CaseNameChanged()));
     connect( PushDir,     SIGNAL(pressed()), this, SLOT(SetDirName()));
     connect( PushFichier, SIGNAL(pressed()), this, SLOT(SetFileName()));
@@ -124,13 +125,14 @@ void MonCreateCase::InitConnect()
     connect( buttonApply,    SIGNAL(pressed()), this, SLOT(PushOnApply(0)));
     connect( buttonCancel,   SIGNAL(pressed()), this, SLOT(close()));
     connect( buttonHelp,     SIGNAL(pressed()), this, SLOT(PushOnHelp()));
+    INFOS("Fin de InitConnect");
 }
 // ------------------------------------------------------------------------
 void MonCreateCase::InitBoundarys()
 // ------------------------------------------------------------------------
 // Initialisation des menus avec les frontieres deja enregistrees
 {
-  MESSAGE("InitBoundarys");
+  INFOS("InitBoundarys");
 // Pour les frontieres analytiques : la colonne des groupes
   ADAPT::ListGroupType_var _listeGroupesCas = aCase->GetGroups();
   QTableWidgetItem *__colItem = new QTableWidgetItem();
@@ -146,11 +148,11 @@ void MonCreateCase::InitBoundarys()
 // Pour les frontieres discretes : la liste a saisir
 // Pour les frontieres analytiques : les colonnes de chaque frontiere
   ADAPT::HOMARD_Boundary_var myBoundary ;
-  ADAPT::listeBoundarys_var  mesBoundarys = myHomardGen->GetAllBoundarysName();
-//   MESSAGE("Nombre de frontieres enregistrees : "<<mesBoundarys->length());
+  ADAPT::listeBoundarys_var  mesBoundarys = myAdaptGen->GetAllBoundarysName();
+//   INFOS("Nombre de frontieres enregistrees : "<<mesBoundarys->length());
   for (int i=0; i<mesBoundarys->length(); i++)
   {
-    myBoundary = myHomardGen->GetBoundary(mesBoundarys[i]);
+    myBoundary = myAdaptGen->GetBoundary(mesBoundarys[i]);
     int type_obj = myBoundary->GetType() ;
     if ( type_obj==-1 )     { CBBoundaryCAO->addItem(QString(mesBoundarys[i])); }
     else if ( type_obj==0 ) { CBBoundaryDi->addItem(QString(mesBoundarys[i])); }
@@ -165,7 +167,7 @@ void MonCreateCase::InitBoundarys()
 bool MonCreateCase::PushOnApply(int option)
 // --------------------------------
 {
-  MESSAGE("PushOnApply");
+  INFOS("PushOnApply");
   QString aCaseName=LEName->text().trimmed();
   if ( aCaseName == "" )
   {
@@ -183,7 +185,7 @@ bool MonCreateCase::PushOnApply(int option)
   }
 
   if ( aDirName != _aDirName)
-  { QString CaseNameDir = myHomardGen->VerifieDir( aDirName.toStdString().c_str()) ;
+  { QString CaseNameDir = myAdaptGen->VerifieDir( aDirName.toStdString().c_str()) ;
     if ( ( CaseNameDir != "" ) & ( CaseNameDir != aCaseName ) )
     {
       QString texte ;
@@ -231,10 +233,10 @@ bool MonCreateCase::PushOnApply(int option)
         {
 //        Nom du groupe
           NomGroup = QString(TWBoundary->item(row, 0)->text()) ;
-//           MESSAGE("NomGroup "<<NomGroup.toStdString().c_str());
+//           INFOS("NomGroup "<<NomGroup.toStdString().c_str());
           for ( int nugr = 0 ; nugr<ListeGroup.size(); nugr++)
           {
-//             MESSAGE("....... "<<ListeGroup[nugr].toStdString().c_str());
+//             INFOS("....... "<<ListeGroup[nugr].toStdString().c_str());
             if ( NomGroup == ListeGroup[nugr] )
             {
               QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
@@ -254,7 +256,7 @@ bool MonCreateCase::PushOnApply(int option)
     _aCaseName = aCaseName;
     try
     {
-    aCase = myHomardGen->CreateCase( \
+    aCase = myAdaptGen->CreateCase( \
             CORBA::string_dup(_aCaseName.toStdString().c_str()),  \
             CORBA::string_dup(aMeshName.toStdString().c_str()),  \
             CORBA::string_dup(aFileName.toStdString().c_str()) );
@@ -345,19 +347,22 @@ void MonCreateCase::PushOnOK()
 void MonCreateCase::PushOnHelp()
 //-------------------------------
 {
-  std::string LanguageShort = myHomardGen->GetLanguageShort();
+  std::string LanguageShort = myAdaptGen->GetLanguageShort();
   HOMARD_UTILS::PushOnHelp(QString("gui_create_case.html"), QString(""), QString(LanguageShort.c_str()));
 }
 // ---------------------------------
 void MonCreateCase::SetNewName()
 // ------------------------------
 {
-  ADAPT::listeCases_var  MyCases = myHomardGen->GetAllCasesName();
+  INFOS("Debut de SetNewName");
+  ADAPT::listeCases_var  MyCases = myAdaptGen->GetAllCasesName();
+  INFOS("MyCases construit");
   int num = 0; QString aCaseName="";
   while (aCaseName=="" )
   {
     aCaseName.setNum(num+1) ;
     aCaseName.insert(0, QString("Case_")) ;
+    std::cout  << "aCaseName : --" << aCaseName.toStdString().c_str() << "--" << std::endl;
     for ( int i=0; i<MyCases->length(); i++)
     {
       if ( aCaseName ==  QString((MyCases)[i]))
@@ -368,8 +373,10 @@ void MonCreateCase::SetNewName()
       }
    }
   }
+  INFOS("aCaseName construit");
   LEName->clear() ;
   LEName->insert(aCaseName);
+  INFOS("Fin de SetNewName");
 }
 
 // ------------------------------------------------------------------------
@@ -507,7 +514,7 @@ void MonCreateCase::PushBoundaryCAONew()
 // ------------------------------------------------------------------------
 {
    MonCreateBoundaryCAO *BoundaryDlg = new MonCreateBoundaryCAO(this, true,
-                ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, "") ;
+                ADAPT::ADAPT_Gen::_duplicate(myAdaptGen), _aCaseName, "") ;
    BoundaryDlg->show();
 }
 // ------------------------------------------------------------------------
@@ -516,21 +523,21 @@ void MonCreateCase::PushBoundaryCAOEdit()
 {
   if (CBBoundaryCAO->currentText() == QString(""))  return;
   MonEditBoundaryCAO *BoundaryDlg = new MonEditBoundaryCAO(this, true,
-       ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, CBBoundaryCAO->currentText() ) ;
+       ADAPT::ADAPT_Gen::_duplicate(myAdaptGen), _aCaseName, CBBoundaryCAO->currentText() ) ;
   BoundaryDlg->show();
 }
 // ------------------------------------------------------------------------
 void MonCreateCase::PushBoundaryCAOHelp()
 // ------------------------------------------------------------------------
 {
-  std::string LanguageShort = myHomardGen->GetLanguageShort();
+  std::string LanguageShort = myAdaptGen->GetLanguageShort();
   HOMARD_UTILS::PushOnHelp(QString("gui_create_boundary.html"), QString("CAO"), QString(LanguageShort.c_str()));
 }
 // ------------------------------------------------------------------------
 void MonCreateCase::SetBoundaryD()
 // ------------------------------------------------------------------------
 {
-  MESSAGE("Debut de SetBoundaryD ");
+  INFOS("Debut de SetBoundaryD ");
   if (CBBoundaryD->isChecked())
   {
     bool bOK = PushOnApply(0);
@@ -555,7 +562,7 @@ void MonCreateCase::PushBoundaryDiNew()
 // ------------------------------------------------------------------------
 {
    MonCreateBoundaryDi *BoundaryDlg = new MonCreateBoundaryDi(this, true,
-                ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, "") ;
+                ADAPT::ADAPT_Gen::_duplicate(myAdaptGen), _aCaseName, "") ;
    BoundaryDlg->show();
 }
 // ------------------------------------------------------------------------
@@ -564,21 +571,21 @@ void MonCreateCase::PushBoundaryDiEdit()
 {
   if (CBBoundaryDi->currentText() == QString(""))  return;
   MonEditBoundaryDi *BoundaryDlg = new MonEditBoundaryDi(this, true,
-       ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, CBBoundaryDi->currentText() ) ;
+       ADAPT::ADAPT_Gen::_duplicate(myAdaptGen), _aCaseName, CBBoundaryDi->currentText() ) ;
   BoundaryDlg->show();
 }
 // ------------------------------------------------------------------------
 void MonCreateCase::PushBoundaryDiHelp()
 // ------------------------------------------------------------------------
 {
-  std::string LanguageShort = myHomardGen->GetLanguageShort();
+  std::string LanguageShort = myAdaptGen->GetLanguageShort();
   HOMARD_UTILS::PushOnHelp(QString("gui_create_boundary.html"), QString("frontiere-discrete"), QString(LanguageShort.c_str()));
 }
 // ------------------------------------------------------------------------
 void MonCreateCase::SetBoundaryA()
 // ------------------------------------------------------------------------
 {
-  MESSAGE("Debut de SetBoundaryA ");
+  INFOS("Debut de SetBoundaryA ");
   if (CBBoundaryA->isChecked())
   {
     bool bOK = PushOnApply(0);
@@ -595,10 +602,10 @@ void MonCreateCase::SetBoundaryA()
 void MonCreateCase::AddBoundaryAn(QString newBoundary)
 // ------------------------------------------------------------------------
 {
-  MESSAGE("Debut de AddBoundaryAn ");
+  INFOS("Debut de AddBoundaryAn ");
 // Ajout d'une nouvelle colonne
   int nbcol = TWBoundary->columnCount();
-//   MESSAGE("nbcol " <<  nbcol);
+//   INFOS("nbcol " <<  nbcol);
   nbcol += 1 ;
   TWBoundary->setColumnCount ( nbcol ) ;
   QTableWidgetItem *__colItem = new QTableWidgetItem();
@@ -607,7 +614,7 @@ void MonCreateCase::AddBoundaryAn(QString newBoundary)
 /*  TWBoundary->horizontalHeaderItem(nbcol-1)->setFlags( Qt::ItemIsSelectable|Qt::ItemIsEnabled );*/
 // Chaque case est a cocher
   int nbrow = TWBoundary->rowCount();
-//   MESSAGE("nbrow " <<  nbrow);
+//   INFOS("nbrow " <<  nbrow);
   for ( int i = 0; i < nbrow; i++ )
   {
     TWBoundary->setItem( i, nbcol-1, new QTableWidgetItem( QString ("") ) );
@@ -617,14 +624,14 @@ void MonCreateCase::AddBoundaryAn(QString newBoundary)
   }
   TWBoundary->resizeColumnToContents(nbcol-1);
 //   TWBoundary->resizeRowsToContents();
-//   MESSAGE("Fin de AddBoundaryAn ");
+//   INFOS("Fin de AddBoundaryAn ");
 }
 // ------------------------------------------------------------------------
 void MonCreateCase::PushBoundaryAnNew()
 // ------------------------------------------------------------------------
 {
    MonCreateBoundaryAn *BoundaryDlg = new MonCreateBoundaryAn(this, true,
-                ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName) ;
+                ADAPT::ADAPT_Gen::_duplicate(myAdaptGen), _aCaseName) ;
    BoundaryDlg->show();
 }
 // ------------------------------------------------------------------------
@@ -638,10 +645,10 @@ void MonCreateCase::PushBoundaryAnEdit()
     QTableWidgetItem *__colItem = new QTableWidgetItem();
     __colItem = TWBoundary->horizontalHeaderItem(i);
     nom = QString(__colItem->text()) ;
-    MESSAGE("nom "<<nom.toStdString().c_str());
+    INFOS("nom "<<nom.toStdString().c_str());
     if (nom != QString(""))
     { MonEditBoundaryAn *BoundaryDlg = new MonEditBoundaryAn(this, true,
-        ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, nom ) ;
+        ADAPT::ADAPT_Gen::_duplicate(myAdaptGen), _aCaseName, nom ) ;
       BoundaryDlg->show(); }
   }
 }
@@ -649,7 +656,7 @@ void MonCreateCase::PushBoundaryAnEdit()
 void MonCreateCase::PushBoundaryAnHelp()
 // ------------------------------------------------------------------------
 {
-  std::string LanguageShort = myHomardGen->GetLanguageShort();
+  std::string LanguageShort = myAdaptGen->GetLanguageShort();
   HOMARD_UTILS::PushOnHelp(QString("gui_create_boundary.html"), QString("frontiere-analytique"), QString(LanguageShort.c_str()));
 }
 // ------------------------------------------------------------------------
@@ -666,7 +673,7 @@ void MonCreateCase::CaseNameChanged()
 void MonCreateCase::SetAdvanced()
 // ------------------------------------------------------------------------
 {
-  MESSAGE("Debut de SetAdvanced ");
+  INFOS("Debut de SetAdvanced ");
   if (CBAdvanced->isChecked())
   { GBAdvancedOptions->setVisible(1);
     GBConforme->setVisible(1);
@@ -688,6 +695,7 @@ void MonCreateCase::SetAdvanced()
     _Pyram = 0 ;
     SetStandard() ;
     SetMED() ;
+  INFOS("Fin de SetAdvanced ");
  }
 //
   adjustSize();

diff --git a/src/ADAPTGUI/MonCreateCase.h b/src/ADAPTGUI/MonCreateCase.h
index 03178ef2ecf07c1dc38495d67418f18de182ca12..36f01b88487a6ad8284bdece905cddfb0a666345 100644 (file)
--- a/src/ADAPTGUI/MonCreateCase.h
+++ b/src/ADAPTGUI/MonCreateCase.h
@@ -37,7 +37,7 @@ class HOMARD_EXPORT MonCreateCase : public QDialog, public Ui_CreateCase
     Q_OBJECT
 
 public:
-    MonCreateCase( bool modal, ADAPT::ADAPT_Gen_var myHomardGen );
+    MonCreateCase( bool modal, ADAPT::ADAPT_Gen_var myAdaptGen );
     ~MonCreateCase();
 
     void AddBoundaryCAO(QString newBoundary);
@@ -54,7 +54,7 @@ protected :
     int _Pyram;
 
     ADAPT::HOMARD_Cas_var aCase ;
-    ADAPT::ADAPT_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myAdaptGen;
 
     virtual void InitConnect();
     virtual void InitBoundarys();

diff --git a/src/ADAPTGUI/MonCreateHypothesis.cxx b/src/ADAPTGUI/MonCreateHypothesis.cxx
index add1122eee40a6a5f10c9958b5184813ccac5c39..6c87eb0116627ed8ad784ed692bdfae268c83f3c 100644 (file)
--- a/src/ADAPTGUI/MonCreateHypothesis.cxx
+++ b/src/ADAPTGUI/MonCreateHypothesis.cxx
@@ -35,7 +35,7 @@ using namespace std;
 
 // -------------------------------------------------------------------------------
 MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal,
-                                         ADAPT::ADAPT_Gen_var myHomardGen0,
+                                         ADAPT::ADAPT_Gen_var myAdaptGen0,
                                          QString Name,
                                          QString caseName, QString aFieldFile)
 // ---------------------------------------------------------------------------------
@@ -56,7 +56,7 @@ MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal,
 
 {
       MESSAGE("Constructeur") ;
-      myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
+      myAdaptGen=ADAPT::ADAPT_Gen::_duplicate(myAdaptGen0);
       setupUi(this);
       if ( modal ) { setWindowModality(Qt::WindowModal); }
       else         { setWindowModality(Qt::NonModal); }
@@ -158,7 +158,7 @@ bool MonCreateHypothesis::PushOnApply()
     _Name=LEName->text().trimmed();
     try
     {
-     aHypothesis=myHomardGen->CreateHypothesis(CORBA::string_dup(_Name.toStdString().c_str()) );
+     aHypothesis=myAdaptGen->CreateHypothesis(CORBA::string_dup(_Name.toStdString().c_str()) );
      _parent->addHypothese(_Name);
     }
     catch( SALOME::SALOME_Exception& S_ex )
@@ -223,7 +223,7 @@ void MonCreateHypothesis::PushOnOK()
 void MonCreateHypothesis::PushOnHelp()
 // ------------------------------------------------------------------------
 {
-  std::string LanguageShort = myHomardGen->GetLanguageShort();
+  std::string LanguageShort = myAdaptGen->GetLanguageShort();
   HOMARD_UTILS::PushOnHelp(QString("gui_create_hypothese.html"), QString(""), QString(LanguageShort.c_str()));
 }
 // -------------------------------------------------
@@ -231,7 +231,7 @@ void MonCreateHypothesis::SetNewName()
 // --------------------------------------------------
 {
 
-  ADAPT::listeHypotheses_var  MyObjects = myHomardGen->GetAllHypothesesName();
+  ADAPT::listeHypotheses_var  MyObjects = myAdaptGen->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, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName) ;
+  MonCreateZone *aDlg = new MonCreateZone(this, true, ADAPT::ADAPT_Gen::_duplicate(myAdaptGen), _aCaseName) ;
   aDlg->show();
 }
 
@@ -336,7 +336,7 @@ void MonCreateHypothesis::PushZoneEdit()
     return;
   }
   QString zoneName = monItem->text().trimmed();
-  MonEditZone *aDlg = new MonEditZone(this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, zoneName) ;
+  MonEditZone *aDlg = new MonEditZone(this, true, ADAPT::ADAPT_Gen::_duplicate(myAdaptGen), _aCaseName, zoneName) ;
   aDlg->show();
 }
 // ------------------------------------------------------------------------
@@ -357,7 +357,7 @@ void MonCreateHypothesis::GetAllZones()
 // Par defaut, aucune n'est selectionnee
 {
   MESSAGE("Debut de GetAllZones") ;
-  ADAPT::listeZones_var mesZones = myHomardGen->GetAllZonesName();
+  ADAPT::listeZones_var mesZones = myAdaptGen->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, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ;
+  MonCreateListGroup *aDlg = new MonCreateListGroup(this, NULL, true, ADAPT::ADAPT_Gen::_duplicate(myAdaptGen),_aCaseName, _aListeGroupes) ;
   aDlg->show();
 }
 

diff --git a/src/ADAPTGUI/MonCreateHypothesis.h b/src/ADAPTGUI/MonCreateHypothesis.h
index a760fcfef26dd660210c600e2e04265b48be5a19..42f41f1ef7f7523c1dbf59861fda8a2d4c5b6e70 100644 (file)
--- a/src/ADAPTGUI/MonCreateHypothesis.h
+++ b/src/ADAPTGUI/MonCreateHypothesis.h
@@ -38,7 +38,7 @@ class HOMARD_EXPORT MonCreateHypothesis : public QScrollArea, public Ui_CreateHy
     Q_OBJECT
 
 public:
-    MonCreateHypothesis( MonCreateIteration* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen,
+    MonCreateHypothesis( MonCreateIteration* parent, bool modal, ADAPT::ADAPT_Gen_var myAdaptGen,
                          QString aHypotheseName, QString caseName, QString aFieldFile);
     ~MonCreateHypothesis();
 
@@ -46,7 +46,7 @@ public:
     virtual void setGroups(QStringList listGroup);
 
 protected :
-   // MonCreateHypothesis( MonCreateIteration* parent, ADAPT::ADAPT_Gen_var myHomardGen,
+   // MonCreateHypothesis( MonCreateIteration* parent, ADAPT::ADAPT_Gen_var myAdaptGen,
    //                      QString caseName, QString aFieldFile);
 
     MonCreateIteration *_parent;
@@ -75,7 +75,7 @@ protected :
     int _ExtraOutput;
 
     ADAPT::HOMARD_Hypothesis_var aHypothesis;
-    ADAPT::ADAPT_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myAdaptGen;
 
     QStringList _aListeZone;
     QStringList _aListeComposant;

diff --git a/src/ADAPTGUI/MonCreateIteration.cxx b/src/ADAPTGUI/MonCreateIteration.cxx
index 8d4d200d35c666344d28ea7fc929552940f385a5..27befda2d0e91adacd3c05798662804ad99e224b 100644 (file)
--- a/src/ADAPTGUI/MonCreateIteration.cxx
+++ b/src/ADAPTGUI/MonCreateIteration.cxx
@@ -33,7 +33,7 @@ using namespace std;
 
 // -----------------------------------------------------------------------------------------------------
 MonCreateIteration::MonCreateIteration(QWidget* parent, bool modal,
-                                       ADAPT::ADAPT_Gen_var myHomardGen0, QString IterParentName ):
+                                       ADAPT::ADAPT_Gen_var myAdaptGen0, QString IterParentName ):
 // -----------------------------------------------------------------------------------------------------
 /* Constructs a MonCreateIteration
  * Inherits from CasHomard
@@ -46,7 +46,7 @@ MonCreateIteration::MonCreateIteration(QWidget* parent, bool modal,
     _CaseName("")
     {
       MESSAGE("Constructeur");
-      myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
+      myAdaptGen=ADAPT::ADAPT_Gen::_duplicate(myAdaptGen0);
       setupUi(this);
       if ( modal ) { setWindowModality(Qt::WindowModal); }
       else         { setWindowModality(Qt::NonModal); }
@@ -87,7 +87,7 @@ void MonCreateIteration::InitConnect()
 void MonCreateIteration::GetHypotheses()
 // ------------------------------------------------------------------------
 {
-     ADAPT::listeHypotheses_var  mesHypotheses = myHomardGen->GetAllHypothesesName();
+     ADAPT::listeHypotheses_var  mesHypotheses = myAdaptGen->GetAllHypothesesName();
      for (int i=0; i<mesHypotheses->length(); i++)
      {
          CBHypothese->addItem(QString(mesHypotheses[i]));
@@ -128,7 +128,7 @@ bool MonCreateIteration::PushOnApply()
                               QObject::tr("HOM_ITER_HYPO") );
     return false;
   }
-  ADAPT::HOMARD_Hypothesis_var _myHypothesis = myHomardGen->GetHypothesis(monHypoName.toStdString().c_str());
+  ADAPT::HOMARD_Hypothesis_var _myHypothesis = myAdaptGen->GetHypothesis(monHypoName.toStdString().c_str());
   ADAPT::listeTypes_var ListTypes (_myHypothesis->GetAdapRefinUnRef());
   int TypeAdap = ListTypes[0];
   if ( TypeAdap == 1 && LEFieldFile->text().trimmed() == QString("") )
@@ -149,7 +149,7 @@ bool MonCreateIteration::PushOnApply()
     {
       _Name = aName;
       std::cerr << _Name.toStdString() << std::endl;
-      aIter = myHomardGen->CreateIteration( \
+      aIter = myAdaptGen->CreateIteration( \
                CORBA::string_dup(_Name.toStdString().c_str()),
                CORBA::string_dup(_IterParentName.toStdString().c_str()));
     }
@@ -172,7 +172,7 @@ bool MonCreateIteration::PushOnApply()
     if ( step == -2 ) { aIter->SetTimeStepRankLast(); }
     else              { aIter->SetTimeStepRank(step,rank); }
   }
-  myHomardGen->AssociateIterHypo (IterName.c_str(), monHypoName.toStdString().c_str());
+  myAdaptGen->AssociateIterHypo (IterName.c_str(), monHypoName.toStdString().c_str());
   aIter->SetMeshName(CORBA::string_dup(aMeshName_np1.toStdString().c_str()));
 
   HOMARD_UTILS::updateObjBrowser() ;
@@ -190,7 +190,7 @@ void MonCreateIteration::PushOnOK()
 void MonCreateIteration::PushOnHelp()
 // ------------------------------------------------------------------------
 {
-  std::string LanguageShort = myHomardGen->GetLanguageShort();
+  std::string LanguageShort = myAdaptGen->GetLanguageShort();
   HOMARD_UTILS::PushOnHelp(QString("gui_create_iteration.html"), QString(""), QString(LanguageShort.c_str()));
 }
 // ------------------------------------------------------------------------
@@ -202,7 +202,7 @@ void MonCreateIteration::SetIterParentName()
     if (_IterParentName == QString("")) { raise();return;};
   }
   _CaseName=HOMARD_QT_COMMUN::SelectionCasEtude();
-  ADAPT::HOMARD_Iteration_var aIterParent = myHomardGen->GetIteration(_IterParentName.toStdString().c_str()) ;
+  ADAPT::HOMARD_Iteration_var aIterParent = myAdaptGen->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
 
-  ADAPT::listeIterations_var  MyObjects=myHomardGen->GetAllIterationsName();
+  ADAPT::listeIterations_var  MyObjects=myAdaptGen->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, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),CBHypothese->currentText(), _CaseName, aFieldFile) ;
+  MonEditHypothesis *HypoDlg = new MonEditHypothesis(this, true, ADAPT::ADAPT_Gen::_duplicate(myAdaptGen),CBHypothese->currentText(), _CaseName, aFieldFile) ;
   HypoDlg->show();
 }
 
@@ -273,11 +273,11 @@ void MonCreateIteration::PushHypoNew()
   }
   if ( _CaseName == QString(""))
   {
-    ADAPT::HOMARD_Iteration_var aIterParent = myHomardGen->GetIteration(_IterParentName.toStdString().c_str()) ;
+    ADAPT::HOMARD_Iteration_var aIterParent = myAdaptGen->GetIteration(_IterParentName.toStdString().c_str()) ;
     _CaseName = aIterParent->GetCaseName();
   }
   QString aFieldFile=LEFieldFile->text().trimmed();
-  MonCreateHypothesis *HypoDlg = new MonCreateHypothesis(this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), QString(""), _CaseName, aFieldFile) ;
+  MonCreateHypothesis *HypoDlg = new MonCreateHypothesis(this, true, ADAPT::ADAPT_Gen::_duplicate(myAdaptGen), QString(""), _CaseName, aFieldFile) ;
   HypoDlg->show();
 }
 // ------------------------------------------------------------------------

diff --git a/src/ADAPTGUI/MonCreateIteration.h b/src/ADAPTGUI/MonCreateIteration.h
index a10f48d9150de19676ab1142cfb2fb94b9ab4637..383110d5cd22fa44245855381628f772914718bd 100644 (file)
--- a/src/ADAPTGUI/MonCreateIteration.h
+++ b/src/ADAPTGUI/MonCreateIteration.h
@@ -37,14 +37,14 @@ class HOMARD_EXPORT MonCreateIteration : public QScrollArea, public Ui_CreateIte
     Q_OBJECT
 
 public:
-    MonCreateIteration( QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString IterParentName );
+    MonCreateIteration( QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myAdaptGen, QString IterParentName );
     ~MonCreateIteration();
 
     void addHypothese(QString newHypothese);
 
 
 protected :
-    MonCreateIteration( QWidget* parent, ADAPT::ADAPT_Gen_var myHomardGen, QString IterParentName );
+    MonCreateIteration( QWidget* parent, ADAPT::ADAPT_Gen_var myAdaptGen, QString IterParentName );
 
     QString _Name;
     QString _IterParentName;
@@ -54,7 +54,7 @@ protected :
     ADAPT::HOMARD_Iteration_var aIter ;
     ADAPT::HOMARD_Iteration_var aIterParent ;
     ADAPT::HOMARD_Cas_var aCas ;
-    ADAPT::ADAPT_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myAdaptGen;
 
 
     virtual void InitConnect();

diff --git a/src/ADAPTGUI/MonCreateListGroup.cxx b/src/ADAPTGUI/MonCreateListGroup.cxx
index 7664a01fea302c20a5c5b694e9d761ee94d0b9db..3c4ef4c4886e88822fc102287b4df9f7f8e9d036 100644 (file)
--- a/src/ADAPTGUI/MonCreateListGroup.cxx
+++ b/src/ADAPTGUI/MonCreateListGroup.cxx
@@ -38,7 +38,7 @@ using namespace std;
 
 // --------------------------------------------------------------------------------------------------------------
 MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal,
-                                       ADAPT::ADAPT_Gen_var myHomardGen0, QString aCaseName,  QStringList listeGroupesHypo) :
+                                       ADAPT::ADAPT_Gen_var myAdaptGen0, QString aCaseName,  QStringList listeGroupesHypo) :
 // --------------------------------------------------------------------------------------------------------------
 //
     QDialog(0), Ui_CreateListGroup(),
@@ -48,7 +48,7 @@ MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreate
     _parentBound(parentBound)
 {
     MESSAGE("Debut de  MonCreateListGroup")
-     myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
+     myAdaptGen=ADAPT::ADAPT_Gen::_duplicate(myAdaptGen0);
     setupUi(this);
     setModal(modal);
     InitConnect();
@@ -56,7 +56,7 @@ MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreate
 }
 // --------------------------------------------------------------------------------------------------------------
 MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound,
-                                       ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName,  QStringList listeGroupesHypo) :
+                                       ADAPT::ADAPT_Gen_var myAdaptGen, QString aCaseName,  QStringList listeGroupesHypo) :
 // --------------------------------------------------------------------------------------------------------------
 //
     QDialog(0), Ui_CreateListGroup(),
@@ -65,7 +65,7 @@ MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreate
     _parentHyp(parentHyp),
     _parentBound(parentBound)
 {
-    myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen);
+    myAdaptGen=ADAPT::ADAPT_Gen::_duplicate(myAdaptGen);
     setupUi(this);
     InitConnect();
 }
@@ -118,7 +118,7 @@ void MonCreateListGroup::PushOnOK()
 void MonCreateListGroup::PushOnHelp()
 // ------------------------------------------------------------------------
 {
-  std::string LanguageShort = myHomardGen->GetLanguageShort();
+  std::string LanguageShort = myAdaptGen->GetLanguageShort();
   HOMARD_UTILS::PushOnHelp(QString("gui_create_hypothese.html"), QString(""), QString(LanguageShort.c_str()));
 }
 // ------------------------------------------------------------------------
@@ -130,7 +130,7 @@ void MonCreateListGroup::InitGroupes()
       TWGroupe->removeRow(row);
   TWGroupe->setRowCount(0);
   if (_aCaseName == QString("")) { return; };
-  ADAPT::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+  ADAPT::HOMARD_Cas_var monCas= myAdaptGen->GetCase(_aCaseName.toStdString().c_str());
   ADAPT::ListGroupType_var _listeGroupesCas = monCas->GetGroups();
   for ( int i = 0; i < _listeGroupesCas->length(); i++ )
   {

diff --git a/src/ADAPTGUI/MonCreateListGroup.h b/src/ADAPTGUI/MonCreateListGroup.h
index 4aa8a159ee3efa7dbd41f98a8e60494da87c468f..9422e8be2374d2ec049aba2e046d9e36414a92d8 100644 (file)
--- a/src/ADAPTGUI/MonCreateListGroup.h
+++ b/src/ADAPTGUI/MonCreateListGroup.h
@@ -38,13 +38,13 @@ class HOMARD_EXPORT MonCreateListGroup : public QDialog, public Ui_CreateListGro
     Q_OBJECT
 
 public:
-    MonCreateListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName,  QStringList listeGroupesHypo);
-    MonCreateListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo);
+    MonCreateListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, ADAPT::ADAPT_Gen_var myAdaptGen, QString aCaseName,  QStringList listeGroupesHypo);
+    MonCreateListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, ADAPT::ADAPT_Gen_var myAdaptGen, QString aCaseName, QStringList listeGroupesHypo);
     virtual ~MonCreateListGroup();
 
 protected :
 
-    ADAPT::ADAPT_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myAdaptGen;
 
     MonCreateHypothesis * _parentHyp;
     MonCreateBoundaryDi * _parentBound;

diff --git a/src/ADAPTGUI/MonCreateListGroupCAO.cxx b/src/ADAPTGUI/MonCreateListGroupCAO.cxx
index a630d455806266f2cec53c8122202583afdb92d4..5df4690dd938cda6eb46f118d2a1e7441b4659e7 100644 (file)
--- a/src/ADAPTGUI/MonCreateListGroupCAO.cxx
+++ b/src/ADAPTGUI/MonCreateListGroupCAO.cxx
@@ -38,7 +38,7 @@ using namespace std;
 
 // --------------------------------------------------------------------------------------------------------------
 MonCreateListGroupCAO::MonCreateListGroupCAO(MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal,
-                                       ADAPT::ADAPT_Gen_var myHomardGen0, QString aCaseName,  QStringList listeGroupesHypo) :
+                                       ADAPT::ADAPT_Gen_var myAdaptGen0, QString aCaseName,  QStringList listeGroupesHypo) :
 // --------------------------------------------------------------------------------------------------------------
 //
     QDialog(0), Ui_CreateListGroup(),
@@ -48,7 +48,7 @@ MonCreateListGroupCAO::MonCreateListGroupCAO(MonCreateHypothesis* parentHyp, Mon
     _parentBound(parentBound)
 {
     MESSAGE("Debut de  MonCreateListGroupCAO")
-     myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
+     myAdaptGen=ADAPT::ADAPT_Gen::_duplicate(myAdaptGen0);
     setupUi(this);
     setModal(modal);
     InitConnect();
@@ -56,7 +56,7 @@ MonCreateListGroupCAO::MonCreateListGroupCAO(MonCreateHypothesis* parentHyp, Mon
 }
 // --------------------------------------------------------------------------------------------------------------
 MonCreateListGroupCAO::MonCreateListGroupCAO(MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound,
-                                       ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName,  QStringList listeGroupesHypo) :
+                                       ADAPT::ADAPT_Gen_var myAdaptGen, QString aCaseName,  QStringList listeGroupesHypo) :
 // --------------------------------------------------------------------------------------------------------------
 //
     QDialog(0), Ui_CreateListGroup(),
@@ -65,7 +65,7 @@ MonCreateListGroupCAO::MonCreateListGroupCAO(MonCreateHypothesis* parentHyp, Mon
     _parentHyp(parentHyp),
     _parentBound(parentBound)
 {
-    myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen);
+    myAdaptGen=ADAPT::ADAPT_Gen::_duplicate(myAdaptGen);
     setupUi(this);
     InitConnect();
 }
@@ -115,7 +115,7 @@ void MonCreateListGroupCAO::PushOnOK()
 void MonCreateListGroupCAO::PushOnHelp()
 // ------------------------------------------------------------------------
 {
-  std::string LanguageShort = myHomardGen->GetLanguageShort();
+  std::string LanguageShort = myAdaptGen->GetLanguageShort();
   HOMARD_UTILS::PushOnHelp(QString("gui_create_hypothese.html"), QString(""), QString(LanguageShort.c_str()));
 }
 // ------------------------------------------------------------------------
@@ -127,7 +127,7 @@ void MonCreateListGroupCAO::InitGroupes()
       TWGroupe->removeRow(row);
   TWGroupe->setRowCount(0);
   if (_aCaseName == QString("")) { return; };
-  ADAPT::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+  ADAPT::HOMARD_Cas_var monCas= myAdaptGen->GetCase(_aCaseName.toStdString().c_str());
   ADAPT::ListGroupType_var _listeGroupesCas = monCas->GetGroups();
   for ( int i = 0; i < _listeGroupesCas->length(); i++ )
   {

diff --git a/src/ADAPTGUI/MonCreateListGroupCAO.h b/src/ADAPTGUI/MonCreateListGroupCAO.h
index 8917c413624f0d2396eb493e7aa9b7e56695ce81..1e291d3312fd91140bbcef38ec9019ea4eb763f0 100644 (file)
--- a/src/ADAPTGUI/MonCreateListGroupCAO.h
+++ b/src/ADAPTGUI/MonCreateListGroupCAO.h
@@ -38,13 +38,13 @@ class HOMARD_EXPORT MonCreateListGroupCAO : public QDialog, public Ui_CreateList
     Q_OBJECT
 
 public:
-    MonCreateListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName,  QStringList listeGroupesHypo);
-    MonCreateListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo);
+    MonCreateListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal, ADAPT::ADAPT_Gen_var myAdaptGen, QString aCaseName,  QStringList listeGroupesHypo);
+    MonCreateListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, ADAPT::ADAPT_Gen_var myAdaptGen, QString aCaseName, QStringList listeGroupesHypo);
     virtual ~MonCreateListGroupCAO();
 
 protected :
 
-    ADAPT::ADAPT_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myAdaptGen;
 
     MonCreateHypothesis * _parentHyp;
     MonCreateBoundaryCAO * _parentBound;

diff --git a/src/ADAPTGUI/MonCreateYACS.cxx b/src/ADAPTGUI/MonCreateYACS.cxx
index 9572db73abf9a1732773e761a68f50ca5b609cc9..e0ae6fda14f3f0cd14e6ff6f4a9e510d8820e481 100644 (file)
--- a/src/ADAPTGUI/MonCreateYACS.cxx
+++ b/src/ADAPTGUI/MonCreateYACS.cxx
@@ -34,7 +34,7 @@
 using namespace std;
 
 // ----------------------------------------------------------------------
-MonCreateYACS::MonCreateYACS (bool modal, ADAPT::ADAPT_Gen_var myHomardGen0, QString CaseName ):
+MonCreateYACS::MonCreateYACS (bool modal, ADAPT::ADAPT_Gen_var myAdaptGen0, QString CaseName ):
 // ----------------------------------------------------------------------
 /* Constructs a MonCreateYACS
  * Sets attributes to default values
@@ -50,7 +50,7 @@ MonCreateYACS::MonCreateYACS (bool modal, ADAPT::ADAPT_Gen_var myHomardGen0, QSt
   // et doivent correspondre aux defauts des boutons
   {
 //     MESSAGE("Debut du constructeur de MonCreateYACS");
-    myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
+    myAdaptGen=ADAPT::ADAPT_Gen::_duplicate(myAdaptGen0);
     setupUi(this);
     if ( modal ) { setWindowModality(Qt::WindowModal); }
     else         { setWindowModality(Qt::NonModal); }
@@ -63,9 +63,9 @@ MonCreateYACS::MonCreateYACS (bool modal, ADAPT::ADAPT_Gen_var myHomardGen0, QSt
     else                           { setWindowModality(Qt::NonModal); /* permet selection du cas dans l arbre d etude */}
 //
 //  Les valeurs definies dans les preferences
-    _MaxIter = myHomardGen->GetYACSMaxIter();
-    _MaxNode = myHomardGen->GetYACSMaxNode();
-    _MaxElem = myHomardGen->GetYACSMaxElem();
+    _MaxIter = myAdaptGen->GetYACSMaxIter();
+    _MaxNode = myAdaptGen->GetYACSMaxNode();
+    _MaxElem = myAdaptGen->GetYACSMaxElem();
     MESSAGE ("Valeur par defaut de MaxIter = " << _MaxIter<<", MaxNode = "<< _MaxNode<<", MaxElem = "<< _MaxElem);
     SpinBoxMaxIter->setValue(_MaxIter) ;
     SpinBoxMaxNode->setValue(_MaxNode) ;
@@ -75,12 +75,12 @@ MonCreateYACS::MonCreateYACS (bool modal, ADAPT::ADAPT_Gen_var myHomardGen0, QSt
   }
 
 // ----------------------------------------------------------------------
-MonCreateYACS::MonCreateYACS(ADAPT::ADAPT_Gen_var myHomardGen0,
+MonCreateYACS::MonCreateYACS(ADAPT::ADAPT_Gen_var myAdaptGen0,
                              QString caseName):
 // ----------------------------------------------------------------------
 // Constructeur appele par MonEditYACS
 //
-myHomardGen(myHomardGen0),
+myAdaptGen(myAdaptGen0),
 _Name (""),
 Chgt (false)
 {
@@ -139,7 +139,7 @@ bool MonCreateYACS::PushOnApply()
     return false;
   }
   if ( aDirName != _aDirName)
-  { QString CaseNameDir = myHomardGen->VerifieDir( aDirName.toStdString().c_str()) ;
+  { QString CaseNameDir = myAdaptGen->VerifieDir( aDirName.toStdString().c_str()) ;
     if ( CaseNameDir != "" )
     {
       QString texte ;
@@ -218,7 +218,7 @@ bool MonCreateYACS:: CreateOrUpdate()
   try
   {
     _Name=LEName->text().trimmed();
-    aYACS=myHomardGen->CreateYACSSchema(CORBA::string_dup(_Name.toStdString().c_str()), CORBA::string_dup(_aCaseName.toStdString().c_str()), CORBA::string_dup(_aScriptFile.toStdString().c_str()), CORBA::string_dup(_aDirName.toStdString().c_str()), CORBA::string_dup(_aMeshFile.toStdString().c_str()));
+    aYACS=myAdaptGen->CreateYACSSchema(CORBA::string_dup(_Name.toStdString().c_str()), CORBA::string_dup(_aCaseName.toStdString().c_str()), CORBA::string_dup(_aScriptFile.toStdString().c_str()), CORBA::string_dup(_aDirName.toStdString().c_str()), CORBA::string_dup(_aMeshFile.toStdString().c_str()));
   }
   catch( SALOME::SALOME_Exception& S_ex )
   {
@@ -265,7 +265,7 @@ void MonCreateYACS::PushOnOK()
 void MonCreateYACS::PushOnHelp()
 //-------------------------------
 {
-  std::string LanguageShort = myHomardGen->GetLanguageShort();
+  std::string LanguageShort = myAdaptGen->GetLanguageShort();
   HOMARD_UTILS::PushOnHelp(QString("yacs.html"), QString(""), QString(LanguageShort.c_str()));
 }
 // -------------------------------------------------
@@ -273,7 +273,7 @@ void MonCreateYACS::SetNewName()
 // --------------------------------------------------
 {
 
-  ADAPT::listeYACSs_var MyObjects = myHomardGen->GetAllYACSsName();
+  ADAPT::listeYACSs_var MyObjects = myAdaptGen->GetAllYACSsName();
   int num = 0; QString aName="";
   while (aName == QString("") )
   {

diff --git a/src/ADAPTGUI/MonCreateYACS.h b/src/ADAPTGUI/MonCreateYACS.h
index f932b704e3787c36d60faaac90e552e3bac2c623..ea93be82134a6ae304bc0aea202a62a2a2bfc1ee 100644 (file)
--- a/src/ADAPTGUI/MonCreateYACS.h
+++ b/src/ADAPTGUI/MonCreateYACS.h
@@ -37,11 +37,11 @@ class HOMARD_EXPORT MonCreateYACS : public QScrollArea, public Ui_CreateYACS
     Q_OBJECT
 
   public:
-    MonCreateYACS( bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString CaseName);
+    MonCreateYACS( bool modal, ADAPT::ADAPT_Gen_var myAdaptGen, QString CaseName);
     virtual ~MonCreateYACS();
 
   protected :
-    MonCreateYACS( ADAPT::ADAPT_Gen_var myHomardGen, QString CaseName);
+    MonCreateYACS( ADAPT::ADAPT_Gen_var myAdaptGen, QString CaseName);
 
     QString _Name;
     QString _aCaseName;
@@ -57,7 +57,7 @@ class HOMARD_EXPORT MonCreateYACS : public QScrollArea, public Ui_CreateYACS
     bool Chgt;
 
     ADAPT::HOMARD_YACS_var aYACS;
-    ADAPT::ADAPT_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myAdaptGen;
 
     virtual void InitConnect();
     virtual bool CreateOrUpdate();

diff --git a/src/ADAPTGUI/MonCreateZone.cxx b/src/ADAPTGUI/MonCreateZone.cxx
index b07d87e0b0da6ade470e8a5765913daf838b13c6..aeb3b6ac9f94bde6cd9699f5958dd2e59291ddc8 100644 (file)
--- a/src/ADAPTGUI/MonCreateZone.cxx
+++ b/src/ADAPTGUI/MonCreateZone.cxx
@@ -38,7 +38,7 @@ using namespace std;
 
 // ----------------------------------------------------------------------
 MonCreateZone::MonCreateZone(MonCreateHypothesis* parent, bool modal,
-                             ADAPT::ADAPT_Gen_var myHomardGen0,
+                             ADAPT::ADAPT_Gen_var myAdaptGen0,
                              QString caseName) :
 // ----------------------------------------------------------------------
 /* Constructs a MonCreateZone
@@ -61,7 +61,7 @@ MonCreateZone::MonCreateZone(MonCreateHypothesis* parent, bool modal,
     Chgt (false)
     {
       MESSAGE("Constructeur") ;
-      myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0) ;
+      myAdaptGen=ADAPT::ADAPT_Gen::_duplicate(myAdaptGen0) ;
       setupUi(this) ;
       setModal(modal) ;
       InitConnect( ) ;
@@ -74,13 +74,13 @@ MonCreateZone::MonCreateZone(MonCreateHypothesis* parent, bool modal,
     }
 // ----------------------------------------------------------------------
 MonCreateZone::MonCreateZone(MonCreateHypothesis* parent,
-                             ADAPT::ADAPT_Gen_var myHomardGen0,
+                             ADAPT::ADAPT_Gen_var myAdaptGen0,
                              QString caseName):
 // ----------------------------------------------------------------------
 // Constructeur appele par MonEditZone
 //
     QDialog(0), Ui_CreateZone(),
-     myHomardGen(myHomardGen0),
+     myAdaptGen(myAdaptGen0),
     _parent(parent),
     _Name (""),
     _aCaseName(caseName),
@@ -131,7 +131,7 @@ void MonCreateZone::InitValZone()
 //
   if (_aCaseName == QString("")) { return; }
 
-  ADAPT::HOMARD_Cas_var aCas = myHomardGen->GetCase(_aCaseName.toStdString().c_str()) ;
+  ADAPT::HOMARD_Cas_var aCas = myAdaptGen->GetCase(_aCaseName.toStdString().c_str()) ;
   ADAPT::extrema_var  MesExtremes = aCas->GetBoundingBox() ;
   int num = MesExtremes->length() ;
   ASSERT(num == 10) ;
@@ -494,67 +494,67 @@ bool MonCreateZone::CreateOrUpdateZone()
       switch (_Type)
       {
         case 11 : // il s agit d un rectangle, dans le plan (X,Y)
-        { aZone = myHomardGen->CreateZoneBox2D(CORBA::string_dup(_Name.toStdString().c_str()), \
+        { aZone = myAdaptGen->CreateZoneBox2D(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneXmin, _ZoneXmax, _ZoneYmin, _ZoneYmax, _Orient );
           break;
         }
         case 12 : // il s agit d un rectangle, dans le plan (Y,Z)
-        { aZone = myHomardGen->CreateZoneBox2D(CORBA::string_dup(_Name.toStdString().c_str()), \
+        { aZone = myAdaptGen->CreateZoneBox2D(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneYmin, _ZoneYmax, _ZoneZmin, _ZoneZmax, _Orient );
           break;
         }
         case 13 : // il s agit d un rectangle, dans le plan (Z,X)
-        { aZone = myHomardGen->CreateZoneBox2D(CORBA::string_dup(_Name.toStdString().c_str()), \
+        { aZone = myAdaptGen->CreateZoneBox2D(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneZmin, _ZoneZmax, _ZoneXmin, _ZoneXmax, _Orient );
           break;
         }
         case 2 : // il s agit d un parallelepipede
-        { aZone = myHomardGen->CreateZoneBox(CORBA::string_dup(_Name.toStdString().c_str()), \
+        { aZone = myAdaptGen->CreateZoneBox(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneXmin, _ZoneXmax, _ZoneYmin, _ZoneYmax, _ZoneZmin, _ZoneZmax );
           break;
         }
         case 4 : // il s agit d une sphere
-        { aZone = myHomardGen->CreateZoneSphere(CORBA::string_dup(_Name.toStdString().c_str()), \
+        { aZone = myAdaptGen->CreateZoneSphere(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneXcentre, _ZoneYcentre, _ZoneZcentre, _ZoneRayon );
           break;
         }
         case 31 : // il s agit d un disque issu d'un cylindre, dans le plan (X,Y)
-        { aZone = myHomardGen->CreateZoneDisk(CORBA::string_dup(_Name.toStdString().c_str()), \
+        { aZone = myAdaptGen->CreateZoneDisk(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneXcentre, _ZoneYcentre, _ZoneRayon, _Orient );
           break;
           }
         case 32 : // il s agit d un disque issu d'un cylindre, dans le plan (Y,Z)
-        { aZone = myHomardGen->CreateZoneDisk(CORBA::string_dup(_Name.toStdString().c_str()), \
+        { aZone = myAdaptGen->CreateZoneDisk(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneYcentre, _ZoneZcentre, _ZoneRayon, _Orient );
           break;
         }
         case 33 : // il s agit d un disque issu d'un cylindre, dans le plan (Z,X)
-        { aZone = myHomardGen->CreateZoneDisk(CORBA::string_dup(_Name.toStdString().c_str()), \
+        { aZone = myAdaptGen->CreateZoneDisk(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneZcentre, _ZoneXcentre, _ZoneRayon, _Orient );
           break;
         }
         case 5 : // il s agit d un cylindre
-        { aZone = myHomardGen->CreateZoneCylinder(CORBA::string_dup(_Name.toStdString().c_str()), \
+        { aZone = myAdaptGen->CreateZoneCylinder(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneXcentre, _ZoneYcentre, _ZoneZcentre, _ZoneXaxis, _ZoneYaxis, _ZoneZaxis, _ZoneRayon, _ZoneHaut );
           break;
         }
         case 61 : // il s agit d un disque avec trou, dans le plan (X,Y)
-        { aZone = myHomardGen->CreateZoneDiskWithHole(CORBA::string_dup(_Name.toStdString().c_str()), \
+        { aZone = myAdaptGen->CreateZoneDiskWithHole(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneXcentre, _ZoneYcentre, _ZoneRayon, _ZoneRayonInt, _Orient );
           break;
         }
         case 62 : // il s agit d un disque avec trou, dans le plan (Y,Z)
-        { aZone = myHomardGen->CreateZoneDiskWithHole(CORBA::string_dup(_Name.toStdString().c_str()), \
+        { aZone = myAdaptGen->CreateZoneDiskWithHole(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneYcentre, _ZoneZcentre, _ZoneRayon, _ZoneRayonInt, _Orient );
           break;
         }
         case 63 : // il s agit d un disque avec trou, dans le plan (Z,X)
-        { aZone = myHomardGen->CreateZoneDiskWithHole(CORBA::string_dup(_Name.toStdString().c_str()), \
+        { aZone = myAdaptGen->CreateZoneDiskWithHole(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneZcentre, _ZoneXcentre, _ZoneRayon, _ZoneRayonInt, _Orient );
           break;
         }
         case 7 : // il s agit d un tuyau
-        { aZone = myHomardGen->CreateZonePipe(CORBA::string_dup(_Name.toStdString().c_str()), \
+        { aZone = myAdaptGen->CreateZonePipe(CORBA::string_dup(_Name.toStdString().c_str()), \
           _ZoneXcentre, _ZoneYcentre, _ZoneZcentre, _ZoneXaxis, _ZoneYaxis, _ZoneZaxis, _ZoneRayon, _ZoneHaut, _ZoneRayonInt );
           break;
         }
@@ -589,7 +589,7 @@ void MonCreateZone::PushOnOK()
 void MonCreateZone::PushOnHelp()
 // ------------------------------------------------------------------------
 {
-  std::string LanguageShort = myHomardGen->GetLanguageShort();
+  std::string LanguageShort = myAdaptGen->GetLanguageShort();
   HOMARD_UTILS::PushOnHelp(QString("gui_create_zone.html"), QString(""), QString(LanguageShort.c_str()));
 }
 
@@ -600,7 +600,7 @@ void MonCreateZone::SetNewName()
   MESSAGE("SetNewName");
 // Recherche d'un nom par defaut qui n'existe pas encore
 
-  ADAPT::listeZones_var  MyObjects = myHomardGen->GetAllZonesName() ;
+  ADAPT::listeZones_var  MyObjects = myAdaptGen->GetAllZonesName() ;
   int num = 0; QString aName="";
   while (aName=="" )
   {

diff --git a/src/ADAPTGUI/MonCreateZone.h b/src/ADAPTGUI/MonCreateZone.h
index 099c063e333e203a390c50b4c7082942cd1b0a3c..4eb700a434986be0e2553c9fb0c50ae2b427921f 100644 (file)
--- a/src/ADAPTGUI/MonCreateZone.h
+++ b/src/ADAPTGUI/MonCreateZone.h
@@ -38,13 +38,13 @@ class HOMARD_EXPORT MonCreateZone : public QDialog, public Ui_CreateZone
 
 public:
     MonCreateZone( MonCreateHypothesis* parent, bool modal,
-                   ADAPT::ADAPT_Gen_var myHomardGen,
+                   ADAPT::ADAPT_Gen_var myAdaptGen,
                    QString caseName);
     virtual ~MonCreateZone();
 
 protected :
     MonCreateZone( MonCreateHypothesis* parent,
-                   ADAPT::ADAPT_Gen_var myHomardGen,
+                   ADAPT::ADAPT_Gen_var myAdaptGen,
                    QString caseName);
 
     MonCreateHypothesis * _parent;
@@ -65,7 +65,7 @@ protected :
     bool Chgt;
 
     ADAPT::HOMARD_Zone_var aZone ;
-    ADAPT::ADAPT_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myAdaptGen;
 
     virtual void InitConnect();
     virtual void InitValZone();

diff --git a/src/ADAPTGUI/MonEditBoundaryAn.cxx b/src/ADAPTGUI/MonEditBoundaryAn.cxx
index bb9a8c3401b2dde6a482ed8aa375ba4f7bc51ecb..03ceaf4bb02bb1b1f587f173b7e6e2c3fbc3a098 100644 (file)
--- a/src/ADAPTGUI/MonEditBoundaryAn.cxx
+++ b/src/ADAPTGUI/MonEditBoundaryAn.cxx
@@ -27,18 +27,18 @@ using namespace std;
 
 // ------------------------------------------------------------------------
 MonEditBoundaryAn::MonEditBoundaryAn( MonCreateCase* parent, bool modal,
-                          ADAPT::ADAPT_Gen_var myHomardGen,
+                          ADAPT::ADAPT_Gen_var myAdaptGen,
                           QString caseName, QString Name ):
 // ------------------------------------------------------------------------
 /* Constructs a MonEditBoundaryAn
     herite de MonCreateBoundaryAn
 */
-    MonCreateBoundaryAn(parent, myHomardGen, caseName)
+    MonCreateBoundaryAn(parent, myAdaptGen, caseName)
 {
     MESSAGE("Debut de MonEditBoundaryAn pour " << Name.toStdString().c_str());
     setWindowTitle(QObject::tr("HOM_BOUN_A_EDIT_WINDOW_TITLE"));
     _Name=Name;
-    aBoundaryAn = myHomardGen->GetBoundary(_Name.toStdString().c_str());
+    aBoundaryAn = myAdaptGen->GetBoundary(_Name.toStdString().c_str());
     InitValEdit();
 }
 // ------------------------------------------------------------------------
@@ -374,14 +374,14 @@ bool MonEditBoundaryAn::CreateOrUpdateBoundaryAn()
     }
     case 3 : // il s agit d un cone defini par un axe et un angle
     {
-      aBoundaryAn = myHomardGen->CreateBoundaryConeA(CORBA::string_dup(_Name.toStdString().c_str()), \
+      aBoundaryAn = myAdaptGen->CreateBoundaryConeA(CORBA::string_dup(_Name.toStdString().c_str()), \
       _BoundaryAnXaxisCone, _BoundaryAnYaxisCone, _BoundaryAnZaxisCone, _BoundaryAngle, \
       _BoundaryAnXorigCone, _BoundaryAnYorigCone, _BoundaryAnYorigCone);
       break;
     }
     case 4 : // il s agit d un cone defini par les 2 rayons
     {
-      aBoundaryAn = myHomardGen->CreateBoundaryConeR(CORBA::string_dup(_Name.toStdString().c_str()), \
+      aBoundaryAn = myAdaptGen->CreateBoundaryConeR(CORBA::string_dup(_Name.toStdString().c_str()), \
         _BoundaryAnXcone1, _BoundaryAnYcone1, _BoundaryAnZcone1, _BoundaryAnRayon1, \
         _BoundaryAnXcone2, _BoundaryAnYcone2, _BoundaryAnZcone2, _BoundaryAnRayon2);
       break;
@@ -392,7 +392,7 @@ bool MonEditBoundaryAn::CreateOrUpdateBoundaryAn()
       break;
     }
   }
-  if (Chgt) myHomardGen->InvalideBoundary(_Name.toStdString().c_str());
+  if (Chgt) myAdaptGen->InvalideBoundary(_Name.toStdString().c_str());
   HOMARD_UTILS::updateObjBrowser();
   return true;
 }

diff --git a/src/ADAPTGUI/MonEditBoundaryAn.h b/src/ADAPTGUI/MonEditBoundaryAn.h
index f43764b8ed794ce0b2e3d61a96f6d5dfdcada3a1..fcc9167f753498e6f1eb14e52ed05b8df4cade5e 100644 (file)
--- a/src/ADAPTGUI/MonEditBoundaryAn.h
+++ b/src/ADAPTGUI/MonEditBoundaryAn.h
@@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditBoundaryAn : public MonCreateBoundaryAn
     Q_OBJECT
 public:
     MonEditBoundaryAn( MonCreateCase* parent, bool modal,
-                 ADAPT::ADAPT_Gen_var myHomardGen,
+                 ADAPT::ADAPT_Gen_var myAdaptGen,
                  QString caseName, QString Name);
     virtual ~MonEditBoundaryAn();
 

diff --git a/src/ADAPTGUI/MonEditBoundaryCAO.cxx b/src/ADAPTGUI/MonEditBoundaryCAO.cxx
index e9ab43a93afa76d7f56a3dd652a4c0ae94a89f4f..a0c6abb287c4cc7b96c1e2d8592971e9080aed6c 100644 (file)
--- a/src/ADAPTGUI/MonEditBoundaryCAO.cxx
+++ b/src/ADAPTGUI/MonEditBoundaryCAO.cxx
@@ -31,19 +31,19 @@ using namespace std;
 
 // -------------------------------------------------------------------------------------------------------------------------------------
 MonEditBoundaryCAO::MonEditBoundaryCAO( MonCreateCase* parent, bool modal,
-                                      ADAPT::ADAPT_Gen_var myHomardGen,
+                                      ADAPT::ADAPT_Gen_var myAdaptGen,
                                       QString caseName, QString Name):
 // -------------------------------------------------------------------------------------------------------------------------------------
 /* Constructs a MonEditBoundaryCAO
     herite de MonCreateBoundaryCAO
 */
-    MonCreateBoundaryCAO(parent, modal, myHomardGen, caseName, Name)
+    MonCreateBoundaryCAO(parent, modal, myAdaptGen, caseName, Name)
 {
     MESSAGE("Debut de Boundary pour " << Name.toStdString().c_str());
     setWindowTitle(QObject::tr("HOM_BOUN_C_EDIT_WINDOW_TITLE"));
     try
     {
-     aBoundary=myHomardGen->GetBoundary(CORBA::string_dup(_aName.toStdString().c_str()));
+     aBoundary=myAdaptGen->GetBoundary(CORBA::string_dup(_aName.toStdString().c_str()));
      if (caseName==QString("")) { _aCaseName=aBoundary->GetCaseCreation();}
      InitValEdit();
     }
@@ -95,10 +95,10 @@ void MonEditBoundaryCAO::SetFiltrage()
                               QObject::tr("HOM_BOUN_CASE") );
     return;
   }
-  ADAPT::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+  ADAPT::HOMARD_Cas_var monCas= myAdaptGen->GetCase(_aCaseName.toStdString().c_str());
   ADAPT::ListGroupType_var _listeGroupesCas = monCas->GetGroups();
 
-  MonEditListGroupCAO *aDlg = new MonEditListGroupCAO(NULL, this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),
+  MonEditListGroupCAO *aDlg = new MonEditListGroupCAO(NULL, this, true, ADAPT::ADAPT_Gen::_duplicate(myAdaptGen),
                             _aCaseName, _listeGroupesBoundary) ;
   aDlg->show();
 }

diff --git a/src/ADAPTGUI/MonEditBoundaryCAO.h b/src/ADAPTGUI/MonEditBoundaryCAO.h
index d8131825d22acfbc0a020aaed5aec2f0cbe1b8a2..802727623c609723348670d894f109cac5b53c15 100644 (file)
--- a/src/ADAPTGUI/MonEditBoundaryCAO.h
+++ b/src/ADAPTGUI/MonEditBoundaryCAO.h
@@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditBoundaryCAO : public MonCreateBoundaryCAO
     Q_OBJECT
 public:
     MonEditBoundaryCAO( MonCreateCase* parent, bool modal,
-                       ADAPT::ADAPT_Gen_var myHomardGen,
+                       ADAPT::ADAPT_Gen_var myAdaptGen,
                        QString caseName, QString Name );
     virtual ~MonEditBoundaryCAO();
 

diff --git a/src/ADAPTGUI/MonEditBoundaryDi.cxx b/src/ADAPTGUI/MonEditBoundaryDi.cxx
index fa92cc174e1b9c8f851cbf91e23240f5f3d1c3b4..afbe926b43e981b55edc1d3d0fe665253c346bb8 100644 (file)
--- a/src/ADAPTGUI/MonEditBoundaryDi.cxx
+++ b/src/ADAPTGUI/MonEditBoundaryDi.cxx
@@ -31,19 +31,19 @@ using namespace std;
 
 // -------------------------------------------------------------------------------------------------------------------------------------
 MonEditBoundaryDi::MonEditBoundaryDi( MonCreateCase* parent, bool modal,
-                                      ADAPT::ADAPT_Gen_var myHomardGen,
+                                      ADAPT::ADAPT_Gen_var myAdaptGen,
                                       QString caseName, QString Name):
 // -------------------------------------------------------------------------------------------------------------------------------------
 /* Constructs a MonEditBoundaryDi
     herite de MonCreateBoundaryDi
 */
-    MonCreateBoundaryDi(parent, modal, myHomardGen, caseName, Name)
+    MonCreateBoundaryDi(parent, modal, myAdaptGen, caseName, Name)
 {
     MESSAGE("Debut de Boundary pour " << Name.toStdString().c_str());
     setWindowTitle(QObject::tr("HOM_BOUN_D_EDIT_WINDOW_TITLE"));
     try
     {
-     aBoundary=myHomardGen->GetBoundary(CORBA::string_dup(_aName.toStdString().c_str()));
+     aBoundary=myAdaptGen->GetBoundary(CORBA::string_dup(_aName.toStdString().c_str()));
      if (caseName==QString("")) { _aCaseName=aBoundary->GetCaseCreation();}
      InitValEdit();
     }
@@ -95,10 +95,10 @@ void MonEditBoundaryDi::SetFiltrage()
                               QObject::tr("HOM_BOUN_CASE") );
     return;
   }
-  ADAPT::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+  ADAPT::HOMARD_Cas_var monCas= myAdaptGen->GetCase(_aCaseName.toStdString().c_str());
   ADAPT::ListGroupType_var _listeGroupesCas = monCas->GetGroups();
 
-  MonEditListGroup *aDlg = new MonEditListGroup(NULL, this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),
+  MonEditListGroup *aDlg = new MonEditListGroup(NULL, this, true, ADAPT::ADAPT_Gen::_duplicate(myAdaptGen),
                             _aCaseName, _listeGroupesBoundary) ;
   aDlg->show();
 }

diff --git a/src/ADAPTGUI/MonEditBoundaryDi.h b/src/ADAPTGUI/MonEditBoundaryDi.h
index 97cdc7fe43a2f2ddbf0d52dc32b05d2551e098b2..635a7b084d9be14fea8bc42efcd6cb6293461b7e 100644 (file)
--- a/src/ADAPTGUI/MonEditBoundaryDi.h
+++ b/src/ADAPTGUI/MonEditBoundaryDi.h
@@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditBoundaryDi : public MonCreateBoundaryDi
     Q_OBJECT
 public:
     MonEditBoundaryDi( MonCreateCase* parent, bool modal,
-                       ADAPT::ADAPT_Gen_var myHomardGen,
+                       ADAPT::ADAPT_Gen_var myAdaptGen,
                        QString caseName, QString Name );
     virtual ~MonEditBoundaryDi();
 

diff --git a/src/ADAPTGUI/MonEditCase.cxx b/src/ADAPTGUI/MonEditCase.cxx
index 4ed612213f43083b8cb22e354bfe9aeab6c42d4c..c68c228113a439430dcfeef7aa11938a2372f797 100644 (file)
--- a/src/ADAPTGUI/MonEditCase.cxx
+++ b/src/ADAPTGUI/MonEditCase.cxx
@@ -32,14 +32,14 @@ using namespace std;
 */
 // -------------------------------------------------------------
 MonEditCase::MonEditCase ( bool modal,
-                           ADAPT::ADAPT_Gen_var myHomardGen,
+                           ADAPT::ADAPT_Gen_var myAdaptGen,
                            QString CaseName ):
-   MonCreateCase(modal, myHomardGen)
+   MonCreateCase(modal, myAdaptGen)
 {
     MESSAGE("Debut de MonEditCase" << CaseName.toStdString().c_str());
     setWindowTitle(QObject::tr("HOM_CASE_EDIT_WINDOW_TITLE"));
     _aCaseName = CaseName;
-    aCase = myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+    aCase = myAdaptGen->GetCase(_aCaseName.toStdString().c_str());
     InitValEdit();
 }
 // ------------------------------
@@ -61,7 +61,7 @@ void MonEditCase::InitValEdit()
   PushDir->setVisible(0);
 
   QString _aitername=aCase->GetIter0Name();
-  ADAPT::HOMARD_Iteration_var aIter = myHomardGen->GetIteration(_aitername.toStdString().c_str());
+  ADAPT::HOMARD_Iteration_var aIter = myAdaptGen->GetIteration(_aitername.toStdString().c_str());
   QString aFileName = aIter->GetMeshFile();
   LEFileName->setText(aFileName);
   LEFileName->setReadOnly(true);
@@ -98,7 +98,7 @@ void MonEditCase::InitValEdit()
       NomFron = mesBoundarys[i++];
       MESSAGE("NomFron "<<NomFron.toStdString().c_str());
 //    L'objet associe pour en deduire le type
-      ADAPT::HOMARD_Boundary_var myBoundary = myHomardGen->GetBoundary(NomFron.toStdString().c_str());
+      ADAPT::HOMARD_Boundary_var myBoundary = myAdaptGen->GetBoundary(NomFron.toStdString().c_str());
       int type_obj = myBoundary->GetType() ;
       MESSAGE("type_obj "<<type_obj);
 //        C'est une frontiere CAO

diff --git a/src/ADAPTGUI/MonEditCase.h b/src/ADAPTGUI/MonEditCase.h
index 21780ff15d5014d62e0a9b97a03b0e66d849fa04..70625cb6b17d4f14efbe5ae7a20646d3744fb241 100644 (file)
--- a/src/ADAPTGUI/MonEditCase.h
+++ b/src/ADAPTGUI/MonEditCase.h
@@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditCase : public MonCreateCase
     Q_OBJECT
 public:
     MonEditCase( bool modal,
-                 ADAPT::ADAPT_Gen_var myHomardGen,
+                 ADAPT::ADAPT_Gen_var myAdaptGen,
                  QString Name );
     virtual ~MonEditCase();
 

diff --git a/src/ADAPTGUI/MonEditFile.cxx b/src/ADAPTGUI/MonEditFile.cxx
index b1ee709ee154a210a3840af82acd743d1f82abbf..623b3c33cb27ba393abbdd571da5eb7acc24e464 100644 (file)
--- a/src/ADAPTGUI/MonEditFile.cxx
+++ b/src/ADAPTGUI/MonEditFile.cxx
@@ -43,7 +43,7 @@ using namespace std;
  * ---------------------------------------------------------
  */
 MonEditFile::MonEditFile( QWidget* parent,  bool modal,
-                          ADAPT::ADAPT_Gen_var myHomardGen,
+                          ADAPT::ADAPT_Gen_var myAdaptGen,
                           QString aFileName, int option):
 //    QWidget(0),
     Ui_EditFile(),

diff --git a/src/ADAPTGUI/MonEditFile.h b/src/ADAPTGUI/MonEditFile.h
index cf34d7f2e42c88f240db5ea6f8a252806b436e8f..e600710801ba8ae49c77404b11fdbbb504000724 100644 (file)
--- a/src/ADAPTGUI/MonEditFile.h
+++ b/src/ADAPTGUI/MonEditFile.h
@@ -42,14 +42,14 @@ class HOMARD_EXPORT MonEditFile : public QWidget, public Ui_EditFile
 
 public:
     MonEditFile( QWidget* parent,  bool modal,
-                 ADAPT::ADAPT_Gen_var myHomardGen,
+                 ADAPT::ADAPT_Gen_var myAdaptGen,
                  QString FileName, int option );
     ~MonEditFile();
     int _codret ;
 
 protected :
 
-    ADAPT::ADAPT_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myAdaptGen;
     QString _aFileName ;
     int _option ;
 

diff --git a/src/ADAPTGUI/MonEditHypothesis.cxx b/src/ADAPTGUI/MonEditHypothesis.cxx
index 35fd32103c0263a5d47bebf92463538645cddc0c..997667b81f8184752ac73d955787be07a0c7f9d3 100644 (file)
--- a/src/ADAPTGUI/MonEditHypothesis.cxx
+++ b/src/ADAPTGUI/MonEditHypothesis.cxx
@@ -30,18 +30,18 @@ using namespace std;
 
 // ----------------------------------------------------------------------------
 MonEditHypothesis::MonEditHypothesis( MonCreateIteration* parent, bool modal,
-                                      ADAPT::ADAPT_Gen_var myHomardGen,
+                                      ADAPT::ADAPT_Gen_var myAdaptGen,
                                       QString Name,
                                       QString caseName,  QString aFieldFile ):
 // ----------------------------------------------------------------------------
 /* Constructs a MonEditHypothesis
     herite de MonCreateHypothesis
 */
-    MonCreateHypothesis(parent, modal,myHomardGen, Name, caseName, aFieldFile)
+    MonCreateHypothesis(parent, modal,myAdaptGen, Name, caseName, aFieldFile)
 {
     MESSAGE("Hypothese " << Name.toStdString().c_str());
     setWindowTitle(QObject::tr("HOM_HYPO_EDIT_WINDOW_TITLE"));
-    aHypothesis    = myHomardGen->GetHypothesis(_Name.toStdString().c_str());
+    aHypothesis    = myAdaptGen->GetHypothesis(_Name.toStdString().c_str());
     if (caseName == QString("") ){ _aCaseName = aHypothesis->GetCaseCreation();}
     InitValEdit();
     InitGroupes();
@@ -445,7 +445,7 @@ bool MonEditHypothesis::PushOnApply()
       aHypothesis->SetUnRefThr(_TypeThC, _ThreshC) ;
     }
 
-    myHomardGen->InvalideHypo(_Name.toStdString().c_str());
+    myAdaptGen->InvalideHypo(_Name.toStdString().c_str());
     HOMARD_UTILS::updateObjBrowser();
   }
   return true;
@@ -456,7 +456,7 @@ void MonEditHypothesis::SetFiltrage()
 {
   if (CBGroupe->isChecked())
   {
-    MonEditListGroup *aDlg = new MonEditListGroup(this, NULL, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ;
+    MonEditListGroup *aDlg = new MonEditListGroup(this, NULL, true, ADAPT::ADAPT_Gen::_duplicate(myAdaptGen),_aCaseName, _aListeGroupes) ;
     aDlg->show();
   }
 }

diff --git a/src/ADAPTGUI/MonEditHypothesis.h b/src/ADAPTGUI/MonEditHypothesis.h
index 7bf402e9a4c6e83012ee2cf8e5521d97f9347795..ef5a3e5924db898495e680990d6151f5730f88f8 100644 (file)
--- a/src/ADAPTGUI/MonEditHypothesis.h
+++ b/src/ADAPTGUI/MonEditHypothesis.h
@@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditHypothesis : public MonCreateHypothesis
     Q_OBJECT
 public:
     MonEditHypothesis( MonCreateIteration* parent, bool modal,
-                       ADAPT::ADAPT_Gen_var myHomardGen,
+                       ADAPT::ADAPT_Gen_var myAdaptGen,
                        QString caseName, QString Name, QString aFieldFile );
     virtual ~MonEditHypothesis();
 

diff --git a/src/ADAPTGUI/MonEditIteration.cxx b/src/ADAPTGUI/MonEditIteration.cxx
index 2a5203af5585e3c99c1b8c42a941069625ea8537..8e75e0f6ebcef69ad9c6e5f5f40b96fb23aebcad 100644 (file)
--- a/src/ADAPTGUI/MonEditIteration.cxx
+++ b/src/ADAPTGUI/MonEditIteration.cxx
@@ -28,19 +28,19 @@ using namespace std;
 
 // -------------------------------------------------------------------------------------------------------------------------------------
 MonEditIteration::MonEditIteration ( QWidget* parent, bool modal,
-                                     ADAPT::ADAPT_Gen_var myHomardGen,
+                                     ADAPT::ADAPT_Gen_var myAdaptGen,
                                      QString IterParentName, QString IterName ):
 // -------------------------------------------------------------------------------------------------------------------------------------
 /* Constructs a MonEditIteration
     herite de MonCreateIteration
 */
-   MonCreateIteration(parent, modal, myHomardGen, IterParentName),
+   MonCreateIteration(parent, modal, myAdaptGen, IterParentName),
    _rank(-1), _step(-1), _IterationName(""), _FieldFile(""),_aTypeAdap()
 {
     MESSAGE("Debut de  MonEditIteration" << IterName.toStdString().c_str());
     setWindowTitle(QObject::tr("HOM_ITER_EDIT_WINDOW_TITLE"));
     _IterationName = IterName;
-    aIter = myHomardGen->GetIteration(_IterationName.toStdString().c_str());
+    aIter = myAdaptGen->GetIteration(_IterationName.toStdString().c_str());
 
 //  Attention au cas ou c'est une iteration initiale : il faut inhiber l'essentiel
     int etat = aIter->GetState() ;
@@ -100,7 +100,7 @@ void MonEditIteration::InitValEdit()
   PBIterParent->setVisible(0);
 
   //    Affichage bloque du nom du maillage de l'iteration parent
-  aIterParent = myHomardGen->GetIteration(_IterParentName.toStdString().c_str());
+  aIterParent = myAdaptGen->GetIteration(_IterParentName.toStdString().c_str());
   QString MeshNameParent = aIterParent->GetMeshName();
   LEMeshName_n->setText(MeshNameParent);
   LEMeshName_n->setReadOnly(1);
@@ -118,7 +118,7 @@ void MonEditIteration::InitValEdit()
   PBHypoNew->setVisible(0);
 
   //    Pour une adaptation selon un champ
-  ADAPT::HOMARD_Hypothesis_var myHypo = myHomardGen->GetHypothesis(HypoName.toStdString().c_str()) ;
+  ADAPT::HOMARD_Hypothesis_var myHypo = myAdaptGen->GetHypothesis(HypoName.toStdString().c_str()) ;
   _aTypeAdap = myHypo->GetAdapType() ;
   if ( _aTypeAdap == 1 )
   {
@@ -177,7 +177,7 @@ bool MonEditIteration::PushOnApply()
       _step = SpinBox_TimeStep->value();
       if ( _step == -2 ) { aIter->SetTimeStepRankLast(); }
       else               { aIter->SetTimeStepRank(_step, _rank); }
-      myHomardGen->InvalideIter(_IterationName.toStdString().c_str());
+      myAdaptGen->InvalideIter(_IterationName.toStdString().c_str());
       HOMARD_UTILS::updateObjBrowser();
     }
   }

diff --git a/src/ADAPTGUI/MonEditIteration.h b/src/ADAPTGUI/MonEditIteration.h
index 3fa4084b7c00e6fc7b869eb6f8b633f376b2d34b..76abc6025261d18343db901cbce7886c989292ad 100644 (file)
--- a/src/ADAPTGUI/MonEditIteration.h
+++ b/src/ADAPTGUI/MonEditIteration.h
@@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditIteration : public MonCreateIteration
     Q_OBJECT
 public:
     MonEditIteration( QWidget* parent, bool modal,
-                      ADAPT::ADAPT_Gen_var myHomardGen,
+                      ADAPT::ADAPT_Gen_var myAdaptGen,
                       QString IterParentName, QString Name );
     virtual ~MonEditIteration();
 

diff --git a/src/ADAPTGUI/MonEditListGroup.cxx b/src/ADAPTGUI/MonEditListGroup.cxx
index 19f0961382045ae5fb9333c367a24a10a0494aba..c931c7ba760b10c2715c4626a53440efdc75158e 100644 (file)
--- a/src/ADAPTGUI/MonEditListGroup.cxx
+++ b/src/ADAPTGUI/MonEditListGroup.cxx
@@ -25,11 +25,11 @@ using namespace std;
 MonEditListGroup::MonEditListGroup( MonCreateHypothesis* parentHyp,
                                     MonCreateBoundaryDi* parentBound,
                                     bool modal,
-                                    ADAPT::ADAPT_Gen_var myHomardGen,
+                                    ADAPT::ADAPT_Gen_var myAdaptGen,
                                     QString aCaseName,
                                     QStringList listeGroupesHypo):
 //---------------------------------------------------------------------
-MonCreateListGroup(parentHyp,parentBound,myHomardGen,aCaseName,listeGroupesHypo)
+MonCreateListGroup(parentHyp,parentBound,myAdaptGen,aCaseName,listeGroupesHypo)
 {
   MESSAGE("Debut de MonEditListGroup");
     setWindowTitle(QObject::tr("HOM_GROU_EDIT_WINDOW_TITLE"));

diff --git a/src/ADAPTGUI/MonEditListGroup.h b/src/ADAPTGUI/MonEditListGroup.h
index d789abf487563e62d53f38b337def75782a39461..0e90cf8375e2eb3747ab847d86e29fec9cf52128 100644 (file)
--- a/src/ADAPTGUI/MonEditListGroup.h
+++ b/src/ADAPTGUI/MonEditListGroup.h
@@ -37,7 +37,7 @@ class HOMARD_EXPORT MonEditListGroup : public MonCreateListGroup
     Q_OBJECT
 
 public:
-    MonEditListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName,  QStringList listeGroupesHypo);
+    MonEditListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, ADAPT::ADAPT_Gen_var myAdaptGen, QString aCaseName,  QStringList listeGroupesHypo);
     virtual ~MonEditListGroup();
 
 protected :

diff --git a/src/ADAPTGUI/MonEditListGroupCAO.cxx b/src/ADAPTGUI/MonEditListGroupCAO.cxx
index 18a0d3f5293f5cc7d9bbd6c210edc69e601aa7d7..c29d2288c51c3d1aed21c886773f06012590a83a 100644 (file)
--- a/src/ADAPTGUI/MonEditListGroupCAO.cxx
+++ b/src/ADAPTGUI/MonEditListGroupCAO.cxx
@@ -25,11 +25,11 @@ using namespace std;
 MonEditListGroupCAO::MonEditListGroupCAO( MonCreateHypothesis* parentHyp,
                                     MonCreateBoundaryCAO* parentBound,
                                     bool modal,
-                                    ADAPT::ADAPT_Gen_var myHomardGen,
+                                    ADAPT::ADAPT_Gen_var myAdaptGen,
                                     QString aCaseName,
                                     QStringList listeGroupesHypo):
 //---------------------------------------------------------------------
-MonCreateListGroupCAO(parentHyp,parentBound,myHomardGen,aCaseName,listeGroupesHypo)
+MonCreateListGroupCAO(parentHyp,parentBound,myAdaptGen,aCaseName,listeGroupesHypo)
 {
   MESSAGE("Debut de MonEditListGroupCAO");
     setWindowTitle(QObject::tr("HOM_GROU_EDIT_WINDOW_TITLE"));

diff --git a/src/ADAPTGUI/MonEditListGroupCAO.h b/src/ADAPTGUI/MonEditListGroupCAO.h
index 90dfb19671dd71ec28397c8e9c58310b2c38281f..a32d87402793058c3f461520a7e07b995e8a95f2 100644 (file)
--- a/src/ADAPTGUI/MonEditListGroupCAO.h
+++ b/src/ADAPTGUI/MonEditListGroupCAO.h
@@ -37,7 +37,7 @@ class HOMARD_EXPORT MonEditListGroupCAO : public MonCreateListGroupCAO
     Q_OBJECT
 
 public:
-    MonEditListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName,  QStringList listeGroupesHypo);
+    MonEditListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal, ADAPT::ADAPT_Gen_var myAdaptGen, QString aCaseName,  QStringList listeGroupesHypo);
     virtual ~MonEditListGroupCAO();
 
 protected :

diff --git a/src/ADAPTGUI/MonEditYACS.cxx b/src/ADAPTGUI/MonEditYACS.cxx
index 51fff9cb3588e462fbc3ec6d6c4e10b0569b4bc0..3b346ed2df32e0cb34302218486398d58c47d08e 100644 (file)
--- a/src/ADAPTGUI/MonEditYACS.cxx
+++ b/src/ADAPTGUI/MonEditYACS.cxx
@@ -32,14 +32,14 @@ using namespace std;
 */
 // -------------------------------------------------------------
 MonEditYACS::MonEditYACS ( bool modal,
-                           ADAPT::ADAPT_Gen_var myHomardGen,
+                           ADAPT::ADAPT_Gen_var myAdaptGen,
                            QString Name ):
-   MonCreateYACS(myHomardGen, Name)
+   MonCreateYACS(myAdaptGen, Name)
 {
     MESSAGE("Debut de MonEditYACS" << Name.toStdString().c_str());
     setWindowTitle(QObject::tr("HOM_YACS_EDIT_WINDOW_TITLE"));
     _Name = Name;
-    aYACS = myHomardGen->GetYACS(_Name.toStdString().c_str());
+    aYACS = myAdaptGen->GetYACS(_Name.toStdString().c_str());
     InitValEdit();
 }
 // ------------------------------
@@ -140,7 +140,7 @@ bool MonEditYACS:: CreateOrUpdate()
 // B. Si changement
   if ( chgt )
   {
-    myHomardGen->InvalideYACS(_Name.toStdString().c_str());
+    myAdaptGen->InvalideYACS(_Name.toStdString().c_str());
   }
 
   HOMARD_UTILS::updateObjBrowser();

diff --git a/src/ADAPTGUI/MonEditYACS.h b/src/ADAPTGUI/MonEditYACS.h
index f8d3a48d56fe61cab9970a726e64ec4f39f6e51f..ddb1b5dcce84e3ed4c10146f21ef1f5d630c36ae 100644 (file)
--- a/src/ADAPTGUI/MonEditYACS.h
+++ b/src/ADAPTGUI/MonEditYACS.h
@@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditYACS : public MonCreateYACS
     Q_OBJECT
 public:
     MonEditYACS( bool modal,
-                 ADAPT::ADAPT_Gen_var myHomardGen,
+                 ADAPT::ADAPT_Gen_var myAdaptGen,
                  QString Name );
     virtual ~MonEditYACS();
 

diff --git a/src/ADAPTGUI/MonEditZone.cxx b/src/ADAPTGUI/MonEditZone.cxx
index 3bb2c98daf6aa3f9c528ccac6fcf3c67d22b457b..c2ec454f73a349abe55c63bae0f504a0ce9e8036 100644 (file)
--- a/src/ADAPTGUI/MonEditZone.cxx
+++ b/src/ADAPTGUI/MonEditZone.cxx
@@ -32,18 +32,18 @@ using namespace std;
 
 // ------------------------------------------------------------------------
 MonEditZone::MonEditZone( MonCreateHypothesis* parent, bool modal,
-                          ADAPT::ADAPT_Gen_var myHomardGen,
+                          ADAPT::ADAPT_Gen_var myAdaptGen,
                           QString caseName, QString Name ):
 // ------------------------------------------------------------------------
 /* Constructs a MonEditZone
     herite de MonCreateZone
 */
-    MonCreateZone(parent, myHomardGen, caseName)
+    MonCreateZone(parent, myAdaptGen, caseName)
 {
     MESSAGE("Debut de MonEditZone pour " << Name.toStdString().c_str());
     setWindowTitle(QObject::tr("HOM_ZONE_EDIT_WINDOW_TITLE"));
     _Name=Name;
-    aZone = myHomardGen->GetZone(_Name.toStdString().c_str());
+    aZone = myAdaptGen->GetZone(_Name.toStdString().c_str());
     InitValEdit();
 }
 // ------------------------------------------------------------------------
@@ -420,7 +420,7 @@ bool MonEditZone::CreateOrUpdateZone()
         break;
       }
     }
-    if (Chgt) myHomardGen->InvalideZone(_Name.toStdString().c_str());
+    if (Chgt) myAdaptGen->InvalideZone(_Name.toStdString().c_str());
     HOMARD_UTILS::updateObjBrowser();
   }
   catch( const SALOME::SALOME_Exception& S_ex ) {

diff --git a/src/ADAPTGUI/MonEditZone.h b/src/ADAPTGUI/MonEditZone.h
index 726a1d93346d10d5d02bc31b06294d519d801d1a..c561f14d12f05459b98ec16f1bb86411d54d4543 100644 (file)
--- a/src/ADAPTGUI/MonEditZone.h
+++ b/src/ADAPTGUI/MonEditZone.h
@@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditZone : public MonCreateZone
     Q_OBJECT
 public:
     MonEditZone( MonCreateHypothesis* parent, bool modal,
-                 ADAPT::ADAPT_Gen_var myHomardGen,
+                 ADAPT::ADAPT_Gen_var myAdaptGen,
                  QString caseName, QString Name);
     virtual ~MonEditZone();
 

diff --git a/src/ADAPTGUI/MonIterInfo.cxx b/src/ADAPTGUI/MonIterInfo.cxx
index 4a789439cdf86ab5d25a20f5b6d687130b0d7045..8d922f887e5ba50263cfb65cbcf731c29d7e2e02 100644 (file)
--- a/src/ADAPTGUI/MonIterInfo.cxx
+++ b/src/ADAPTGUI/MonIterInfo.cxx
@@ -33,7 +33,7 @@
 using namespace std;
 
 // -----------------------------------------------------------------------------------------
-MonIterInfo::MonIterInfo(QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen0, QString IterName)
+MonIterInfo::MonIterInfo(QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myAdaptGen0, QString IterName)
 // -----------------------------------------------------------------------------------------
 /* Constructs a MonIterInfo
  * Inherits from CasHomard
@@ -51,7 +51,7 @@ MonIterInfo::MonIterInfo(QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHom
     _Option(-1)
 {
     MESSAGE("appel de _duplicate");
-      myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
+      myAdaptGen=ADAPT::ADAPT_Gen::_duplicate(myAdaptGen0);
       setupUi(this);
       setModal(modal);
       InitConnect();
@@ -96,7 +96,7 @@ bool MonIterInfo::PushOnApply()
   }
 
   // Recuperation de l'iteration
-  aIter = myHomardGen->GetIteration(_IterName.toStdString().c_str()) ;
+  aIter = myAdaptGen->GetIteration(_IterName.toStdString().c_str()) ;
 
   // Lancement de l'analyse
   try
@@ -112,7 +112,7 @@ bool MonIterInfo::PushOnApply()
 
   // Le bilan de l'analyse a afficher
   QString aFileName = aIter->GetFileInfo() ;
-  MonEditFile *aDlg = new MonEditFile( 0, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), aFileName, 0 ) ;
+  MonEditFile *aDlg = new MonEditFile( 0, true, ADAPT::ADAPT_Gen::_duplicate(myAdaptGen), aFileName, 0 ) ;
   if ( aDlg->_codret == 0 ) { aDlg->show(); }
 
 
@@ -130,7 +130,7 @@ void MonIterInfo::PushOnOK()
 void MonIterInfo::PushOnHelp()
 //-------------------------------
 {
-  std::string LanguageShort = myHomardGen->GetLanguageShort();
+  std::string LanguageShort = myAdaptGen->GetLanguageShort();
   HOMARD_UTILS::PushOnHelp(QString("gui_mesh_info.html"), QString(""), QString(LanguageShort.c_str()));
 }
 // ------------------------------------------------------------------------

diff --git a/src/ADAPTGUI/MonIterInfo.h b/src/ADAPTGUI/MonIterInfo.h
index 5ce8cf742060c571fcd12eed9828c93f3e5bb53b..8627efbd40bb955717354bae40067728ee75f5cb 100644 (file)
--- a/src/ADAPTGUI/MonIterInfo.h
+++ b/src/ADAPTGUI/MonIterInfo.h
@@ -40,11 +40,11 @@ class HOMARD_EXPORT MonIterInfo : public QDialog, public Ui_IterInfo
     Q_OBJECT
 
 public:
-    MonIterInfo( QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString IterName);
+    MonIterInfo( QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myAdaptGen, QString IterName);
     ~MonIterInfo();
 
 protected :
-    MonIterInfo( QWidget* parent, ADAPT::ADAPT_Gen_var myHomardGen, QString IterName );
+    MonIterInfo( QWidget* parent, ADAPT::ADAPT_Gen_var myAdaptGen, QString IterName );
 
     QString _IterName;
     QString _aCaseName;
@@ -57,7 +57,7 @@ protected :
     int _Option;
 
     ADAPT::HOMARD_Iteration_var aIter ;
-    ADAPT::ADAPT_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myAdaptGen;
 
     virtual void InitConnect();
 

diff --git a/src/ADAPTGUI/MonMeshInfo.cxx b/src/ADAPTGUI/MonMeshInfo.cxx
index b172e38e1df1aaffc5d6eb8010d99eea1bbd6c27..3589c5f9a699e0d623ed83b0e70fa37b68d343ca 100644 (file)
--- a/src/ADAPTGUI/MonMeshInfo.cxx
+++ b/src/ADAPTGUI/MonMeshInfo.cxx
@@ -36,7 +36,7 @@
 using namespace std;
 
 // -----------------------------------------------------------------------------------------
-MonMeshInfo::MonMeshInfo(QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen0)
+MonMeshInfo::MonMeshInfo(QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myAdaptGen0)
 // -----------------------------------------------------------------------------------------
 /* Constructs a MonMeshInfo
  * Inherits from CasHomard
@@ -51,7 +51,7 @@ MonMeshInfo::MonMeshInfo(QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHom
     _Entanglement(0),
     _Quality(0)
 {
-      myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
+      myAdaptGen=ADAPT::ADAPT_Gen::_duplicate(myAdaptGen0);
       setupUi(this);
       setModal(modal);
       InitConnect();
@@ -106,7 +106,7 @@ bool MonMeshInfo::PushOnApply()
     return false;
   }
   if ( aDirName != _aDirName)
-  { QString CaseNameDir = myHomardGen->VerifieDir( aDirName.toStdString().c_str()) ;
+  { QString CaseNameDir = myAdaptGen->VerifieDir( aDirName.toStdString().c_str()) ;
     if ( CaseNameDir != "" )
     {
       QString texte ;
@@ -150,7 +150,7 @@ bool MonMeshInfo::PushOnApply()
     _aCaseName = aCaseName;
     try
     {
-      myHomardGen->MeshInfo( \
+      myAdaptGen->MeshInfo( \
             CORBA::string_dup(_aCaseName.toStdString().c_str()),  \
             CORBA::string_dup(aMeshName.toStdString().c_str()),  \
             CORBA::string_dup(aFileName.toStdString().c_str()),  \
@@ -166,11 +166,11 @@ bool MonMeshInfo::PushOnApply()
   }
 
   // Le bilan de l'analyse a afficher
-  aCase = myHomardGen->GetCase(_aCaseName.toStdString().c_str());
+  aCase = myAdaptGen->GetCase(_aCaseName.toStdString().c_str());
   string iter0 = aCase->GetIter0Name();
-  ADAPT::HOMARD_Iteration_var aIter =  myHomardGen->GetIteration(iter0.c_str());
+  ADAPT::HOMARD_Iteration_var aIter =  myAdaptGen->GetIteration(iter0.c_str());
   aFileName = aIter->GetFileInfo() ;
-  MonEditFile *aDlg = new MonEditFile( 0, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), aFileName, 1 ) ;
+  MonEditFile *aDlg = new MonEditFile( 0, true, ADAPT::ADAPT_Gen::_duplicate(myAdaptGen), aFileName, 1 ) ;
   if ( aDlg->_codret == 0 ) { aDlg->show(); }
 
 HOMARD_UTILS::updateObjBrowser();
@@ -187,14 +187,14 @@ void MonMeshInfo::PushOnOK()
 void MonMeshInfo::PushOnHelp()
 //-------------------------------
 {
-  std::string LanguageShort = myHomardGen->GetLanguageShort();
+  std::string LanguageShort = myAdaptGen->GetLanguageShort();
   HOMARD_UTILS::PushOnHelp(QString("gui_create_case.html"), QString(""), QString(LanguageShort.c_str()));
 }
 // ---------------------------------
 void MonMeshInfo::SetNewCaseName()
 // ------------------------------
 {
-  ADAPT::listeCases_var  MyCases = myHomardGen->GetAllCasesName();
+  ADAPT::listeCases_var  MyCases = myAdaptGen->GetAllCasesName();
   int num = 0; QString aCaseName="";
   while (aCaseName=="" )
   {

diff --git a/src/ADAPTGUI/MonMeshInfo.h b/src/ADAPTGUI/MonMeshInfo.h
index 132ce89deafdb6fc58b46fbfa7d66ac6b4f96782..ec29de7063f7c274b74d896c9fc40a9d5ca2d623 100644 (file)
--- a/src/ADAPTGUI/MonMeshInfo.h
+++ b/src/ADAPTGUI/MonMeshInfo.h
@@ -37,7 +37,7 @@ class HOMARD_EXPORT MonMeshInfo : public QDialog, public Ui_MeshInfo
     Q_OBJECT
 
 public:
-    MonMeshInfo( QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen);
+    MonMeshInfo( QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myAdaptGen);
     ~MonMeshInfo();
 
 protected :
@@ -51,7 +51,7 @@ protected :
     int _Quality;
 
     ADAPT::HOMARD_Cas_var aCase ;
-    ADAPT::ADAPT_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myAdaptGen;
 
     virtual void InitConnect();
     virtual void SetNewCaseName();

diff --git a/src/ADAPTGUI/MonPursueIteration.cxx b/src/ADAPTGUI/MonPursueIteration.cxx
index b929d58100fd83f7a9fac7ce6f4de12efeb7b0a8..ebecd5fa67b7fbe3bb42049bee7bbb195a9840cb 100644 (file)
--- a/src/ADAPTGUI/MonPursueIteration.cxx
+++ b/src/ADAPTGUI/MonPursueIteration.cxx
@@ -39,13 +39,13 @@ using namespace std;
  * Sets attributes to default values
  */
 // -----------------------------------------------------------------------------------------
-MonPursueIteration::MonPursueIteration ( bool modal, ADAPT::ADAPT_Gen_var myHomardGen0 )
+MonPursueIteration::MonPursueIteration ( bool modal, ADAPT::ADAPT_Gen_var myAdaptGen0 )
     :
     Ui_PursueIteration(),
     _aCaseName(""), _aDirName(""), _aDirNameStart("")
 {
   MESSAGE("Debut du constructeur de MonPursueIteration");
-  myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0);
+  myAdaptGen=ADAPT::ADAPT_Gen::_duplicate(myAdaptGen0);
   setupUi(this);
   setModal(modal);
 
@@ -98,7 +98,7 @@ bool MonPursueIteration::PushOnApply()
     return false;
   }
   if ( aDirName != _aDirName)
-  { QString CaseNameDir = myHomardGen->VerifieDir( aDirName.toStdString().c_str()) ;
+  { QString CaseNameDir = myAdaptGen->VerifieDir( aDirName.toStdString().c_str()) ;
     if ( CaseNameDir != "" )
     {
       QString texte ;
@@ -147,7 +147,7 @@ bool MonPursueIteration::PushOnApply()
       try
       {
         MESSAGE("Poursuite a partir d'une iteration");
-        aCase = myHomardGen->CreateCaseFromIteration( \
+        aCase = myAdaptGen->CreateCaseFromIteration( \
                   CORBA::string_dup(_aCaseName.toStdString().c_str()),  \
                   CORBA::string_dup(_aDirNameStart.toStdString().c_str()) );
       }
@@ -164,7 +164,7 @@ bool MonPursueIteration::PushOnApply()
       try
       {
         MESSAGE("Poursuite a partir de la derniere iteration dans un cas");
-        aCase = myHomardGen->CreateCaseFromCaseLastIteration( \
+        aCase = myAdaptGen->CreateCaseFromCaseLastIteration( \
                   CORBA::string_dup(_aCaseName.toStdString().c_str()),  \
                   CORBA::string_dup(_aDirNameStart.toStdString().c_str()) );
       }
@@ -181,7 +181,7 @@ bool MonPursueIteration::PushOnApply()
       try
       {
         MESSAGE("Poursuite a partir d'une iteration dans un cas");
-        aCase = myHomardGen->CreateCaseFromCaseIteration( \
+        aCase = myAdaptGen->CreateCaseFromCaseIteration( \
                   CORBA::string_dup(_aCaseName.toStdString().c_str()),  \
                   CORBA::string_dup(_aDirNameStart.toStdString().c_str()),  \
                   Number );
@@ -214,14 +214,14 @@ void MonPursueIteration::PushOnOK()
 void MonPursueIteration::PushOnHelp()
 //-------------------------------
 {
-  std::string LanguageShort = myHomardGen->GetLanguageShort();
+  std::string LanguageShort = myAdaptGen->GetLanguageShort();
   HOMARD_UTILS::PushOnHelp(QString("gui_create_case.html"), QString(""), QString(LanguageShort.c_str()));
 }
 // ---------------------------------
 void MonPursueIteration::SetNewCaseName()
 // ------------------------------
 {
-  ADAPT::listeCases_var  MyCases = myHomardGen->GetAllCasesName();
+  ADAPT::listeCases_var  MyCases = myAdaptGen->GetAllCasesName();
   int num = 0; QString aCaseName="";
   while (aCaseName=="" )
   {

diff --git a/src/ADAPTGUI/MonPursueIteration.h b/src/ADAPTGUI/MonPursueIteration.h
index 367f9141de9f47a2ff150c4c874040c14600fe19..00dd62015852f6cf4aee613c44ffb43c283522ee 100644 (file)
--- a/src/ADAPTGUI/MonPursueIteration.h
+++ b/src/ADAPTGUI/MonPursueIteration.h
@@ -37,7 +37,7 @@ class HOMARD_EXPORT MonPursueIteration : public QDialog, public Ui_PursueIterati
     Q_OBJECT
 
   public:
-    MonPursueIteration( bool modal, ADAPT::ADAPT_Gen_var myHomardGen );
+    MonPursueIteration( bool modal, ADAPT::ADAPT_Gen_var myAdaptGen );
     virtual ~MonPursueIteration();
 
   protected :
@@ -48,7 +48,7 @@ class HOMARD_EXPORT MonPursueIteration : public QDialog, public Ui_PursueIterati
     int _Type ;
 
     ADAPT::HOMARD_Cas_var aCase ;
-    ADAPT::ADAPT_Gen_var myHomardGen;
+    ADAPT::ADAPT_Gen_var myAdaptGen;
 
     virtual void InitConnect();
     virtual void SetNewCaseName();

diff --git a/src/SMESHGUI/SMESHGUI_AdaptDlg.cxx b/src/SMESHGUI/SMESHGUI_AdaptDlg.cxx
index 387baa90f385e8b6701d046a0cf3635c0338549c..5d55ae1755bfb4610dd2db922926e5e8a5795401 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_AdaptDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_AdaptDlg.cxx
@@ -187,9 +187,9 @@ bool SMESHGUI_AdaptDlg::OnGUIEvent (int theCommandID)
     case 8011: // Creation d un Cas
     {
       INFOS("Creation d'un Cas");
-//       MonCreateCase *aDlg = new MonCreateCase( true,
-//                             ADAPT::ADAPT_Gen::_duplicate(homardGen) ) ;
-//       aDlg->show();
+      MonCreateCase *aDlg = new MonCreateCase( true,
+                            ADAPT::ADAPT_Gen::_duplicate(homardGen) ) ;
+      aDlg->show();
       break;
     }