From 93ad4359b074e4a3743dc485affbd865163f71e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=A9rald=20NICOLAS?= Date: Tue, 26 May 2020 14:36:52 +0200 Subject: [PATCH] Changements de noms HOMARD ==> ADAPT --- idl/{HOMARD_Gen.idl => ADAPT_Gen.idl} | 6 +- idl/CMakeLists.txt | 2 +- src/ADAPT/{HOMARD_Gen.cxx => ADAPT_Gen.cxx} | 12 +- src/ADAPT/{HOMARD_Gen.hxx => ADAPT_Gen.hxx} | 12 +- src/ADAPT/CMakeLists.txt | 4 +- src/ADAPT/HOMARD_DriverTools.cxx | 4 +- src/ADAPT/HOMARD_DriverTools.hxx | 2 +- src/ADAPT/YACSDriver.cxx | 6 +- src/ADAPTGUI/ADAPTGUI.cxx | 44 +- src/ADAPTGUI/ADAPTGUI.h | 6 +- src/ADAPTGUI/HOMARDGUI_Utils.cxx | 2 +- src/ADAPTGUI/HOMARDGUI_Utils.h | 2 +- src/ADAPTGUI/HomardQtCommun.h | 2 +- src/ADAPTGUI/MonCreateBoundaryAn.cxx | 12 +- src/ADAPTGUI/MonCreateBoundaryAn.h | 10 +- src/ADAPTGUI/MonCreateBoundaryCAO.cxx | 10 +- src/ADAPTGUI/MonCreateBoundaryCAO.h | 8 +- src/ADAPTGUI/MonCreateBoundaryDi.cxx | 10 +- src/ADAPTGUI/MonCreateBoundaryDi.h | 8 +- src/ADAPTGUI/MonCreateCase.cxx | 24 +- src/ADAPTGUI/MonCreateCase.h | 8 +- src/ADAPTGUI/MonCreateHypothesis.cxx | 16 +- src/ADAPTGUI/MonCreateHypothesis.h | 10 +- src/ADAPTGUI/MonCreateIteration.cxx | 20 +- src/ADAPTGUI/MonCreateIteration.h | 14 +- src/ADAPTGUI/MonCreateListGroup.cxx | 12 +- src/ADAPTGUI/MonCreateListGroup.h | 8 +- src/ADAPTGUI/MonCreateListGroupCAO.cxx | 12 +- src/ADAPTGUI/MonCreateListGroupCAO.h | 8 +- src/ADAPTGUI/MonCreateYACS.cxx | 10 +- src/ADAPTGUI/MonCreateYACS.h | 10 +- src/ADAPTGUI/MonCreateZone.cxx | 12 +- src/ADAPTGUI/MonCreateZone.h | 10 +- src/ADAPTGUI/MonEditBoundaryAn.cxx | 14 +- src/ADAPTGUI/MonEditBoundaryAn.h | 4 +- src/ADAPTGUI/MonEditBoundaryCAO.cxx | 10 +- src/ADAPTGUI/MonEditBoundaryCAO.h | 4 +- src/ADAPTGUI/MonEditBoundaryDi.cxx | 10 +- src/ADAPTGUI/MonEditBoundaryDi.h | 4 +- src/ADAPTGUI/MonEditCase.cxx | 8 +- src/ADAPTGUI/MonEditCase.h | 4 +- src/ADAPTGUI/MonEditFile.cxx | 2 +- src/ADAPTGUI/MonEditFile.h | 6 +- src/ADAPTGUI/MonEditHypothesis.cxx | 16 +- src/ADAPTGUI/MonEditHypothesis.h | 4 +- src/ADAPTGUI/MonEditIteration.cxx | 4 +- src/ADAPTGUI/MonEditIteration.h | 4 +- src/ADAPTGUI/MonEditListGroup.cxx | 2 +- src/ADAPTGUI/MonEditListGroup.h | 4 +- src/ADAPTGUI/MonEditListGroupCAO.cxx | 2 +- src/ADAPTGUI/MonEditListGroupCAO.h | 4 +- src/ADAPTGUI/MonEditYACS.cxx | 2 +- src/ADAPTGUI/MonEditYACS.h | 4 +- src/ADAPTGUI/MonEditZone.cxx | 12 +- src/ADAPTGUI/MonEditZone.h | 4 +- src/ADAPTGUI/MonIterInfo.cxx | 6 +- src/ADAPTGUI/MonIterInfo.h | 10 +- src/ADAPTGUI/MonMeshInfo.cxx | 10 +- src/ADAPTGUI/MonMeshInfo.h | 8 +- src/ADAPTGUI/MonPursueIteration.cxx | 6 +- src/ADAPTGUI/MonPursueIteration.h | 8 +- .../{HOMARD_Gen_i.cxx => ADAPT_Gen_i.cxx} | 728 +++++++++--------- .../{HOMARD_Gen_i.hxx => ADAPT_Gen_i.hxx} | 150 ++-- src/ADAPT_I/CMakeLists.txt | 4 +- src/ADAPT_I/HOMARD_Boundary_i.cxx | 22 +- src/ADAPT_I/HOMARD_Boundary_i.hxx | 16 +- src/ADAPT_I/HOMARD_Cas_i.cxx | 46 +- src/ADAPT_I/HOMARD_Cas_i.hxx | 26 +- src/ADAPT_I/HOMARD_Hypothesis_i.cxx | 38 +- src/ADAPT_I/HOMARD_Hypothesis_i.hxx | 24 +- src/ADAPT_I/HOMARD_Iteration_i.cxx | 26 +- src/ADAPT_I/HOMARD_Iteration_i.hxx | 18 +- src/ADAPT_I/HOMARD_YACS_i.cxx | 8 +- src/ADAPT_I/HOMARD_YACS_i.hxx | 8 +- src/ADAPT_I/HOMARD_Zone_i.cxx | 20 +- src/ADAPT_I/HOMARD_Zone_i.hxx | 14 +- 76 files changed, 830 insertions(+), 830 deletions(-) rename idl/{HOMARD_Gen.idl => ADAPT_Gen.idl} (99%) rename src/ADAPT/{HOMARD_Gen.cxx => ADAPT_Gen.cxx} (90%) rename src/ADAPT/{HOMARD_Gen.hxx => ADAPT_Gen.hxx} (87%) rename src/ADAPT_I/{HOMARD_Gen_i.cxx => ADAPT_Gen_i.cxx} (87%) rename src/ADAPT_I/{HOMARD_Gen_i.hxx => ADAPT_Gen_i.hxx} (68%) diff --git a/idl/HOMARD_Gen.idl b/idl/ADAPT_Gen.idl similarity index 99% rename from idl/HOMARD_Gen.idl rename to idl/ADAPT_Gen.idl index 797b3f8c4..83114652e 100644 --- a/idl/HOMARD_Gen.idl +++ b/idl/ADAPT_Gen.idl @@ -17,8 +17,8 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#ifndef __HOMARD_GEN__ -#define __HOMARD_GEN__ +#ifndef __ADAPT_GEN__ +#define __ADAPT_GEN__ #include "SALOME_Component.idl" #include "SALOME_Exception.idl" @@ -40,7 +40,7 @@ module ADAPT typedef sequence listeBoundarys; typedef sequence listeYACSs; - interface HOMARD_Gen : Engines::EngineComponent, SALOMEDS::Driver + interface ADAPT_Gen : Engines::EngineComponent, SALOMEDS::Driver { // // A. Les methodes qui suivent sont celles que l'on retrouvera dans diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index e870d89af..7aabfb53b 100644 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -38,7 +38,7 @@ SET(SalomeIDLSMESH_IDLSOURCES SMESH_Measurements.idl HOMARD_Boundary.idl HOMARD_Cas.idl - HOMARD_Gen.idl + ADAPT_Gen.idl HOMARD_Hypothesis.idl HOMARD_Iteration.idl HOMARD_YACS.idl diff --git a/src/ADAPT/HOMARD_Gen.cxx b/src/ADAPT/ADAPT_Gen.cxx similarity index 90% rename from src/ADAPT/HOMARD_Gen.cxx rename to src/ADAPT/ADAPT_Gen.cxx index a9059a6ad..94e762ed5 100644 --- a/src/ADAPT/HOMARD_Gen.cxx +++ b/src/ADAPT/ADAPT_Gen.cxx @@ -18,24 +18,24 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : HOMARD_Gen.cxx +// File : ADAPT_Gen.cxx // Author : Gerald NICOLAS, EDF // Module : HOMARD -#include "HOMARD_Gen.hxx" +#include "ADAPT_Gen.hxx" #include "utilities.h" //============================================================================= //============================================================================= -HOMARD_Gen::HOMARD_Gen() +ADAPT_Gen::ADAPT_Gen() { - MESSAGE("HOMARD_Gen"); + MESSAGE("ADAPT_Gen"); } //============================================================================= //============================================================================= -HOMARD_Gen::~HOMARD_Gen() +ADAPT_Gen::~ADAPT_Gen() { - MESSAGE("~HOMARD_Gen"); + MESSAGE("~ADAPT_Gen"); } //============================================================================= diff --git a/src/ADAPT/HOMARD_Gen.hxx b/src/ADAPT/ADAPT_Gen.hxx similarity index 87% rename from src/ADAPT/HOMARD_Gen.hxx rename to src/ADAPT/ADAPT_Gen.hxx index 3ff864a14..7a7d05098 100644 --- a/src/ADAPT/HOMARD_Gen.hxx +++ b/src/ADAPT/ADAPT_Gen.hxx @@ -18,20 +18,20 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : HOMARD_Gen.hxx +// File : ADAPT_Gen.hxx // Author : Gerald NICOLAS, EDF // Module : HOMARD -#ifndef _HOMARD_GEN_HXX_ -#define _HOMARD_GEN_HXX_ +#ifndef _ADAPT_GEN_HXX_ +#define _ADAPT_GEN_HXX_ #include "HOMARD.hxx" -class HOMARDIMPL_EXPORT HOMARD_Gen +class HOMARDIMPL_EXPORT ADAPT_Gen { public : - HOMARD_Gen(); - ~HOMARD_Gen(); + ADAPT_Gen(); + ~ADAPT_Gen(); }; #endif diff --git a/src/ADAPT/CMakeLists.txt b/src/ADAPT/CMakeLists.txt index bc90a1aa0..728d7203d 100644 --- a/src/ADAPT/CMakeLists.txt +++ b/src/ADAPT/CMakeLists.txt @@ -43,7 +43,7 @@ SET(ADAPTImpl_HEADERS HOMARD_Hypothesis.hxx HOMARD_Iteration.hxx HOMARD_Zone.hxx - HOMARD_Gen.hxx + ADAPT_Gen.hxx HOMARD_DriverTools.hxx HOMARD_YACS.hxx HomardDriver.hxx @@ -59,7 +59,7 @@ SET(ADAPTImpl_SOURCES HOMARD_Hypothesis.cxx HOMARD_Iteration.cxx HOMARD_Zone.cxx - HOMARD_Gen.cxx + ADAPT_Gen.cxx HOMARD_DriverTools.cxx HOMARD_YACS.cxx HomardDriver.cxx diff --git a/src/ADAPT/HOMARD_DriverTools.cxx b/src/ADAPT/HOMARD_DriverTools.cxx index df7c5e6b2..74ec51209 100644 --- a/src/ADAPT/HOMARD_DriverTools.cxx +++ b/src/ADAPT/HOMARD_DriverTools.cxx @@ -32,7 +32,7 @@ #include #include "utilities.h" -namespace HOMARD +namespace ADAPT { std::string SEPARATOR = "|" ; @@ -837,4 +837,4 @@ namespace HOMARD return true; } -} // namespace HOMARD /end/ +} // namespace ADAPT /end/ diff --git a/src/ADAPT/HOMARD_DriverTools.hxx b/src/ADAPT/HOMARD_DriverTools.hxx index 887d5f35b..e7aff54f8 100644 --- a/src/ADAPT/HOMARD_DriverTools.hxx +++ b/src/ADAPT/HOMARD_DriverTools.hxx @@ -35,7 +35,7 @@ class HOMARD_Hypothesis; class HOMARD_Zone; class HOMARD_YACS; -namespace HOMARD +namespace ADAPT { //! persistence entity type typedef enum { Case, Zone, Hypothesis, Iteration, Boundary, YACS } SignatureType; diff --git a/src/ADAPT/YACSDriver.cxx b/src/ADAPT/YACSDriver.cxx index 27910535d..864803db8 100644 --- a/src/ADAPT/YACSDriver.cxx +++ b/src/ADAPT/YACSDriver.cxx @@ -144,7 +144,7 @@ std::string YACSDriver::Texte_Iter_1_Zone( int ZoneType, const std::string pytho _Texte += Texte_inport( "string", "ZoneName" ) ; TexteParametre( node, "ZoneName", "string", ZoneName ) ; // 4.2. Les valeurs numeriques -// ATTENTION : les noms doivent etre les memes que dans Gen.xml, donc HOMARD_Gen.idl +// ATTENTION : les noms doivent etre les memes que dans Gen.xml, donc ADAPT_Gen.idl // 4.2.1. Decodage des valeurs // La chaine pythonStructure est de ce genre : // CreateZoneBox( "Zone_1", 0.144, 0.216, 0.096, 0.1464, 0.076, 0.12) @@ -312,7 +312,7 @@ std::string YACSDriver::Texte_Iter_1_Boundary( int BoundaryType, const std::stri _Texte += " " + motcle + ".UpdateStudy\n" ; _Texte += " " + methode + "\n" ; // 4. Les inports -// ATTENTION : les noms doivent etre les memes que dans Gen.xml, donc HOMARD_Gen.idl +// ATTENTION : les noms doivent etre les memes que dans Gen.xml, donc ADAPT_Gen.idl // 4.1. Le nom de la frontiere _Texte += Texte_inport( "string", "BoundaryName" ) ; TexteParametre( node, "BoundaryName", "string", BoundaryName ) ; @@ -658,7 +658,7 @@ void YACSDriver::CreeFichier( ) // } //=============================================================================== -// REMARQUE : on devrait utiliser le GetStringInTexte de HOMARD_Gen_i mais je ne sais pas +// REMARQUE : on devrait utiliser le GetStringInTexte de ADAPT_Gen_i mais je ne sais pas // comment l'appeler. ALors je clone. // Recuperation de la chaine de caracteres par rapport l'apparition d'un texte // ligne : la ligne a manipuler diff --git a/src/ADAPTGUI/ADAPTGUI.cxx b/src/ADAPTGUI/ADAPTGUI.cxx index 5b5fae290..ed8cf6b51 100644 --- a/src/ADAPTGUI/ADAPTGUI.cxx +++ b/src/ADAPTGUI/ADAPTGUI.cxx @@ -103,10 +103,10 @@ ADAPTGUI::~ADAPTGUI() // function : InitHOMARDGen // launch HOMARD component and return a handle //======================================================================= -HOMARD::HOMARD_Gen_var ADAPTGUI::InitHOMARDGen(SalomeApp_Application* app) +ADAPT::ADAPT_Gen_var ADAPTGUI::InitHOMARDGen(SalomeApp_Application* app) { Engines::EngineComponent_var comp = app->lcc()->FindOrLoad_Component( "FactoryServer","HOMARD" ); - HOMARD::HOMARD_Gen_var clr = HOMARD::HOMARD_Gen::_narrow(comp); + ADAPT::ADAPT_Gen_var clr = ADAPT::ADAPT_Gen::_narrow(comp); ASSERT(!CORBA::is_nil(clr)); return clr; } @@ -261,10 +261,10 @@ void ADAPTGUI::createMenus() //================================================ // function : recupPreferences -// Pour chaque valeur, le defaut est la valeur definie dans HOMARD_Gen -// . Si la recuperation dans config/salome s'est bien passee a la creation de HOMARD_Gen, +// Pour chaque valeur, le defaut est la valeur definie dans ADAPT_Gen +// . Si la recuperation dans config/salome s'est bien passee a la creation de ADAPT_Gen, // ces valeurs sont les valeurs definies. -// . Si cela ne s'est pas bien passe, ce sont les valeurs par defaut de HOMARD_Gen +// . Si cela ne s'est pas bien passe, ce sont les valeurs par defaut de ADAPT_Gen //================================================ void ADAPTGUI::recupPreferences() { @@ -273,7 +273,7 @@ void ADAPTGUI::recupPreferences() // A. Declarations // SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( application() ); - HOMARD::HOMARD_Gen_var homardGen = ADAPTGUI::InitHOMARDGen(app); + ADAPT::ADAPT_Gen_var homardGen = ADAPTGUI::InitHOMARDGen(app); int defaut_i ; std::string defaut_s ; QString QString_v ; @@ -370,7 +370,7 @@ bool ADAPTGUI::OnGUIEvent (int theCommandID) SUIT_Desktop* parent = application()->desktop(); - HOMARD::HOMARD_Gen_var homardGen = ADAPTGUI::InitHOMARDGen(app); + ADAPT::ADAPT_Gen_var homardGen = ADAPTGUI::InitHOMARDGen(app); if (!CORBA::is_nil(homardGen)) homardGen->UpdateStudy(); @@ -385,7 +385,7 @@ bool ADAPTGUI::OnGUIEvent (int theCommandID) { MESSAGE("command " << theCommandID << " activated"); MonCreateCase *aDlg = new MonCreateCase( true, - HOMARD::HOMARD_Gen::_duplicate(homardGen) ) ; + ADAPT::ADAPT_Gen::_duplicate(homardGen) ) ; aDlg->show(); break; } @@ -394,7 +394,7 @@ bool ADAPTGUI::OnGUIEvent (int theCommandID) { MESSAGE("command " << theCommandID << " activated"); MonPursueIteration *aDlg = new MonPursueIteration( true, - HOMARD::HOMARD_Gen::_duplicate(homardGen) ) ; + ADAPT::ADAPT_Gen::_duplicate(homardGen) ) ; aDlg->show(); break; } @@ -403,7 +403,7 @@ bool ADAPTGUI::OnGUIEvent (int theCommandID) { MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() ); MonCreateIteration *IterDlg = new MonCreateIteration( parent, true, - HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ; + ADAPT::ADAPT_Gen::_duplicate(homardGen), _ObjectName ) ; IterDlg->show(); break; } @@ -439,7 +439,7 @@ bool ADAPTGUI::OnGUIEvent (int theCommandID) case 1121: // Information sur le maillage de l'iteration { MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() ); - MonIterInfo *IterDlg = new MonIterInfo( parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ; + MonIterInfo *IterDlg = new MonIterInfo( parent, true, ADAPT::ADAPT_Gen::_duplicate(homardGen), _ObjectName ) ; IterDlg->show(); break; } @@ -469,50 +469,50 @@ bool ADAPTGUI::OnGUIEvent (int theCommandID) // Edition d'une frontiere CAO if (HOMARD_UTILS::isBoundaryCAO(obj)) { - MonEditBoundaryCAO *aDlg = new MonEditBoundaryCAO(0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ; + MonEditBoundaryCAO *aDlg = new MonEditBoundaryCAO(0, true, ADAPT::ADAPT_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ; aDlg->show(); } // Edition d'une frontiere discrete else if (HOMARD_UTILS::isBoundaryDi(obj)) { - MonEditBoundaryDi *aDlg = new MonEditBoundaryDi(0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ; + MonEditBoundaryDi *aDlg = new MonEditBoundaryDi(0, true, ADAPT::ADAPT_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ; aDlg->show(); } // Edition d'une frontiere analytique else if (HOMARD_UTILS::isBoundaryAn(obj)) { - MonEditBoundaryAn *aDlg = new MonEditBoundaryAn(0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ; + MonEditBoundaryAn *aDlg = new MonEditBoundaryAn(0, true, ADAPT::ADAPT_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ; aDlg->show(); } // Edition d'un cas else if (HOMARD_UTILS::isCase(obj)) { - MonEditCase *aDlg = new MonEditCase(true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ; + MonEditCase *aDlg = new MonEditCase(true, ADAPT::ADAPT_Gen::_duplicate(homardGen), _ObjectName ) ; aDlg->show(); } // Edition d'une hypothese else if (HOMARD_UTILS::isHypo(obj)) { - MonEditHypothesis *aDlg = new MonEditHypothesis(0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName, QString(""), QString("")) ; + MonEditHypothesis *aDlg = new MonEditHypothesis(0, true, ADAPT::ADAPT_Gen::_duplicate(homardGen), _ObjectName, QString(""), QString("")) ; aDlg->show(); } // Edition d'une iteration else if (HOMARD_UTILS::isIter(obj)) { - MonEditIteration *aDlg = new MonEditIteration(parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ; + MonEditIteration *aDlg = new MonEditIteration(parent, true, ADAPT::ADAPT_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ; aDlg->show(); } // Edition d'un schema YACS else if (HOMARD_UTILS::isYACS(obj)) { MESSAGE("appel de MonEditYACS"); - MonEditYACS *aDlg = new MonEditYACS(true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName) ; + MonEditYACS *aDlg = new MonEditYACS(true, ADAPT::ADAPT_Gen::_duplicate(homardGen), _ObjectName) ; aDlg->show(); } // Edition d'une zone else if (HOMARD_UTILS::isZone(obj)) { - MonEditZone *aDlg = new MonEditZone(0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ; + MonEditZone *aDlg = new MonEditZone(0, true, ADAPT::ADAPT_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ; aDlg->show(); } } @@ -613,7 +613,7 @@ bool ADAPTGUI::OnGUIEvent (int theCommandID) { MESSAGE("etape 1301") MESSAGE("command " << theCommandID << " activated"); - MonMeshInfo *aDlg = new MonMeshInfo( parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen) ) ; + MonMeshInfo *aDlg = new MonMeshInfo( parent, true, ADAPT::ADAPT_Gen::_duplicate(homardGen) ) ; aDlg->show(); break; } @@ -624,7 +624,7 @@ bool ADAPTGUI::OnGUIEvent (int theCommandID) _PTR(SObject) obj = chercheMonObjet(); if ( (obj) && ( HOMARD_UTILS::isFileType(obj,QString("log")) || HOMARD_UTILS::isFileType(obj,QString("Summary")) || HOMARD_UTILS::isFileType(obj,QString("xml")) ) ) { - MonEditFile *aDlg = new MonEditFile( 0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName, 0 ) ; + MonEditFile *aDlg = new MonEditFile( 0, true, ADAPT::ADAPT_Gen::_duplicate(homardGen), _ObjectName, 0 ) ; if ( aDlg->_codret == 0 ) { aDlg->show(); } } break; @@ -634,7 +634,7 @@ bool ADAPTGUI::OnGUIEvent (int theCommandID) { MESSAGE("etape 1401") MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() ); - MonCreateYACS *aDlg = new MonCreateYACS( true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ; + MonCreateYACS *aDlg = new MonCreateYACS( true, ADAPT::ADAPT_Gen::_duplicate(homardGen), _ObjectName ) ; aDlg->show(); break; } diff --git a/src/ADAPTGUI/ADAPTGUI.h b/src/ADAPTGUI/ADAPTGUI.h index d86a72991..82b71aa79 100644 --- a/src/ADAPTGUI/ADAPTGUI.h +++ b/src/ADAPTGUI/ADAPTGUI.h @@ -30,7 +30,7 @@ #include #include -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include CORBA_CLIENT_HEADER(HOMARD_Cas) #include CORBA_CLIENT_HEADER(HOMARD_Hypothesis) @@ -53,7 +53,7 @@ public: QString engineIOR() const; void windows( QMap& ) const; - static HOMARD::HOMARD_Gen_var InitHOMARDGen(SalomeApp_Application* ); + static ADAPT::ADAPT_Gen_var InitHOMARDGen(SalomeApp_Application* ); public slots: @@ -89,7 +89,7 @@ private: _PTR(SObject) chercheMonObjet(); virtual void createPreferences(); - HOMARD::HOMARD_Gen_var myComponentHomard; + ADAPT::ADAPT_Gen_var myComponentHomard; int anId; QString _ObjectName; diff --git a/src/ADAPTGUI/HOMARDGUI_Utils.cxx b/src/ADAPTGUI/HOMARDGUI_Utils.cxx index 562546eec..5358c5c32 100644 --- a/src/ADAPTGUI/HOMARDGUI_Utils.cxx +++ b/src/ADAPTGUI/HOMARDGUI_Utils.cxx @@ -90,7 +90,7 @@ void HOMARD_UTILS::updateObjBrowser() appMod->updateObjBrowser( true ); } else - MESSAGE( "--- HOMARD::updateObjBrowser: appMod = NULL"); + MESSAGE( "--- ADAPT::updateObjBrowser: appMod = NULL"); } } diff --git a/src/ADAPTGUI/HOMARDGUI_Utils.h b/src/ADAPTGUI/HOMARDGUI_Utils.h index d257dbb6f..a2f24a6e2 100644 --- a/src/ADAPTGUI/HOMARDGUI_Utils.h +++ b/src/ADAPTGUI/HOMARDGUI_Utils.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(HOMARD_Cas) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include "SALOMEDSClient_definitions.hxx" #include "SALOME_InteractiveObject.hxx" diff --git a/src/ADAPTGUI/HomardQtCommun.h b/src/ADAPTGUI/HomardQtCommun.h index 4587833e2..32f32deff 100644 --- a/src/ADAPTGUI/HomardQtCommun.h +++ b/src/ADAPTGUI/HomardQtCommun.h @@ -29,7 +29,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include CORBA_CLIENT_HEADER(HOMARD_Cas) #include diff --git a/src/ADAPTGUI/MonCreateBoundaryAn.cxx b/src/ADAPTGUI/MonCreateBoundaryAn.cxx index 40fa47f4b..a9a4880ee 100644 --- a/src/ADAPTGUI/MonCreateBoundaryAn.cxx +++ b/src/ADAPTGUI/MonCreateBoundaryAn.cxx @@ -41,7 +41,7 @@ using namespace std; // ------------------------------------------------------------------------------------------------------------------------ MonCreateBoundaryAn::MonCreateBoundaryAn(MonCreateCase* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen0, + ADAPT::ADAPT_Gen_var myHomardGen0, QString caseName) : // ------------------------------------------------------------------------------------------------------------------------------ /* Constructs a MonCreateBoundaryAn @@ -67,7 +67,7 @@ MonCreateBoundaryAn::MonCreateBoundaryAn(MonCreateCase* parent, bool modal, Chgt (false) { MESSAGE("Constructeur") ; - myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0); + myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0); setupUi(this); setModal(modal); @@ -103,7 +103,7 @@ MonCreateBoundaryAn::MonCreateBoundaryAn(MonCreateCase* parent, bool modal, } // -------------------------------------------------------------------------------------------------------------- MonCreateBoundaryAn::MonCreateBoundaryAn(MonCreateCase* parent, - HOMARD::HOMARD_Gen_var myHomardGen0, + ADAPT::ADAPT_Gen_var myHomardGen0, QString caseName): // -------------------------------------------------------------------------------------------------------------- // @@ -172,8 +172,8 @@ void MonCreateBoundaryAn::InitValBoundaryAn() // if (_aCaseName == QString("")) { return; } - HOMARD::HOMARD_Cas_var aCas = myHomardGen->GetCase(_aCaseName.toStdString().c_str()); - HOMARD::extrema_var MesExtremes = aCas->GetBoundingBox(); + ADAPT::HOMARD_Cas_var aCas = myHomardGen->GetCase(_aCaseName.toStdString().c_str()); + ADAPT::extrema_var MesExtremes = aCas->GetBoundingBox(); int num = MesExtremes->length() ; ASSERT(num == 10); _Xmin=MesExtremes[0]; _Xmax=MesExtremes[1]; _Xincr=MesExtremes[2]; @@ -521,7 +521,7 @@ void MonCreateBoundaryAn::SetNewName() { // Recherche d'un nom par defaut qui n'existe pas encore - HOMARD::listeBoundarys_var MyObjects = myHomardGen->GetAllBoundarysName(); + ADAPT::listeBoundarys_var MyObjects = myHomardGen->GetAllBoundarysName(); int num = 0; QString aName=""; while (aName=="" ) { diff --git a/src/ADAPTGUI/MonCreateBoundaryAn.h b/src/ADAPTGUI/MonCreateBoundaryAn.h index 46c838ac9..2576d14fd 100644 --- a/src/ADAPTGUI/MonCreateBoundaryAn.h +++ b/src/ADAPTGUI/MonCreateBoundaryAn.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include CORBA_CLIENT_HEADER(HOMARD_Boundary) #include "ui_CreateBoundaryAn.h" @@ -39,13 +39,13 @@ class HOMARD_EXPORT MonCreateBoundaryAn : public QDialog, public Ui_CreateBounda public: MonCreateBoundaryAn( MonCreateCase* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString caseName); virtual ~MonCreateBoundaryAn(); protected : MonCreateBoundaryAn( MonCreateCase* parent, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString caseName); MonCreateCase * _parent; @@ -70,8 +70,8 @@ protected : bool Chgt; - HOMARD::HOMARD_Boundary_var aBoundaryAn ; - HOMARD::HOMARD_Gen_var myHomardGen; + ADAPT::HOMARD_Boundary_var aBoundaryAn ; + ADAPT::ADAPT_Gen_var myHomardGen; virtual void InitConnect(); virtual void InitValBoundaryAn(); diff --git a/src/ADAPTGUI/MonCreateBoundaryCAO.cxx b/src/ADAPTGUI/MonCreateBoundaryCAO.cxx index da07e84a5..da3f9d31e 100644 --- a/src/ADAPTGUI/MonCreateBoundaryCAO.cxx +++ b/src/ADAPTGUI/MonCreateBoundaryCAO.cxx @@ -33,14 +33,14 @@ using namespace std; // ------------------------------------------------------------------------------- MonCreateBoundaryCAO::MonCreateBoundaryCAO(MonCreateCase* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen0, + ADAPT::ADAPT_Gen_var myHomardGen0, QString caseName, QString aName) // --------------------------------------------------------------------------------- /* Constructs a MonCreateBoundaryCAO */ : QDialog(0), Ui_CreateBoundaryCAO(), _parent(parent), _aName(aName), - myHomardGen(HOMARD::HOMARD_Gen::_duplicate(myHomardGen0)), + myHomardGen(ADAPT::ADAPT_Gen::_duplicate(myHomardGen0)), _aCaseName(caseName) { MESSAGE("Constructeur") ; @@ -137,7 +137,7 @@ void MonCreateBoundaryCAO::PushOnHelp() void MonCreateBoundaryCAO::AssocieLesGroupes() // ------------------------------------------------------------------------ { - HOMARD::ListGroupType_var aSeqGroupe = new HOMARD::ListGroupType; + ADAPT::ListGroupType_var aSeqGroupe = new ADAPT::ListGroupType; aSeqGroupe->length(_listeGroupesBoundary.size()); QStringList::const_iterator it; int i=0; @@ -152,7 +152,7 @@ void MonCreateBoundaryCAO::SetNewName() // -------------------------------------------------- { - HOMARD::listeBoundarys_var MyObjects = myHomardGen->GetAllBoundarysName(); + ADAPT::listeBoundarys_var MyObjects = myHomardGen->GetAllBoundarysName(); int num = 0; QString aName=""; while (aName == QString("") ) { @@ -195,7 +195,7 @@ void MonCreateBoundaryCAO::SetFiltrage() return; } - MonCreateListGroupCAO *aDlg = new MonCreateListGroupCAO(NULL, this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), + MonCreateListGroupCAO *aDlg = new MonCreateListGroupCAO(NULL, this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, _listeGroupesBoundary) ; aDlg->show(); } diff --git a/src/ADAPTGUI/MonCreateBoundaryCAO.h b/src/ADAPTGUI/MonCreateBoundaryCAO.h index 1b6eff095..1d5b646e1 100644 --- a/src/ADAPTGUI/MonCreateBoundaryCAO.h +++ b/src/ADAPTGUI/MonCreateBoundaryCAO.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include CORBA_CLIENT_HEADER(HOMARD_Boundary) #include "ui_CreateBoundaryCAO.h" @@ -39,7 +39,7 @@ class HOMARD_EXPORT MonCreateBoundaryCAO : public QDialog, public Ui_CreateBound public: MonCreateBoundaryCAO( MonCreateCase* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString caseName, QString BoundaryName ); ~MonCreateBoundaryCAO(); virtual void setGroups (QStringList listGroup); @@ -52,8 +52,8 @@ protected : QString _aCaseName; - HOMARD::HOMARD_Boundary_var aBoundary; - HOMARD::HOMARD_Gen_var myHomardGen; + ADAPT::HOMARD_Boundary_var aBoundary; + ADAPT::ADAPT_Gen_var myHomardGen; QStringList _listeGroupesBoundary; diff --git a/src/ADAPTGUI/MonCreateBoundaryDi.cxx b/src/ADAPTGUI/MonCreateBoundaryDi.cxx index f61b7653f..8d1158c72 100644 --- a/src/ADAPTGUI/MonCreateBoundaryDi.cxx +++ b/src/ADAPTGUI/MonCreateBoundaryDi.cxx @@ -33,14 +33,14 @@ using namespace std; // ------------------------------------------------------------------------------- MonCreateBoundaryDi::MonCreateBoundaryDi(MonCreateCase* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen0, + ADAPT::ADAPT_Gen_var myHomardGen0, QString caseName, QString aName) // --------------------------------------------------------------------------------- /* Constructs a MonCreateBoundaryDi */ : QDialog(0), Ui_CreateBoundaryDi(), _parent(parent), _aName(aName), - myHomardGen(HOMARD::HOMARD_Gen::_duplicate(myHomardGen0)), + myHomardGen(ADAPT::ADAPT_Gen::_duplicate(myHomardGen0)), _aCaseName(caseName) { MESSAGE("Constructeur") ; @@ -146,7 +146,7 @@ void MonCreateBoundaryDi::PushOnHelp() void MonCreateBoundaryDi::AssocieLesGroupes() // ------------------------------------------------------------------------ { - HOMARD::ListGroupType_var aSeqGroupe = new HOMARD::ListGroupType; + ADAPT::ListGroupType_var aSeqGroupe = new ADAPT::ListGroupType; aSeqGroupe->length(_listeGroupesBoundary.size()); QStringList::const_iterator it; int i=0; @@ -161,7 +161,7 @@ void MonCreateBoundaryDi::SetNewName() // -------------------------------------------------- { - HOMARD::listeBoundarys_var MyObjects = myHomardGen->GetAllBoundarysName(); + ADAPT::listeBoundarys_var MyObjects = myHomardGen->GetAllBoundarysName(); int num = 0; QString aName=""; while (aName == QString("") ) { @@ -204,7 +204,7 @@ void MonCreateBoundaryDi::SetFiltrage() return; } - MonCreateListGroup *aDlg = new MonCreateListGroup(NULL, this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), + MonCreateListGroup *aDlg = new MonCreateListGroup(NULL, this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, _listeGroupesBoundary) ; aDlg->show(); } diff --git a/src/ADAPTGUI/MonCreateBoundaryDi.h b/src/ADAPTGUI/MonCreateBoundaryDi.h index b81ef6a7c..de99a1120 100644 --- a/src/ADAPTGUI/MonCreateBoundaryDi.h +++ b/src/ADAPTGUI/MonCreateBoundaryDi.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include CORBA_CLIENT_HEADER(HOMARD_Boundary) #include "ui_CreateBoundaryDi.h" @@ -39,7 +39,7 @@ class HOMARD_EXPORT MonCreateBoundaryDi : public QDialog, public Ui_CreateBounda public: MonCreateBoundaryDi( MonCreateCase* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString caseName, QString BoundaryName ); ~MonCreateBoundaryDi(); virtual void setGroups (QStringList listGroup); @@ -52,8 +52,8 @@ protected : QString _aCaseName; - HOMARD::HOMARD_Boundary_var aBoundary; - HOMARD::HOMARD_Gen_var myHomardGen; + ADAPT::HOMARD_Boundary_var aBoundary; + ADAPT::ADAPT_Gen_var myHomardGen; QStringList _listeGroupesBoundary; diff --git a/src/ADAPTGUI/MonCreateCase.cxx b/src/ADAPTGUI/MonCreateCase.cxx index fa451efa7..3943d3ed4 100644 --- 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, HOMARD::HOMARD_Gen_var myHomardGen0 ) +MonCreateCase::MonCreateCase( bool modal, ADAPT::ADAPT_Gen_var myHomardGen0 ) : Ui_CreateCase(), _aCaseName(""),_aDirName(""), @@ -55,7 +55,7 @@ MonCreateCase::MonCreateCase( bool modal, HOMARD::HOMARD_Gen_var myHomardGen0 ) _Pyram(0) { MESSAGE("Debut du constructeur de MonCreateCase"); - myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0); + myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0); setupUi(this); setModal(modal); InitConnect(); @@ -132,7 +132,7 @@ void MonCreateCase::InitBoundarys() { MESSAGE("InitBoundarys"); // Pour les frontieres analytiques : la colonne des groupes - HOMARD::ListGroupType_var _listeGroupesCas = aCase->GetGroups(); + ADAPT::ListGroupType_var _listeGroupesCas = aCase->GetGroups(); QTableWidgetItem *__colItem = new QTableWidgetItem(); __colItem->setText(QApplication::translate("CreateCase", "", 0)); TWBoundary->setHorizontalHeaderItem(0, __colItem); @@ -145,8 +145,8 @@ void MonCreateCase::InitBoundarys() // Pour les frontieres CAO : la liste a saisir // Pour les frontieres discretes : la liste a saisir // Pour les frontieres analytiques : les colonnes de chaque frontiere - HOMARD::HOMARD_Boundary_var myBoundary ; - HOMARD::listeBoundarys_var mesBoundarys = myHomardGen->GetAllBoundarysName(); + ADAPT::HOMARD_Boundary_var myBoundary ; + ADAPT::listeBoundarys_var mesBoundarys = myHomardGen->GetAllBoundarysName(); // MESSAGE("Nombre de frontieres enregistrees : "<length()); for (int i=0; ilength(); i++) { @@ -352,7 +352,7 @@ void MonCreateCase::PushOnHelp() void MonCreateCase::SetNewName() // ------------------------------ { - HOMARD::listeCases_var MyCases = myHomardGen->GetAllCasesName(); + ADAPT::listeCases_var MyCases = myHomardGen->GetAllCasesName(); int num = 0; QString aCaseName=""; while (aCaseName=="" ) { @@ -507,7 +507,7 @@ void MonCreateCase::PushBoundaryCAONew() // ------------------------------------------------------------------------ { MonCreateBoundaryCAO *BoundaryDlg = new MonCreateBoundaryCAO(this, true, - HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, "") ; + ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, "") ; BoundaryDlg->show(); } // ------------------------------------------------------------------------ @@ -516,7 +516,7 @@ void MonCreateCase::PushBoundaryCAOEdit() { if (CBBoundaryCAO->currentText() == QString("")) return; MonEditBoundaryCAO *BoundaryDlg = new MonEditBoundaryCAO(this, true, - HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, CBBoundaryCAO->currentText() ) ; + ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, CBBoundaryCAO->currentText() ) ; BoundaryDlg->show(); } // ------------------------------------------------------------------------ @@ -555,7 +555,7 @@ void MonCreateCase::PushBoundaryDiNew() // ------------------------------------------------------------------------ { MonCreateBoundaryDi *BoundaryDlg = new MonCreateBoundaryDi(this, true, - HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, "") ; + ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, "") ; BoundaryDlg->show(); } // ------------------------------------------------------------------------ @@ -564,7 +564,7 @@ void MonCreateCase::PushBoundaryDiEdit() { if (CBBoundaryDi->currentText() == QString("")) return; MonEditBoundaryDi *BoundaryDlg = new MonEditBoundaryDi(this, true, - HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, CBBoundaryDi->currentText() ) ; + ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, CBBoundaryDi->currentText() ) ; BoundaryDlg->show(); } // ------------------------------------------------------------------------ @@ -624,7 +624,7 @@ void MonCreateCase::PushBoundaryAnNew() // ------------------------------------------------------------------------ { MonCreateBoundaryAn *BoundaryDlg = new MonCreateBoundaryAn(this, true, - HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName) ; + ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName) ; BoundaryDlg->show(); } // ------------------------------------------------------------------------ @@ -641,7 +641,7 @@ void MonCreateCase::PushBoundaryAnEdit() MESSAGE("nom "<show(); } } } diff --git a/src/ADAPTGUI/MonCreateCase.h b/src/ADAPTGUI/MonCreateCase.h index ab1a2f4c1..03178ef2e 100644 --- a/src/ADAPTGUI/MonCreateCase.h +++ b/src/ADAPTGUI/MonCreateCase.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include CORBA_CLIENT_HEADER(HOMARD_Cas) #include "ui_CreateCase.h" @@ -37,7 +37,7 @@ class HOMARD_EXPORT MonCreateCase : public QDialog, public Ui_CreateCase Q_OBJECT public: - MonCreateCase( bool modal, HOMARD::HOMARD_Gen_var myHomardGen ); + MonCreateCase( bool modal, ADAPT::ADAPT_Gen_var myHomardGen ); ~MonCreateCase(); void AddBoundaryCAO(QString newBoundary); @@ -53,8 +53,8 @@ protected : int _Pyram; - HOMARD::HOMARD_Cas_var aCase ; - HOMARD::HOMARD_Gen_var myHomardGen; + ADAPT::HOMARD_Cas_var aCase ; + ADAPT::ADAPT_Gen_var myHomardGen; virtual void InitConnect(); virtual void InitBoundarys(); diff --git a/src/ADAPTGUI/MonCreateHypothesis.cxx b/src/ADAPTGUI/MonCreateHypothesis.cxx index 6b03def0e..add1122ee 100644 --- a/src/ADAPTGUI/MonCreateHypothesis.cxx +++ b/src/ADAPTGUI/MonCreateHypothesis.cxx @@ -35,7 +35,7 @@ using namespace std; // ------------------------------------------------------------------------------- MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen0, + ADAPT::ADAPT_Gen_var myHomardGen0, QString Name, QString caseName, QString aFieldFile) // --------------------------------------------------------------------------------- @@ -56,7 +56,7 @@ MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal, { MESSAGE("Constructeur") ; - myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0); + myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0); setupUi(this); if ( modal ) { setWindowModality(Qt::WindowModal); } else { setWindowModality(Qt::NonModal); } @@ -231,7 +231,7 @@ void MonCreateHypothesis::SetNewName() // -------------------------------------------------- { - HOMARD::listeHypotheses_var MyObjects = myHomardGen->GetAllHypothesesName(); + ADAPT::listeHypotheses_var MyObjects = myHomardGen->GetAllHypothesesName(); int num = 0;// QString aName=""; while (aName=="" ) @@ -318,7 +318,7 @@ void MonCreateHypothesis::PushZoneNew() // ------------------------------------------------------------------------ { MESSAGE("Debut de MonCreateHypothesis::PushZoneNew") - MonCreateZone *aDlg = new MonCreateZone(this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName) ; + MonCreateZone *aDlg = new MonCreateZone(this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName) ; aDlg->show(); } @@ -336,7 +336,7 @@ void MonCreateHypothesis::PushZoneEdit() return; } QString zoneName = monItem->text().trimmed(); - MonEditZone *aDlg = new MonEditZone(this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), _aCaseName, zoneName) ; + MonEditZone *aDlg = new MonEditZone(this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, zoneName) ; aDlg->show(); } // ------------------------------------------------------------------------ @@ -357,7 +357,7 @@ void MonCreateHypothesis::GetAllZones() // Par defaut, aucune n'est selectionnee { MESSAGE("Debut de GetAllZones") ; - HOMARD::listeZones_var mesZones = myHomardGen->GetAllZonesName(); + ADAPT::listeZones_var mesZones = myHomardGen->GetAllZonesName(); int nbrow=TWZone->rowCount(); for ( int row=0; row< nbrow; row++) { @@ -711,7 +711,7 @@ void MonCreateHypothesis::SetFiltrage() // ------------------------------------------------------------------------ { if (!CBGroupe->isChecked()) return; - MonCreateListGroup *aDlg = new MonCreateListGroup(this, NULL, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ; + MonCreateListGroup *aDlg = new MonCreateListGroup(this, NULL, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ; aDlg->show(); } @@ -805,7 +805,7 @@ void MonCreateHypothesis::AssocieComposants() void MonCreateHypothesis::AssocieLesGroupes() // ------------------------------------------------------------------------ { - HOMARD::ListGroupType_var aSeqGroupe = new HOMARD::ListGroupType; + ADAPT::ListGroupType_var aSeqGroupe = new ADAPT::ListGroupType; aSeqGroupe->length(_aListeGroupes.size()); QStringList::const_iterator it; int i=0; diff --git a/src/ADAPTGUI/MonCreateHypothesis.h b/src/ADAPTGUI/MonCreateHypothesis.h index 929ee30aa..a760fcfef 100644 --- a/src/ADAPTGUI/MonCreateHypothesis.h +++ b/src/ADAPTGUI/MonCreateHypothesis.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include CORBA_CLIENT_HEADER(HOMARD_Hypothesis) #include "ui_CreateHypothesis.h" @@ -38,7 +38,7 @@ class HOMARD_EXPORT MonCreateHypothesis : public QScrollArea, public Ui_CreateHy Q_OBJECT public: - MonCreateHypothesis( MonCreateIteration* parent, bool modal, HOMARD::HOMARD_Gen_var myHomardGen, + MonCreateHypothesis( MonCreateIteration* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString aHypotheseName, QString caseName, QString aFieldFile); ~MonCreateHypothesis(); @@ -46,7 +46,7 @@ public: virtual void setGroups(QStringList listGroup); protected : - // MonCreateHypothesis( MonCreateIteration* parent, HOMARD::HOMARD_Gen_var myHomardGen, + // MonCreateHypothesis( MonCreateIteration* parent, ADAPT::ADAPT_Gen_var myHomardGen, // QString caseName, QString aFieldFile); MonCreateIteration *_parent; @@ -74,8 +74,8 @@ protected : int _AdapInit; int _ExtraOutput; - HOMARD::HOMARD_Hypothesis_var aHypothesis; - HOMARD::HOMARD_Gen_var myHomardGen; + ADAPT::HOMARD_Hypothesis_var aHypothesis; + ADAPT::ADAPT_Gen_var myHomardGen; QStringList _aListeZone; QStringList _aListeComposant; diff --git a/src/ADAPTGUI/MonCreateIteration.cxx b/src/ADAPTGUI/MonCreateIteration.cxx index 99da0c955..8d4d200d3 100644 --- a/src/ADAPTGUI/MonCreateIteration.cxx +++ b/src/ADAPTGUI/MonCreateIteration.cxx @@ -33,7 +33,7 @@ using namespace std; // ----------------------------------------------------------------------------------------------------- MonCreateIteration::MonCreateIteration(QWidget* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen0, QString IterParentName ): + ADAPT::ADAPT_Gen_var myHomardGen0, QString IterParentName ): // ----------------------------------------------------------------------------------------------------- /* Constructs a MonCreateIteration * Inherits from CasHomard @@ -46,7 +46,7 @@ MonCreateIteration::MonCreateIteration(QWidget* parent, bool modal, _CaseName("") { MESSAGE("Constructeur"); - myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0); + myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0); setupUi(this); if ( modal ) { setWindowModality(Qt::WindowModal); } else { setWindowModality(Qt::NonModal); } @@ -87,7 +87,7 @@ void MonCreateIteration::InitConnect() void MonCreateIteration::GetHypotheses() // ------------------------------------------------------------------------ { - HOMARD::listeHypotheses_var mesHypotheses = myHomardGen->GetAllHypothesesName(); + ADAPT::listeHypotheses_var mesHypotheses = myHomardGen->GetAllHypothesesName(); for (int i=0; ilength(); i++) { CBHypothese->addItem(QString(mesHypotheses[i])); @@ -128,8 +128,8 @@ bool MonCreateIteration::PushOnApply() QObject::tr("HOM_ITER_HYPO") ); return false; } - HOMARD::HOMARD_Hypothesis_var _myHypothesis = myHomardGen->GetHypothesis(monHypoName.toStdString().c_str()); - HOMARD::listeTypes_var ListTypes (_myHypothesis->GetAdapRefinUnRef()); + ADAPT::HOMARD_Hypothesis_var _myHypothesis = myHomardGen->GetHypothesis(monHypoName.toStdString().c_str()); + ADAPT::listeTypes_var ListTypes (_myHypothesis->GetAdapRefinUnRef()); int TypeAdap = ListTypes[0]; if ( TypeAdap == 1 && LEFieldFile->text().trimmed() == QString("") ) { @@ -202,7 +202,7 @@ void MonCreateIteration::SetIterParentName() if (_IterParentName == QString("")) { raise();return;}; } _CaseName=HOMARD_QT_COMMUN::SelectionCasEtude(); - HOMARD::HOMARD_Iteration_var aIterParent = myHomardGen->GetIteration(_IterParentName.toStdString().c_str()) ; + ADAPT::HOMARD_Iteration_var aIterParent = myHomardGen->GetIteration(_IterParentName.toStdString().c_str()) ; QString MeshName = aIterParent->GetMeshName(); LEMeshName_n->setText(MeshName); @@ -217,7 +217,7 @@ void MonCreateIteration::SetNewName() { // Recherche d'un nom par defaut qui n'existe pas encore - HOMARD::listeIterations_var MyObjects=myHomardGen->GetAllIterationsName(); + ADAPT::listeIterations_var MyObjects=myHomardGen->GetAllIterationsName(); int num = 0;// QString aName=""; while (aName=="" ) @@ -249,7 +249,7 @@ void MonCreateIteration::PushHypoEdit() return; } QString aFieldFile=LEFieldFile->text().trimmed(); - MonEditHypothesis *HypoDlg = new MonEditHypothesis(this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),CBHypothese->currentText(), _CaseName, aFieldFile) ; + MonEditHypothesis *HypoDlg = new MonEditHypothesis(this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),CBHypothese->currentText(), _CaseName, aFieldFile) ; HypoDlg->show(); } @@ -273,11 +273,11 @@ void MonCreateIteration::PushHypoNew() } if ( _CaseName == QString("")) { - HOMARD::HOMARD_Iteration_var aIterParent = myHomardGen->GetIteration(_IterParentName.toStdString().c_str()) ; + ADAPT::HOMARD_Iteration_var aIterParent = myHomardGen->GetIteration(_IterParentName.toStdString().c_str()) ; _CaseName = aIterParent->GetCaseName(); } QString aFieldFile=LEFieldFile->text().trimmed(); - MonCreateHypothesis *HypoDlg = new MonCreateHypothesis(this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), QString(""), _CaseName, aFieldFile) ; + MonCreateHypothesis *HypoDlg = new MonCreateHypothesis(this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), QString(""), _CaseName, aFieldFile) ; HypoDlg->show(); } // ------------------------------------------------------------------------ diff --git a/src/ADAPTGUI/MonCreateIteration.h b/src/ADAPTGUI/MonCreateIteration.h index 7567c4866..a10f48d91 100644 --- a/src/ADAPTGUI/MonCreateIteration.h +++ b/src/ADAPTGUI/MonCreateIteration.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include CORBA_CLIENT_HEADER(HOMARD_Cas) #include "ui_CreateIteration.h" @@ -37,24 +37,24 @@ class HOMARD_EXPORT MonCreateIteration : public QScrollArea, public Ui_CreateIte Q_OBJECT public: - MonCreateIteration( QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myHomardGen, QString IterParentName ); + MonCreateIteration( QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString IterParentName ); ~MonCreateIteration(); void addHypothese(QString newHypothese); protected : - MonCreateIteration( QWidget* parent, HOMARD::HOMARD_Gen_var myHomardGen, QString IterParentName ); + MonCreateIteration( QWidget* parent, ADAPT::ADAPT_Gen_var myHomardGen, QString IterParentName ); QString _Name; QString _IterParentName; QString _CaseName; - HOMARD::HOMARD_Iteration_var aIter ; - HOMARD::HOMARD_Iteration_var aIterParent ; - HOMARD::HOMARD_Cas_var aCas ; - HOMARD::HOMARD_Gen_var myHomardGen; + ADAPT::HOMARD_Iteration_var aIter ; + ADAPT::HOMARD_Iteration_var aIterParent ; + ADAPT::HOMARD_Cas_var aCas ; + ADAPT::ADAPT_Gen_var myHomardGen; virtual void InitConnect(); diff --git a/src/ADAPTGUI/MonCreateListGroup.cxx b/src/ADAPTGUI/MonCreateListGroup.cxx index 28f93e315..7664a01fe 100644 --- 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, - HOMARD::HOMARD_Gen_var myHomardGen0, QString aCaseName, QStringList listeGroupesHypo) : + ADAPT::ADAPT_Gen_var myHomardGen0, QString aCaseName, QStringList listeGroupesHypo) : // -------------------------------------------------------------------------------------------------------------- // QDialog(0), Ui_CreateListGroup(), @@ -48,7 +48,7 @@ MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreate _parentBound(parentBound) { MESSAGE("Debut de MonCreateListGroup") - myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0); + myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0); setupUi(this); setModal(modal); InitConnect(); @@ -56,7 +56,7 @@ MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreate } // -------------------------------------------------------------------------------------------------------------- MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, - HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo) : + ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo) : // -------------------------------------------------------------------------------------------------------------- // QDialog(0), Ui_CreateListGroup(), @@ -65,7 +65,7 @@ MonCreateListGroup::MonCreateListGroup(MonCreateHypothesis* parentHyp, MonCreate _parentHyp(parentHyp), _parentBound(parentBound) { - myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen); + myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen); setupUi(this); InitConnect(); } @@ -130,8 +130,8 @@ void MonCreateListGroup::InitGroupes() TWGroupe->removeRow(row); TWGroupe->setRowCount(0); if (_aCaseName == QString("")) { return; }; - HOMARD::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str()); - HOMARD::ListGroupType_var _listeGroupesCas = monCas->GetGroups(); + ADAPT::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str()); + ADAPT::ListGroupType_var _listeGroupesCas = monCas->GetGroups(); for ( int i = 0; i < _listeGroupesCas->length(); i++ ) { TWGroupe->insertRow(i); diff --git a/src/ADAPTGUI/MonCreateListGroup.h b/src/ADAPTGUI/MonCreateListGroup.h index b0472d3b9..4aa8a159e 100644 --- a/src/ADAPTGUI/MonCreateListGroup.h +++ b/src/ADAPTGUI/MonCreateListGroup.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include "ui_CreateListGroup.h" #include @@ -38,13 +38,13 @@ class HOMARD_EXPORT MonCreateListGroup : public QDialog, public Ui_CreateListGro Q_OBJECT public: - MonCreateListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo); - MonCreateListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo); + MonCreateListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo); + MonCreateListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo); virtual ~MonCreateListGroup(); protected : - HOMARD::HOMARD_Gen_var myHomardGen; + ADAPT::ADAPT_Gen_var myHomardGen; MonCreateHypothesis * _parentHyp; MonCreateBoundaryDi * _parentBound; diff --git a/src/ADAPTGUI/MonCreateListGroupCAO.cxx b/src/ADAPTGUI/MonCreateListGroupCAO.cxx index 796f2502d..a630d4558 100644 --- 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, - HOMARD::HOMARD_Gen_var myHomardGen0, QString aCaseName, QStringList listeGroupesHypo) : + ADAPT::ADAPT_Gen_var myHomardGen0, QString aCaseName, QStringList listeGroupesHypo) : // -------------------------------------------------------------------------------------------------------------- // QDialog(0), Ui_CreateListGroup(), @@ -48,7 +48,7 @@ MonCreateListGroupCAO::MonCreateListGroupCAO(MonCreateHypothesis* parentHyp, Mon _parentBound(parentBound) { MESSAGE("Debut de MonCreateListGroupCAO") - myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0); + myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0); setupUi(this); setModal(modal); InitConnect(); @@ -56,7 +56,7 @@ MonCreateListGroupCAO::MonCreateListGroupCAO(MonCreateHypothesis* parentHyp, Mon } // -------------------------------------------------------------------------------------------------------------- MonCreateListGroupCAO::MonCreateListGroupCAO(MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, - HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo) : + ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo) : // -------------------------------------------------------------------------------------------------------------- // QDialog(0), Ui_CreateListGroup(), @@ -65,7 +65,7 @@ MonCreateListGroupCAO::MonCreateListGroupCAO(MonCreateHypothesis* parentHyp, Mon _parentHyp(parentHyp), _parentBound(parentBound) { - myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen); + myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen); setupUi(this); InitConnect(); } @@ -127,8 +127,8 @@ void MonCreateListGroupCAO::InitGroupes() TWGroupe->removeRow(row); TWGroupe->setRowCount(0); if (_aCaseName == QString("")) { return; }; - HOMARD::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str()); - HOMARD::ListGroupType_var _listeGroupesCas = monCas->GetGroups(); + ADAPT::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str()); + ADAPT::ListGroupType_var _listeGroupesCas = monCas->GetGroups(); for ( int i = 0; i < _listeGroupesCas->length(); i++ ) { TWGroupe->insertRow(i); diff --git a/src/ADAPTGUI/MonCreateListGroupCAO.h b/src/ADAPTGUI/MonCreateListGroupCAO.h index 898389b83..8917c4136 100644 --- a/src/ADAPTGUI/MonCreateListGroupCAO.h +++ b/src/ADAPTGUI/MonCreateListGroupCAO.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include "ui_CreateListGroup.h" #include @@ -38,13 +38,13 @@ class HOMARD_EXPORT MonCreateListGroupCAO : public QDialog, public Ui_CreateList Q_OBJECT public: - MonCreateListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal, HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo); - MonCreateListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo); + MonCreateListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo); + MonCreateListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo); virtual ~MonCreateListGroupCAO(); protected : - HOMARD::HOMARD_Gen_var myHomardGen; + ADAPT::ADAPT_Gen_var myHomardGen; MonCreateHypothesis * _parentHyp; MonCreateBoundaryCAO * _parentBound; diff --git a/src/ADAPTGUI/MonCreateYACS.cxx b/src/ADAPTGUI/MonCreateYACS.cxx index 4d1002798..9572db73a 100644 --- a/src/ADAPTGUI/MonCreateYACS.cxx +++ b/src/ADAPTGUI/MonCreateYACS.cxx @@ -34,7 +34,7 @@ using namespace std; // ---------------------------------------------------------------------- -MonCreateYACS::MonCreateYACS (bool modal, HOMARD::HOMARD_Gen_var myHomardGen0, QString CaseName ): +MonCreateYACS::MonCreateYACS (bool modal, ADAPT::ADAPT_Gen_var myHomardGen0, QString CaseName ): // ---------------------------------------------------------------------- /* Constructs a MonCreateYACS * Sets attributes to default values @@ -46,11 +46,11 @@ MonCreateYACS::MonCreateYACS (bool modal, HOMARD::HOMARD_Gen_var myHomardGen0, Q _aDirName(""), _aMeshFile(""), _Type(1) - // Les valeurs de _Type, _MaxIter, _MaxNode, _MaxElem doivent etre les memes que celles dans HOMARD_Gen_i::CreateYACSSchema + // Les valeurs de _Type, _MaxIter, _MaxNode, _MaxElem doivent etre les memes que celles dans ADAPT_Gen_i::CreateYACSSchema // et doivent correspondre aux defauts des boutons { // MESSAGE("Debut du constructeur de MonCreateYACS"); - myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0); + myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0); setupUi(this); if ( modal ) { setWindowModality(Qt::WindowModal); } else { setWindowModality(Qt::NonModal); } @@ -75,7 +75,7 @@ MonCreateYACS::MonCreateYACS (bool modal, HOMARD::HOMARD_Gen_var myHomardGen0, Q } // ---------------------------------------------------------------------- -MonCreateYACS::MonCreateYACS(HOMARD::HOMARD_Gen_var myHomardGen0, +MonCreateYACS::MonCreateYACS(ADAPT::ADAPT_Gen_var myHomardGen0, QString caseName): // ---------------------------------------------------------------------- // Constructeur appele par MonEditYACS @@ -273,7 +273,7 @@ void MonCreateYACS::SetNewName() // -------------------------------------------------- { - HOMARD::listeYACSs_var MyObjects = myHomardGen->GetAllYACSsName(); + ADAPT::listeYACSs_var MyObjects = myHomardGen->GetAllYACSsName(); int num = 0; QString aName=""; while (aName == QString("") ) { diff --git a/src/ADAPTGUI/MonCreateYACS.h b/src/ADAPTGUI/MonCreateYACS.h index a0c5ba0f7..f932b704e 100644 --- a/src/ADAPTGUI/MonCreateYACS.h +++ b/src/ADAPTGUI/MonCreateYACS.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include CORBA_CLIENT_HEADER(HOMARD_Cas) #include "ui_CreateYACS.h" @@ -37,11 +37,11 @@ class HOMARD_EXPORT MonCreateYACS : public QScrollArea, public Ui_CreateYACS Q_OBJECT public: - MonCreateYACS( bool modal, HOMARD::HOMARD_Gen_var myHomardGen, QString CaseName); + MonCreateYACS( bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString CaseName); virtual ~MonCreateYACS(); protected : - MonCreateYACS( HOMARD::HOMARD_Gen_var myHomardGen, QString CaseName); + MonCreateYACS( ADAPT::ADAPT_Gen_var myHomardGen, QString CaseName); QString _Name; QString _aCaseName; @@ -56,8 +56,8 @@ class HOMARD_EXPORT MonCreateYACS : public QScrollArea, public Ui_CreateYACS bool Chgt; - HOMARD::HOMARD_YACS_var aYACS; - HOMARD::HOMARD_Gen_var myHomardGen; + ADAPT::HOMARD_YACS_var aYACS; + ADAPT::ADAPT_Gen_var myHomardGen; virtual void InitConnect(); virtual bool CreateOrUpdate(); diff --git a/src/ADAPTGUI/MonCreateZone.cxx b/src/ADAPTGUI/MonCreateZone.cxx index 1adb91653..b07d87e0b 100644 --- a/src/ADAPTGUI/MonCreateZone.cxx +++ b/src/ADAPTGUI/MonCreateZone.cxx @@ -38,7 +38,7 @@ using namespace std; // ---------------------------------------------------------------------- MonCreateZone::MonCreateZone(MonCreateHypothesis* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen0, + ADAPT::ADAPT_Gen_var myHomardGen0, QString caseName) : // ---------------------------------------------------------------------- /* Constructs a MonCreateZone @@ -61,7 +61,7 @@ MonCreateZone::MonCreateZone(MonCreateHypothesis* parent, bool modal, Chgt (false) { MESSAGE("Constructeur") ; - myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0) ; + myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0) ; setupUi(this) ; setModal(modal) ; InitConnect( ) ; @@ -74,7 +74,7 @@ MonCreateZone::MonCreateZone(MonCreateHypothesis* parent, bool modal, } // ---------------------------------------------------------------------- MonCreateZone::MonCreateZone(MonCreateHypothesis* parent, - HOMARD::HOMARD_Gen_var myHomardGen0, + ADAPT::ADAPT_Gen_var myHomardGen0, QString caseName): // ---------------------------------------------------------------------- // Constructeur appele par MonEditZone @@ -131,8 +131,8 @@ void MonCreateZone::InitValZone() // if (_aCaseName == QString("")) { return; } - HOMARD::HOMARD_Cas_var aCas = myHomardGen->GetCase(_aCaseName.toStdString().c_str()) ; - HOMARD::extrema_var MesExtremes = aCas->GetBoundingBox() ; + ADAPT::HOMARD_Cas_var aCas = myHomardGen->GetCase(_aCaseName.toStdString().c_str()) ; + ADAPT::extrema_var MesExtremes = aCas->GetBoundingBox() ; int num = MesExtremes->length() ; ASSERT(num == 10) ; _Xmin=MesExtremes[0]; _Xmax=MesExtremes[1]; _Xincr=MesExtremes[2]; @@ -600,7 +600,7 @@ void MonCreateZone::SetNewName() MESSAGE("SetNewName"); // Recherche d'un nom par defaut qui n'existe pas encore - HOMARD::listeZones_var MyObjects = myHomardGen->GetAllZonesName() ; + ADAPT::listeZones_var MyObjects = myHomardGen->GetAllZonesName() ; int num = 0; QString aName=""; while (aName=="" ) { diff --git a/src/ADAPTGUI/MonCreateZone.h b/src/ADAPTGUI/MonCreateZone.h index 932e9965f..099c063e3 100644 --- a/src/ADAPTGUI/MonCreateZone.h +++ b/src/ADAPTGUI/MonCreateZone.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include "ui_CreateZone.h" #include @@ -38,13 +38,13 @@ class HOMARD_EXPORT MonCreateZone : public QDialog, public Ui_CreateZone public: MonCreateZone( MonCreateHypothesis* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString caseName); virtual ~MonCreateZone(); protected : MonCreateZone( MonCreateHypothesis* parent, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString caseName); MonCreateHypothesis * _parent; @@ -64,8 +64,8 @@ protected : bool Chgt; - HOMARD::HOMARD_Zone_var aZone ; - HOMARD::HOMARD_Gen_var myHomardGen; + ADAPT::HOMARD_Zone_var aZone ; + ADAPT::ADAPT_Gen_var myHomardGen; virtual void InitConnect(); virtual void InitValZone(); diff --git a/src/ADAPTGUI/MonEditBoundaryAn.cxx b/src/ADAPTGUI/MonEditBoundaryAn.cxx index 6f7889d94..bb9a8c340 100644 --- a/src/ADAPTGUI/MonEditBoundaryAn.cxx +++ b/src/ADAPTGUI/MonEditBoundaryAn.cxx @@ -27,7 +27,7 @@ using namespace std; // ------------------------------------------------------------------------ MonEditBoundaryAn::MonEditBoundaryAn( MonCreateCase* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString caseName, QString Name ): // ------------------------------------------------------------------------ /* Constructs a MonEditBoundaryAn @@ -95,7 +95,7 @@ void MonEditBoundaryAn::InitValEdit() void MonEditBoundaryAn::InitValBoundaryAnLimit() // ------------------------------------------------------------------------ { - HOMARD::double_array_var mesCoordLimits = aBoundaryAn->GetLimit(); + ADAPT::double_array_var mesCoordLimits = aBoundaryAn->GetLimit(); ASSERT(mesCoordLimits->length() == 3 ); _Xincr=mesCoordLimits[0]; _Yincr=mesCoordLimits[1]; @@ -105,7 +105,7 @@ void MonEditBoundaryAn::InitValBoundaryAnLimit() void MonEditBoundaryAn::InitValBoundaryAnCylindre() // ------------------------------------------------------------------------ { - HOMARD::double_array_var mesCoordBoundary = aBoundaryAn->GetCoords(); + ADAPT::double_array_var mesCoordBoundary = aBoundaryAn->GetCoords(); ASSERT(mesCoordBoundary->length() == 7 ); _BoundaryAnXcentre=mesCoordBoundary[0]; _BoundaryAnYcentre=mesCoordBoundary[1]; @@ -119,7 +119,7 @@ void MonEditBoundaryAn::InitValBoundaryAnCylindre() void MonEditBoundaryAn::InitValBoundaryAnSphere() // ------------------------------------------------------------------------ { - HOMARD::double_array_var mesCoordBoundary = aBoundaryAn->GetCoords(); + ADAPT::double_array_var mesCoordBoundary = aBoundaryAn->GetCoords(); ASSERT(mesCoordBoundary->length() == 4 ); _BoundaryAnXcentre=mesCoordBoundary[0]; _BoundaryAnYcentre=mesCoordBoundary[1]; @@ -130,7 +130,7 @@ void MonEditBoundaryAn::InitValBoundaryAnSphere() void MonEditBoundaryAn::InitValBoundaryAnConeA() // ------------------------------------------------------------------------ { - HOMARD::double_array_var mesCoordBoundary = aBoundaryAn->GetCoords(); + ADAPT::double_array_var mesCoordBoundary = aBoundaryAn->GetCoords(); ASSERT(mesCoordBoundary->length() == 7 ); _BoundaryAnXaxisCone=mesCoordBoundary[0]; _BoundaryAnYaxisCone=mesCoordBoundary[1]; @@ -145,7 +145,7 @@ void MonEditBoundaryAn::InitValBoundaryAnConeA() void MonEditBoundaryAn::InitValBoundaryAnConeR() // ------------------------------------------------------------------------ { - HOMARD::double_array_var mesCoordBoundary = aBoundaryAn->GetCoords(); + ADAPT::double_array_var mesCoordBoundary = aBoundaryAn->GetCoords(); ASSERT(mesCoordBoundary->length() == 8 ); _BoundaryAnXcone1=mesCoordBoundary[0]; _BoundaryAnYcone1=mesCoordBoundary[1]; @@ -161,7 +161,7 @@ void MonEditBoundaryAn::InitValBoundaryAnConeR() void MonEditBoundaryAn::InitValBoundaryAnTore() // ------------------------------------------------------------------------ { - HOMARD::double_array_var mesCoordBoundary = aBoundaryAn->GetCoords(); + ADAPT::double_array_var mesCoordBoundary = aBoundaryAn->GetCoords(); ASSERT(mesCoordBoundary->length() == 8 ); _BoundaryAnXcentre=mesCoordBoundary[0]; _BoundaryAnYcentre=mesCoordBoundary[1]; diff --git a/src/ADAPTGUI/MonEditBoundaryAn.h b/src/ADAPTGUI/MonEditBoundaryAn.h index ea98981e3..f43764b8e 100644 --- a/src/ADAPTGUI/MonEditBoundaryAn.h +++ b/src/ADAPTGUI/MonEditBoundaryAn.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include @@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditBoundaryAn : public MonCreateBoundaryAn Q_OBJECT public: MonEditBoundaryAn( MonCreateCase* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString caseName, QString Name); virtual ~MonEditBoundaryAn(); diff --git a/src/ADAPTGUI/MonEditBoundaryCAO.cxx b/src/ADAPTGUI/MonEditBoundaryCAO.cxx index 36e3714ed..e9ab43a93 100644 --- a/src/ADAPTGUI/MonEditBoundaryCAO.cxx +++ b/src/ADAPTGUI/MonEditBoundaryCAO.cxx @@ -31,7 +31,7 @@ using namespace std; // ------------------------------------------------------------------------------------------------------------------------------------- MonEditBoundaryCAO::MonEditBoundaryCAO( MonCreateCase* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString caseName, QString Name): // ------------------------------------------------------------------------------------------------------------------------------------- /* Constructs a MonEditBoundaryCAO @@ -54,7 +54,7 @@ MonEditBoundaryCAO::MonEditBoundaryCAO( MonCreateCase* parent, bool modal, return; } - HOMARD::ListGroupType_var maListe = aBoundary->GetGroups(); + ADAPT::ListGroupType_var maListe = aBoundary->GetGroups(); for ( int i = 0; i < maListe->length(); i++ ) _listeGroupesBoundary << QString(maListe[i]); @@ -95,10 +95,10 @@ void MonEditBoundaryCAO::SetFiltrage() QObject::tr("HOM_BOUN_CASE") ); return; } - HOMARD::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str()); - HOMARD::ListGroupType_var _listeGroupesCas = monCas->GetGroups(); + ADAPT::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str()); + ADAPT::ListGroupType_var _listeGroupesCas = monCas->GetGroups(); - MonEditListGroupCAO *aDlg = new MonEditListGroupCAO(NULL, this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), + MonEditListGroupCAO *aDlg = new MonEditListGroupCAO(NULL, this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, _listeGroupesBoundary) ; aDlg->show(); } diff --git a/src/ADAPTGUI/MonEditBoundaryCAO.h b/src/ADAPTGUI/MonEditBoundaryCAO.h index 01ac507b8..d8131825d 100644 --- a/src/ADAPTGUI/MonEditBoundaryCAO.h +++ b/src/ADAPTGUI/MonEditBoundaryCAO.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include @@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditBoundaryCAO : public MonCreateBoundaryCAO Q_OBJECT public: MonEditBoundaryCAO( MonCreateCase* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString caseName, QString Name ); virtual ~MonEditBoundaryCAO(); diff --git a/src/ADAPTGUI/MonEditBoundaryDi.cxx b/src/ADAPTGUI/MonEditBoundaryDi.cxx index d891732c0..fa92cc174 100644 --- a/src/ADAPTGUI/MonEditBoundaryDi.cxx +++ b/src/ADAPTGUI/MonEditBoundaryDi.cxx @@ -31,7 +31,7 @@ using namespace std; // ------------------------------------------------------------------------------------------------------------------------------------- MonEditBoundaryDi::MonEditBoundaryDi( MonCreateCase* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString caseName, QString Name): // ------------------------------------------------------------------------------------------------------------------------------------- /* Constructs a MonEditBoundaryDi @@ -54,7 +54,7 @@ MonEditBoundaryDi::MonEditBoundaryDi( MonCreateCase* parent, bool modal, return; } - HOMARD::ListGroupType_var maListe = aBoundary->GetGroups(); + ADAPT::ListGroupType_var maListe = aBoundary->GetGroups(); for ( int i = 0; i < maListe->length(); i++ ) _listeGroupesBoundary << QString(maListe[i]); @@ -95,10 +95,10 @@ void MonEditBoundaryDi::SetFiltrage() QObject::tr("HOM_BOUN_CASE") ); return; } - HOMARD::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str()); - HOMARD::ListGroupType_var _listeGroupesCas = monCas->GetGroups(); + ADAPT::HOMARD_Cas_var monCas= myHomardGen->GetCase(_aCaseName.toStdString().c_str()); + ADAPT::ListGroupType_var _listeGroupesCas = monCas->GetGroups(); - MonEditListGroup *aDlg = new MonEditListGroup(NULL, this, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), + MonEditListGroup *aDlg = new MonEditListGroup(NULL, this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, _listeGroupesBoundary) ; aDlg->show(); } diff --git a/src/ADAPTGUI/MonEditBoundaryDi.h b/src/ADAPTGUI/MonEditBoundaryDi.h index 123b12340..97cdc7fe4 100644 --- a/src/ADAPTGUI/MonEditBoundaryDi.h +++ b/src/ADAPTGUI/MonEditBoundaryDi.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include @@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditBoundaryDi : public MonCreateBoundaryDi Q_OBJECT public: MonEditBoundaryDi( MonCreateCase* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString caseName, QString Name ); virtual ~MonEditBoundaryDi(); diff --git a/src/ADAPTGUI/MonEditCase.cxx b/src/ADAPTGUI/MonEditCase.cxx index d6304c54c..4ed612213 100644 --- a/src/ADAPTGUI/MonEditCase.cxx +++ b/src/ADAPTGUI/MonEditCase.cxx @@ -32,7 +32,7 @@ using namespace std; */ // ------------------------------------------------------------- MonEditCase::MonEditCase ( bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString CaseName ): MonCreateCase(modal, myHomardGen) { @@ -61,7 +61,7 @@ void MonEditCase::InitValEdit() PushDir->setVisible(0); QString _aitername=aCase->GetIter0Name(); - HOMARD::HOMARD_Iteration_var aIter = myHomardGen->GetIteration(_aitername.toStdString().c_str()); + ADAPT::HOMARD_Iteration_var aIter = myHomardGen->GetIteration(_aitername.toStdString().c_str()); QString aFileName = aIter->GetMeshFile(); LEFileName->setText(aFileName); LEFileName->setReadOnly(true); @@ -84,7 +84,7 @@ void MonEditCase::InitValEdit() GBBoundaryD->setVisible(0); GBBoundaryA->setVisible(0); // On passe en revue tous les couples (frontiere,groupe) du cas - HOMARD::ListBoundaryGroupType_var mesBoundarys = aCase->GetBoundaryGroup(); + ADAPT::ListBoundaryGroupType_var mesBoundarys = aCase->GetBoundaryGroup(); if (mesBoundarys->length()>0) { QStringList ListeFron ; @@ -98,7 +98,7 @@ void MonEditCase::InitValEdit() NomFron = mesBoundarys[i++]; MESSAGE("NomFron "<GetBoundary(NomFron.toStdString().c_str()); + ADAPT::HOMARD_Boundary_var myBoundary = myHomardGen->GetBoundary(NomFron.toStdString().c_str()); int type_obj = myBoundary->GetType() ; MESSAGE("type_obj "< #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include @@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditCase : public MonCreateCase Q_OBJECT public: MonEditCase( bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString Name ); virtual ~MonEditCase(); diff --git a/src/ADAPTGUI/MonEditFile.cxx b/src/ADAPTGUI/MonEditFile.cxx index 773b9f394..b1ee709ee 100644 --- a/src/ADAPTGUI/MonEditFile.cxx +++ b/src/ADAPTGUI/MonEditFile.cxx @@ -43,7 +43,7 @@ using namespace std; * --------------------------------------------------------- */ MonEditFile::MonEditFile( QWidget* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString aFileName, int option): // QWidget(0), Ui_EditFile(), diff --git a/src/ADAPTGUI/MonEditFile.h b/src/ADAPTGUI/MonEditFile.h index 62687b8be..cf34d7f2e 100644 --- a/src/ADAPTGUI/MonEditFile.h +++ b/src/ADAPTGUI/MonEditFile.h @@ -27,7 +27,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include CORBA_CLIENT_HEADER(HOMARD_Cas) #include "ui_EditFile.h" @@ -42,14 +42,14 @@ class HOMARD_EXPORT MonEditFile : public QWidget, public Ui_EditFile public: MonEditFile( QWidget* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString FileName, int option ); ~MonEditFile(); int _codret ; protected : - HOMARD::HOMARD_Gen_var myHomardGen; + ADAPT::ADAPT_Gen_var myHomardGen; QString _aFileName ; int _option ; diff --git a/src/ADAPTGUI/MonEditHypothesis.cxx b/src/ADAPTGUI/MonEditHypothesis.cxx index d7dd550c7..35fd32103 100644 --- a/src/ADAPTGUI/MonEditHypothesis.cxx +++ b/src/ADAPTGUI/MonEditHypothesis.cxx @@ -30,7 +30,7 @@ using namespace std; // ---------------------------------------------------------------------------- MonEditHypothesis::MonEditHypothesis( MonCreateIteration* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString Name, QString caseName, QString aFieldFile ): // ---------------------------------------------------------------------------- @@ -55,7 +55,7 @@ MonEditHypothesis::~MonEditHypothesis() void MonEditHypothesis::InitGroupes() // ------------------------------ { - HOMARD::ListGroupType_var maListe = aHypothesis->GetGroups(); + ADAPT::ListGroupType_var maListe = aHypothesis->GetGroups(); for ( int i = 0; i < maListe->length(); i++ ) _aListeGroupes << QString(maListe[i]); @@ -69,7 +69,7 @@ void MonEditHypothesis::InitValEdit() MESSAGE("Debut de InitValEdit"); LEName->setText(_Name); LEName->setReadOnly(true); - HOMARD::listeTypes_var ListTypes (aHypothesis->GetAdapRefinUnRef()); + ADAPT::listeTypes_var ListTypes (aHypothesis->GetAdapRefinUnRef()); ASSERT( ListTypes->length()==3) ; _aTypeAdap = ListTypes[0]; _aTypeRaff = ListTypes[1]; @@ -214,7 +214,7 @@ void MonEditHypothesis::InitAdaptZone() // Recuperation de toutes les zones decrites et notation de celles retenues GetAllZones(); - HOMARD::listeZonesHypo_var mesZonesAvant = aHypothesis->GetZones(); + ADAPT::listeZonesHypo_var mesZonesAvant = aHypothesis->GetZones(); for (int i=0; ilength(); i++) { MESSAGE ("i"<setEnabled(false); RBZone->setEnabled(false); - HOMARD::InfosHypo_var aInfosHypo = aHypothesis->GetField(); + ADAPT::InfosHypo_var aInfosHypo = aHypothesis->GetField(); _aFieldName = aInfosHypo->FieldName; _TypeThR = aInfosHypo->TypeThR; _ThreshR = aInfosHypo->ThreshR; @@ -284,7 +284,7 @@ void MonEditHypothesis::InitAdaptChamps() CBFieldName->setEnabled(false); //SetFieldName(Qt::Unchecked); - HOMARD::listeComposantsHypo_var mesComposantsAvant = aHypothesis->GetComps(); + ADAPT::listeComposantsHypo_var mesComposantsAvant = aHypothesis->GetComps(); TWCMP->clear(); TWCMP->setRowCount(0); TWCMP->resizeRowsToContents(); @@ -397,7 +397,7 @@ void MonEditHypothesis::InitFieldInterp() RBFieldChosen->setChecked(true); // TWField->setVisible(1); - HOMARD::listeFieldInterpsHypo_var mesChampsAvant = aHypothesis->GetFieldInterps(); + ADAPT::listeFieldInterpsHypo_var mesChampsAvant = aHypothesis->GetFieldInterps(); TWField->clear(); TWField->setRowCount(0); TWField->resizeRowsToContents(); @@ -456,7 +456,7 @@ void MonEditHypothesis::SetFiltrage() { if (CBGroupe->isChecked()) { - MonEditListGroup *aDlg = new MonEditListGroup(this, NULL, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ; + MonEditListGroup *aDlg = new MonEditListGroup(this, NULL, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ; aDlg->show(); } } diff --git a/src/ADAPTGUI/MonEditHypothesis.h b/src/ADAPTGUI/MonEditHypothesis.h index 051365b01..7bf402e9a 100644 --- a/src/ADAPTGUI/MonEditHypothesis.h +++ b/src/ADAPTGUI/MonEditHypothesis.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include @@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditHypothesis : public MonCreateHypothesis Q_OBJECT public: MonEditHypothesis( MonCreateIteration* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString caseName, QString Name, QString aFieldFile ); virtual ~MonEditHypothesis(); diff --git a/src/ADAPTGUI/MonEditIteration.cxx b/src/ADAPTGUI/MonEditIteration.cxx index e158f27cf..2a5203af5 100644 --- a/src/ADAPTGUI/MonEditIteration.cxx +++ b/src/ADAPTGUI/MonEditIteration.cxx @@ -28,7 +28,7 @@ using namespace std; // ------------------------------------------------------------------------------------------------------------------------------------- MonEditIteration::MonEditIteration ( QWidget* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString IterParentName, QString IterName ): // ------------------------------------------------------------------------------------------------------------------------------------- /* Constructs a MonEditIteration @@ -118,7 +118,7 @@ void MonEditIteration::InitValEdit() PBHypoNew->setVisible(0); // Pour une adaptation selon un champ - HOMARD::HOMARD_Hypothesis_var myHypo = myHomardGen->GetHypothesis(HypoName.toStdString().c_str()) ; + ADAPT::HOMARD_Hypothesis_var myHypo = myHomardGen->GetHypothesis(HypoName.toStdString().c_str()) ; _aTypeAdap = myHypo->GetAdapType() ; if ( _aTypeAdap == 1 ) { diff --git a/src/ADAPTGUI/MonEditIteration.h b/src/ADAPTGUI/MonEditIteration.h index 0107d4b26..3fa4084b7 100644 --- a/src/ADAPTGUI/MonEditIteration.h +++ b/src/ADAPTGUI/MonEditIteration.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include @@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditIteration : public MonCreateIteration Q_OBJECT public: MonEditIteration( QWidget* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString IterParentName, QString Name ); virtual ~MonEditIteration(); diff --git a/src/ADAPTGUI/MonEditListGroup.cxx b/src/ADAPTGUI/MonEditListGroup.cxx index d8a68150a..19f096138 100644 --- a/src/ADAPTGUI/MonEditListGroup.cxx +++ b/src/ADAPTGUI/MonEditListGroup.cxx @@ -25,7 +25,7 @@ using namespace std; MonEditListGroup::MonEditListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo): //--------------------------------------------------------------------- diff --git a/src/ADAPTGUI/MonEditListGroup.h b/src/ADAPTGUI/MonEditListGroup.h index 8ea41c935..d789abf48 100644 --- a/src/ADAPTGUI/MonEditListGroup.h +++ b/src/ADAPTGUI/MonEditListGroup.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include @@ -37,7 +37,7 @@ class HOMARD_EXPORT MonEditListGroup : public MonCreateListGroup Q_OBJECT public: - MonEditListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo); + MonEditListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo); virtual ~MonEditListGroup(); protected : diff --git a/src/ADAPTGUI/MonEditListGroupCAO.cxx b/src/ADAPTGUI/MonEditListGroupCAO.cxx index 5c942fd5a..18a0d3f52 100644 --- a/src/ADAPTGUI/MonEditListGroupCAO.cxx +++ b/src/ADAPTGUI/MonEditListGroupCAO.cxx @@ -25,7 +25,7 @@ using namespace std; MonEditListGroupCAO::MonEditListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo): //--------------------------------------------------------------------- diff --git a/src/ADAPTGUI/MonEditListGroupCAO.h b/src/ADAPTGUI/MonEditListGroupCAO.h index 4f6ada6db..90dfb1967 100644 --- a/src/ADAPTGUI/MonEditListGroupCAO.h +++ b/src/ADAPTGUI/MonEditListGroupCAO.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include @@ -37,7 +37,7 @@ class HOMARD_EXPORT MonEditListGroupCAO : public MonCreateListGroupCAO Q_OBJECT public: - MonEditListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal, HOMARD::HOMARD_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo); + MonEditListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo); virtual ~MonEditListGroupCAO(); protected : diff --git a/src/ADAPTGUI/MonEditYACS.cxx b/src/ADAPTGUI/MonEditYACS.cxx index 0c41e5b56..51fff9cb3 100644 --- a/src/ADAPTGUI/MonEditYACS.cxx +++ b/src/ADAPTGUI/MonEditYACS.cxx @@ -32,7 +32,7 @@ using namespace std; */ // ------------------------------------------------------------- MonEditYACS::MonEditYACS ( bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString Name ): MonCreateYACS(myHomardGen, Name) { diff --git a/src/ADAPTGUI/MonEditYACS.h b/src/ADAPTGUI/MonEditYACS.h index 11fe76d01..f8d3a48d5 100644 --- a/src/ADAPTGUI/MonEditYACS.h +++ b/src/ADAPTGUI/MonEditYACS.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include @@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditYACS : public MonCreateYACS Q_OBJECT public: MonEditYACS( bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString Name ); virtual ~MonEditYACS(); diff --git a/src/ADAPTGUI/MonEditZone.cxx b/src/ADAPTGUI/MonEditZone.cxx index acab891eb..3bb2c98da 100644 --- a/src/ADAPTGUI/MonEditZone.cxx +++ b/src/ADAPTGUI/MonEditZone.cxx @@ -32,7 +32,7 @@ using namespace std; // ------------------------------------------------------------------------ MonEditZone::MonEditZone( MonCreateHypothesis* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString caseName, QString Name ): // ------------------------------------------------------------------------ /* Constructs a MonEditZone @@ -113,7 +113,7 @@ void MonEditZone::InitValEdit() void MonEditZone::InitValZoneLimit() // ------------------------------------------------------------------------ { - HOMARD::double_array_var mesCoordLimits = aZone->GetLimit(); + ADAPT::double_array_var mesCoordLimits = aZone->GetLimit(); ASSERT(mesCoordLimits->length() == 3 ); _Xincr=mesCoordLimits[0]; _Yincr=mesCoordLimits[1]; @@ -123,7 +123,7 @@ void MonEditZone::InitValZoneLimit() void MonEditZone::InitValZoneBox() // ------------------------------------------------------------------------ { - HOMARD::double_array_var mesCoordZones = aZone->GetCoords(); + ADAPT::double_array_var mesCoordZones = aZone->GetCoords(); ASSERT(mesCoordZones->length() == 6 ); _ZoneXmin=mesCoordZones[0]; _ZoneXmax=mesCoordZones[1]; @@ -136,7 +136,7 @@ void MonEditZone::InitValZoneBox() void MonEditZone::InitValZoneSphere() // ------------------------------------------------------------------------ { - HOMARD::double_array_var mesCoordZones = aZone->GetCoords(); + ADAPT::double_array_var mesCoordZones = aZone->GetCoords(); ASSERT(mesCoordZones->length() == 4 ); _ZoneXcentre=mesCoordZones[0]; _ZoneYcentre=mesCoordZones[1]; @@ -148,7 +148,7 @@ void MonEditZone::InitValZoneSphere() void MonEditZone::InitValZoneCylinder() // ------------------------------------------------------------------------ { - HOMARD::double_array_var mesCoordZones = aZone->GetCoords(); + ADAPT::double_array_var mesCoordZones = aZone->GetCoords(); ASSERT(mesCoordZones->length() == 8 ); _ZoneXcentre=mesCoordZones[0]; _ZoneYcentre=mesCoordZones[1]; @@ -163,7 +163,7 @@ void MonEditZone::InitValZoneCylinder() void MonEditZone::InitValZonePipe() // ------------------------------------------------------------------------ { - HOMARD::double_array_var mesCoordZones = aZone->GetCoords(); + ADAPT::double_array_var mesCoordZones = aZone->GetCoords(); ASSERT(mesCoordZones->length() == 9 ); _ZoneXcentre=mesCoordZones[0]; _ZoneYcentre=mesCoordZones[1]; diff --git a/src/ADAPTGUI/MonEditZone.h b/src/ADAPTGUI/MonEditZone.h index 6570d263e..726a1d933 100644 --- a/src/ADAPTGUI/MonEditZone.h +++ b/src/ADAPTGUI/MonEditZone.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include @@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditZone : public MonCreateZone Q_OBJECT public: MonEditZone( MonCreateHypothesis* parent, bool modal, - HOMARD::HOMARD_Gen_var myHomardGen, + ADAPT::ADAPT_Gen_var myHomardGen, QString caseName, QString Name); virtual ~MonEditZone(); diff --git a/src/ADAPTGUI/MonIterInfo.cxx b/src/ADAPTGUI/MonIterInfo.cxx index b361d29e8..4a789439c 100644 --- a/src/ADAPTGUI/MonIterInfo.cxx +++ b/src/ADAPTGUI/MonIterInfo.cxx @@ -33,7 +33,7 @@ using namespace std; // ----------------------------------------------------------------------------------------- -MonIterInfo::MonIterInfo(QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myHomardGen0, QString IterName) +MonIterInfo::MonIterInfo(QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen0, QString IterName) // ----------------------------------------------------------------------------------------- /* Constructs a MonIterInfo * Inherits from CasHomard @@ -51,7 +51,7 @@ MonIterInfo::MonIterInfo(QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myH _Option(-1) { MESSAGE("appel de _duplicate"); - myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0); + myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0); setupUi(this); setModal(modal); InitConnect(); @@ -112,7 +112,7 @@ bool MonIterInfo::PushOnApply() // Le bilan de l'analyse a afficher QString aFileName = aIter->GetFileInfo() ; - MonEditFile *aDlg = new MonEditFile( 0, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), aFileName, 0 ) ; + MonEditFile *aDlg = new MonEditFile( 0, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), aFileName, 0 ) ; if ( aDlg->_codret == 0 ) { aDlg->show(); } diff --git a/src/ADAPTGUI/MonIterInfo.h b/src/ADAPTGUI/MonIterInfo.h index 358c3baf4..5ce8cf742 100644 --- a/src/ADAPTGUI/MonIterInfo.h +++ b/src/ADAPTGUI/MonIterInfo.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include CORBA_CLIENT_HEADER(HOMARD_Cas) #include "ui_IterInfo.h" @@ -40,11 +40,11 @@ class HOMARD_EXPORT MonIterInfo : public QDialog, public Ui_IterInfo Q_OBJECT public: - MonIterInfo( QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myHomardGen, QString IterName); + MonIterInfo( QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString IterName); ~MonIterInfo(); protected : - MonIterInfo( QWidget* parent, HOMARD::HOMARD_Gen_var myHomardGen, QString IterName ); + MonIterInfo( QWidget* parent, ADAPT::ADAPT_Gen_var myHomardGen, QString IterName ); QString _IterName; QString _aCaseName; @@ -56,8 +56,8 @@ protected : int _Quality; int _Option; - HOMARD::HOMARD_Iteration_var aIter ; - HOMARD::HOMARD_Gen_var myHomardGen; + ADAPT::HOMARD_Iteration_var aIter ; + ADAPT::ADAPT_Gen_var myHomardGen; virtual void InitConnect(); diff --git a/src/ADAPTGUI/MonMeshInfo.cxx b/src/ADAPTGUI/MonMeshInfo.cxx index 7c5e92899..b172e38e1 100644 --- a/src/ADAPTGUI/MonMeshInfo.cxx +++ b/src/ADAPTGUI/MonMeshInfo.cxx @@ -36,7 +36,7 @@ using namespace std; // ----------------------------------------------------------------------------------------- -MonMeshInfo::MonMeshInfo(QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myHomardGen0) +MonMeshInfo::MonMeshInfo(QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen0) // ----------------------------------------------------------------------------------------- /* Constructs a MonMeshInfo * Inherits from CasHomard @@ -51,7 +51,7 @@ MonMeshInfo::MonMeshInfo(QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myH _Entanglement(0), _Quality(0) { - myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0); + myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0); setupUi(this); setModal(modal); InitConnect(); @@ -168,9 +168,9 @@ bool MonMeshInfo::PushOnApply() // Le bilan de l'analyse a afficher aCase = myHomardGen->GetCase(_aCaseName.toStdString().c_str()); string iter0 = aCase->GetIter0Name(); - HOMARD::HOMARD_Iteration_var aIter = myHomardGen->GetIteration(iter0.c_str()); + ADAPT::HOMARD_Iteration_var aIter = myHomardGen->GetIteration(iter0.c_str()); aFileName = aIter->GetFileInfo() ; - MonEditFile *aDlg = new MonEditFile( 0, true, HOMARD::HOMARD_Gen::_duplicate(myHomardGen), aFileName, 1 ) ; + MonEditFile *aDlg = new MonEditFile( 0, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), aFileName, 1 ) ; if ( aDlg->_codret == 0 ) { aDlg->show(); } HOMARD_UTILS::updateObjBrowser(); @@ -194,7 +194,7 @@ void MonMeshInfo::PushOnHelp() void MonMeshInfo::SetNewCaseName() // ------------------------------ { - HOMARD::listeCases_var MyCases = myHomardGen->GetAllCasesName(); + ADAPT::listeCases_var MyCases = myHomardGen->GetAllCasesName(); int num = 0; QString aCaseName=""; while (aCaseName=="" ) { diff --git a/src/ADAPTGUI/MonMeshInfo.h b/src/ADAPTGUI/MonMeshInfo.h index 55a31fe34..132ce89de 100644 --- a/src/ADAPTGUI/MonMeshInfo.h +++ b/src/ADAPTGUI/MonMeshInfo.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include CORBA_CLIENT_HEADER(HOMARD_Cas) #include "ui_MeshInfo.h" @@ -37,7 +37,7 @@ class HOMARD_EXPORT MonMeshInfo : public QDialog, public Ui_MeshInfo Q_OBJECT public: - MonMeshInfo( QWidget* parent, bool modal, HOMARD::HOMARD_Gen_var myHomardGen); + MonMeshInfo( QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen); ~MonMeshInfo(); protected : @@ -50,8 +50,8 @@ protected : int _Entanglement; int _Quality; - HOMARD::HOMARD_Cas_var aCase ; - HOMARD::HOMARD_Gen_var myHomardGen; + ADAPT::HOMARD_Cas_var aCase ; + ADAPT::ADAPT_Gen_var myHomardGen; virtual void InitConnect(); virtual void SetNewCaseName(); diff --git a/src/ADAPTGUI/MonPursueIteration.cxx b/src/ADAPTGUI/MonPursueIteration.cxx index b6c76d407..b929d5810 100644 --- 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, HOMARD::HOMARD_Gen_var myHomardGen0 ) +MonPursueIteration::MonPursueIteration ( bool modal, ADAPT::ADAPT_Gen_var myHomardGen0 ) : Ui_PursueIteration(), _aCaseName(""), _aDirName(""), _aDirNameStart("") { MESSAGE("Debut du constructeur de MonPursueIteration"); - myHomardGen=HOMARD::HOMARD_Gen::_duplicate(myHomardGen0); + myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0); setupUi(this); setModal(modal); @@ -221,7 +221,7 @@ void MonPursueIteration::PushOnHelp() void MonPursueIteration::SetNewCaseName() // ------------------------------ { - HOMARD::listeCases_var MyCases = myHomardGen->GetAllCasesName(); + ADAPT::listeCases_var MyCases = myHomardGen->GetAllCasesName(); int num = 0; QString aCaseName=""; while (aCaseName=="" ) { diff --git a/src/ADAPTGUI/MonPursueIteration.h b/src/ADAPTGUI/MonPursueIteration.h index fbeda6f75..367f9141d 100644 --- a/src/ADAPTGUI/MonPursueIteration.h +++ b/src/ADAPTGUI/MonPursueIteration.h @@ -26,7 +26,7 @@ #include #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) -#include CORBA_CLIENT_HEADER(HOMARD_Gen) +#include CORBA_CLIENT_HEADER(ADAPT_Gen) #include CORBA_CLIENT_HEADER(HOMARD_Cas) #include "ui_PursueIteration.h" @@ -37,7 +37,7 @@ class HOMARD_EXPORT MonPursueIteration : public QDialog, public Ui_PursueIterati Q_OBJECT public: - MonPursueIteration( bool modal, HOMARD::HOMARD_Gen_var myHomardGen ); + MonPursueIteration( bool modal, ADAPT::ADAPT_Gen_var myHomardGen ); virtual ~MonPursueIteration(); protected : @@ -47,8 +47,8 @@ class HOMARD_EXPORT MonPursueIteration : public QDialog, public Ui_PursueIterati int _Type ; - HOMARD::HOMARD_Cas_var aCase ; - HOMARD::HOMARD_Gen_var myHomardGen; + ADAPT::HOMARD_Cas_var aCase ; + ADAPT::ADAPT_Gen_var myHomardGen; virtual void InitConnect(); virtual void SetNewCaseName(); diff --git a/src/ADAPT_I/HOMARD_Gen_i.cxx b/src/ADAPT_I/ADAPT_Gen_i.cxx similarity index 87% rename from src/ADAPT_I/HOMARD_Gen_i.cxx rename to src/ADAPT_I/ADAPT_Gen_i.cxx index 35cca098a..6b055fd62 100644 --- a/src/ADAPT_I/HOMARD_Gen_i.cxx +++ b/src/ADAPT_I/ADAPT_Gen_i.cxx @@ -17,7 +17,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#include "HOMARD_Gen_i.hxx" +#include "ADAPT_Gen_i.hxx" #include "HOMARD_Cas_i.hxx" #include "HOMARD_Hypothesis_i.hxx" #include "HOMARD_Iteration_i.hxx" @@ -88,7 +88,7 @@ std::string RemoveTabulation( std::string theScript ) * standard constructor */ //============================================================================= -HOMARD_Gen_i::HOMARD_Gen_i( CORBA::ORB_ptr orb, +ADAPT_Gen_i::ADAPT_Gen_i( CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, PortableServer::ObjectId * contId, const char *instanceName, @@ -99,7 +99,7 @@ Engines_Component_i(orb, poa, contId, instanceName, interfaceName) _thisObj = this; _id = _poa->activate_object(_thisObj); - myHomard = new ::HOMARD_Gen(); + myHomard = new ::ADAPT_Gen(); _NS = SINGLETON_::Instance(); ASSERT(SINGLETON_::IsAlreadyExisting()); _NS->init_orb(_orb); @@ -119,7 +119,7 @@ Engines_Component_i(orb, poa, contId, instanceName, interfaceName) * standard destructor */ //================================ -HOMARD_Gen_i::~HOMARD_Gen_i() +ADAPT_Gen_i::~ADAPT_Gen_i() { } //============================================================================= @@ -127,7 +127,7 @@ HOMARD_Gen_i::~HOMARD_Gen_i() // Utilitaires pour l'étude //============================================================================= //============================================================================= -void HOMARD_Gen_i::UpdateStudy() +void ADAPT_Gen_i::UpdateStudy() { ASSERT(!CORBA::is_nil(myStudy)); SALOMEDS::StudyBuilder_var myBuilder = myStudy->NewBuilder(); @@ -157,7 +157,7 @@ void HOMARD_Gen_i::UpdateStudy() anAttr = myBuilder->FindOrCreateAttribute(homardFather,"AttributePixMap"); SALOMEDS::AttributePixMap_var aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr); aPixmap->SetPixMap("HOMARD_2.png"); - myBuilder->DefineComponentInstance(homardFather, HOMARD_Gen::_this()); + myBuilder->DefineComponentInstance(homardFather, ADAPT_Gen::_this()); if (aLocked) myStudy->GetProperties()->SetLocked(true); myBuilder->CommitCommand(); @@ -169,11 +169,11 @@ void HOMARD_Gen_i::UpdateStudy() // Utilitaires pour l'iteration //============================================================================= //============================================================================= -void HOMARD_Gen_i::SetEtatIter(const char* nomIter, const CORBA::Long Etat) +void ADAPT_Gen_i::SetEtatIter(const char* nomIter, const CORBA::Long Etat) //===================================================================================== { MESSAGE( "SetEtatIter : affectation de l'etat " << Etat << " a l'iteration " << nomIter ); - HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[nomIter]; + ADAPT::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[nomIter]; if (CORBA::is_nil(myIteration)) { SALOME::ExceptionStruct es; @@ -208,10 +208,10 @@ void HOMARD_Gen_i::SetEtatIter(const char* nomIter, const CORBA::Long Etat) // Destruction des structures identifiees par leurs noms //============================================================================= //============================================================================= -CORBA::Long HOMARD_Gen_i::DeleteBoundary(const char* BoundaryName) +CORBA::Long ADAPT_Gen_i::DeleteBoundary(const char* BoundaryName) { MESSAGE ( "DeleteBoundary : BoundaryName = " << BoundaryName ); - HOMARD::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName]; + ADAPT::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName]; if (CORBA::is_nil(myBoundary)) { SALOME::ExceptionStruct es; @@ -222,13 +222,13 @@ CORBA::Long HOMARD_Gen_i::DeleteBoundary(const char* BoundaryName) }; // On verifie que la frontiere n'est plus utilisee - HOMARD::listeCases* maListe = GetAllCasesName(); + ADAPT::listeCases* maListe = GetAllCasesName(); int numberOfCases = maListe->length(); MESSAGE ( ".. Nombre de cas = " << numberOfCases ); std::string CaseName ; - HOMARD::ListBoundaryGroupType* ListBoundaryGroupType ; + ADAPT::ListBoundaryGroupType* ListBoundaryGroupType ; int numberOfitems ; - HOMARD::HOMARD_Cas_var myCase ; + ADAPT::HOMARD_Cas_var myCase ; for (int NumeCas = 0; NumeCas< numberOfCases; NumeCas++) { CaseName = std::string((*maListe)[NumeCas]); @@ -261,11 +261,11 @@ CORBA::Long HOMARD_Gen_i::DeleteBoundary(const char* BoundaryName) return 0 ; } //============================================================================= -CORBA::Long HOMARD_Gen_i::DeleteCase(const char* nomCas, CORBA::Long Option) +CORBA::Long ADAPT_Gen_i::DeleteCase(const char* nomCas, CORBA::Long Option) { // Pour detruire un cas MESSAGE ( "DeleteCase : nomCas = " << nomCas << ", avec option = " << Option ); - HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas]; + ADAPT::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas]; if (CORBA::is_nil(myCase)) { SALOME::ExceptionStruct es; @@ -292,10 +292,10 @@ CORBA::Long HOMARD_Gen_i::DeleteCase(const char* nomCas, CORBA::Long Option) return 0 ; } //============================================================================= -CORBA::Long HOMARD_Gen_i::DeleteHypo(const char* nomHypo) +CORBA::Long ADAPT_Gen_i::DeleteHypo(const char* nomHypo) { MESSAGE ( "DeleteHypo : nomHypo = " << nomHypo ); - HOMARD::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypo]; + ADAPT::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypo]; if (CORBA::is_nil(myHypo)) { SALOME::ExceptionStruct es; @@ -306,7 +306,7 @@ CORBA::Long HOMARD_Gen_i::DeleteHypo(const char* nomHypo) }; // On verifie que l'hypothese n'est plus utilisee - HOMARD::listeIters* maListeIter = myHypo->GetIterations(); + ADAPT::listeIters* maListeIter = myHypo->GetIterations(); int numberOfIter = maListeIter->length(); if ( numberOfIter > 0 ) { @@ -318,7 +318,7 @@ CORBA::Long HOMARD_Gen_i::DeleteHypo(const char* nomHypo) }; // suppression du lien avec les zones eventuelles - HOMARD::listeZonesHypo* maListe = myHypo->GetZones(); + ADAPT::listeZonesHypo* maListe = myHypo->GetZones(); int numberOfZones = maListe->length(); MESSAGE ( ".. Nombre de zones = " << numberOfZones ); for (int NumeZone = 0; NumeZone< numberOfZones; NumeZone++) @@ -339,7 +339,7 @@ CORBA::Long HOMARD_Gen_i::DeleteHypo(const char* nomHypo) return 0 ; } //============================================================================= -CORBA::Long HOMARD_Gen_i::DeleteIteration(const char* nomIter, CORBA::Long Option) +CORBA::Long ADAPT_Gen_i::DeleteIteration(const char* nomIter, CORBA::Long Option) { // Option = 0 : On ne supprime pas le fichier du maillage associe // Option = 1 : On supprime le fichier du maillage associe @@ -349,7 +349,7 @@ CORBA::Long HOMARD_Gen_i::DeleteIteration(const char* nomIter, CORBA::Long Optio return DeleteIterationOption(nomIter, Option1, Option); } //============================================================================= -CORBA::Long HOMARD_Gen_i::DeleteIterationOption(const char* nomIter, CORBA::Long Option1, CORBA::Long Option2) +CORBA::Long ADAPT_Gen_i::DeleteIterationOption(const char* nomIter, CORBA::Long Option1, CORBA::Long Option2) { // Option1 = 0 : On autorise la destruction de l'iteration 0 // Option1 = 1 : On interdit la destruction de l'iteration 0 @@ -357,7 +357,7 @@ CORBA::Long HOMARD_Gen_i::DeleteIterationOption(const char* nomIter, CORBA::Long // Option2 = 0 : On ne supprime pas le fichier du maillage associe // Option2 = 1 : On supprime le fichier du maillage associe MESSAGE ( "DeleteIterationOption : nomIter = " << nomIter << ", avec options = " << Option1<< ", " << Option2 ); - HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[nomIter]; + ADAPT::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[nomIter]; if (CORBA::is_nil(myIteration)) { SALOME::ExceptionStruct es; @@ -379,7 +379,7 @@ CORBA::Long HOMARD_Gen_i::DeleteIterationOption(const char* nomIter, CORBA::Long }; // On detruit recursivement toutes les filles - HOMARD::listeIterFilles* maListe = myIteration->GetIterations(); + ADAPT::listeIterFilles* maListe = myIteration->GetIterations(); int numberOfIter = maListe->length(); for (int NumeIter = 0; NumeIter< numberOfIter; NumeIter++) { @@ -402,7 +402,7 @@ CORBA::Long HOMARD_Gen_i::DeleteIterationOption(const char* nomIter, CORBA::Long { std::string nomIterationParent = myIteration->GetIterParentName(); MESSAGE ( "Retrait dans la descendance de nomIterationParent " << nomIterationParent ); - HOMARD::HOMARD_Iteration_var myIterationParent = myStudyContext._mesIterations[nomIterationParent]; + ADAPT::HOMARD_Iteration_var myIterationParent = myStudyContext._mesIterations[nomIterationParent]; if (CORBA::is_nil(myIterationParent)) { SALOME::ExceptionStruct es; @@ -418,7 +418,7 @@ CORBA::Long HOMARD_Gen_i::DeleteIterationOption(const char* nomIter, CORBA::Long if ( numero > 0 ) { std::string nomHypo = myIteration->GetHypoName(); - HOMARD::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypo]; + ADAPT::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypo]; ASSERT(!CORBA::is_nil(myHypo)); myHypo->UnLinkIteration(nomIter); } @@ -431,7 +431,7 @@ CORBA::Long HOMARD_Gen_i::DeleteIterationOption(const char* nomIter, CORBA::Long myStudy->NewBuilder()->RemoveObjectWithChildren(aSO); // on peut aussi faire RemoveObject // MESSAGE ( "Au final" ); -// HOMARD::listeIterations* Liste = GetAllIterationsName() ; +// ADAPT::listeIterations* Liste = GetAllIterationsName() ; // numberOfIter = Liste->length(); // for (int NumeIter = 0; NumeIter< numberOfIter; NumeIter++) // { @@ -442,12 +442,12 @@ CORBA::Long HOMARD_Gen_i::DeleteIterationOption(const char* nomIter, CORBA::Long return 0 ; } //============================================================================= -CORBA::Long HOMARD_Gen_i::DeleteYACS(const char* nomYACS, CORBA::Long Option) +CORBA::Long ADAPT_Gen_i::DeleteYACS(const char* nomYACS, CORBA::Long Option) { // Option = 0 : On ne supprime pas le fichier du schema associe // Option = 1 : On supprime le fichier du schema associe MESSAGE ( "DeleteYACS : nomYACS = " << nomYACS << ", avec option = " << Option ); - HOMARD::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[nomYACS]; + ADAPT::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[nomYACS]; if (CORBA::is_nil(myYACS)) { SALOME::ExceptionStruct es; @@ -481,10 +481,10 @@ CORBA::Long HOMARD_Gen_i::DeleteYACS(const char* nomYACS, CORBA::Long Option) return 0 ; } //============================================================================= -CORBA::Long HOMARD_Gen_i::DeleteZone(const char* nomZone) +CORBA::Long ADAPT_Gen_i::DeleteZone(const char* nomZone) { MESSAGE ( "DeleteZone : nomZone = " << nomZone ); - HOMARD::HOMARD_Zone_var myZone = myStudyContext._mesZones[nomZone]; + ADAPT::HOMARD_Zone_var myZone = myStudyContext._mesZones[nomZone]; if (CORBA::is_nil(myZone)) { SALOME::ExceptionStruct es; @@ -495,7 +495,7 @@ CORBA::Long HOMARD_Gen_i::DeleteZone(const char* nomZone) }; // On verifie que la zone n'est plus utilisee - HOMARD::listeHypo* maListe = myZone->GetHypo(); + ADAPT::listeHypo* maListe = myZone->GetHypo(); int numberOfHypo = maListe->length(); MESSAGE ( ".. Nombre d'hypotheses = " << numberOfHypo ); if ( numberOfHypo > 0 ) @@ -524,10 +524,10 @@ CORBA::Long HOMARD_Gen_i::DeleteZone(const char* nomZone) // Invalidation des structures identifiees par leurs noms //============================================================================= //============================================================================= -void HOMARD_Gen_i::InvalideBoundary(const char* BoundaryName) +void ADAPT_Gen_i::InvalideBoundary(const char* BoundaryName) { MESSAGE( "InvalideBoundary : BoundaryName = " << BoundaryName ); - HOMARD::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName]; + ADAPT::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName]; if (CORBA::is_nil(myBoundary)) { SALOME::ExceptionStruct es; @@ -546,10 +546,10 @@ void HOMARD_Gen_i::InvalideBoundary(const char* BoundaryName) }; } //============================================================================= -void HOMARD_Gen_i::InvalideHypo(const char* nomHypo) +void ADAPT_Gen_i::InvalideHypo(const char* nomHypo) { MESSAGE( "InvalideHypo : nomHypo = " << nomHypo ); - HOMARD::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypo]; + ADAPT::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypo]; if (CORBA::is_nil(myHypo)) { SALOME::ExceptionStruct es; @@ -559,7 +559,7 @@ void HOMARD_Gen_i::InvalideHypo(const char* nomHypo) return ; }; - HOMARD::listeIters* maListe = myHypo->GetIterations(); + ADAPT::listeIters* maListe = myHypo->GetIterations(); int numberOfIter = maListe->length(); for (int NumeIter = 0; NumeIter< numberOfIter; NumeIter++) { @@ -569,7 +569,7 @@ void HOMARD_Gen_i::InvalideHypo(const char* nomHypo) } } //============================================================================= -void HOMARD_Gen_i::InvalideIter(const char* nomIter) +void ADAPT_Gen_i::InvalideIter(const char* nomIter) { MESSAGE("InvalideIter : nomIter = " << nomIter); // Pour invalider totalement une iteration courante @@ -577,12 +577,12 @@ void HOMARD_Gen_i::InvalideIter(const char* nomIter) return InvalideIterOption(nomIter, Option); } //============================================================================= -void HOMARD_Gen_i::InvalideIterOption(const char* nomIter, CORBA::Long Option) +void ADAPT_Gen_i::InvalideIterOption(const char* nomIter, CORBA::Long Option) { // Option = 0 : On ne supprime pas le fichier du maillage associe // Option = 1 : On supprime le fichier du maillage associe MESSAGE ( "InvalideIterOption : nomIter = " << nomIter << ", avec option = " << Option ); - HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[nomIter]; + ADAPT::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[nomIter]; if (CORBA::is_nil(myIteration)) { SALOME::ExceptionStruct es; @@ -592,7 +592,7 @@ void HOMARD_Gen_i::InvalideIterOption(const char* nomIter, CORBA::Long Option) return ; }; - HOMARD::listeIterFilles* maListe = myIteration->GetIterations(); + ADAPT::listeIterFilles* maListe = myIteration->GetIterations(); int numberOfIter = maListe->length(); for (int NumeIter = 0; NumeIter< numberOfIter; NumeIter++) { @@ -623,7 +623,7 @@ void HOMARD_Gen_i::InvalideIterOption(const char* nomIter, CORBA::Long Option) { SetEtatIter(nomIter,1); const char * nomCas = myIteration->GetCaseName(); - HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas]; + ADAPT::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas]; if (CORBA::is_nil(myCase)) { SALOME::ExceptionStruct es; @@ -652,10 +652,10 @@ void HOMARD_Gen_i::InvalideIterOption(const char* nomIter, CORBA::Long Option) } //============================================================================= -void HOMARD_Gen_i::InvalideIterInfo(const char* nomIter) +void ADAPT_Gen_i::InvalideIterInfo(const char* nomIter) { MESSAGE("InvalideIterInfo : nomIter = " << nomIter); - HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[nomIter]; + ADAPT::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[nomIter]; if (CORBA::is_nil(myIteration)) { SALOME::ExceptionStruct es; @@ -683,7 +683,7 @@ void HOMARD_Gen_i::InvalideIterInfo(const char* nomIter) } const char * nomCas = myIteration->GetCaseName(); - HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas]; + ADAPT::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas]; if (CORBA::is_nil(myCase)) { SALOME::ExceptionStruct es; @@ -706,10 +706,10 @@ void HOMARD_Gen_i::InvalideIterInfo(const char* nomIter) } } //============================================================================= -void HOMARD_Gen_i::InvalideYACS(const char* YACSName) +void ADAPT_Gen_i::InvalideYACS(const char* YACSName) { MESSAGE( "InvalideYACS : YACSName = " << YACSName ); - HOMARD::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[YACSName]; + ADAPT::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[YACSName]; if (CORBA::is_nil(myYACS)) { SALOME::ExceptionStruct es; @@ -747,10 +747,10 @@ void HOMARD_Gen_i::InvalideYACS(const char* YACSName) } } //============================================================================= -void HOMARD_Gen_i::InvalideZone(const char* ZoneName) +void ADAPT_Gen_i::InvalideZone(const char* ZoneName) { MESSAGE( "InvalideZone : ZoneName = " << ZoneName ); - HOMARD::HOMARD_Zone_var myZone = myStudyContext._mesZones[ZoneName]; + ADAPT::HOMARD_Zone_var myZone = myStudyContext._mesZones[ZoneName]; if (CORBA::is_nil(myZone)) { SALOME::ExceptionStruct es; @@ -759,7 +759,7 @@ void HOMARD_Gen_i::InvalideZone(const char* ZoneName) throw SALOME::SALOME_Exception(es); return ; }; - HOMARD::listeHypo* maListe = myZone->GetHypo(); + ADAPT::listeHypo* maListe = myZone->GetHypo(); int numberOfHypo = maListe->length(); MESSAGE( ".. numberOfHypo = " << numberOfHypo ); for (int NumeHypo = 0; NumeHypo< numberOfHypo; NumeHypo++) @@ -777,11 +777,11 @@ void HOMARD_Gen_i::InvalideZone(const char* ZoneName) // Association de lien entre des structures identifiees par leurs noms //============================================================================= //============================================================================= -void HOMARD_Gen_i::AssociateCaseIter(const char* nomCas, const char* nomIter, const char* labelIter) +void ADAPT_Gen_i::AssociateCaseIter(const char* nomCas, const char* nomIter, const char* labelIter) { MESSAGE( "AssociateCaseIter : " << nomCas << ", " << nomIter << ", " << labelIter ); - HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas]; + ADAPT::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas]; if (CORBA::is_nil(myCase)) { SALOME::ExceptionStruct es; @@ -791,7 +791,7 @@ void HOMARD_Gen_i::AssociateCaseIter(const char* nomCas, const char* nomIter, co return ; }; - HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[nomIter]; + ADAPT::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[nomIter]; if (CORBA::is_nil(myIteration)) { SALOME::ExceptionStruct es; @@ -822,16 +822,16 @@ void HOMARD_Gen_i::AssociateCaseIter(const char* nomCas, const char* nomIter, co myIteration->SetCaseName(nomCas); } //===================================================================================== -void HOMARD_Gen_i::AssociateHypoZone(const char* nomHypothesis, const char* ZoneName, CORBA::Long TypeUse) +void ADAPT_Gen_i::AssociateHypoZone(const char* nomHypothesis, const char* ZoneName, CORBA::Long TypeUse) { MESSAGE ( "AssociateHypoZone : nomHypo = " << nomHypothesis << ", ZoneName= " << ZoneName << ", TypeUse = " << TypeUse); - HOMARD::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypothesis]; + ADAPT::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypothesis]; ASSERT(!CORBA::is_nil(myHypo)); SALOMEDS::SObject_var aHypoSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myHypo))); ASSERT(!CORBA::is_nil(aHypoSO)); - HOMARD::HOMARD_Zone_var myZone = myStudyContext._mesZones[ZoneName]; + ADAPT::HOMARD_Zone_var myZone = myStudyContext._mesZones[ZoneName]; ASSERT(!CORBA::is_nil(myZone)); SALOMEDS::SObject_var aZoneSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myZone))); ASSERT(!CORBA::is_nil(aZoneSO)); @@ -849,18 +849,18 @@ void HOMARD_Gen_i::AssociateHypoZone(const char* nomHypothesis, const char* Zone myHypo->AddZone0(ZoneName, TypeUse); }; //============================================================================= -void HOMARD_Gen_i::AssociateIterHypo(const char* nomIter, const char* nomHypo) +void ADAPT_Gen_i::AssociateIterHypo(const char* nomIter, const char* nomHypo) { MESSAGE("AssociateIterHypo : nomHypo = " << nomHypo << " nomIter = " << nomIter); // Verification de l'existence de l'hypothese - HOMARD::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypo]; + ADAPT::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypo]; ASSERT(!CORBA::is_nil(myHypo)); SALOMEDS::SObject_var aHypoSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myHypo))); ASSERT(!CORBA::is_nil(aHypoSO)); // Verification de l'existence de l'iteration - HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[nomIter]; + ADAPT::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[nomIter]; ASSERT(!CORBA::is_nil(myIteration)); SALOMEDS::SObject_var aIterSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myIteration))); ASSERT(!CORBA::is_nil(aIterSO)); @@ -878,7 +878,7 @@ void HOMARD_Gen_i::AssociateIterHypo(const char* nomIter, const char* nomHypo) // On stocke les noms des champ a interpoler pour le futur controle de la donnée des pas de temps myIteration->SupprFieldInterps() ; - HOMARD::listeFieldInterpsHypo* ListField = myHypo->GetFieldInterps(); + ADAPT::listeFieldInterpsHypo* ListField = myHypo->GetFieldInterps(); int numberOfFieldsx2 = ListField->length(); for (int iaux = 0; iaux< numberOfFieldsx2; iaux++) { @@ -895,16 +895,16 @@ void HOMARD_Gen_i::AssociateIterHypo(const char* nomIter, const char* nomHypo) // Dissociation de lien entre des structures identifiees par leurs noms //============================================================================= //============================================================================= -void HOMARD_Gen_i::DissociateHypoZone(const char* nomHypothesis, const char* ZoneName) +void ADAPT_Gen_i::DissociateHypoZone(const char* nomHypothesis, const char* ZoneName) { MESSAGE ( "DissociateHypoZone : ZoneName= " << ZoneName << ", nomHypo = " << nomHypothesis); - HOMARD::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypothesis]; + ADAPT::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypothesis]; ASSERT(!CORBA::is_nil(myHypo)); SALOMEDS::SObject_var aHypoSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myHypo))); ASSERT(!CORBA::is_nil(aHypoSO)); - HOMARD::HOMARD_Zone_var myZone = myStudyContext._mesZones[ZoneName]; + ADAPT::HOMARD_Zone_var myZone = myStudyContext._mesZones[ZoneName]; ASSERT(!CORBA::is_nil(myZone)); SALOMEDS::SObject_var aZoneSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myZone))); ASSERT(!CORBA::is_nil(aZoneSO)); @@ -940,14 +940,14 @@ void HOMARD_Gen_i::DissociateHypoZone(const char* nomHypothesis, const char* Zon // Recuperation des listes //============================================================================= //============================================================================= -HOMARD::listeBoundarys* HOMARD_Gen_i::GetAllBoundarysName() +ADAPT::listeBoundarys* ADAPT_Gen_i::GetAllBoundarysName() { MESSAGE("GetAllBoundarysName"); IsValidStudy () ; - HOMARD::listeBoundarys_var ret = new HOMARD::listeBoundarys; + ADAPT::listeBoundarys_var ret = new ADAPT::listeBoundarys; ret->length(myStudyContext._mesBoundarys.size()); - std::map::const_iterator it; + std::map::const_iterator it; int i = 0; for (it = myStudyContext._mesBoundarys.begin(); it != myStudyContext._mesBoundarys.end(); it++) @@ -958,14 +958,14 @@ HOMARD::listeBoundarys* HOMARD_Gen_i::GetAllBoundarysName() return ret._retn(); } //============================================================================= -HOMARD::listeCases* HOMARD_Gen_i::GetAllCasesName() +ADAPT::listeCases* ADAPT_Gen_i::GetAllCasesName() { MESSAGE("GetAllCasesName"); IsValidStudy () ; - HOMARD::listeCases_var ret = new HOMARD::listeCases; + ADAPT::listeCases_var ret = new ADAPT::listeCases; ret->length(myStudyContext._mesCas.size()); - std::map::const_iterator it; + std::map::const_iterator it; int i = 0; for (it = myStudyContext._mesCas.begin(); it != myStudyContext._mesCas.end(); it++) @@ -976,14 +976,14 @@ HOMARD::listeCases* HOMARD_Gen_i::GetAllCasesName() return ret._retn(); } //============================================================================= -HOMARD::listeHypotheses* HOMARD_Gen_i::GetAllHypothesesName() +ADAPT::listeHypotheses* ADAPT_Gen_i::GetAllHypothesesName() { MESSAGE("GetAllHypothesesName"); IsValidStudy () ; - HOMARD::listeHypotheses_var ret = new HOMARD::listeHypotheses; + ADAPT::listeHypotheses_var ret = new ADAPT::listeHypotheses; ret->length(myStudyContext._mesHypotheses.size()); - std::map::const_iterator it; + std::map::const_iterator it; int i = 0; for (it = myStudyContext._mesHypotheses.begin(); it != myStudyContext._mesHypotheses.end(); it++) @@ -994,14 +994,14 @@ HOMARD::listeHypotheses* HOMARD_Gen_i::GetAllHypothesesName() return ret._retn(); } //============================================================================= -HOMARD::listeIterations* HOMARD_Gen_i::GetAllIterationsName() +ADAPT::listeIterations* ADAPT_Gen_i::GetAllIterationsName() { MESSAGE("GetAllIterationsName"); IsValidStudy () ; - HOMARD::listeIterations_var ret = new HOMARD::listeIterations; + ADAPT::listeIterations_var ret = new ADAPT::listeIterations; ret->length(myStudyContext._mesIterations.size()); - std::map::const_iterator it; + std::map::const_iterator it; int i = 0; for (it = myStudyContext._mesIterations.begin(); it != myStudyContext._mesIterations.end(); it++) @@ -1012,14 +1012,14 @@ HOMARD::listeIterations* HOMARD_Gen_i::GetAllIterationsName() return ret._retn(); } //============================================================================= -HOMARD::listeYACSs* HOMARD_Gen_i::GetAllYACSsName() +ADAPT::listeYACSs* ADAPT_Gen_i::GetAllYACSsName() { MESSAGE("GetAllYACSsName"); IsValidStudy () ; - HOMARD::listeYACSs_var ret = new HOMARD::listeYACSs; + ADAPT::listeYACSs_var ret = new ADAPT::listeYACSs; ret->length(myStudyContext._mesYACSs.size()); - std::map::const_iterator it; + std::map::const_iterator it; int i = 0; for (it = myStudyContext._mesYACSs.begin(); it != myStudyContext._mesYACSs.end(); it++) @@ -1030,14 +1030,14 @@ HOMARD::listeYACSs* HOMARD_Gen_i::GetAllYACSsName() return ret._retn(); } //============================================================================= -HOMARD::listeZones* HOMARD_Gen_i::GetAllZonesName() +ADAPT::listeZones* ADAPT_Gen_i::GetAllZonesName() { MESSAGE("GetAllZonesName"); IsValidStudy () ; - HOMARD::listeZones_var ret = new HOMARD::listeZones; + ADAPT::listeZones_var ret = new ADAPT::listeZones; ret->length(myStudyContext._mesZones.size()); - std::map::const_iterator it; + std::map::const_iterator it; int i = 0; for (it = myStudyContext._mesZones.begin(); it != myStudyContext._mesZones.end(); it++) @@ -1055,46 +1055,46 @@ HOMARD::listeZones* HOMARD_Gen_i::GetAllZonesName() // Recuperation des structures identifiees par leurs noms //============================================================================= //============================================================================= -HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::GetBoundary(const char* nomBoundary) +ADAPT::HOMARD_Boundary_ptr ADAPT_Gen_i::GetBoundary(const char* nomBoundary) { - HOMARD::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[nomBoundary]; + ADAPT::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[nomBoundary]; ASSERT(!CORBA::is_nil(myBoundary)); - return HOMARD::HOMARD_Boundary::_duplicate(myBoundary); + return ADAPT::HOMARD_Boundary::_duplicate(myBoundary); } //============================================================================= -HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::GetCase(const char* nomCas) +ADAPT::HOMARD_Cas_ptr ADAPT_Gen_i::GetCase(const char* nomCas) { - HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas]; + ADAPT::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas]; ASSERT(!CORBA::is_nil(myCase)); - return HOMARD::HOMARD_Cas::_duplicate(myCase); + return ADAPT::HOMARD_Cas::_duplicate(myCase); } //============================================================================= -HOMARD::HOMARD_Hypothesis_ptr HOMARD_Gen_i::GetHypothesis(const char* nomHypothesis) +ADAPT::HOMARD_Hypothesis_ptr ADAPT_Gen_i::GetHypothesis(const char* nomHypothesis) { - HOMARD::HOMARD_Hypothesis_var myHypothesis = myStudyContext._mesHypotheses[nomHypothesis]; + ADAPT::HOMARD_Hypothesis_var myHypothesis = myStudyContext._mesHypotheses[nomHypothesis]; ASSERT(!CORBA::is_nil(myHypothesis)); - return HOMARD::HOMARD_Hypothesis::_duplicate(myHypothesis); + return ADAPT::HOMARD_Hypothesis::_duplicate(myHypothesis); } //============================================================================= -HOMARD::HOMARD_Iteration_ptr HOMARD_Gen_i::GetIteration(const char* NomIterationation) +ADAPT::HOMARD_Iteration_ptr ADAPT_Gen_i::GetIteration(const char* NomIterationation) { - HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[NomIterationation]; + ADAPT::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[NomIterationation]; ASSERT(!CORBA::is_nil(myIteration)); - return HOMARD::HOMARD_Iteration::_duplicate(myIteration); + return ADAPT::HOMARD_Iteration::_duplicate(myIteration); } //============================================================================= -HOMARD::HOMARD_YACS_ptr HOMARD_Gen_i::GetYACS(const char* nomYACS) +ADAPT::HOMARD_YACS_ptr ADAPT_Gen_i::GetYACS(const char* nomYACS) { - HOMARD::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[nomYACS]; + ADAPT::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[nomYACS]; ASSERT(!CORBA::is_nil(myYACS)); - return HOMARD::HOMARD_YACS::_duplicate(myYACS); + return ADAPT::HOMARD_YACS::_duplicate(myYACS); } //============================================================================= -HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::GetZone(const char* ZoneName) +ADAPT::HOMARD_Zone_ptr ADAPT_Gen_i::GetZone(const char* ZoneName) { - HOMARD::HOMARD_Zone_var myZone = myStudyContext._mesZones[ZoneName]; + ADAPT::HOMARD_Zone_var myZone = myStudyContext._mesZones[ZoneName]; ASSERT(!CORBA::is_nil(myZone)); - return HOMARD::HOMARD_Zone::_duplicate(myZone); + return ADAPT::HOMARD_Zone::_duplicate(myZone); } //============================================================================= //============================================================================= @@ -1104,7 +1104,7 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::GetZone(const char* ZoneName) // Informations //============================================================================= //============================================================================= -void HOMARD_Gen_i::MeshInfo(const char* nomCas, const char* MeshName, const char* MeshFile, const char* DirName, CORBA::Long Qual, CORBA::Long Diam, CORBA::Long Conn, CORBA::Long Tail, CORBA::Long Inte) +void ADAPT_Gen_i::MeshInfo(const char* nomCas, const char* MeshName, const char* MeshFile, const char* DirName, CORBA::Long Qual, CORBA::Long Diam, CORBA::Long Conn, CORBA::Long Tail, CORBA::Long Inte) { INFOS ( "MeshInfo : nomCas = " << nomCas << ", MeshName = " << MeshName << ", MeshFile = " << MeshFile ); INFOS ( "Qual = " << Qual << ", Diam = " << Diam << ", Conn = " << Conn << ", Tail = " << Tail << ", Inte = " << Inte ); @@ -1113,7 +1113,7 @@ void HOMARD_Gen_i::MeshInfo(const char* nomCas, const char* MeshName, const char // Creation du cas int option = 1 ; if ( _PublisMeshIN != 0 ) option = 2 ; - HOMARD::HOMARD_Cas_ptr myCase = CreateCase0(nomCas, MeshName, MeshFile, 1, 0, option) ; + ADAPT::HOMARD_Cas_ptr myCase = CreateCase0(nomCas, MeshName, MeshFile, 1, 0, option) ; myCase->SetDirName(DirName) ; // Analyse myCase->MeshInfo(Qual, Diam, Conn, Tail, Inte) ; @@ -1128,15 +1128,15 @@ void HOMARD_Gen_i::MeshInfo(const char* nomCas, const char* MeshName, const char // Recuperation des structures par le contexte //============================================================================= //============================================================================= -HOMARD::HOMARD_Iteration_ptr HOMARD_Gen_i::LastIteration(const char* nomCas) +ADAPT::HOMARD_Iteration_ptr ADAPT_Gen_i::LastIteration(const char* nomCas) { - HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas]; + ADAPT::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas]; ASSERT(!CORBA::is_nil(myCase)); // - HOMARD::HOMARD_Iteration_var myIteration = myCase->LastIteration(); + ADAPT::HOMARD_Iteration_var myIteration = myCase->LastIteration(); ASSERT(!CORBA::is_nil(myIteration)); // - return HOMARD::HOMARD_Iteration::_duplicate(myIteration); + return ADAPT::HOMARD_Iteration::_duplicate(myIteration); } //============================================================================= //============================================================================= @@ -1146,51 +1146,51 @@ HOMARD::HOMARD_Iteration_ptr HOMARD_Gen_i::LastIteration(const char* nomCas) // Nouvelles structures //============================================================================= //============================================================================= -HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::newCase() +ADAPT::HOMARD_Cas_ptr ADAPT_Gen_i::newCase() { - HOMARD::HOMARD_Gen_var engine = POA_HOMARD::HOMARD_Gen::_this(); + ADAPT::ADAPT_Gen_var engine = POA_ADAPT::ADAPT_Gen::_this(); HOMARD_Cas_i* aServant = new HOMARD_Cas_i(_orb, engine); - HOMARD::HOMARD_Cas_var aCase = HOMARD::HOMARD_Cas::_narrow(aServant->_this()); + ADAPT::HOMARD_Cas_var aCase = ADAPT::HOMARD_Cas::_narrow(aServant->_this()); return aCase._retn(); } //============================================================================= -HOMARD::HOMARD_Hypothesis_ptr HOMARD_Gen_i::newHypothesis() +ADAPT::HOMARD_Hypothesis_ptr ADAPT_Gen_i::newHypothesis() { - HOMARD::HOMARD_Gen_var engine = POA_HOMARD::HOMARD_Gen::_this(); + ADAPT::ADAPT_Gen_var engine = POA_ADAPT::ADAPT_Gen::_this(); HOMARD_Hypothesis_i* aServant = new HOMARD_Hypothesis_i(_orb, engine); - HOMARD::HOMARD_Hypothesis_var aHypo = HOMARD::HOMARD_Hypothesis::_narrow(aServant->_this()); + ADAPT::HOMARD_Hypothesis_var aHypo = ADAPT::HOMARD_Hypothesis::_narrow(aServant->_this()); return aHypo._retn(); } //============================================================================= -HOMARD::HOMARD_Iteration_ptr HOMARD_Gen_i::newIteration() +ADAPT::HOMARD_Iteration_ptr ADAPT_Gen_i::newIteration() { - HOMARD::HOMARD_Gen_var engine = POA_HOMARD::HOMARD_Gen::_this(); + ADAPT::ADAPT_Gen_var engine = POA_ADAPT::ADAPT_Gen::_this(); HOMARD_Iteration_i* aServant = new HOMARD_Iteration_i(_orb, engine); - HOMARD::HOMARD_Iteration_var aIter = HOMARD::HOMARD_Iteration::_narrow(aServant->_this()); + ADAPT::HOMARD_Iteration_var aIter = ADAPT::HOMARD_Iteration::_narrow(aServant->_this()); return aIter._retn(); } //============================================================================= -HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::newBoundary() +ADAPT::HOMARD_Boundary_ptr ADAPT_Gen_i::newBoundary() { - HOMARD::HOMARD_Gen_var engine = POA_HOMARD::HOMARD_Gen::_this(); + ADAPT::ADAPT_Gen_var engine = POA_ADAPT::ADAPT_Gen::_this(); HOMARD_Boundary_i* aServant = new HOMARD_Boundary_i(_orb, engine); - HOMARD::HOMARD_Boundary_var aBoundary = HOMARD::HOMARD_Boundary::_narrow(aServant->_this()); + ADAPT::HOMARD_Boundary_var aBoundary = ADAPT::HOMARD_Boundary::_narrow(aServant->_this()); return aBoundary._retn(); } //============================================================================= -HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::newZone() +ADAPT::HOMARD_Zone_ptr ADAPT_Gen_i::newZone() { - HOMARD::HOMARD_Gen_var engine = POA_HOMARD::HOMARD_Gen::_this(); + ADAPT::ADAPT_Gen_var engine = POA_ADAPT::ADAPT_Gen::_this(); HOMARD_Zone_i* aServant = new HOMARD_Zone_i(_orb, engine); - HOMARD::HOMARD_Zone_var aZone = HOMARD::HOMARD_Zone::_narrow(aServant->_this()); + ADAPT::HOMARD_Zone_var aZone = ADAPT::HOMARD_Zone::_narrow(aServant->_this()); return aZone._retn(); } //============================================================================= -HOMARD::HOMARD_YACS_ptr HOMARD_Gen_i::newYACS() +ADAPT::HOMARD_YACS_ptr ADAPT_Gen_i::newYACS() { - HOMARD::HOMARD_Gen_var engine = POA_HOMARD::HOMARD_Gen::_this(); + ADAPT::ADAPT_Gen_var engine = POA_ADAPT::ADAPT_Gen::_this(); HOMARD_YACS_i* aServant = new HOMARD_YACS_i(_orb, engine); - HOMARD::HOMARD_YACS_var aYACS = HOMARD::HOMARD_YACS::_narrow(aServant->_this()); + ADAPT::HOMARD_YACS_var aYACS = ADAPT::HOMARD_YACS::_narrow(aServant->_this()); return aYACS._retn(); } //============================================================================= @@ -1201,7 +1201,7 @@ HOMARD::HOMARD_YACS_ptr HOMARD_Gen_i::newYACS() // Creation des structures identifiees par leurs noms //============================================================================= //============================================================================= -HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCase(const char* nomCas, const char* MeshName, const char* MeshFile) +ADAPT::HOMARD_Cas_ptr ADAPT_Gen_i::CreateCase(const char* nomCas, const char* MeshName, const char* MeshFile) // // Creation d'un cas initial // nomCas : nom du cas a creer @@ -1212,15 +1212,15 @@ HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCase(const char* nomCas, const char* int option = 1 ; if ( _PublisMeshIN != 0 ) option = 2 ; - HOMARD::HOMARD_Cas_ptr myCase = CreateCase0(nomCas, MeshName, MeshFile, 0, 0, option) ; + ADAPT::HOMARD_Cas_ptr myCase = CreateCase0(nomCas, MeshName, MeshFile, 0, 0, option) ; // Valeurs par defaut des filtrages myCase->SetPyram(0); - return HOMARD::HOMARD_Cas::_duplicate(myCase); + return ADAPT::HOMARD_Cas::_duplicate(myCase); } //============================================================================= -HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCaseFromIteration(const char* nomCas, const char* DirNameStart) +ADAPT::HOMARD_Cas_ptr ADAPT_Gen_i::CreateCaseFromIteration(const char* nomCas, const char* DirNameStart) // // nomCas : nom du cas a creer // DirNameStart : nom du répertoire contenant l'iteration de reprise @@ -1385,7 +1385,7 @@ HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCaseFromIteration(const char* nomCas, int option = 1 ; if ( _PublisMeshIN != 0 ) option = 2 ; - HOMARD::HOMARD_Cas_ptr myCase = CreateCase0(nomCas, MeshName, MeshFile, 1, NumeIter, option) ; + ADAPT::HOMARD_Cas_ptr myCase = CreateCase0(nomCas, MeshName, MeshFile, 1, NumeIter, option) ; // D. Parametrages lus dans le fichier de configuration @@ -1399,7 +1399,7 @@ HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCaseFromIteration(const char* nomCas, // E.2. Répertoire associe a l'iteration de ce cas char* IterName ; IterName = myCase->GetIter0Name() ; - HOMARD::HOMARD_Iteration_var Iter = GetIteration(IterName) ; + ADAPT::HOMARD_Iteration_var Iter = GetIteration(IterName) ; char* nomDirIter = CreateDirNameIter(nomDirCase, 0 ); Iter->SetDirNameLoc(nomDirIter); std::string nomDirIterTotal ; @@ -1438,10 +1438,10 @@ HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCaseFromIteration(const char* nomCas, delete[] MeshFile ; CHDIR(nomDirWork.c_str()); - return HOMARD::HOMARD_Cas::_duplicate(myCase); + return ADAPT::HOMARD_Cas::_duplicate(myCase); } //============================================================================= -HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCaseFromCaseLastIteration(const char* nomCas, const char* DirNameStart) +ADAPT::HOMARD_Cas_ptr ADAPT_Gen_i::CreateCaseFromCaseLastIteration(const char* nomCas, const char* DirNameStart) // // nomCas : nom du cas a creer // DirNameStart : nom du répertoire du cas contenant l'iteration de reprise @@ -1452,12 +1452,12 @@ HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCaseFromCaseLastIteration(const char* std::string DirNameStartIter = CreateCase1(DirNameStart, -1) ; DirNameStartIter = string(DirNameStart) + "/" + DirNameStartIter ; - HOMARD::HOMARD_Cas_ptr myCase = CreateCaseFromIteration(nomCas, DirNameStartIter.c_str()) ; + ADAPT::HOMARD_Cas_ptr myCase = CreateCaseFromIteration(nomCas, DirNameStartIter.c_str()) ; - return HOMARD::HOMARD_Cas::_duplicate(myCase); + return ADAPT::HOMARD_Cas::_duplicate(myCase); } //============================================================================= -HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCaseFromCaseIteration(const char* nomCas, const char* DirNameStart, CORBA::Long Number) +ADAPT::HOMARD_Cas_ptr ADAPT_Gen_i::CreateCaseFromCaseIteration(const char* nomCas, const char* DirNameStart, CORBA::Long Number) // // nomCas : nom du cas a creer // DirNameStart : nom du répertoire du cas contenant l'iteration de reprise @@ -1477,12 +1477,12 @@ HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCaseFromCaseIteration(const char* nom std::string DirNameStartIter = CreateCase1(DirNameStart, Number) ; DirNameStartIter = string(DirNameStart) + "/" + DirNameStartIter ; - HOMARD::HOMARD_Cas_ptr myCase = CreateCaseFromIteration(nomCas, DirNameStartIter.c_str()) ; + ADAPT::HOMARD_Cas_ptr myCase = CreateCaseFromIteration(nomCas, DirNameStartIter.c_str()) ; - return HOMARD::HOMARD_Cas::_duplicate(myCase); + return ADAPT::HOMARD_Cas::_duplicate(myCase); } //============================================================================= -std::string HOMARD_Gen_i::CreateCase1(const char* DirNameStart, CORBA::Long Number) +std::string ADAPT_Gen_i::CreateCase1(const char* DirNameStart, CORBA::Long Number) // // Retourne le nom du répertoire ou se trouve l'iteration voulue. // DirNameStart : nom du répertoire du cas contenant l'iteration de reprise @@ -1629,7 +1629,7 @@ std::string HOMARD_Gen_i::CreateCase1(const char* DirNameStart, CORBA::Long Numb return DirNameStartIter ; } //============================================================================= -HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCase0(const char* nomCas, const char* MeshName, const char* MeshFile, CORBA::Long MeshOption, CORBA::Long NumeIter, CORBA::Long Option) +ADAPT::HOMARD_Cas_ptr ADAPT_Gen_i::CreateCase0(const char* nomCas, const char* MeshName, const char* MeshFile, CORBA::Long MeshOption, CORBA::Long NumeIter, CORBA::Long Option) // // nomCas : nom du cas a creer // MeshName, MeshFile : nom et fichier du maillage correspondant @@ -1678,7 +1678,7 @@ HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCase0(const char* nomCas, const char* // B. Creation de l'objet cas et publication // MESSAGE ( "CreateCase0 : Creation de l'objet" ); - HOMARD::HOMARD_Cas_var myCase = newCase(); + ADAPT::HOMARD_Cas_var myCase = newCase(); myCase->SetName(nomCas); SALOMEDS::SObject_var aSO; SALOMEDS::SObject_var aResultSO=PublishInStudy(aSO, myCase, nomCas); @@ -1690,7 +1690,7 @@ HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCase0(const char* nomCas, const char* // Les valeurs extremes des coordonnées // MESSAGE ( "CreateCase0 : Les valeurs extremes des coordonnées" ); std::vector LesExtremes =GetBoundingBoxInMedFile(MeshFile) ; - HOMARD::extrema_var aSeq = new HOMARD::extrema() ; + ADAPT::extrema_var aSeq = new ADAPT::extrema() ; if (LesExtremes.size()!=10) { return 0; } aSeq->length(10) ; for (int i =0 ; i< LesExtremes.size() ; i++) @@ -1699,7 +1699,7 @@ HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCase0(const char* nomCas, const char* // Les groupes // MESSAGE ( "CreateCase0 : Les groupes" ); std::set LesGroupes =GetListeGroupesInMedFile(MeshFile) ; - HOMARD::ListGroupType_var aSeqGroupe = new HOMARD::ListGroupType ; + ADAPT::ListGroupType_var aSeqGroupe = new ADAPT::ListGroupType ; aSeqGroupe->length(LesGroupes.size()); std::set::const_iterator it ; int i = 0 ; @@ -1724,7 +1724,7 @@ HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCase0(const char* nomCas, const char* MESSAGE ( "CreateCas0 : ==> NomIteration = " << NomIteration ); // D.2. Creation de l'iteration - HOMARD::HOMARD_Iteration_var anIter = newIteration(); + ADAPT::HOMARD_Iteration_var anIter = newIteration(); myStudyContext._mesIterations[NomIteration] = anIter; anIter->SetName(NomIteration.c_str()); AssociateCaseIter (nomCas, NomIteration.c_str(), "IterationHomard"); @@ -1744,10 +1744,10 @@ HOMARD::HOMARD_Cas_ptr HOMARD_Gen_i::CreateCase0(const char* nomCas, const char* SetEtatIter(NomIteration.c_str(), -NumeIter); // - return HOMARD::HOMARD_Cas::_duplicate(myCase); + return ADAPT::HOMARD_Cas::_duplicate(myCase); } //============================================================================= -HOMARD::HOMARD_Hypothesis_ptr HOMARD_Gen_i::CreateHypothesis(const char* nomHypothesis) +ADAPT::HOMARD_Hypothesis_ptr ADAPT_Gen_i::CreateHypothesis(const char* nomHypothesis) { INFOS ( "CreateHypothesis : nomHypothesis = " << nomHypothesis ); IsValidStudy () ; @@ -1763,7 +1763,7 @@ HOMARD::HOMARD_Hypothesis_ptr HOMARD_Gen_i::CreateHypothesis(const char* nomHypo } // B. Creation de l'objet - HOMARD::HOMARD_Hypothesis_var myHypothesis = newHypothesis(); + ADAPT::HOMARD_Hypothesis_var myHypothesis = newHypothesis(); if (CORBA::is_nil(myHypothesis)) { SALOME::ExceptionStruct es; @@ -1786,17 +1786,17 @@ HOMARD::HOMARD_Hypothesis_ptr HOMARD_Gen_i::CreateHypothesis(const char* nomHypo myHypothesis->SetAdapInit(0); myHypothesis->SetExtraOutput(1); - return HOMARD::HOMARD_Hypothesis::_duplicate(myHypothesis); + return ADAPT::HOMARD_Hypothesis::_duplicate(myHypothesis); } //============================================================================= -HOMARD::HOMARD_Iteration_ptr HOMARD_Gen_i::CreateIteration(const char* NomIteration, const char* nomIterParent) +ADAPT::HOMARD_Iteration_ptr ADAPT_Gen_i::CreateIteration(const char* NomIteration, const char* nomIterParent) //============================================================================= { INFOS ("CreateIteration : NomIteration = " << NomIteration << ", nomIterParent = " << nomIterParent); IsValidStudy () ; - HOMARD::HOMARD_Iteration_var myIterationParent = myStudyContext._mesIterations[nomIterParent]; + ADAPT::HOMARD_Iteration_var myIterationParent = myStudyContext._mesIterations[nomIterParent]; if (CORBA::is_nil(myIterationParent)) { SALOME::ExceptionStruct es; @@ -1808,7 +1808,7 @@ HOMARD::HOMARD_Iteration_ptr HOMARD_Gen_i::CreateIteration(const char* NomIterat const char* nomCas = myIterationParent->GetCaseName(); MESSAGE ("CreateIteration : nomCas = " << nomCas); - HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas]; + ADAPT::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas]; if (CORBA::is_nil(myCase)) { SALOME::ExceptionStruct es; @@ -1829,7 +1829,7 @@ HOMARD::HOMARD_Iteration_ptr HOMARD_Gen_i::CreateIteration(const char* NomIterat return 0; }; - HOMARD::HOMARD_Iteration_var myIteration = newIteration(); + ADAPT::HOMARD_Iteration_var myIteration = newIteration(); if (CORBA::is_nil(myIteration)) { SALOME::ExceptionStruct es; @@ -1886,10 +1886,10 @@ HOMARD::HOMARD_Iteration_ptr HOMARD_Gen_i::CreateIteration(const char* NomIterat aStudyBuilder->Addreference(aSubSO, aIterSOParent); aStudyBuilder->CommitCommand(); - return HOMARD::HOMARD_Iteration::_duplicate(myIteration); + return ADAPT::HOMARD_Iteration::_duplicate(myIteration); } //============================================================================= -HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundary(const char* BoundaryName, CORBA::Long BoundaryType) +ADAPT::HOMARD_Boundary_ptr ADAPT_Gen_i::CreateBoundary(const char* BoundaryName, CORBA::Long BoundaryType) { MESSAGE ("CreateBoundary : BoundaryName = " << BoundaryName << ", BoundaryType = " << BoundaryType); IsValidStudy () ; @@ -1905,7 +1905,7 @@ HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundary(const char* BoundaryNam return 0; }; - HOMARD::HOMARD_Boundary_var myBoundary = newBoundary(); + ADAPT::HOMARD_Boundary_var myBoundary = newBoundary(); myBoundary->SetName(BoundaryName); myBoundary->SetType(BoundaryType); @@ -1914,29 +1914,29 @@ HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundary(const char* BoundaryNam SALOMEDS::SObject_var aSO; SALOMEDS::SObject_var aResultSO=PublishInStudy(aSO, myBoundary, BoundaryName); - return HOMARD::HOMARD_Boundary::_duplicate(myBoundary); + return ADAPT::HOMARD_Boundary::_duplicate(myBoundary); } //============================================================================= -HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundaryCAO(const char* BoundaryName, const char* CAOFile) +ADAPT::HOMARD_Boundary_ptr ADAPT_Gen_i::CreateBoundaryCAO(const char* BoundaryName, const char* CAOFile) { INFOS ("CreateBoundaryCAO : BoundaryName = " << BoundaryName << ", CAOFile = " << CAOFile ); - HOMARD::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, -1); + ADAPT::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, -1); myBoundary->SetDataFile( CAOFile ) ; - return HOMARD::HOMARD_Boundary::_duplicate(myBoundary); + return ADAPT::HOMARD_Boundary::_duplicate(myBoundary); } //============================================================================= -HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundaryDi(const char* BoundaryName, const char* MeshName, const char* MeshFile) +ADAPT::HOMARD_Boundary_ptr ADAPT_Gen_i::CreateBoundaryDi(const char* BoundaryName, const char* MeshName, const char* MeshFile) { INFOS ("CreateBoundaryDi : BoundaryName = " << BoundaryName << ", MeshName = " << MeshName << ", MeshFile = " << MeshFile ); - HOMARD::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, 0); + ADAPT::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, 0); myBoundary->SetDataFile( MeshFile ) ; myBoundary->SetMeshName( MeshName ) ; - return HOMARD::HOMARD_Boundary::_duplicate(myBoundary); + return ADAPT::HOMARD_Boundary::_duplicate(myBoundary); } //============================================================================= -HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundaryCylinder(const char* BoundaryName, +ADAPT::HOMARD_Boundary_ptr ADAPT_Gen_i::CreateBoundaryCylinder(const char* BoundaryName, CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre, CORBA::Double Xaxe, CORBA::Double Yaxe, CORBA::Double Zaxe, CORBA::Double Rayon) @@ -1959,13 +1959,13 @@ HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundaryCylinder(const char* Bou return 0; }; // - HOMARD::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, 1) ; + ADAPT::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, 1) ; myBoundary->SetCylinder( Xcentre, Ycentre, Zcentre, Xaxe, Yaxe, Zaxe, Rayon ) ; - return HOMARD::HOMARD_Boundary::_duplicate(myBoundary) ; + return ADAPT::HOMARD_Boundary::_duplicate(myBoundary) ; } //============================================================================= -HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundarySphere(const char* BoundaryName, +ADAPT::HOMARD_Boundary_ptr ADAPT_Gen_i::CreateBoundarySphere(const char* BoundaryName, CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre, CORBA::Double Rayon) { @@ -1983,13 +1983,13 @@ HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundarySphere(const char* Bound return 0; }; // - HOMARD::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, 2) ; + ADAPT::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, 2) ; myBoundary->SetSphere( Xcentre, Ycentre, Zcentre, Rayon ) ; - return HOMARD::HOMARD_Boundary::_duplicate(myBoundary) ; + return ADAPT::HOMARD_Boundary::_duplicate(myBoundary) ; } //============================================================================= -HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundaryConeA(const char* BoundaryName, +ADAPT::HOMARD_Boundary_ptr ADAPT_Gen_i::CreateBoundaryConeA(const char* BoundaryName, CORBA::Double Xaxe, CORBA::Double Yaxe, CORBA::Double Zaxe, CORBA::Double Angle, CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre) { @@ -2011,13 +2011,13 @@ HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundaryConeA(const char* Bounda return 0; }; // - HOMARD::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, 3) ; + ADAPT::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, 3) ; myBoundary->SetConeA( Xaxe, Yaxe, Zaxe, Angle, Xcentre, Ycentre, Zcentre ) ; - return HOMARD::HOMARD_Boundary::_duplicate(myBoundary) ; + return ADAPT::HOMARD_Boundary::_duplicate(myBoundary) ; } //============================================================================= -HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundaryConeR(const char* BoundaryName, +ADAPT::HOMARD_Boundary_ptr ADAPT_Gen_i::CreateBoundaryConeR(const char* BoundaryName, CORBA::Double Xcentre1, CORBA::Double Ycentre1, CORBA::Double Zcentre1, CORBA::Double Rayon1, CORBA::Double Xcentre2, CORBA::Double Ycentre2, CORBA::Double Zcentre2, CORBA::Double Rayon2) { @@ -2043,13 +2043,13 @@ HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundaryConeR(const char* Bounda return 0; }; // - HOMARD::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, 4) ; + ADAPT::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, 4) ; myBoundary->SetConeR( Xcentre1, Ycentre1, Zcentre1, Rayon1, Xcentre2, Ycentre2, Zcentre2, Rayon2 ) ; - return HOMARD::HOMARD_Boundary::_duplicate(myBoundary) ; + return ADAPT::HOMARD_Boundary::_duplicate(myBoundary) ; } //============================================================================= -HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundaryTorus(const char* BoundaryName, +ADAPT::HOMARD_Boundary_ptr ADAPT_Gen_i::CreateBoundaryTorus(const char* BoundaryName, CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre, CORBA::Double Xaxe, CORBA::Double Yaxe, CORBA::Double Zaxe, CORBA::Double RayonRev, CORBA::Double RayonPri) @@ -2072,13 +2072,13 @@ HOMARD::HOMARD_Boundary_ptr HOMARD_Gen_i::CreateBoundaryTorus(const char* Bounda return 0; }; // - HOMARD::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, 5) ; + ADAPT::HOMARD_Boundary_var myBoundary = CreateBoundary(BoundaryName, 5) ; myBoundary->SetTorus( Xcentre, Ycentre, Zcentre, Xaxe, Yaxe, Zaxe, RayonRev, RayonPri ) ; - return HOMARD::HOMARD_Boundary::_duplicate(myBoundary) ; + return ADAPT::HOMARD_Boundary::_duplicate(myBoundary) ; } //============================================================================= -HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZone(const char* ZoneName, CORBA::Long ZoneType) +ADAPT::HOMARD_Zone_ptr ADAPT_Gen_i::CreateZone(const char* ZoneName, CORBA::Long ZoneType) { MESSAGE ("CreateZone : ZoneName = " << ZoneName << ", ZoneType = " << ZoneType); IsValidStudy () ; @@ -2093,7 +2093,7 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZone(const char* ZoneName, CORBA::Lo return 0; }; - HOMARD::HOMARD_Zone_var myZone = newZone(); + ADAPT::HOMARD_Zone_var myZone = newZone(); myZone->SetName(ZoneName); myZone->SetType(ZoneType); @@ -2102,10 +2102,10 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZone(const char* ZoneName, CORBA::Lo SALOMEDS::SObject_var aSO; SALOMEDS::SObject_var aResultSO=PublishInStudy(aSO, myZone, ZoneName); - return HOMARD::HOMARD_Zone::_duplicate(myZone); + return ADAPT::HOMARD_Zone::_duplicate(myZone); } //============================================================================= -HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneBox(const char* ZoneName, +ADAPT::HOMARD_Zone_ptr ADAPT_Gen_i::CreateZoneBox(const char* ZoneName, CORBA::Double Xmini, CORBA::Double Xmaxi, CORBA::Double Ymini, CORBA::Double Ymaxi, CORBA::Double Zmini, CORBA::Double Zmaxi) @@ -2130,13 +2130,13 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneBox(const char* ZoneName, return 0; }; // - HOMARD::HOMARD_Zone_var myZone = CreateZone(ZoneName, 2) ; + ADAPT::HOMARD_Zone_var myZone = CreateZone(ZoneName, 2) ; myZone->SetBox ( Xmini, Xmaxi, Ymini, Ymaxi, Zmini, Zmaxi) ; - return HOMARD::HOMARD_Zone::_duplicate(myZone) ; + return ADAPT::HOMARD_Zone::_duplicate(myZone) ; } //============================================================================= -HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneSphere(const char* ZoneName, +ADAPT::HOMARD_Zone_ptr ADAPT_Gen_i::CreateZoneSphere(const char* ZoneName, CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre, CORBA::Double Rayon) { INFOS ("CreateZoneSphere : ZoneName = " << ZoneName ) ; @@ -2153,13 +2153,13 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneSphere(const char* ZoneName, return 0; }; // - HOMARD::HOMARD_Zone_var myZone = CreateZone(ZoneName, 4) ; + ADAPT::HOMARD_Zone_var myZone = CreateZone(ZoneName, 4) ; myZone->SetSphere( Xcentre, Ycentre, Zcentre, Rayon ) ; - return HOMARD::HOMARD_Zone::_duplicate(myZone) ; + return ADAPT::HOMARD_Zone::_duplicate(myZone) ; } //============================================================================= -HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneCylinder(const char* ZoneName, +ADAPT::HOMARD_Zone_ptr ADAPT_Gen_i::CreateZoneCylinder(const char* ZoneName, CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre, CORBA::Double Xaxe, CORBA::Double Yaxe, CORBA::Double Zaxe, CORBA::Double Rayon, CORBA::Double Haut) @@ -2185,13 +2185,13 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneCylinder(const char* ZoneName, return 0; }; // - HOMARD::HOMARD_Zone_var myZone = CreateZone(ZoneName, 5) ; + ADAPT::HOMARD_Zone_var myZone = CreateZone(ZoneName, 5) ; myZone->SetCylinder( Xcentre, Ycentre, Zcentre, Xaxe, Yaxe, Zaxe, Rayon, Haut ) ; - return HOMARD::HOMARD_Zone::_duplicate(myZone) ; + return ADAPT::HOMARD_Zone::_duplicate(myZone) ; } //============================================================================= -HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZonePipe(const char* ZoneName, +ADAPT::HOMARD_Zone_ptr ADAPT_Gen_i::CreateZonePipe(const char* ZoneName, CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre, CORBA::Double Xaxe, CORBA::Double Yaxe, CORBA::Double Zaxe, CORBA::Double Rayon, CORBA::Double Haut, CORBA::Double Rayonint) @@ -2220,13 +2220,13 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZonePipe(const char* ZoneName, return 0; }; // - HOMARD::HOMARD_Zone_var myZone = CreateZone(ZoneName, 7) ; + ADAPT::HOMARD_Zone_var myZone = CreateZone(ZoneName, 7) ; myZone->SetPipe( Xcentre, Ycentre, Zcentre, Xaxe, Yaxe, Zaxe, Rayon, Haut, Rayonint ) ; - return HOMARD::HOMARD_Zone::_duplicate(myZone) ; + return ADAPT::HOMARD_Zone::_duplicate(myZone) ; } //============================================================================= -HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneBox2D(const char* ZoneName, +ADAPT::HOMARD_Zone_ptr ADAPT_Gen_i::CreateZoneBox2D(const char* ZoneName, CORBA::Double Umini, CORBA::Double Umaxi, CORBA::Double Vmini, CORBA::Double Vmaxi, CORBA::Long Orient) @@ -2280,13 +2280,13 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneBox2D(const char* ZoneName, Zmaxi = Umaxi ; } else { VERIFICATION( (Orient>=1) && (Orient<=3) ) ; } - HOMARD::HOMARD_Zone_var myZone = CreateZone(ZoneName, 10+Orient) ; + ADAPT::HOMARD_Zone_var myZone = CreateZone(ZoneName, 10+Orient) ; myZone->SetBox ( Xmini, Xmaxi, Ymini, Ymaxi, Zmini, Zmaxi) ; - return HOMARD::HOMARD_Zone::_duplicate(myZone) ; + return ADAPT::HOMARD_Zone::_duplicate(myZone) ; } //============================================================================= -HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneDisk(const char* ZoneName, +ADAPT::HOMARD_Zone_ptr ADAPT_Gen_i::CreateZoneDisk(const char* ZoneName, CORBA::Double Ucentre, CORBA::Double Vcentre, CORBA::Double Rayon, CORBA::Long Orient) @@ -2325,13 +2325,13 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneDisk(const char* ZoneName, Zcentre = Ucentre ; } else { VERIFICATION( (Orient>=1) && (Orient<=3) ) ; } - HOMARD::HOMARD_Zone_var myZone = CreateZone(ZoneName, 30+Orient) ; + ADAPT::HOMARD_Zone_var myZone = CreateZone(ZoneName, 30+Orient) ; myZone->SetCylinder( Xcentre, Ycentre, Zcentre, 0., 0., 1., Rayon, 1. ) ; - return HOMARD::HOMARD_Zone::_duplicate(myZone) ; + return ADAPT::HOMARD_Zone::_duplicate(myZone) ; } //============================================================================= -HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneDiskWithHole(const char* ZoneName, +ADAPT::HOMARD_Zone_ptr ADAPT_Gen_i::CreateZoneDiskWithHole(const char* ZoneName, CORBA::Double Ucentre, CORBA::Double Vcentre, CORBA::Double Rayon, CORBA::Double Rayonint, CORBA::Long Orient) @@ -2373,10 +2373,10 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneDiskWithHole(const char* ZoneNam Zcentre = Ucentre ; } else { VERIFICATION( (Orient>=1) && (Orient<=3) ) ; } - HOMARD::HOMARD_Zone_var myZone = CreateZone(ZoneName, 60+Orient) ; + ADAPT::HOMARD_Zone_var myZone = CreateZone(ZoneName, 60+Orient) ; myZone->SetPipe( Xcentre, Ycentre, Zcentre, 0., 0., 1., Rayon, 1., Rayonint ) ; - return HOMARD::HOMARD_Zone::_duplicate(myZone) ; + return ADAPT::HOMARD_Zone::_duplicate(myZone) ; } //============================================================================= //============================================================================= @@ -2396,7 +2396,7 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::CreateZoneDiskWithHole(const char* ZoneNam // 1 : aucune option // x2 : publication du maillage dans SMESH //============================================================================= -CORBA::Long HOMARD_Gen_i::Compute(const char* NomIteration, CORBA::Long etatMenage, CORBA::Long modeHOMARD, CORBA::Long Option1, CORBA::Long Option2) +CORBA::Long ADAPT_Gen_i::Compute(const char* NomIteration, CORBA::Long etatMenage, CORBA::Long modeHOMARD, CORBA::Long Option1, CORBA::Long Option2) { INFOS ( "Compute : traitement de " << NomIteration << ", avec modeHOMARD = " << modeHOMARD << ", Option1 = " << Option1 << ", Option2 = " << Option2 ); @@ -2404,7 +2404,7 @@ CORBA::Long HOMARD_Gen_i::Compute(const char* NomIteration, CORBA::Long etatMena int codret = 0; // A.1. L'objet iteration - HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[NomIteration]; + ADAPT::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[NomIteration]; ASSERT(!CORBA::is_nil(myIteration)); // A.2. Controle de la possibilite d'agir @@ -2471,7 +2471,7 @@ CORBA::Long HOMARD_Gen_i::Compute(const char* NomIteration, CORBA::Long etatMena // A.4. Le cas const char* nomCas = myIteration->GetCaseName(); - HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas]; + ADAPT::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas]; ASSERT(!CORBA::is_nil(myCase)); // B. Les répertoires @@ -2653,7 +2653,7 @@ CORBA::Long HOMARD_Gen_i::Compute(const char* NomIteration, CORBA::Long etatMena //============================================================================= // Calcul d'une iteration : partie spécifique à l'adaptation //============================================================================= -CORBA::Long HOMARD_Gen_i::ComputeAdap(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long etatMenage, HomardDriver* myDriver, CORBA::Long Option1, CORBA::Long Option2) +CORBA::Long ADAPT_Gen_i::ComputeAdap(ADAPT::HOMARD_Cas_var myCase, ADAPT::HOMARD_Iteration_var myIteration, CORBA::Long etatMenage, HomardDriver* myDriver, CORBA::Long Option1, CORBA::Long Option2) { MESSAGE ( "ComputeAdap avec Option1 = " << Option1 << ", Option2 = " << Option2 ); @@ -2677,12 +2677,12 @@ CORBA::Long HOMARD_Gen_i::ComputeAdap(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOM throw SALOME::SALOME_Exception(es); return 2; }; - HOMARD::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypo]; + ADAPT::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypo]; ASSERT(!CORBA::is_nil(myHypo)); // B. L'iteration parent const char* nomIterationParent = myIteration->GetIterParentName(); - HOMARD::HOMARD_Iteration_var myIterationParent = myStudyContext._mesIterations[nomIterationParent]; + ADAPT::HOMARD_Iteration_var myIterationParent = myStudyContext._mesIterations[nomIterationParent]; ASSERT(!CORBA::is_nil(myIterationParent)); // Si l'iteration parent n'est pas calculee, on le fait (recursivite amont) if ( myIterationParent->GetState() == 1 ) @@ -2748,7 +2748,7 @@ CORBA::Long HOMARD_Gen_i::ComputeAdap(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOM // D.5. Les types de raffinement et de deraffinement // Les appels corba sont lourds, il vaut mieux les grouper - HOMARD::listeTypes* ListTypes = myHypo->GetAdapRefinUnRef(); + ADAPT::listeTypes* ListTypes = myHypo->GetAdapRefinUnRef(); ASSERT(ListTypes->length() == 3); int TypeAdap = (*ListTypes)[0]; int TypeRaff = (*ListTypes)[1]; @@ -2772,7 +2772,7 @@ CORBA::Long HOMARD_Gen_i::ComputeAdap(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOM { DriverTexteField(myIteration, myHypo, myDriver) ; } // E.4. Ajout des informations liees au filtrage eventuel par les groupes - HOMARD::ListGroupType* listeGroupes = myHypo->GetGroups(); + ADAPT::ListGroupType* listeGroupes = myHypo->GetGroups(); int numberOfGroups = listeGroupes->length(); MESSAGE( ". Filtrage par " << numberOfGroups << " groupes"); if (numberOfGroups > 0) @@ -2811,7 +2811,7 @@ CORBA::Long HOMARD_Gen_i::ComputeAdap(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOM //============================================================================= // Calcul d'une iteration : partie spécifique au suivi de frontière CAO //============================================================================= -CORBA::Long HOMARD_Gen_i::ComputeCAO(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long Option1, CORBA::Long Option2) +CORBA::Long ADAPT_Gen_i::ComputeCAO(ADAPT::HOMARD_Cas_var myCase, ADAPT::HOMARD_Iteration_var myIteration, CORBA::Long Option1, CORBA::Long Option2) { MESSAGE ( "ComputeCAO avec Option1 = " << Option1 << ", Option2 = " << Option2 ); @@ -2876,10 +2876,10 @@ CORBA::Long HOMARD_Gen_i::ComputeCAO(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMA { MESSAGE ( ". theInputNodeFiles["<< i << "] = " << theInputNodeFiles[i] ); } // B.4. Le fichier de la CAO - HOMARD::ListBoundaryGroupType* ListBoundaryGroupType = myCase->GetBoundaryGroup(); + ADAPT::ListBoundaryGroupType* ListBoundaryGroupType = myCase->GetBoundaryGroup(); std::string BoundaryName = std::string((*ListBoundaryGroupType)[0]); MESSAGE ( ". BoundaryName = " << BoundaryName ); - HOMARD::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName]; + ADAPT::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName]; const std::string theXaoFileName = myBoundary->GetDataFile(); MESSAGE ( ". theXaoFileName = " << theXaoFileName ); @@ -2907,7 +2907,7 @@ CORBA::Long HOMARD_Gen_i::ComputeCAO(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMA // 1 : aucune option // x2 : publication du maillage dans SMESH //============================================================================= -CORBA::Long HOMARD_Gen_i::ComputeCAObis(HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long Option1, CORBA::Long Option2) +CORBA::Long ADAPT_Gen_i::ComputeCAObis(ADAPT::HOMARD_Iteration_var myIteration, CORBA::Long Option1, CORBA::Long Option2) { MESSAGE ( "ComputeCAObis, avec Option1 = " << Option1 << ", Option2 = " << Option2 ); @@ -2939,7 +2939,7 @@ CORBA::Long HOMARD_Gen_i::ComputeCAObis(HOMARD::HOMARD_Iteration_var myIteration // A.3. Le cas const char* CaseName = myIteration->GetCaseName(); - HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[CaseName]; + ADAPT::HOMARD_Cas_var myCase = myStudyContext._mesCas[CaseName]; ASSERT(!CORBA::is_nil(myCase)); // A.4. Le sous-répertoire de l'iteration a traiter @@ -3020,7 +3020,7 @@ CORBA::Long HOMARD_Gen_i::ComputeCAObis(HOMARD::HOMARD_Iteration_var myIteration // nomrep : nom du répertoire parent // num : le nom du sous-répertoire est sous la forme 'In', n est >= num //============================================================================= -char* HOMARD_Gen_i::CreateDirNameIter(const char* nomrep, CORBA::Long num ) +char* ADAPT_Gen_i::CreateDirNameIter(const char* nomrep, CORBA::Long num ) { MESSAGE ( "CreateDirNameIter : nomrep ="<< nomrep << ", num = "<GetIterParentName(); - HOMARD::HOMARD_Iteration_var myIterationParent = myStudyContext._mesIterations[nomIterationParent]; + ADAPT::HOMARD_Iteration_var myIterationParent = myStudyContext._mesIterations[nomIterationParent]; const char* nomDirItPa = myIterationParent->GetDirNameLoc(); std::stringstream DirComputePa ; DirComputePa << nomDirCase << "/" << nomDirItPa; @@ -3219,10 +3219,10 @@ char* HOMARD_Gen_i::ComputeDirPaManagement(HOMARD::HOMARD_Cas_var myCase, HOMARD //============================================================================= // Calcul d'une iteration : ecriture des zones dans le fichier de configuration //============================================================================= -void HOMARD_Gen_i::DriverTexteZone(HOMARD::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver) +void ADAPT_Gen_i::DriverTexteZone(ADAPT::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver) { MESSAGE ( "... DriverTexteZone" ); - HOMARD::listeZonesHypo* ListZone = myHypo->GetZones(); + ADAPT::listeZonesHypo* ListZone = myHypo->GetZones(); int numberOfZonesx2 = ListZone->length(); int NumZone ; @@ -3230,7 +3230,7 @@ void HOMARD_Gen_i::DriverTexteZone(HOMARD::HOMARD_Hypothesis_var myHypo, HomardD { std::string ZoneName = std::string((*ListZone)[iaux]); MESSAGE ( "... ZoneName = " << ZoneName); - HOMARD::HOMARD_Zone_var myZone = myStudyContext._mesZones[ZoneName]; + ADAPT::HOMARD_Zone_var myZone = myStudyContext._mesZones[ZoneName]; ASSERT(!CORBA::is_nil(myZone)); int ZoneType = myZone->GetType(); @@ -3238,7 +3238,7 @@ void HOMARD_Gen_i::DriverTexteZone(HOMARD::HOMARD_Hypothesis_var myHypo, HomardD int TypeUse = atoi( TypeUsestr.c_str() ); MESSAGE ( "... ZoneType = " << ZoneType << ", TypeUse = "<GetCoords(); + ADAPT::double_array* zone = myZone->GetCoords(); if ( ZoneType == 2 || ( ZoneType>=11 && ZoneType <=13 ) ) // Cas d un parallelepipede ou d'un rectangle { myDriver->TexteZone(NumZone, ZoneType, TypeUse, (*zone)[0], (*zone)[1], (*zone)[2], (*zone)[3], (*zone)[4], (*zone)[5], 0., 0., 0.); } else if ( ZoneType == 4 ) // Cas d une sphere @@ -3255,7 +3255,7 @@ void HOMARD_Gen_i::DriverTexteZone(HOMARD::HOMARD_Hypothesis_var myHypo, HomardD //============================================================================= // Calcul d'une iteration : ecriture des champs dans le fichier de configuration //============================================================================= -void HOMARD_Gen_i::DriverTexteField(HOMARD::HOMARD_Iteration_var myIteration, HOMARD::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver) +void ADAPT_Gen_i::DriverTexteField(ADAPT::HOMARD_Iteration_var myIteration, ADAPT::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver) { MESSAGE ( "... DriverTexteField" ); // Le fichier du champ @@ -3273,7 +3273,7 @@ void HOMARD_Gen_i::DriverTexteField(HOMARD::HOMARD_Iteration_var myIteration, HO int Rank = myIteration->GetRank(); MESSAGE( ". Rank = " << Rank ); // Les informations sur les champs - HOMARD::InfosHypo* aInfosHypo = myHypo->GetField(); + ADAPT::InfosHypo* aInfosHypo = myHypo->GetField(); // Le nom const char* FieldName = aInfosHypo->FieldName; // Les seuils @@ -3291,7 +3291,7 @@ void HOMARD_Gen_i::DriverTexteField(HOMARD::HOMARD_Iteration_var myIteration, HO myDriver->TexteField(FieldName, FieldFile, TimeStep, Rank, TypeThR, ThreshR, TypeThC, ThreshC, UsField, UsCmpI); // // Les composantes - HOMARD::listeComposantsHypo* mescompo = myHypo->GetComps(); + ADAPT::listeComposantsHypo* mescompo = myHypo->GetComps(); int numberOfCompos = mescompo->length(); MESSAGE( ". numberOfCompos = " << numberOfCompos ); for (int NumeComp = 0; NumeComp< numberOfCompos; NumeComp++) @@ -3309,12 +3309,12 @@ void HOMARD_Gen_i::DriverTexteField(HOMARD::HOMARD_Iteration_var myIteration, HO // 2. les liens avec les groupes // 3. un entier resumant le type de comportement pour les frontieres //============================================================================= -int HOMARD_Gen_i::DriverTexteBoundary(HOMARD::HOMARD_Cas_var myCase, HomardDriver* myDriver) +int ADAPT_Gen_i::DriverTexteBoundary(ADAPT::HOMARD_Cas_var myCase, HomardDriver* myDriver) { MESSAGE ( "... DriverTexteBoundary" ); // 1. Recuperation des frontieres std::list ListeBoundaryTraitees ; - HOMARD::ListBoundaryGroupType* ListBoundaryGroupType = myCase->GetBoundaryGroup(); + ADAPT::ListBoundaryGroupType* ListBoundaryGroupType = myCase->GetBoundaryGroup(); int numberOfitems = ListBoundaryGroupType->length(); MESSAGE ( "... number of string for Boundary+Group = " << numberOfitems); int BoundaryOption = 1 ; @@ -3338,7 +3338,7 @@ int HOMARD_Gen_i::DriverTexteBoundary(HOMARD::HOMARD_Cas_var myCase, HomardDrive if ( A_faire == 1 ) { // 2.2.1. Caracteristiques de la frontiere - HOMARD::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName]; + ADAPT::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName]; ASSERT(!CORBA::is_nil(myBoundary)); int BoundaryType = myBoundary->GetType(); MESSAGE ( "... BoundaryType = " << BoundaryType ); @@ -3364,7 +3364,7 @@ int HOMARD_Gen_i::DriverTexteBoundary(HOMARD::HOMARD_Cas_var myCase, HomardDrive else { NumBoundaryAnalytical++ ; - HOMARD::double_array* coor = myBoundary->GetCoords(); + ADAPT::double_array* coor = myBoundary->GetCoords(); if (BoundaryType == 1) // Cas d un cylindre { myDriver->TexteBoundaryAn(BoundaryName, NumBoundaryAnalytical, BoundaryType, (*coor)[0], (*coor)[1], (*coor)[2], (*coor)[3], (*coor)[4], (*coor)[5], (*coor)[6], 0.); @@ -3401,7 +3401,7 @@ int HOMARD_Gen_i::DriverTexteBoundary(HOMARD::HOMARD_Cas_var myCase, HomardDrive { std::string BoundaryName = std::string((*ListBoundaryGroupType)[NumBoundary]); MESSAGE ( "... BoundaryName = " << BoundaryName); - HOMARD::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName]; + ADAPT::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName]; ASSERT(!CORBA::is_nil(myBoundary)); int BoundaryType = myBoundary->GetType(); MESSAGE ( "... BoundaryType = " << BoundaryType ); @@ -3433,7 +3433,7 @@ int HOMARD_Gen_i::DriverTexteBoundary(HOMARD::HOMARD_Cas_var myCase, HomardDrive //============================================================================= // Calcul d'une iteration : ecriture des interpolations dans le fichier de configuration //============================================================================= -void HOMARD_Gen_i::DriverTexteFieldInterp(HOMARD::HOMARD_Iteration_var myIteration, HOMARD::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver) +void ADAPT_Gen_i::DriverTexteFieldInterp(ADAPT::HOMARD_Iteration_var myIteration, ADAPT::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver) { MESSAGE ( "... DriverTexteFieldInterp" ); int TypeFieldInterp = myHypo->GetTypeFieldInterp(); @@ -3462,11 +3462,11 @@ void HOMARD_Gen_i::DriverTexteFieldInterp(HOMARD::HOMARD_Iteration_var myIterati else if (TypeFieldInterp == 2) { // Les champs et leurs instants pour l'iteration - HOMARD::listeFieldInterpTSRsIter* ListFieldTSR = myIteration->GetFieldInterpsTimeStepRank(); + ADAPT::listeFieldInterpTSRsIter* ListFieldTSR = myIteration->GetFieldInterpsTimeStepRank(); int numberOfFieldsx3 = ListFieldTSR->length(); MESSAGE( ". pour iteration, numberOfFields = " << numberOfFieldsx3/3 ); // Les champs pour l'hypothese - HOMARD::listeFieldInterpsHypo* ListField = myHypo->GetFieldInterps(); + ADAPT::listeFieldInterpsHypo* ListField = myHypo->GetFieldInterps(); int numberOfFieldsx2 = ListField->length(); MESSAGE( ". pour hypothese, numberOfFields = " << numberOfFieldsx2/2 ); // On parcourt tous les champs de l'hypothese @@ -3522,7 +3522,7 @@ void HOMARD_Gen_i::DriverTexteFieldInterp(HOMARD::HOMARD_Iteration_var myIterati // Publications //=========================================================================== //=========================================================================== -SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr theSObject, +SALOMEDS::SObject_ptr ADAPT_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr theSObject, CORBA::Object_ptr theObject, const char* theName) { @@ -3539,11 +3539,11 @@ SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr theSObj // Recuperation de l'objet correspondant, en essayant chacun des types possibles // Rq : Iteration est publiee ailleurs - HOMARD::HOMARD_Boundary_var aBoundary = HOMARD::HOMARD_Boundary::_narrow(theObject); - HOMARD::HOMARD_Cas_var aCase = HOMARD::HOMARD_Cas::_narrow(theObject); - HOMARD::HOMARD_Hypothesis_var aHypo = HOMARD::HOMARD_Hypothesis::_narrow(theObject); - HOMARD::HOMARD_YACS_var aYACS = HOMARD::HOMARD_YACS::_narrow(theObject); - HOMARD::HOMARD_Zone_var aZone = HOMARD::HOMARD_Zone::_narrow(theObject); + ADAPT::HOMARD_Boundary_var aBoundary = ADAPT::HOMARD_Boundary::_narrow(theObject); + ADAPT::HOMARD_Cas_var aCase = ADAPT::HOMARD_Cas::_narrow(theObject); + ADAPT::HOMARD_Hypothesis_var aHypo = ADAPT::HOMARD_Hypothesis::_narrow(theObject); + ADAPT::HOMARD_YACS_var aYACS = ADAPT::HOMARD_YACS::_narrow(theObject); + ADAPT::HOMARD_Zone_var aZone = ADAPT::HOMARD_Zone::_narrow(theObject); UpdateStudy(); @@ -3578,14 +3578,14 @@ SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr theSObj return aResultSO._retn(); }; //============================================================================= -SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishBoundaryInStudy( SALOMEDS::StudyBuilder_var aStudyBuilder, - HOMARD::HOMARD_Boundary_ptr theObject, const char* theName) +SALOMEDS::SObject_ptr ADAPT_Gen_i::PublishBoundaryInStudy( SALOMEDS::StudyBuilder_var aStudyBuilder, + ADAPT::HOMARD_Boundary_ptr theObject, const char* theName) { MESSAGE("PublishBoundaryStudy pour "<FindComponent(ComponentDataType()); @@ -3658,18 +3658,18 @@ SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishBoundaryInStudy( SALOMEDS::StudyBuild return aResultSO._retn(); } //============================================================================= -SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishCaseInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder, - HOMARD::HOMARD_Cas_ptr theObject, const char* theName) +SALOMEDS::SObject_ptr ADAPT_Gen_i::PublishCaseInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder, + ADAPT::HOMARD_Cas_ptr theObject, const char* theName) { MESSAGE("PublishCaseInStudy pour "<_is_nil()"); + MESSAGE("ADAPT_Gen_i::theObject->_is_nil()"); return aResultSO._retn(); } if (myStudy->_is_nil()) { - MESSAGE("HOMARD_Gen_i::myStudy->_is_nil()"); + MESSAGE("ADAPT_Gen_i::myStudy->_is_nil()"); return aResultSO._retn(); } @@ -3690,8 +3690,8 @@ SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishCaseInStudy(SALOMEDS::StudyBuilder_va return aResultSO._retn(); } //============================================================================= -SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishHypotheseInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder, - HOMARD::HOMARD_Hypothesis_ptr theObject, const char* theName) +SALOMEDS::SObject_ptr ADAPT_Gen_i::PublishHypotheseInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder, + ADAPT::HOMARD_Hypothesis_ptr theObject, const char* theName) { MESSAGE("PublishHypotheseInStudy pour "<GetType(); // On ajoute la categorie des zones dans l etude si necessaire @@ -3858,7 +3858,7 @@ SALOMEDS::SObject_ptr HOMARD_Gen_i::PublishZoneInStudy(SALOMEDS::StudyBuilder_va return aResultSO._retn(); } //=========================================================================== -void HOMARD_Gen_i::PublishInStudyAttr(SALOMEDS::StudyBuilder_var aStudyBuilder, +void ADAPT_Gen_i::PublishInStudyAttr(SALOMEDS::StudyBuilder_var aStudyBuilder, SALOMEDS::SObject_var aResultSO, const char* name, const char* comment, const char* icone, const char* ior) { @@ -3900,16 +3900,16 @@ void HOMARD_Gen_i::PublishInStudyAttr(SALOMEDS::StudyBuilder_var aStudyBuilder, }; //===================================================================================== -void HOMARD_Gen_i::PublishBoundaryUnderCase(const char* CaseName, const char* BoundaryName) +void ADAPT_Gen_i::PublishBoundaryUnderCase(const char* CaseName, const char* BoundaryName) { MESSAGE ( "PublishBoundaryUnderCase : CaseName = " << CaseName << ", BoundaryName= " << BoundaryName ); - HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[CaseName]; + ADAPT::HOMARD_Cas_var myCase = myStudyContext._mesCas[CaseName]; ASSERT(!CORBA::is_nil(myCase)); SALOMEDS::SObject_var aCaseSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myCase))); ASSERT(!CORBA::is_nil(aCaseSO)); - HOMARD::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName]; + ADAPT::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName]; ASSERT(!CORBA::is_nil(myBoundary)); SALOMEDS::SObject_var aBoundarySO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myBoundary))); ASSERT(!CORBA::is_nil(aBoundarySO)); @@ -3926,16 +3926,16 @@ void HOMARD_Gen_i::PublishBoundaryUnderCase(const char* CaseName, const char* Bo }; //===================================================================================== -void HOMARD_Gen_i::PublishCaseUnderYACS(const char* nomYACS, const char* CaseName) +void ADAPT_Gen_i::PublishCaseUnderYACS(const char* nomYACS, const char* CaseName) { MESSAGE ( "PublishCaseUnderYACS : nomYACS = " << nomYACS << ", CaseName= " << CaseName ); - HOMARD::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[nomYACS]; + ADAPT::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[nomYACS]; ASSERT(!CORBA::is_nil(myYACS)); SALOMEDS::SObject_var aYACSSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myYACS))); ASSERT(!CORBA::is_nil(aYACSSO)); - HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[CaseName]; + ADAPT::HOMARD_Cas_var myCase = myStudyContext._mesCas[CaseName]; ASSERT(!CORBA::is_nil(myCase)); SALOMEDS::SObject_var aCaseSO = SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myCase))); ASSERT(!CORBA::is_nil(aCaseSO)); @@ -3951,7 +3951,7 @@ void HOMARD_Gen_i::PublishCaseUnderYACS(const char* nomYACS, const char* CaseNam }; //============================================================================= -void HOMARD_Gen_i::PublishResultInSmesh(const char* NomFich, CORBA::Long Option) +void ADAPT_Gen_i::PublishResultInSmesh(const char* NomFich, CORBA::Long Option) // Option = 0 : fichier issu d'une importation // Option = 1 : fichier issu d'une execution HOMARD { @@ -4030,7 +4030,7 @@ void HOMARD_Gen_i::PublishResultInSmesh(const char* NomFich, CORBA::Long Option) } //============================================================================= -void HOMARD_Gen_i::DeleteResultInSmesh(std::string NomFich, std::string MeshName) +void ADAPT_Gen_i::DeleteResultInSmesh(std::string NomFich, std::string MeshName) { MESSAGE ("DeleteResultInSmesh pour le maillage " << MeshName << " dans le fichier " << NomFich ); if (CORBA::is_nil(myStudy)) @@ -4077,10 +4077,10 @@ void HOMARD_Gen_i::DeleteResultInSmesh(std::string NomFich, std::string MeshName return ; } //============================================================================= -void HOMARD_Gen_i::PublishMeshIterInSmesh(const char* NomIter) +void ADAPT_Gen_i::PublishMeshIterInSmesh(const char* NomIter) { MESSAGE( "PublishMeshIterInSmesh " << NomIter); - HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[NomIter]; + ADAPT::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[NomIter]; SALOMEDS::SObject_var aIterSO=SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myIteration))); if (CORBA::is_nil(myIteration)) @@ -4108,10 +4108,10 @@ void HOMARD_Gen_i::PublishMeshIterInSmesh(const char* NomIter) } //============================================================================= -void HOMARD_Gen_i::PublishFileUnderIteration(const char* NomIter, const char* NomFich, const char* Commentaire) +void ADAPT_Gen_i::PublishFileUnderIteration(const char* NomIter, const char* NomFich, const char* Commentaire) { // MESSAGE ("PublishFileUnderIteration pour l'iteration " << NomIter << " du fichier " << NomFich << " avec le commentaire " << Commentaire ); - HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[NomIter]; + ADAPT::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[NomIter]; SALOMEDS::SObject_var aIterSO=SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myIteration))); if (CORBA::is_nil(myIteration)) @@ -4143,10 +4143,10 @@ void HOMARD_Gen_i::PublishFileUnderIteration(const char* NomIter, const char* No } // //============================================================================= -void HOMARD_Gen_i::PublishFileUnderYACS(const char* nomYACS, const char* NomFich, const char* Commentaire) +void ADAPT_Gen_i::PublishFileUnderYACS(const char* nomYACS, const char* NomFich, const char* Commentaire) { // MESSAGE ("PublishFileUnderYACS pour le schema " << nomYACS << " du fichier " << NomFich << " avec le commentaire " << Commentaire ); - HOMARD::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[nomYACS]; + ADAPT::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[nomYACS]; SALOMEDS::SObject_var aYACSSO=SALOMEDS::SObject::_narrow(myStudy->FindObjectIOR(_orb->object_to_string(myYACS))); if (CORBA::is_nil(myYACS)) @@ -4181,7 +4181,7 @@ void HOMARD_Gen_i::PublishFileUnderYACS(const char* nomYACS, const char* NomFich // FileName : nom du fichier contenant le script de lancement du calcul // DirName : le répertoire de lancement des calculs du schéma //============================================================================= -HOMARD::HOMARD_YACS_ptr HOMARD_Gen_i::CreateYACSSchema (const char* nomYACS, const char* nomCas, const char* ScriptFile, const char* DirName, const char* MeshFile) +ADAPT::HOMARD_YACS_ptr ADAPT_Gen_i::CreateYACSSchema (const char* nomYACS, const char* nomCas, const char* ScriptFile, const char* DirName, const char* MeshFile) { INFOS ( "CreateYACSSchema : Schema YACS " << nomYACS ); INFOS ( ". nomCas : " << nomCas); @@ -4200,7 +4200,7 @@ HOMARD::HOMARD_YACS_ptr HOMARD_Gen_i::CreateYACSSchema (const char* nomYACS, con } // B. Creation de l'objet - HOMARD::HOMARD_YACS_var myYACS = newYACS(); + ADAPT::HOMARD_YACS_var myYACS = newYACS(); if (CORBA::is_nil(myYACS)) { SALOME::ExceptionStruct es; @@ -4237,22 +4237,22 @@ HOMARD::HOMARD_YACS_ptr HOMARD_Gen_i::CreateYACSSchema (const char* nomYACS, con defaut_i = GetYACSMaxElem() ; myYACS->SetMaxElem( defaut_i ) ; // D.3. Fichier de sauvegarde dans le répertoire du cas - HOMARD::HOMARD_Cas_ptr caseyacs = GetCase(nomCas) ; + ADAPT::HOMARD_Cas_ptr caseyacs = GetCase(nomCas) ; std::string dirnamecase = caseyacs->GetDirName() ; std::string XMLFile ; XMLFile = dirnamecase + "/schema.xml" ; myYACS->SetXMLFile( XMLFile.c_str() ) ; - return HOMARD::HOMARD_YACS::_duplicate(myYACS); + return ADAPT::HOMARD_YACS::_duplicate(myYACS); } //============================================================================= // Ecriture d'un schema YACS //============================================================================= -CORBA::Long HOMARD_Gen_i::YACSWrite(const char* nomYACS) +CORBA::Long ADAPT_Gen_i::YACSWrite(const char* nomYACS) { INFOS ( "YACSWrite : Ecriture de " << nomYACS ); // Le répertoire du cas - HOMARD::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[nomYACS]; + ADAPT::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[nomYACS]; ASSERT(!CORBA::is_nil(myYACS)); // Le nom du fichier du schema std::string XMLFile ; @@ -4265,7 +4265,7 @@ CORBA::Long HOMARD_Gen_i::YACSWrite(const char* nomYACS) //============================================================================= // Ecriture d'un schema YACS sur un fichier donne //============================================================================= -CORBA::Long HOMARD_Gen_i::YACSWriteOnFile(const char* nomYACS, const char* XMLFile) +CORBA::Long ADAPT_Gen_i::YACSWriteOnFile(const char* nomYACS, const char* XMLFile) { INFOS ( "YACSWriteOnFile : Ecriture de " << nomYACS << " sur " << XMLFile ); @@ -4274,7 +4274,7 @@ CORBA::Long HOMARD_Gen_i::YACSWriteOnFile(const char* nomYACS, const char* XMLFi // B. L'objet YACS // B.1. L'objet - HOMARD::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[nomYACS]; + ADAPT::HOMARD_YACS_var myYACS = myStudyContext._mesYACSs[nomYACS]; ASSERT(!CORBA::is_nil(myYACS)); // B.2. Les caracteristiques std::string DirName = myYACS->GetDirName() ; @@ -4288,7 +4288,7 @@ CORBA::Long HOMARD_Gen_i::YACSWriteOnFile(const char* nomYACS, const char* XMLFi // C. Le cas // C.1. L'objet cas const char* nomCas = myYACS->GetCaseName(); - HOMARD::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas]; + ADAPT::HOMARD_Cas_var myCase = myStudyContext._mesCas[nomCas]; ASSERT(!CORBA::is_nil(myCase)); // C.2. Les instructions python associees au cas CORBA::String_var dumpCorbaCase = myCase->GetDumpPython(); @@ -4297,13 +4297,13 @@ CORBA::Long HOMARD_Gen_i::YACSWriteOnFile(const char* nomYACS, const char* XMLFi // D. Les iterations // D.1. L'iteration initiale - HOMARD::HOMARD_Iteration_var Iter0 = myCase->GetIter0() ; + ADAPT::HOMARD_Iteration_var Iter0 = myCase->GetIter0() ; std::string Iter0Name = myCase->GetIter0Name() ; MESSAGE (". Iter0Name = " << Iter0Name); std::string MeshName = Iter0->GetMeshName(); MESSAGE (". MeshName = " << MeshName); // D.2. L'iteration numero 1 - HOMARD::listeIterFilles* maListe = Iter0->GetIterations(); + ADAPT::listeIterFilles* maListe = Iter0->GetIterations(); int numberOfIter = maListe->length(); if ( numberOfIter > 1 ) { @@ -4317,7 +4317,7 @@ CORBA::Long HOMARD_Gen_i::YACSWriteOnFile(const char* nomYACS, const char* XMLFi } std::string Iter1Name = std::string((*maListe)[0]); MESSAGE ("... Iter1Name = " << Iter1Name); - HOMARD::HOMARD_Iteration_var Iter1 = GetIteration(Iter1Name.c_str()) ; + ADAPT::HOMARD_Iteration_var Iter1 = GetIteration(Iter1Name.c_str()) ; // D.3. Les instructions python associees a l'iteration CORBA::String_var dumpCorbaIter = Iter1->GetDumpPython(); std::string pythonIter = dumpCorbaIter.in(); @@ -4327,10 +4327,10 @@ CORBA::Long HOMARD_Gen_i::YACSWriteOnFile(const char* nomYACS, const char* XMLFi // E.1. La structure std::string nomHypo = Iter1->GetHypoName(); MESSAGE (". nomHypo = " << nomHypo); - HOMARD::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypo]; + ADAPT::HOMARD_Hypothesis_var myHypo = myStudyContext._mesHypotheses[nomHypo]; ASSERT(!CORBA::is_nil(myHypo)); // E.2. Les caracteristiques de l'adaptation - HOMARD::listeTypes* ListTypes = myHypo->GetAdapRefinUnRef(); + ADAPT::listeTypes* ListTypes = myHypo->GetAdapRefinUnRef(); ASSERT(ListTypes->length() == 3); int TypeAdap = (*ListTypes)[0]; // int TypeRaff = (*ListTypes)[1]; @@ -4442,11 +4442,11 @@ CORBA::Long HOMARD_Gen_i::YACSWriteOnFile(const char* nomYACS, const char* XMLFi //============================================================================= // Ecriture d'un schema YACS : ecriture des zones associees a une hypothese //============================================================================= -std::string HOMARD_Gen_i::YACSDriverTexteZone(HOMARD::HOMARD_Hypothesis_var myHypo, YACSDriver* myDriver) +std::string ADAPT_Gen_i::YACSDriverTexteZone(ADAPT::HOMARD_Hypothesis_var myHypo, YACSDriver* myDriver) { MESSAGE ( "YACSDriverTexteZone" ); // A. Les zones associees a cette hypothese - HOMARD::listeZonesHypo* ListZone = myHypo->GetZones(); + ADAPT::listeZonesHypo* ListZone = myHypo->GetZones(); int numberOfZonesx2 = ListZone->length(); // B. Parcours des zones @@ -4456,7 +4456,7 @@ std::string HOMARD_Gen_i::YACSDriverTexteZone(HOMARD::HOMARD_Hypothesis_var myHy // 1. Reperage de la zone std::string ZoneName = std::string((*ListZone)[iaux]); MESSAGE ( "\n. ZoneName = " << ZoneName << " - " <GetBoundaryGroup(); + ADAPT::ListBoundaryGroupType* ListBoundaryGroupType = myCase->GetBoundaryGroup(); int numberOfitems = ListBoundaryGroupType->length(); // B. Parcours des frontieres @@ -4515,7 +4515,7 @@ std::string HOMARD_Gen_i::YACSDriverTexteBoundary(HOMARD::HOMARD_Cas_var myCase, if ( A_faire == 1 ) { // 1. Caracteristiques de la frontiere - HOMARD::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName]; + ADAPT::HOMARD_Boundary_var myBoundary = myStudyContext._mesBoundarys[BoundaryName]; ASSERT(!CORBA::is_nil(myBoundary)); // 2. Les instructions python associees a la frontiere // La premiere ligne est un commentaire a eliminer @@ -4565,7 +4565,7 @@ std::string HOMARD_Gen_i::YACSDriverTexteBoundary(HOMARD::HOMARD_Cas_var myCase, // Next functions are inherited from SALOMEDS::Driver interface //============================================================================= //============================================================================= -SALOMEDS::TMPFile* HOMARD_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent, +SALOMEDS::TMPFile* ADAPT_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent, const char* theURL, CORBA::Boolean isMultiFile) { @@ -4601,57 +4601,57 @@ SALOMEDS::TMPFile* HOMARD_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent, int id = 1; // -> save cases - std::map::const_iterator it_case; + std::map::const_iterator it_case; for (it_case = context._mesCas.begin(); it_case != context._mesCas.end(); ++it_case) { - HOMARD::HOMARD_Cas_var aCas = it_case->second; + ADAPT::HOMARD_Cas_var aCas = it_case->second; PortableServer::ServantBase_var aServant = GetServant(aCas); HOMARD_Cas_i* aCasServant = dynamic_cast(aServant.in()); if (aCasServant) { - f << HOMARD::GetSignature(HOMARD::Case) << aCasServant->Dump() << std::endl; + f << ADAPT::GetSignature(ADAPT::Case) << aCasServant->Dump() << std::endl; context._idmap[id++] = dynamic_cast(aCasServant); } } // -> save zones - std::map::const_iterator it_zone; + std::map::const_iterator it_zone; for (it_zone = context._mesZones.begin(); it_zone != context._mesZones.end(); ++it_zone) { - HOMARD::HOMARD_Zone_var aZone = it_zone->second; + ADAPT::HOMARD_Zone_var aZone = it_zone->second; PortableServer::ServantBase_var aServant = GetServant(aZone); HOMARD_Zone_i* aZoneServant = dynamic_cast(aServant.in()); if (aZoneServant) { - f << HOMARD::GetSignature(HOMARD::Zone) << aZoneServant->Dump() << std::endl; + f << ADAPT::GetSignature(ADAPT::Zone) << aZoneServant->Dump() << std::endl; context._idmap[id++] = dynamic_cast(aZoneServant); } } // -> save hypotheses - std::map::const_iterator it_hypo; + std::map::const_iterator it_hypo; for (it_hypo = context._mesHypotheses.begin(); it_hypo != context._mesHypotheses.end(); ++it_hypo) { - HOMARD::HOMARD_Hypothesis_var aHypo = it_hypo->second; + ADAPT::HOMARD_Hypothesis_var aHypo = it_hypo->second; PortableServer::ServantBase_var aServant = GetServant(aHypo); HOMARD_Hypothesis_i* aHypoServant = dynamic_cast(aServant.in()); if (aHypoServant) { - f << HOMARD::GetSignature(HOMARD::Hypothesis) << aHypoServant->Dump() << std::endl; + f << ADAPT::GetSignature(ADAPT::Hypothesis) << aHypoServant->Dump() << std::endl; context._idmap[id++] = dynamic_cast(aHypoServant); } } // -> save iterations - std::map::const_iterator it_iter; + std::map::const_iterator it_iter; for (it_iter = context._mesIterations.begin(); it_iter != context._mesIterations.end(); ++it_iter) { - HOMARD::HOMARD_Iteration_var aIter = it_iter->second; + ADAPT::HOMARD_Iteration_var aIter = it_iter->second; PortableServer::ServantBase_var aServant = GetServant(aIter); HOMARD_Iteration_i* aIterServant = dynamic_cast(aServant.in()); if (aIterServant) { - f << HOMARD::GetSignature(HOMARD::Iteration) << aIterServant->Dump() << std::endl; + f << ADAPT::GetSignature(ADAPT::Iteration) << aIterServant->Dump() << std::endl; context._idmap[id++] = dynamic_cast(aIterServant); } } // -> save boundaries - std::map::const_iterator it_boundary; + std::map::const_iterator it_boundary; for (it_boundary = context._mesBoundarys.begin(); it_boundary != context._mesBoundarys.end(); ++it_boundary) { - HOMARD::HOMARD_Boundary_var aBoundary = it_boundary->second; + ADAPT::HOMARD_Boundary_var aBoundary = it_boundary->second; PortableServer::ServantBase_var aServant = GetServant(aBoundary); HOMARD_Boundary_i* aBoundaryServant = dynamic_cast(aServant.in()); if (aBoundaryServant) { - f << HOMARD::GetSignature(HOMARD::Boundary) << aBoundaryServant->Dump() << std::endl; + f << ADAPT::GetSignature(ADAPT::Boundary) << aBoundaryServant->Dump() << std::endl; context._idmap[id++] = dynamic_cast(aBoundaryServant); } } @@ -4673,7 +4673,7 @@ SALOMEDS::TMPFile* HOMARD_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent, }; //=========================================================================== -SALOMEDS::TMPFile* HOMARD_Gen_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent, +SALOMEDS::TMPFile* ADAPT_Gen_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent, const char* theURL, CORBA::Boolean isMultiFile) { @@ -4683,7 +4683,7 @@ SALOMEDS::TMPFile* HOMARD_Gen_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent }; //=========================================================================== -CORBA::Boolean HOMARD_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent, +CORBA::Boolean ADAPT_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent, const SALOMEDS::TMPFile& theStream, const char* theURL, CORBA::Boolean isMultiFile) @@ -4726,16 +4726,16 @@ CORBA::Boolean HOMARD_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent, while (f) { std::getline(f, line); - std::string bounSignature = HOMARD::GetSignature(HOMARD::Boundary); - std::string caseSignature = HOMARD::GetSignature(HOMARD::Case); - std::string hypoSignature = HOMARD::GetSignature(HOMARD::Hypothesis); - std::string iterSignature = HOMARD::GetSignature(HOMARD::Iteration); - std::string zoneSignature = HOMARD::GetSignature(HOMARD::Zone); - std::string yacsSignature = HOMARD::GetSignature(HOMARD::YACS); + std::string bounSignature = ADAPT::GetSignature(ADAPT::Boundary); + std::string caseSignature = ADAPT::GetSignature(ADAPT::Case); + std::string hypoSignature = ADAPT::GetSignature(ADAPT::Hypothesis); + std::string iterSignature = ADAPT::GetSignature(ADAPT::Iteration); + std::string zoneSignature = ADAPT::GetSignature(ADAPT::Zone); + std::string yacsSignature = ADAPT::GetSignature(ADAPT::YACS); if (line.substr(0, bounSignature.size()) == bounSignature) { // re-create boundary MESSAGE ("Recreation de la frontiere" ); - HOMARD::HOMARD_Boundary_var aBoundary = newBoundary(); + ADAPT::HOMARD_Boundary_var aBoundary = newBoundary(); PortableServer::ServantBase_var aServant = GetServant(aBoundary); HOMARD_Boundary_i* aBoundaryServant = dynamic_cast(aServant.in()); if (aBoundaryServant && aBoundaryServant->Restore(line.substr(bounSignature.size()))) { @@ -4746,7 +4746,7 @@ CORBA::Boolean HOMARD_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent, else if (line.substr(0, caseSignature.size()) == caseSignature) { // re-create case MESSAGE ("Recreation du cas" ); - HOMARD::HOMARD_Cas_var aCase = newCase(); + ADAPT::HOMARD_Cas_var aCase = newCase(); PortableServer::ServantBase_var aServant = GetServant(aCase); HOMARD_Cas_i* aCaseServant = dynamic_cast(aServant.in()); if (aCaseServant && aCaseServant->Restore(line.substr(caseSignature.size()))) { @@ -4757,7 +4757,7 @@ CORBA::Boolean HOMARD_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent, else if (line.substr(0, hypoSignature.size()) == hypoSignature) { // re-create hypothesis MESSAGE ("Recreation de l hypothese" ); - HOMARD::HOMARD_Hypothesis_var aHypo = newHypothesis(); + ADAPT::HOMARD_Hypothesis_var aHypo = newHypothesis(); PortableServer::ServantBase_var aServant = GetServant(aHypo); HOMARD_Hypothesis_i* aHypoServant = dynamic_cast(aServant.in()); if (aHypoServant && aHypoServant->Restore(line.substr(hypoSignature.size()))) { @@ -4768,7 +4768,7 @@ CORBA::Boolean HOMARD_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent, else if (line.substr(0, iterSignature.size()) == iterSignature) { // re-create iteration MESSAGE ("Recreation de l'iteration" ); - HOMARD::HOMARD_Iteration_var aIter = newIteration(); + ADAPT::HOMARD_Iteration_var aIter = newIteration(); PortableServer::ServantBase_var aServant = GetServant(aIter); HOMARD_Iteration_i* aIterServant = dynamic_cast(aServant.in()); if (aIterServant && aIterServant->Restore(line.substr(iterSignature.size()))) { @@ -4779,7 +4779,7 @@ CORBA::Boolean HOMARD_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent, else if (line.substr(0, zoneSignature.size()) == zoneSignature) { MESSAGE ("Recreation de la zone" ); // re-create zone - HOMARD::HOMARD_Zone_var aZone = newZone(); + ADAPT::HOMARD_Zone_var aZone = newZone(); PortableServer::ServantBase_var aServant = GetServant(aZone); HOMARD_Zone_i* aZoneServant = dynamic_cast(aServant.in()); if (aZoneServant && aZoneServant->Restore(line.substr(zoneSignature.size()))) { @@ -4790,7 +4790,7 @@ CORBA::Boolean HOMARD_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent, else if (line.substr(0, zoneSignature.size()) == yacsSignature) { MESSAGE ("Recreation du schema YACS" ); // re-create YACS - HOMARD::HOMARD_YACS_var aYACS = newYACS(); + ADAPT::HOMARD_YACS_var aYACS = newYACS(); PortableServer::ServantBase_var aServant = GetServant(aYACS); HOMARD_YACS_i* aYACSServant = dynamic_cast(aServant.in()); if (aYACSServant && aYACSServant->Restore(line.substr(yacsSignature.size()))) { @@ -4812,7 +4812,7 @@ CORBA::Boolean HOMARD_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent, }; //=========================================================================== -CORBA::Boolean HOMARD_Gen_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent, +CORBA::Boolean ADAPT_Gen_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent, const SALOMEDS::TMPFile& theStream, const char* theURL, CORBA::Boolean isMultiFile) @@ -4822,18 +4822,18 @@ CORBA::Boolean HOMARD_Gen_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent, }; //=========================================================================== -void HOMARD_Gen_i::Close(SALOMEDS::SComponent_ptr theComponent) +void ADAPT_Gen_i::Close(SALOMEDS::SComponent_ptr theComponent) { }; //=========================================================================== -char* HOMARD_Gen_i::ComponentDataType() +char* ADAPT_Gen_i::ComponentDataType() { return CORBA::string_dup("HOMARD"); }; //=========================================================================== -char* HOMARD_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject, +char* ADAPT_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject, const char* IORString, CORBA::Boolean isMultiFile, CORBA::Boolean isASCII) @@ -4861,7 +4861,7 @@ char* HOMARD_Gen_i::IORToLocalPersistentID(SALOMEDS::SObject_ptr theSObject, }; //=========================================================================== -char* HOMARD_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject, +char* ADAPT_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject, const char* aLocalPersistentID, CORBA::Boolean isMultiFile, CORBA::Boolean isASCII) @@ -4881,29 +4881,29 @@ char* HOMARD_Gen_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject, }; //=========================================================================== -CORBA::Boolean HOMARD_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR) +CORBA::Boolean ADAPT_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR) { if(CORBA::is_nil(myStudy)) return false; - HOMARD::HOMARD_Cas_var aCas = HOMARD::HOMARD_Cas::_narrow(theIOR); + ADAPT::HOMARD_Cas_var aCas = ADAPT::HOMARD_Cas::_narrow(theIOR); if(!aCas->_is_nil()) return true; - HOMARD::HOMARD_Hypothesis_var aHypo = HOMARD::HOMARD_Hypothesis::_narrow(theIOR); + ADAPT::HOMARD_Hypothesis_var aHypo = ADAPT::HOMARD_Hypothesis::_narrow(theIOR); if(!aHypo->_is_nil()) return true; - HOMARD::HOMARD_Zone_var aZone = HOMARD::HOMARD_Zone::_narrow(theIOR); + ADAPT::HOMARD_Zone_var aZone = ADAPT::HOMARD_Zone::_narrow(theIOR); if(!aZone->_is_nil()) return true; - HOMARD::HOMARD_Boundary_var aBoundary = HOMARD::HOMARD_Boundary::_narrow(theIOR); + ADAPT::HOMARD_Boundary_var aBoundary = ADAPT::HOMARD_Boundary::_narrow(theIOR); if(!aBoundary->_is_nil()) return true; /* Iteration is not published directly - HOMARD::HOMARD_Iteration_var aIter = HOMARD::HOMARD_Iteration::_narrow(theIOR); + ADAPT::HOMARD_Iteration_var aIter = ADAPT::HOMARD_Iteration::_narrow(theIOR); if(!aIter->_is_nil()) return true; */ @@ -4911,14 +4911,14 @@ CORBA::Boolean HOMARD_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR) }; //=========================================================================== -CORBA::Boolean HOMARD_Gen_i::CanCopy(SALOMEDS::SObject_ptr theObject) +CORBA::Boolean ADAPT_Gen_i::CanCopy(SALOMEDS::SObject_ptr theObject) { // No Copy/Paste support return false; }; //=========================================================================== -SALOMEDS::TMPFile* HOMARD_Gen_i::CopyFrom(SALOMEDS::SObject_ptr theObject, +SALOMEDS::TMPFile* ADAPT_Gen_i::CopyFrom(SALOMEDS::SObject_ptr theObject, CORBA::Long& theObjectID) { // No Copy/Paste support @@ -4927,7 +4927,7 @@ SALOMEDS::TMPFile* HOMARD_Gen_i::CopyFrom(SALOMEDS::SObject_ptr theObject, }; //=========================================================================== -CORBA::Boolean HOMARD_Gen_i::CanPaste(const char *theComponentName, +CORBA::Boolean ADAPT_Gen_i::CanPaste(const char *theComponentName, CORBA::Long theObjectID) { // No Copy/Paste support @@ -4935,7 +4935,7 @@ CORBA::Boolean HOMARD_Gen_i::CanPaste(const char *theComponentName, }; //=========================================================================== -SALOMEDS::SObject_ptr HOMARD_Gen_i::PasteInto(const SALOMEDS::TMPFile& theStream, +SALOMEDS::SObject_ptr ADAPT_Gen_i::PasteInto(const SALOMEDS::TMPFile& theStream, CORBA::Long theObjectID, SALOMEDS::SObject_ptr theSObject) { @@ -4945,7 +4945,7 @@ SALOMEDS::SObject_ptr HOMARD_Gen_i::PasteInto(const SALOMEDS::TMPFile& theStream }; //=========================================================================== -PortableServer::ServantBase_var HOMARD_Gen_i::GetServant(CORBA::Object_ptr theObject) +PortableServer::ServantBase_var ADAPT_Gen_i::GetServant(CORBA::Object_ptr theObject) { PortableServer::Servant aServant = 0; if (!CORBA::is_nil(theObject)) { @@ -4959,7 +4959,7 @@ PortableServer::ServantBase_var HOMARD_Gen_i::GetServant(CORBA::Object_ptr theOb } //========================================================================== -Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Boolean isPublished, +Engines::TMPFile* ADAPT_Gen_i::DumpPython(CORBA::Boolean isPublished, CORBA::Boolean isMultiFile, CORBA::Boolean& isValidScript) { @@ -4989,11 +4989,11 @@ Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Boolean isPublished, aScript += "#\n# Creation of the boundaries"; aScript += "\n# =========================="; } - std::map::const_iterator it_boundary; + std::map::const_iterator it_boundary; for (it_boundary = myStudyContext._mesBoundarys.begin(); it_boundary != myStudyContext._mesBoundarys.end(); ++it_boundary) { - HOMARD::HOMARD_Boundary_var maBoundary = (*it_boundary).second; + ADAPT::HOMARD_Boundary_var maBoundary = (*it_boundary).second; CORBA::String_var dumpCorbaBoundary = maBoundary->GetDumpPython(); std::string dumpBoundary = dumpCorbaBoundary.in(); MESSAGE (dumpBoundary<<"\n"); @@ -5007,11 +5007,11 @@ Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Boolean isPublished, aScript += "#\n# Creation of the zones"; aScript += "\n# ====================="; } - std::map::const_iterator it_zone; + std::map::const_iterator it_zone; for ( it_zone = myStudyContext._mesZones.begin(); it_zone != myStudyContext._mesZones.end(); ++it_zone) { - HOMARD::HOMARD_Zone_var myZone = (*it_zone).second; + ADAPT::HOMARD_Zone_var myZone = (*it_zone).second; CORBA::String_var dumpCorbaZone = myZone->GetDumpPython(); std::string dumpZone = dumpCorbaZone.in(); MESSAGE (dumpZone<<"\n"); @@ -5025,11 +5025,11 @@ Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Boolean isPublished, aScript += "#\n# Creation of the hypotheses"; aScript += "\n# =========================="; } - std::map::const_iterator it_hypo; + std::map::const_iterator it_hypo; for ( it_hypo = myStudyContext._mesHypotheses.begin(); it_hypo != myStudyContext._mesHypotheses.end(); it_hypo++) { - HOMARD::HOMARD_Hypothesis_var monHypo = (*it_hypo).second; + ADAPT::HOMARD_Hypothesis_var monHypo = (*it_hypo).second; CORBA::String_var dumpCorbaHypo = monHypo->GetDumpPython(); std::string dumpHypo = dumpCorbaHypo.in(); MESSAGE (dumpHypo<<"\n"); @@ -5043,7 +5043,7 @@ Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Boolean isPublished, aScript += "#\n# Creation of the cases"; aScript += "\n# ====================="; } - std::map::const_iterator it_cas; + std::map::const_iterator it_cas; for (it_cas = myStudyContext._mesCas.begin(); it_cas != myStudyContext._mesCas.end(); it_cas++) { @@ -5053,11 +5053,11 @@ Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Boolean isPublished, dumpCas += std::string("\t") + nomCas; dumpCas += std::string(" = homard.CreateCase(\"") + nomCas + std::string("\", \""); - HOMARD::HOMARD_Cas_var myCase = (*it_cas).second; + ADAPT::HOMARD_Cas_var myCase = (*it_cas).second; CORBA::String_var cIter0= myCase->GetIter0Name(); std::string iter0 = cIter0.in(); - HOMARD::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[iter0]; + ADAPT::HOMARD_Iteration_var myIteration = myStudyContext._mesIterations[iter0]; CORBA::String_var cMesh0= myIteration->GetMeshFile(); std::string mesh0 = cMesh0.in(); CORBA::String_var cMeshName0= myIteration->GetMeshName(); @@ -5077,11 +5077,11 @@ Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Boolean isPublished, aScript += "#\n# Creation of the iterations" ; aScript += "\n# =========================="; } - std::map::const_iterator it_iter; + std::map::const_iterator it_iter; for (it_iter = myStudyContext._mesIterations.begin(); it_iter != myStudyContext._mesIterations.end(); ++it_iter) { - HOMARD::HOMARD_Iteration_var aIter = (*it_iter).second; + ADAPT::HOMARD_Iteration_var aIter = (*it_iter).second; CORBA::String_var dumpCorbaIter = aIter->GetDumpPython(); std::string dumpIter = dumpCorbaIter.in(); MESSAGE (dumpIter<<"\n"); @@ -5095,11 +5095,11 @@ Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Boolean isPublished, aScript += "#\n# Creation of the schemas YACS"; aScript += "\n# ============================"; } - std::map::const_iterator it_yacs; + std::map::const_iterator it_yacs; for ( it_yacs = myStudyContext._mesYACSs.begin(); it_yacs != myStudyContext._mesYACSs.end(); ++it_yacs) { - HOMARD::HOMARD_YACS_var myYACS = (*it_yacs).second; + ADAPT::HOMARD_YACS_var myYACS = (*it_yacs).second; CORBA::String_var dumpCorbaYACS = myYACS->GetDumpPython(); std::string dumpYACS = dumpCorbaYACS.in(); MESSAGE (dumpYACS<<"\n"); @@ -5132,7 +5132,7 @@ Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Boolean isPublished, // Utilitaires //============================================================================= //============================================================================= -void HOMARD_Gen_i::IsValidStudy( ) +void ADAPT_Gen_i::IsValidStudy( ) { // MESSAGE( "IsValidStudy" ); if (CORBA::is_nil(SMESH_Gen_i::getStudyServant())) @@ -5146,10 +5146,10 @@ void HOMARD_Gen_i::IsValidStudy( ) } //============================================================================= -char* HOMARD_Gen_i::VerifieDir(const char* nomDir) +char* ADAPT_Gen_i::VerifieDir(const char* nomDir) { std::string casename = std::string("") ; - std::map::const_iterator it; + std::map::const_iterator it; for (it = myStudyContext._mesCas.begin(); it != myStudyContext._mesCas.end(); it++) { @@ -5171,7 +5171,7 @@ void SALOMEException( std::string message ) return ; }*/ //============================================================================= -char* HOMARD_Gen_i::getVersion() +char* ADAPT_Gen_i::getVersion() { #if HOMARD_DEVELOPMENT return CORBA::string_dup(SMESH_VERSION_STR"dev"); @@ -5189,7 +5189,7 @@ char* HOMARD_Gen_i::getVersion() // 3 : la chaine apres la derniere apparition du caractere // Si le caractere est absent, on retourne la chaine totale //=============================================================================== -std::string HOMARD_Gen_i::GetStringInTexte( const std::string ligne, const std::string caractere, int option ) +std::string ADAPT_Gen_i::GetStringInTexte( const std::string ligne, const std::string caractere, int option ) { // MESSAGE("GetStringInTexte, recherche de '"<getId(); + ADAPT_Gen_i* myADAPT_Gen = new ADAPT_Gen_i(orb, poa, contId, instanceName, interfaceName); + return myADAPT_Gen->getId(); } } diff --git a/src/ADAPT_I/HOMARD_Gen_i.hxx b/src/ADAPT_I/ADAPT_Gen_i.hxx similarity index 68% rename from src/ADAPT_I/HOMARD_Gen_i.hxx rename to src/ADAPT_I/ADAPT_Gen_i.hxx index 10c07cec4..4ef3172f1 100644 --- a/src/ADAPT_I/HOMARD_Gen_i.hxx +++ b/src/ADAPT_I/ADAPT_Gen_i.hxx @@ -17,11 +17,11 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -#ifndef _HOMARD_GEN_I_HXX_ -#define _HOMARD_GEN_I_HXX_ +#ifndef _ADAPT_GEN_I_HXX_ +#define _ADAPT_GEN_I_HXX_ #include -#include CORBA_SERVER_HEADER(HOMARD_Gen) +#include CORBA_SERVER_HEADER(ADAPT_Gen) #include CORBA_SERVER_HEADER(HOMARD_Cas) #include CORBA_SERVER_HEADER(HOMARD_Hypothesis) #include CORBA_SERVER_HEADER(HOMARD_Iteration) @@ -32,7 +32,7 @@ #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes) #include "HOMARD_i.hxx" -#include "HOMARD_Gen.hxx" +#include "ADAPT_Gen.hxx" #include "HomardDriver.hxx" #include "YACSDriver.hxx" #include "FrontTrack.hxx" @@ -43,104 +43,104 @@ #include #include -class HOMARDENGINE_EXPORT HOMARD_Gen_i: +class HOMARDENGINE_EXPORT ADAPT_Gen_i: public virtual Engines_Component_i, - public virtual POA_HOMARD::HOMARD_Gen + public virtual POA_ADAPT::ADAPT_Gen { public: - HOMARD_Gen_i( CORBA::ORB_ptr orb, + ADAPT_Gen_i( CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, PortableServer::ObjectId* contId, const char* instanceName, const char* interfaceName ); - virtual ~HOMARD_Gen_i(); + virtual ~ADAPT_Gen_i(); // Generalites // Les creations - HOMARD::HOMARD_Boundary_ptr CreateBoundary (const char* nomBoundary, CORBA::Long typeBoundary); - HOMARD::HOMARD_Boundary_ptr CreateBoundaryCAO(const char* nomBoundary, + ADAPT::HOMARD_Boundary_ptr CreateBoundary (const char* nomBoundary, CORBA::Long typeBoundary); + ADAPT::HOMARD_Boundary_ptr CreateBoundaryCAO(const char* nomBoundary, const char* DataFile); - HOMARD::HOMARD_Boundary_ptr CreateBoundaryDi (const char* nomBoundary, + ADAPT::HOMARD_Boundary_ptr CreateBoundaryDi (const char* nomBoundary, const char* MeshName, const char* DataFile); - HOMARD::HOMARD_Boundary_ptr CreateBoundaryCylinder (const char* nomBoundary, + ADAPT::HOMARD_Boundary_ptr CreateBoundaryCylinder (const char* nomBoundary, CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre, CORBA::Double Xaxis, CORBA::Double Yaxis, CORBA::Double Zaxis, CORBA::Double Rayon); - HOMARD::HOMARD_Boundary_ptr CreateBoundarySphere (const char* nomBoundary, + ADAPT::HOMARD_Boundary_ptr CreateBoundarySphere (const char* nomBoundary, CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre, CORBA::Double Rayon); - HOMARD::HOMARD_Boundary_ptr CreateBoundaryConeR (const char* nomBoundary, + ADAPT::HOMARD_Boundary_ptr CreateBoundaryConeR (const char* nomBoundary, CORBA::Double Xcentre1, CORBA::Double Ycentre1, CORBA::Double Zcentre1, CORBA::Double Rayon1, CORBA::Double Xcentre2, CORBA::Double Ycentre2, CORBA::Double Zcentre2, CORBA::Double Rayon2); - HOMARD::HOMARD_Boundary_ptr CreateBoundaryConeA (const char* nomBoundary, + ADAPT::HOMARD_Boundary_ptr CreateBoundaryConeA (const char* nomBoundary, CORBA::Double Xaxis, CORBA::Double Yaxis, CORBA::Double Zaxis, CORBA::Double Angle, CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre); - HOMARD::HOMARD_Boundary_ptr CreateBoundaryTorus (const char* nomBoundary, + ADAPT::HOMARD_Boundary_ptr CreateBoundaryTorus (const char* nomBoundary, CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre, CORBA::Double Xaxis, CORBA::Double Yaxis, CORBA::Double Zaxis, CORBA::Double RayonRev, CORBA::Double RayonPri); - HOMARD::HOMARD_Cas_ptr CreateCase (const char* nomCas, const char* MeshName, const char* FileName); - HOMARD::HOMARD_Cas_ptr CreateCaseFromIteration (const char* nomCas, const char* DirNameStart); - HOMARD::HOMARD_Cas_ptr CreateCaseFromCaseLastIteration (const char* nomCas, const char* DirNameStart); - HOMARD::HOMARD_Cas_ptr CreateCaseFromCaseIteration (const char* nomCas, const char* DirNameStart, CORBA::Long Number); - HOMARD::HOMARD_Cas_ptr CreateCase0 (const char* nomCas, const char* MeshName, const char* FileName, CORBA::Long MeshOption, CORBA::Long NumeIter, CORBA::Long Option); + ADAPT::HOMARD_Cas_ptr CreateCase (const char* nomCas, const char* MeshName, const char* FileName); + ADAPT::HOMARD_Cas_ptr CreateCaseFromIteration (const char* nomCas, const char* DirNameStart); + ADAPT::HOMARD_Cas_ptr CreateCaseFromCaseLastIteration (const char* nomCas, const char* DirNameStart); + ADAPT::HOMARD_Cas_ptr CreateCaseFromCaseIteration (const char* nomCas, const char* DirNameStart, CORBA::Long Number); + ADAPT::HOMARD_Cas_ptr CreateCase0 (const char* nomCas, const char* MeshName, const char* FileName, CORBA::Long MeshOption, CORBA::Long NumeIter, CORBA::Long Option); std::string CreateCase1 (const char* DirNameStart, CORBA::Long Number); - HOMARD::HOMARD_Hypothesis_ptr CreateHypothesis(const char* nomHypothesis); + ADAPT::HOMARD_Hypothesis_ptr CreateHypothesis(const char* nomHypothesis); - HOMARD::HOMARD_Iteration_ptr CreateIteration (const char* nomIter, const char* nomIterParent); + ADAPT::HOMARD_Iteration_ptr CreateIteration (const char* nomIter, const char* nomIterParent); - HOMARD::HOMARD_Zone_ptr CreateZone (const char* nomZone, CORBA::Long typeZone); - HOMARD::HOMARD_Zone_ptr CreateZoneBox (const char* nomZone, + ADAPT::HOMARD_Zone_ptr CreateZone (const char* nomZone, CORBA::Long typeZone); + ADAPT::HOMARD_Zone_ptr CreateZoneBox (const char* nomZone, CORBA::Double Xmini, CORBA::Double Xmaxi, CORBA::Double Ymini, CORBA::Double Ymaxi, CORBA::Double Zmini, CORBA::Double Zmaxi); - HOMARD::HOMARD_Zone_ptr CreateZoneBox2D (const char* nomZone, + ADAPT::HOMARD_Zone_ptr CreateZoneBox2D (const char* nomZone, CORBA::Double Umini, CORBA::Double Umaxi, CORBA::Double Vmini, CORBA::Double Vmaxi, CORBA::Long Orient); - HOMARD::HOMARD_Zone_ptr CreateZoneCylinder (const char* nomZone, + ADAPT::HOMARD_Zone_ptr CreateZoneCylinder (const char* nomZone, CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre, CORBA::Double Xaxe, CORBA::Double Yaxe, CORBA::Double Zaxe, CORBA::Double Rayon, CORBA::Double Haut); - HOMARD::HOMARD_Zone_ptr CreateZoneDisk (const char* nomZone, + ADAPT::HOMARD_Zone_ptr CreateZoneDisk (const char* nomZone, CORBA::Double Ucentre, CORBA::Double Vcentre, CORBA::Double Rayon, CORBA::Long Orient); - HOMARD::HOMARD_Zone_ptr CreateZoneDiskWithHole (const char* nomZone, + ADAPT::HOMARD_Zone_ptr CreateZoneDiskWithHole (const char* nomZone, CORBA::Double Ucentre, CORBA::Double Vcentre, CORBA::Double Rayon, CORBA::Double Rayonint, CORBA::Long Orient); - HOMARD::HOMARD_Zone_ptr CreateZonePipe (const char* nomZone, + ADAPT::HOMARD_Zone_ptr CreateZonePipe (const char* nomZone, CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre, CORBA::Double Xaxe, CORBA::Double Yaxe, CORBA::Double Zaxe, CORBA::Double Rayon, CORBA::Double Haut, CORBA::Double Rayonint); - HOMARD::HOMARD_Zone_ptr CreateZoneSphere (const char* nomZone, + ADAPT::HOMARD_Zone_ptr CreateZoneSphere (const char* nomZone, CORBA::Double Xcentre, CORBA::Double Ycentre, CORBA::Double Zcentre, CORBA::Double Rayon); // Les informations - HOMARD::HOMARD_Boundary_ptr GetBoundary (const char* nomBoundary); - HOMARD::HOMARD_Cas_ptr GetCase (const char* nomCas); - HOMARD::HOMARD_Hypothesis_ptr GetHypothesis (const char* nomHypothesis); - HOMARD::HOMARD_Iteration_ptr GetIteration (const char* nomIteration); - HOMARD::HOMARD_YACS_ptr GetYACS (const char* nomYACS); - HOMARD::HOMARD_Zone_ptr GetZone (const char* nomZone); - - HOMARD::listeBoundarys* GetAllBoundarysName(); - HOMARD::listeCases* GetAllCasesName(); - HOMARD::listeHypotheses* GetAllHypothesesName(); - HOMARD::listeIterations* GetAllIterationsName(); - HOMARD::listeYACSs* GetAllYACSsName(); - HOMARD::listeZones* GetAllZonesName(); + ADAPT::HOMARD_Boundary_ptr GetBoundary (const char* nomBoundary); + ADAPT::HOMARD_Cas_ptr GetCase (const char* nomCas); + ADAPT::HOMARD_Hypothesis_ptr GetHypothesis (const char* nomHypothesis); + ADAPT::HOMARD_Iteration_ptr GetIteration (const char* nomIteration); + ADAPT::HOMARD_YACS_ptr GetYACS (const char* nomYACS); + ADAPT::HOMARD_Zone_ptr GetZone (const char* nomZone); + + ADAPT::listeBoundarys* GetAllBoundarysName(); + ADAPT::listeCases* GetAllCasesName(); + ADAPT::listeHypotheses* GetAllHypothesesName(); + ADAPT::listeIterations* GetAllIterationsName(); + ADAPT::listeYACSs* GetAllYACSsName(); + ADAPT::listeZones* GetAllZonesName(); void MeshInfo (const char* nomCas, const char* MeshName, const char* FileName, const char* DirName, CORBA::Long Qual, CORBA::Long Diam, CORBA::Long Conn, CORBA::Long Tail, CORBA::Long Inte); - HOMARD::HOMARD_Iteration_ptr LastIteration (const char* nomCas); + ADAPT::HOMARD_Iteration_ptr LastIteration (const char* nomCas); // L'etude void UpdateStudy(); @@ -176,15 +176,15 @@ public: char* CreateDirNameIter(const char* nomrep, CORBA::Long num ); CORBA::Long Compute(const char* nomIteration, CORBA::Long etatMenage, CORBA::Long modeHOMARD, CORBA::Long Option1, CORBA::Long Option2); - CORBA::Long ComputeAdap(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long etatMenage, HomardDriver* myDriver, CORBA::Long Option1, CORBA::Long Option2); - CORBA::Long ComputeCAO(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long Option1, CORBA::Long Option2); - CORBA::Long ComputeCAObis(HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long Option1, CORBA::Long Option2); - char* ComputeDirManagement(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration, CORBA::Long etatMenage); - char* ComputeDirPaManagement(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOMARD_Iteration_var myIteration); - void DriverTexteZone(HOMARD::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver); - void DriverTexteField(HOMARD::HOMARD_Iteration_var myIteration, HOMARD::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver); - int DriverTexteBoundary(HOMARD::HOMARD_Cas_var myCase, HomardDriver* myDriver); - void DriverTexteFieldInterp(HOMARD::HOMARD_Iteration_var myIteration, HOMARD::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver); + CORBA::Long ComputeAdap(ADAPT::HOMARD_Cas_var myCase, ADAPT::HOMARD_Iteration_var myIteration, CORBA::Long etatMenage, HomardDriver* myDriver, CORBA::Long Option1, CORBA::Long Option2); + CORBA::Long ComputeCAO(ADAPT::HOMARD_Cas_var myCase, ADAPT::HOMARD_Iteration_var myIteration, CORBA::Long Option1, CORBA::Long Option2); + CORBA::Long ComputeCAObis(ADAPT::HOMARD_Iteration_var myIteration, CORBA::Long Option1, CORBA::Long Option2); + char* ComputeDirManagement(ADAPT::HOMARD_Cas_var myCase, ADAPT::HOMARD_Iteration_var myIteration, CORBA::Long etatMenage); + char* ComputeDirPaManagement(ADAPT::HOMARD_Cas_var myCase, ADAPT::HOMARD_Iteration_var myIteration); + void DriverTexteZone(ADAPT::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver); + void DriverTexteField(ADAPT::HOMARD_Iteration_var myIteration, ADAPT::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver); + int DriverTexteBoundary(ADAPT::HOMARD_Cas_var myCase, HomardDriver* myDriver); + void DriverTexteFieldInterp(ADAPT::HOMARD_Iteration_var myIteration, ADAPT::HOMARD_Hypothesis_var myHypo, HomardDriver* myDriver); char* VerifieDir(const char* nomDir); @@ -197,11 +197,11 @@ public: void PublishMeshIterInSmesh(const char* NomIter); // YACS - HOMARD::HOMARD_YACS_ptr CreateYACSSchema (const char* YACSName, const char* nomCas, const char* ScriptFile, const char* DirName, const char* MeshFile); + ADAPT::HOMARD_YACS_ptr CreateYACSSchema (const char* YACSName, const char* nomCas, const char* ScriptFile, const char* DirName, const char* MeshFile); CORBA::Long YACSWrite(const char* nomYACS); CORBA::Long YACSWriteOnFile(const char* nomYACS, const char* XMLFile); - std::string YACSDriverTexteZone(HOMARD::HOMARD_Hypothesis_var myHypo, YACSDriver* myDriver); - std::string YACSDriverTexteBoundary(HOMARD::HOMARD_Cas_var myCase, YACSDriver* myDriver); + std::string YACSDriverTexteZone(ADAPT::HOMARD_Hypothesis_var myHypo, YACSDriver* myDriver); + std::string YACSDriverTexteBoundary(ADAPT::HOMARD_Cas_var myCase, YACSDriver* myDriver); // Preferences void SetPreferences() ; @@ -278,27 +278,27 @@ public: private: SALOMEDS::SObject_ptr PublishBoundaryInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder, - HOMARD::HOMARD_Boundary_ptr theObject, const char* theName); + ADAPT::HOMARD_Boundary_ptr theObject, const char* theName); SALOMEDS::SObject_ptr PublishCaseInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder, - HOMARD::HOMARD_Cas_ptr theObject, const char* theName); + ADAPT::HOMARD_Cas_ptr theObject, const char* theName); SALOMEDS::SObject_ptr PublishHypotheseInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder, - HOMARD::HOMARD_Hypothesis_ptr theObject, const char* theName); + ADAPT::HOMARD_Hypothesis_ptr theObject, const char* theName); SALOMEDS::SObject_ptr PublishYACSInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder, - HOMARD::HOMARD_YACS_ptr theObject, const char* theName); + ADAPT::HOMARD_YACS_ptr theObject, const char* theName); SALOMEDS::SObject_ptr PublishZoneInStudy(SALOMEDS::StudyBuilder_var aStudyBuilder, - HOMARD::HOMARD_Zone_ptr theObject, const char* theName); + ADAPT::HOMARD_Zone_ptr theObject, const char* theName); virtual void PublishInStudyAttr(SALOMEDS::StudyBuilder_var aStudyBuilder, SALOMEDS::SObject_var aResultSO, const char* theName, const char* comment, const char* icone, const char* ior); PortableServer::ServantBase_var GetServant(CORBA::Object_ptr theObject); - HOMARD::HOMARD_Boundary_ptr newBoundary(); - HOMARD::HOMARD_Cas_ptr newCase(); - HOMARD::HOMARD_Hypothesis_ptr newHypothesis(); - HOMARD::HOMARD_Iteration_ptr newIteration(); - HOMARD::HOMARD_YACS_ptr newYACS(); - HOMARD::HOMARD_Zone_ptr newZone(); + ADAPT::HOMARD_Boundary_ptr newBoundary(); + ADAPT::HOMARD_Cas_ptr newCase(); + ADAPT::HOMARD_Hypothesis_ptr newHypothesis(); + ADAPT::HOMARD_Iteration_ptr newIteration(); + ADAPT::HOMARD_YACS_ptr newYACS(); + ADAPT::HOMARD_Zone_ptr newZone(); virtual Engines::TMPFile* DumpPython(CORBA::Boolean isPublished, @@ -311,16 +311,16 @@ private: private: struct StudyContext { - std::map _mesBoundarys; - std::map _mesCas; - std::map _mesHypotheses; - std::map _mesIterations; - std::map _mesYACSs; - std::map _mesZones; + std::map _mesBoundarys; + std::map _mesCas; + std::map _mesHypotheses; + std::map _mesIterations; + std::map _mesYACSs; + std::map _mesZones; std::map _idmap; }; - ::HOMARD_Gen* myHomard; + ::ADAPT_Gen* myHomard; SALOMEDS::Study_var myStudy; StudyContext myStudyContext; SALOME_NamingService* _NS; diff --git a/src/ADAPT_I/CMakeLists.txt b/src/ADAPT_I/CMakeLists.txt index b569b1e3d..d604458fb 100644 --- a/src/ADAPT_I/CMakeLists.txt +++ b/src/ADAPT_I/CMakeLists.txt @@ -68,7 +68,7 @@ SET(ADAPTEngine_HEADERS HOMARD_Hypothesis_i.hxx HOMARD_Iteration_i.hxx HOMARD_Zone_i.hxx - HOMARD_Gen_i.hxx + ADAPT_Gen_i.hxx HOMARD_Boundary_i.hxx HOMARD_YACS_i.hxx HomardMedCommun.h @@ -82,7 +82,7 @@ SET(ADAPTEngine_SOURCES HOMARD_Cas_i.cxx HOMARD_Hypothesis_i.cxx HOMARD_Iteration_i.cxx - HOMARD_Gen_i.cxx + ADAPT_Gen_i.cxx HOMARD_Zone_i.cxx HOMARD_Boundary_i.cxx HOMARD_YACS_i.cxx diff --git a/src/ADAPT_I/HOMARD_Boundary_i.cxx b/src/ADAPT_I/HOMARD_Boundary_i.cxx index ef80c35b5..cc1097767 100644 --- a/src/ADAPT_I/HOMARD_Boundary_i.cxx +++ b/src/ADAPT_I/HOMARD_Boundary_i.cxx @@ -27,7 +27,7 @@ // Quand les 2 fonctions Setxxx et Getxxx sont presentes, Setxxx est decrit en premier // #include "HOMARD_Boundary_i.hxx" -#include "HOMARD_Gen_i.hxx" +#include "ADAPT_Gen_i.hxx" #include "HOMARD_Boundary.hxx" #include "HOMARD_DriverTools.hxx" @@ -49,7 +49,7 @@ HOMARD_Boundary_i::HOMARD_Boundary_i() */ //============================================================================= HOMARD_Boundary_i::HOMARD_Boundary_i( CORBA::ORB_ptr orb, - HOMARD::HOMARD_Gen_var engine ) + ADAPT::ADAPT_Gen_var engine ) { MESSAGE( "HOMARD_Boundary_i" ); _gen_i = engine; @@ -98,12 +98,12 @@ char* HOMARD_Boundary_i::GetDumpPython() //============================================================================= std::string HOMARD_Boundary_i::Dump() const { - return HOMARD::Dump( *myHomardBoundary ); + return ADAPT::Dump( *myHomardBoundary ); } //============================================================================= bool HOMARD_Boundary_i::Restore( const std::string& stream ) { - return HOMARD::Restore( *myHomardBoundary, stream ); + return ADAPT::Restore( *myHomardBoundary, stream ); } //============================================================================= //============================================================================= @@ -178,10 +178,10 @@ void HOMARD_Boundary_i::SetTorus( double X0, double X1, double X2, double X3, do myHomardBoundary->SetTorus( X0, X1, X2, X3, X4, X5, X6, X7 ); } //============================================================================= -HOMARD::double_array* HOMARD_Boundary_i::GetCoords() +ADAPT::double_array* HOMARD_Boundary_i::GetCoords() { ASSERT( myHomardBoundary ); - HOMARD::double_array_var aResult = new HOMARD::double_array(); + ADAPT::double_array_var aResult = new ADAPT::double_array(); std::vector mesCoor = myHomardBoundary->GetCoords(); aResult->length( mesCoor .size() ); std::vector::const_iterator it; @@ -197,10 +197,10 @@ void HOMARD_Boundary_i::SetLimit( double Xincr, double Yincr, double Zincr ) myHomardBoundary->SetLimit( Xincr, Yincr, Zincr ); } //============================================================================= -HOMARD::double_array* HOMARD_Boundary_i::GetLimit() +ADAPT::double_array* HOMARD_Boundary_i::GetLimit() { ASSERT( myHomardBoundary ); - HOMARD::double_array_var aResult = new HOMARD::double_array(); + ADAPT::double_array_var aResult = new ADAPT::double_array(); std::vector mesCoor = myHomardBoundary->GetLimit(); aResult->length( mesCoor .size() ); std::vector::const_iterator it; @@ -216,7 +216,7 @@ void HOMARD_Boundary_i::AddGroup( const char* Group) myHomardBoundary->AddGroup( Group ); } //============================================================================= -void HOMARD_Boundary_i::SetGroups(const HOMARD::ListGroupType& ListGroup) +void HOMARD_Boundary_i::SetGroups(const ADAPT::ListGroupType& ListGroup) { ASSERT( myHomardBoundary ); std::list ListString; @@ -227,11 +227,11 @@ void HOMARD_Boundary_i::SetGroups(const HOMARD::ListGroupType& ListGroup) myHomardBoundary->SetGroups( ListString ); } //============================================================================= -HOMARD::ListGroupType* HOMARD_Boundary_i::GetGroups() +ADAPT::ListGroupType* HOMARD_Boundary_i::GetGroups() { ASSERT( myHomardBoundary ); const std::list& ListString = myHomardBoundary->GetGroups(); - HOMARD::ListGroupType_var aResult = new HOMARD::ListGroupType; + ADAPT::ListGroupType_var aResult = new ADAPT::ListGroupType; aResult->length( ListString.size() ); std::list::const_iterator it; int i = 0; diff --git a/src/ADAPT_I/HOMARD_Boundary_i.hxx b/src/ADAPT_I/HOMARD_Boundary_i.hxx index eaac61af3..37b06921e 100644 --- a/src/ADAPT_I/HOMARD_Boundary_i.hxx +++ b/src/ADAPT_I/HOMARD_Boundary_i.hxx @@ -31,7 +31,7 @@ #define _HOMARD_Boundary_I_HXX_ #include -#include CORBA_SERVER_HEADER(HOMARD_Gen) +#include CORBA_SERVER_HEADER(ADAPT_Gen) #include CORBA_SERVER_HEADER(HOMARD_Boundary) #include "HOMARD_i.hxx" @@ -45,11 +45,11 @@ class HOMARD_Boundary; class HOMARDENGINE_EXPORT HOMARD_Boundary_i: public virtual Engines_Component_i, - public virtual POA_HOMARD::HOMARD_Boundary, + public virtual POA_ADAPT::HOMARD_Boundary, public virtual PortableServer::ServantBase { public: - HOMARD_Boundary_i( CORBA::ORB_ptr orb, HOMARD::HOMARD_Gen_var gen_i ); + HOMARD_Boundary_i( CORBA::ORB_ptr orb, ADAPT::ADAPT_Gen_var gen_i ); HOMARD_Boundary_i(); virtual ~HOMARD_Boundary_i(); @@ -88,14 +88,14 @@ public: double Xaxe, double Yaxe, double Zaxe, double rayonRev, double rayonPri ); - HOMARD::double_array* GetCoords(); + ADAPT::double_array* GetCoords(); void SetLimit( double Xincr, double Yincr, double Zincr); - HOMARD::double_array* GetLimit(); + ADAPT::double_array* GetLimit(); void AddGroup( const char* Group); - void SetGroups(const HOMARD::ListGroupType& ListGroup); - HOMARD::ListGroupType* GetGroups(); + void SetGroups(const ADAPT::ListGroupType& ListGroup); + ADAPT::ListGroupType* GetGroups(); // Liens avec les autres structures void SetCaseCreation( const char* NomCaseCreation ); @@ -106,7 +106,7 @@ private: ::HOMARD_Boundary* myHomardBoundary; CORBA::ORB_ptr _orb; - HOMARD::HOMARD_Gen_var _gen_i; + ADAPT::ADAPT_Gen_var _gen_i; }; #endif diff --git a/src/ADAPT_I/HOMARD_Cas_i.cxx b/src/ADAPT_I/HOMARD_Cas_i.cxx index 036dacef1..432faf678 100644 --- a/src/ADAPT_I/HOMARD_Cas_i.cxx +++ b/src/ADAPT_I/HOMARD_Cas_i.cxx @@ -28,7 +28,7 @@ // #include "HOMARD_Cas_i.hxx" -#include "HOMARD_Gen_i.hxx" +#include "ADAPT_Gen_i.hxx" #include "HOMARD_Cas.hxx" #include "HOMARD_DriverTools.hxx" #include "HOMARD.hxx" @@ -58,7 +58,7 @@ HOMARD_Cas_i::HOMARD_Cas_i() */ //============================================================================= HOMARD_Cas_i::HOMARD_Cas_i( CORBA::ORB_ptr orb, - HOMARD::HOMARD_Gen_var engine ) + ADAPT::ADAPT_Gen_var engine ) { MESSAGE( "HOMARD_Cas_i" ); _gen_i = engine; @@ -108,12 +108,12 @@ char* HOMARD_Cas_i::GetDumpPython() //============================================================================= std::string HOMARD_Cas_i::Dump() const { - return HOMARD::Dump( *myHomardCas ); + return ADAPT::Dump( *myHomardCas ); } //============================================================================= bool HOMARD_Cas_i::Restore( const std::string& stream ) { - return HOMARD::Restore( *myHomardCas, stream ); + return ADAPT::Restore( *myHomardCas, stream ); } //============================================================================= //============================================================================= @@ -161,7 +161,7 @@ void HOMARD_Cas_i::SetDirName( const char* NomDir ) { MESSAGE ( "etat : " << GetState() ) ; // D.1. Nom local du repertoire de l'iteration de depart dans le repertoire actuel du cas - HOMARD::HOMARD_Iteration_ptr Iter = GetIter0() ; + ADAPT::HOMARD_Iteration_ptr Iter = GetIter0() ; char* DirNameIter = Iter->GetDirNameLoc() ; MESSAGE ( "SetDirName : nom actuel pour le repertoire de l iteration, DirNameIter = "<< DirNameIter); // D.2. Recherche d'un nom local pour l'iteration de depart dans le futur repertoire du cas @@ -223,7 +223,7 @@ CORBA::Long HOMARD_Cas_i::GetState() ASSERT( myHomardCas ); // Nom de l'iteration initiale char* Iter0Name = GetIter0Name() ; - HOMARD::HOMARD_Iteration_ptr Iter = _gen_i->GetIteration(Iter0Name) ; + ADAPT::HOMARD_Iteration_ptr Iter = _gen_i->GetIteration(Iter0Name) ; int state = Iter->GetNumber() ; return state ; } @@ -260,7 +260,7 @@ CORBA::Long HOMARD_Cas_i::GetExtType() return myHomardCas->GetExtType(); } //============================================================================= -void HOMARD_Cas_i::SetBoundingBox( const HOMARD::extrema& LesExtrema ) +void HOMARD_Cas_i::SetBoundingBox( const ADAPT::extrema& LesExtrema ) { ASSERT( myHomardCas ); std::vector VExtrema; @@ -273,10 +273,10 @@ void HOMARD_Cas_i::SetBoundingBox( const HOMARD::extrema& LesExtrema ) myHomardCas->SetBoundingBox( VExtrema ); } //============================================================================= -HOMARD::extrema* HOMARD_Cas_i::GetBoundingBox() +ADAPT::extrema* HOMARD_Cas_i::GetBoundingBox() { ASSERT(myHomardCas ); - HOMARD::extrema_var aResult = new HOMARD::extrema(); + ADAPT::extrema_var aResult = new ADAPT::extrema(); std::vector LesExtremes = myHomardCas->GetBoundingBox(); ASSERT( LesExtremes.size() == 10 ); aResult->length( 10 ); @@ -293,7 +293,7 @@ void HOMARD_Cas_i::AddGroup( const char* Group) myHomardCas->AddGroup( Group ); } //============================================================================= -void HOMARD_Cas_i::SetGroups( const HOMARD::ListGroupType& ListGroup ) +void HOMARD_Cas_i::SetGroups( const ADAPT::ListGroupType& ListGroup ) { ASSERT( myHomardCas ); std::list ListString ; @@ -304,11 +304,11 @@ void HOMARD_Cas_i::SetGroups( const HOMARD::ListGroupType& ListGroup ) myHomardCas->SetGroups( ListString ); } //============================================================================= -HOMARD::ListGroupType* HOMARD_Cas_i::GetGroups() +ADAPT::ListGroupType* HOMARD_Cas_i::GetGroups() { ASSERT(myHomardCas ); const std::list& ListString = myHomardCas->GetGroups(); - HOMARD::ListGroupType_var aResult = new HOMARD::ListGroupType(); + ADAPT::ListGroupType_var aResult = new ADAPT::ListGroupType(); aResult->length( ListString.size() ); std::list::const_iterator it; int i = 0; @@ -332,7 +332,7 @@ void HOMARD_Cas_i::AddBoundaryGroup( const char* BoundaryName, const char* Group ASSERT( myHomardCas ); // A. Préalables // A.1. Caractéristiques de la frontière à ajouter - HOMARD::HOMARD_Boundary_ptr myBoundary = _gen_i->GetBoundary(BoundaryName) ; + ADAPT::HOMARD_Boundary_ptr myBoundary = _gen_i->GetBoundary(BoundaryName) ; ASSERT(!CORBA::is_nil(myBoundary)); int BoundaryType = myBoundary->GetType(); MESSAGE ( ". BoundaryType = " << BoundaryType ); @@ -366,7 +366,7 @@ void HOMARD_Cas_i::AddBoundaryGroup( const char* BoundaryName, const char* Group { boun = (*it).c_str() ; MESSAGE (".. Frontiere enregistrée : "<< boun ); - HOMARD::HOMARD_Boundary_ptr myBoundary_0 = _gen_i->GetBoundary(boun) ; + ADAPT::HOMARD_Boundary_ptr myBoundary_0 = _gen_i->GetBoundary(boun) ; int BoundaryType_0 = myBoundary_0->GetType(); MESSAGE ( ".. BoundaryType_0 = " << BoundaryType_0 ); if ( BoundaryType_0 == -1 ) @@ -386,7 +386,7 @@ void HOMARD_Cas_i::AddBoundaryGroup( const char* BoundaryName, const char* Group MESSAGE (".. Frontiere enregistrée : "<< boun ); if ( boun != BoundaryName ) { - HOMARD::HOMARD_Boundary_ptr myBoundary_0 = _gen_i->GetBoundary(boun) ; + ADAPT::HOMARD_Boundary_ptr myBoundary_0 = _gen_i->GetBoundary(boun) ; int BoundaryType_0 = myBoundary_0->GetType(); MESSAGE ( ".. BoundaryType_0 = " << BoundaryType_0 ); if ( BoundaryType_0 == 0 ) @@ -455,12 +455,12 @@ void HOMARD_Cas_i::AddBoundaryGroup( const char* BoundaryName, const char* Group } } //============================================================================= -HOMARD::ListBoundaryGroupType* HOMARD_Cas_i::GetBoundaryGroup() +ADAPT::ListBoundaryGroupType* HOMARD_Cas_i::GetBoundaryGroup() { MESSAGE ("GetBoundaryGroup"); ASSERT(myHomardCas ); const std::list& ListBoundaryGroup = myHomardCas->GetBoundaryGroup(); - HOMARD::ListBoundaryGroupType_var aResult = new HOMARD::ListBoundaryGroupType(); + ADAPT::ListBoundaryGroupType_var aResult = new ADAPT::ListBoundaryGroupType(); aResult->length( ListBoundaryGroup.size() ); std::list::const_iterator it; int i = 0; @@ -523,7 +523,7 @@ char* HOMARD_Cas_i::GetIter0Name() return CORBA::string_dup( myHomardCas->GetIter0Name().c_str() ); } //============================================================================= -HOMARD::HOMARD_Iteration_ptr HOMARD_Cas_i::GetIter0() +ADAPT::HOMARD_Iteration_ptr HOMARD_Cas_i::GetIter0() { // Nom de l'iteration initiale char* Iter0Name = GetIter0Name() ; @@ -531,7 +531,7 @@ HOMARD::HOMARD_Iteration_ptr HOMARD_Cas_i::GetIter0() return _gen_i->GetIteration(Iter0Name) ; } //============================================================================= -HOMARD::HOMARD_Iteration_ptr HOMARD_Cas_i::NextIteration( const char* IterName ) +ADAPT::HOMARD_Iteration_ptr HOMARD_Cas_i::NextIteration( const char* IterName ) { // Nom de l'iteration parent char* NomIterParent = GetIter0Name() ; @@ -540,10 +540,10 @@ HOMARD::HOMARD_Iteration_ptr HOMARD_Cas_i::NextIteration( const char* IterName ) return _gen_i->CreateIteration(IterName, NomIterParent) ; } //============================================================================= -HOMARD::HOMARD_Iteration_ptr HOMARD_Cas_i::LastIteration( ) +ADAPT::HOMARD_Iteration_ptr HOMARD_Cas_i::LastIteration( ) { - HOMARD::HOMARD_Iteration_ptr Iter ; - HOMARD::listeIterFilles_var ListeIterFilles ; + ADAPT::HOMARD_Iteration_ptr Iter ; + ADAPT::listeIterFilles_var ListeIterFilles ; char* IterName ; // Iteration initiale du cas IterName = GetIter0Name() ; @@ -586,7 +586,7 @@ void HOMARD_Cas_i::AddIteration( const char* NomIteration ) // DirName : le repertoire de lancement des calculs du sch?ma // MeshFile : nom du fichier contenant le maillage pour le premier calcul //============================================================================= -HOMARD::HOMARD_YACS_ptr HOMARD_Cas_i::CreateYACSSchema( const char* YACSName, const char* ScriptFile, const char* DirName, const char* MeshFile ) +ADAPT::HOMARD_YACS_ptr HOMARD_Cas_i::CreateYACSSchema( const char* YACSName, const char* ScriptFile, const char* DirName, const char* MeshFile ) { // Nom du cas const char* CaseName = GetName() ; diff --git a/src/ADAPT_I/HOMARD_Cas_i.hxx b/src/ADAPT_I/HOMARD_Cas_i.hxx index 94d17f857..60027606a 100644 --- a/src/ADAPT_I/HOMARD_Cas_i.hxx +++ b/src/ADAPT_I/HOMARD_Cas_i.hxx @@ -31,7 +31,7 @@ #define _HOMARD_CAS_I_HXX_ #include -#include CORBA_SERVER_HEADER(HOMARD_Gen) +#include CORBA_SERVER_HEADER(ADAPT_Gen) #include CORBA_SERVER_HEADER(HOMARD_Cas) #include "HOMARD_i.hxx" @@ -45,11 +45,11 @@ class HOMARD_Cas; class HOMARDENGINE_EXPORT HOMARD_Cas_i: public virtual Engines_Component_i, - public virtual POA_HOMARD::HOMARD_Cas, + public virtual POA_ADAPT::HOMARD_Cas, public virtual PortableServer::ServantBase { public: - HOMARD_Cas_i( CORBA::ORB_ptr orb, HOMARD::HOMARD_Gen_var gen_i ); + HOMARD_Cas_i( CORBA::ORB_ptr orb, ADAPT::ADAPT_Gen_var gen_i ); HOMARD_Cas_i(); virtual ~HOMARD_Cas_i(); @@ -79,16 +79,16 @@ public: void SetExtType( CORBA::Long ExtType ); CORBA::Long GetExtType(); - void SetBoundingBox( const HOMARD::extrema& LesExtremes ); - HOMARD::extrema* GetBoundingBox(); + void SetBoundingBox( const ADAPT::extrema& LesExtremes ); + ADAPT::extrema* GetBoundingBox(); void AddGroup( const char* Group); - void SetGroups(const HOMARD::ListGroupType& ListGroup); - HOMARD::ListGroupType* GetGroups(); + void SetGroups(const ADAPT::ListGroupType& ListGroup); + ADAPT::ListGroupType* GetGroups(); void AddBoundary(const char* Boundary); void AddBoundaryGroup(const char* Boundary, const char* Group); - HOMARD::ListBoundaryGroupType* GetBoundaryGroup(); + ADAPT::ListBoundaryGroupType* GetBoundaryGroup(); void SupprBoundaryGroup( ); void SetPyram( CORBA::Long Pyram ); @@ -98,22 +98,22 @@ public: // Liens avec les autres structures char* GetIter0Name(); - HOMARD::HOMARD_Iteration_ptr GetIter0() ; + ADAPT::HOMARD_Iteration_ptr GetIter0() ; - HOMARD::HOMARD_Iteration_ptr NextIteration( const char* Name ) ; + ADAPT::HOMARD_Iteration_ptr NextIteration( const char* Name ) ; - HOMARD::HOMARD_Iteration_ptr LastIteration() ; + ADAPT::HOMARD_Iteration_ptr LastIteration() ; void AddIteration( const char* NomIteration ); // YACS - HOMARD::HOMARD_YACS_ptr CreateYACSSchema( const char* YACSName, const char* ScriptFile, const char* DirName, const char* MeshFile ); + ADAPT::HOMARD_YACS_ptr CreateYACSSchema( const char* YACSName, const char* ScriptFile, const char* DirName, const char* MeshFile ); private: ::HOMARD_Cas* myHomardCas; CORBA::ORB_ptr _orb; - HOMARD::HOMARD_Gen_var _gen_i; + ADAPT::ADAPT_Gen_var _gen_i; }; #endif diff --git a/src/ADAPT_I/HOMARD_Hypothesis_i.cxx b/src/ADAPT_I/HOMARD_Hypothesis_i.cxx index f9c5249f7..b039bc3a8 100644 --- a/src/ADAPT_I/HOMARD_Hypothesis_i.cxx +++ b/src/ADAPT_I/HOMARD_Hypothesis_i.cxx @@ -28,7 +28,7 @@ // #include "HOMARD_Hypothesis_i.hxx" -#include "HOMARD_Gen_i.hxx" +#include "ADAPT_Gen_i.hxx" #include "HOMARD_Hypothesis.hxx" #include "HOMARD_DriverTools.hxx" @@ -51,7 +51,7 @@ HOMARD_Hypothesis_i::HOMARD_Hypothesis_i() */ //============================================================================= HOMARD_Hypothesis_i::HOMARD_Hypothesis_i( CORBA::ORB_ptr orb, - HOMARD::HOMARD_Gen_var engine ) + ADAPT::ADAPT_Gen_var engine ) { MESSAGE( "standard constructor" ); _gen_i = engine; @@ -101,12 +101,12 @@ char* HOMARD_Hypothesis_i::GetDumpPython() //============================================================================= std::string HOMARD_Hypothesis_i::Dump() const { - return HOMARD::Dump( *myHomardHypothesis ); + return ADAPT::Dump( *myHomardHypothesis ); } //============================================================================= bool HOMARD_Hypothesis_i::Restore( const std::string& stream ) { - return HOMARD::Restore( *myHomardHypothesis, stream ); + return ADAPT::Restore( *myHomardHypothesis, stream ); } //============================================================================= //============================================================================= @@ -132,10 +132,10 @@ void HOMARD_Hypothesis_i::SetUnifRefinUnRef( CORBA::Long TypeRaffDera ) myHomardHypothesis->SetRefinTypeDera( TypeRaff, TypeDera ); } //============================================================================= -HOMARD::listeTypes* HOMARD_Hypothesis_i::GetAdapRefinUnRef() +ADAPT::listeTypes* HOMARD_Hypothesis_i::GetAdapRefinUnRef() { ASSERT( myHomardHypothesis ); - HOMARD::listeTypes_var aResult = new HOMARD::listeTypes; + ADAPT::listeTypes_var aResult = new ADAPT::listeTypes; aResult->length( 3 ); aResult[0] = CORBA::Long( myHomardHypothesis->GetAdapType() ); aResult[1] = CORBA::Long( myHomardHypothesis->GetRefinType() ); @@ -177,10 +177,10 @@ void HOMARD_Hypothesis_i::SetUseField( CORBA::Long UsField ) myHomardHypothesis->SetUseField( UsField ); } //============================================================================= -HOMARD::InfosHypo* HOMARD_Hypothesis_i::GetField() +ADAPT::InfosHypo* HOMARD_Hypothesis_i::GetField() { ASSERT( myHomardHypothesis ); - HOMARD::InfosHypo* aInfosHypo = new HOMARD::InfosHypo(); + ADAPT::InfosHypo* aInfosHypo = new ADAPT::InfosHypo(); aInfosHypo->FieldName = CORBA::string_dup( myHomardHypothesis->GetFieldName().c_str() ); aInfosHypo->TypeThR = CORBA::Long( myHomardHypothesis->GetRefinThrType() ); aInfosHypo->ThreshR = CORBA::Double( myHomardHypothesis->GetThreshR() ); @@ -214,11 +214,11 @@ void HOMARD_Hypothesis_i::SupprComps() myHomardHypothesis->SupprComps(); } //============================================================================= -HOMARD::listeComposantsHypo* HOMARD_Hypothesis_i::GetComps() +ADAPT::listeComposantsHypo* HOMARD_Hypothesis_i::GetComps() { ASSERT( myHomardHypothesis ); const std::list& ListString = myHomardHypothesis->GetComps(); - HOMARD::listeComposantsHypo_var aResult = new HOMARD::listeComposantsHypo; + ADAPT::listeComposantsHypo_var aResult = new ADAPT::listeComposantsHypo; aResult->length( ListString.size() ); std::list::const_iterator it; int i = 0; @@ -329,7 +329,7 @@ void HOMARD_Hypothesis_i::SupprGroups() myHomardHypothesis->SupprGroups(); } //============================================================================= -void HOMARD_Hypothesis_i::SetGroups(const HOMARD::ListGroupType& ListGroup) +void HOMARD_Hypothesis_i::SetGroups(const ADAPT::ListGroupType& ListGroup) { ASSERT( myHomardHypothesis ); std::list ListString; @@ -340,11 +340,11 @@ void HOMARD_Hypothesis_i::SetGroups(const HOMARD::ListGroupType& ListGroup) myHomardHypothesis->SetGroups( ListString ); } //============================================================================= -HOMARD::ListGroupType* HOMARD_Hypothesis_i::GetGroups() +ADAPT::ListGroupType* HOMARD_Hypothesis_i::GetGroups() { ASSERT( myHomardHypothesis ); const std::list& ListString = myHomardHypothesis->GetGroups(); - HOMARD::ListGroupType_var aResult = new HOMARD::ListGroupType; + ADAPT::ListGroupType_var aResult = new ADAPT::ListGroupType; aResult->length( ListString.size() ); std::list::const_iterator it; int i = 0; @@ -391,11 +391,11 @@ void HOMARD_Hypothesis_i::SupprFieldInterps() myHomardHypothesis->SupprFieldInterps(); } //============================================================================= -HOMARD::listeFieldInterpsHypo* HOMARD_Hypothesis_i::GetFieldInterps() +ADAPT::listeFieldInterpsHypo* HOMARD_Hypothesis_i::GetFieldInterps() { ASSERT( myHomardHypothesis ); const std::list& ListString = myHomardHypothesis->GetFieldInterps(); - HOMARD::listeFieldInterpsHypo_var aResult = new HOMARD::listeFieldInterpsHypo; + ADAPT::listeFieldInterpsHypo_var aResult = new ADAPT::listeFieldInterpsHypo; aResult->length( ListString.size() ); std::list::const_iterator it; int i = 0; @@ -434,11 +434,11 @@ void HOMARD_Hypothesis_i::UnLinkIteration( const char* NomIteration ) myHomardHypothesis->UnLinkIteration( NomIteration ); } //============================================================================= -HOMARD::listeIters* HOMARD_Hypothesis_i::GetIterations() +ADAPT::listeIters* HOMARD_Hypothesis_i::GetIterations() { ASSERT( myHomardHypothesis ); const std::list& ListString = myHomardHypothesis->GetIterations(); - HOMARD::listeIters_var aResult = new HOMARD::listeIters; + ADAPT::listeIters_var aResult = new ADAPT::listeIters; aResult->length( ListString.size() ); std::list::const_iterator it; int i = 0; @@ -490,11 +490,11 @@ void HOMARD_Hypothesis_i::SupprZones() myHomardHypothesis->SupprZones(); } //============================================================================= -HOMARD::listeZonesHypo* HOMARD_Hypothesis_i::GetZones() +ADAPT::listeZonesHypo* HOMARD_Hypothesis_i::GetZones() { ASSERT( myHomardHypothesis ); const std::list& ListString = myHomardHypothesis->GetZones(); - HOMARD::listeZonesHypo_var aResult = new HOMARD::listeZonesHypo; + ADAPT::listeZonesHypo_var aResult = new ADAPT::listeZonesHypo; aResult->length( ListString.size() ); std::list::const_iterator it; int i = 0; diff --git a/src/ADAPT_I/HOMARD_Hypothesis_i.hxx b/src/ADAPT_I/HOMARD_Hypothesis_i.hxx index 79c4e6b24..d5dc6f98e 100644 --- a/src/ADAPT_I/HOMARD_Hypothesis_i.hxx +++ b/src/ADAPT_I/HOMARD_Hypothesis_i.hxx @@ -31,7 +31,7 @@ #define _HOMARD_HYPOTHESIS_I_HXX_ #include -#include CORBA_SERVER_HEADER(HOMARD_Gen) +#include CORBA_SERVER_HEADER(ADAPT_Gen) #include CORBA_SERVER_HEADER(HOMARD_Hypothesis) #include "HOMARD_i.hxx" @@ -45,11 +45,11 @@ class HOMARD_Hypothesis; class HOMARDENGINE_EXPORT HOMARD_Hypothesis_i: public virtual Engines_Component_i, - public virtual POA_HOMARD::HOMARD_Hypothesis, + public virtual POA_ADAPT::HOMARD_Hypothesis, public virtual PortableServer::ServantBase { public: - HOMARD_Hypothesis_i( CORBA::ORB_ptr orb, HOMARD::HOMARD_Gen_var gen_i ); + HOMARD_Hypothesis_i( CORBA::ORB_ptr orb, ADAPT::ADAPT_Gen_var gen_i ); HOMARD_Hypothesis_i(); virtual ~HOMARD_Hypothesis_i(); @@ -67,7 +67,7 @@ public: // Caracteristiques void SetUnifRefinUnRef( CORBA::Long TypeRaffDera ); - HOMARD::listeTypes* GetAdapRefinUnRef(); + ADAPT::listeTypes* GetAdapRefinUnRef(); CORBA::Long GetAdapType(); CORBA::Long GetRefinType(); CORBA::Long GetUnRefType(); @@ -75,13 +75,13 @@ public: void SetField( const char* FieldName ); char* GetFieldName(); void SetUseField(CORBA::Long UsField); - HOMARD::InfosHypo* GetField(); + ADAPT::InfosHypo* GetField(); void SetUseComp(CORBA::Long UsCmpI); void AddComp( const char* NomComp ); void SupprComp( const char* NomComp ); void SupprComps(); - HOMARD::listeComposantsHypo* GetComps(); + ADAPT::listeComposantsHypo* GetComps(); void SetRefinThr(CORBA::Long TypeThR, CORBA::Double ThreshR); CORBA::Long GetRefinThrType(); @@ -103,8 +103,8 @@ public: void AddGroup( const char* Group); void SupprGroup( const char* Group ); void SupprGroups(); - void SetGroups(const HOMARD::ListGroupType& ListGroup); - HOMARD::ListGroupType* GetGroups(); + void SetGroups(const ADAPT::ListGroupType& ListGroup); + ADAPT::ListGroupType* GetGroups(); void SetTypeFieldInterp( CORBA::Long TypeFieldInterp ); CORBA::Long GetTypeFieldInterp(); @@ -112,7 +112,7 @@ public: void AddFieldInterpType( const char* FieldInterp, CORBA::Long TypeInterp ); void SupprFieldInterp( const char* FieldInterp ); void SupprFieldInterps(); - HOMARD::listeFieldInterpsHypo* GetFieldInterps(); + ADAPT::listeFieldInterpsHypo* GetFieldInterps(); // Liens avec les autres structures void SetCaseCreation( const char* NomCaseCreation ); @@ -120,19 +120,19 @@ public: void LinkIteration( const char* NomIteration ); void UnLinkIteration( const char* NomIteration ); - HOMARD::listeIters* GetIterations(); + ADAPT::listeIters* GetIterations(); void AddZone( const char* NomZone, CORBA::Long TypeUse ); void AddZone0( const char* NomZone, CORBA::Long TypeUse ); void SupprZone( const char* NomZone ); void SupprZones(); - HOMARD::listeZonesHypo* GetZones(); + ADAPT::listeZonesHypo* GetZones(); private: ::HOMARD_Hypothesis* myHomardHypothesis; CORBA::ORB_ptr _orb; - HOMARD::HOMARD_Gen_var _gen_i; + ADAPT::ADAPT_Gen_var _gen_i; }; #endif diff --git a/src/ADAPT_I/HOMARD_Iteration_i.cxx b/src/ADAPT_I/HOMARD_Iteration_i.cxx index 640c13062..5990a6b71 100644 --- a/src/ADAPT_I/HOMARD_Iteration_i.cxx +++ b/src/ADAPT_I/HOMARD_Iteration_i.cxx @@ -28,7 +28,7 @@ // #include "HOMARD_Iteration_i.hxx" -#include "HOMARD_Gen_i.hxx" +#include "ADAPT_Gen_i.hxx" #include "HOMARD_Iteration.hxx" #include "HOMARD_DriverTools.hxx" @@ -52,7 +52,7 @@ HOMARD_Iteration_i::HOMARD_Iteration_i() */ //============================================================================= HOMARD_Iteration_i::HOMARD_Iteration_i( CORBA::ORB_ptr orb, - HOMARD::HOMARD_Gen_var engine ) + ADAPT::ADAPT_Gen_var engine ) { MESSAGE("constructor"); _gen_i = engine; @@ -101,12 +101,12 @@ char* HOMARD_Iteration_i::GetDumpPython() //============================================================================= std::string HOMARD_Iteration_i::Dump() const { - return HOMARD::Dump( *myHomardIteration ); + return ADAPT::Dump( *myHomardIteration ); } //============================================================================= bool HOMARD_Iteration_i::Restore( const std::string& stream ) { - return HOMARD::Restore( *myHomardIteration, stream ); + return ADAPT::Restore( *myHomardIteration, stream ); } //============================================================================= //============================================================================= @@ -129,7 +129,7 @@ char* HOMARD_Iteration_i::GetDirName() { ASSERT( myHomardIteration ); std::string casename = myHomardIteration->GetCaseName() ; - HOMARD::HOMARD_Cas_ptr caseiter = _gen_i->GetCase(casename.c_str()) ; + ADAPT::HOMARD_Cas_ptr caseiter = _gen_i->GetCase(casename.c_str()) ; std::string dirnamecase = caseiter->GetDirName() ; std::string dirname = dirnamecase + "/" + GetDirNameLoc() ; return CORBA::string_dup( dirname.c_str() ); @@ -240,11 +240,11 @@ void HOMARD_Iteration_i::SetFieldInterpTimeStepRank( const char* FieldInterp, CO myHomardIteration->SetFieldInterpTimeStepRank( FieldInterp, TimeStep, Rank ); } //============================================================================= -HOMARD::listeFieldInterpTSRsIter* HOMARD_Iteration_i::GetFieldInterpsTimeStepRank() +ADAPT::listeFieldInterpTSRsIter* HOMARD_Iteration_i::GetFieldInterpsTimeStepRank() { ASSERT( myHomardIteration ); const std::list& ListString = myHomardIteration->GetFieldInterpsTimeStepRank(); - HOMARD::listeFieldInterpTSRsIter_var aResult = new HOMARD::listeFieldInterpTSRsIter; + ADAPT::listeFieldInterpTSRsIter_var aResult = new ADAPT::listeFieldInterpTSRsIter; aResult->length( ListString.size() ); std::list::const_iterator it; int i = 0; @@ -260,11 +260,11 @@ void HOMARD_Iteration_i::SetFieldInterp( const char* FieldInterp ) myHomardIteration->SetFieldInterp( FieldInterp ); } //============================================================================= -HOMARD::listeFieldInterpsIter* HOMARD_Iteration_i::GetFieldInterps() +ADAPT::listeFieldInterpsIter* HOMARD_Iteration_i::GetFieldInterps() { ASSERT( myHomardIteration ); const std::list& ListString = myHomardIteration->GetFieldInterps(); - HOMARD::listeFieldInterpsIter_var aResult = new HOMARD::listeFieldInterpsIter; + ADAPT::listeFieldInterpsIter_var aResult = new ADAPT::listeFieldInterpsIter; aResult->length( ListString.size() ); std::list::const_iterator it; int i = 0; @@ -355,7 +355,7 @@ char* HOMARD_Iteration_i::GetFileInfo() // Liens avec les autres iterations //============================================================================= //============================================================================= -HOMARD::HOMARD_Iteration_ptr HOMARD_Iteration_i::NextIteration( const char* IterName ) +ADAPT::HOMARD_Iteration_ptr HOMARD_Iteration_i::NextIteration( const char* IterName ) { // Nom de l'iteration parent char* NomIterParent = GetName() ; @@ -375,11 +375,11 @@ void HOMARD_Iteration_i::UnLinkNextIteration( const char* NomIteration ) myHomardIteration->UnLinkNextIteration( NomIteration ); } //============================================================================= -HOMARD::listeIterFilles* HOMARD_Iteration_i::GetIterations() +ADAPT::listeIterFilles* HOMARD_Iteration_i::GetIterations() { ASSERT( myHomardIteration ); const std::list& maListe = myHomardIteration->GetIterations(); - HOMARD::listeIterFilles_var aResult = new HOMARD::listeIterFilles; + ADAPT::listeIterFilles_var aResult = new ADAPT::listeIterFilles; aResult->length( maListe.size() ); std::list::const_iterator it; int i = 0; @@ -402,7 +402,7 @@ char* HOMARD_Iteration_i::GetIterParentName() return CORBA::string_dup( myHomardIteration->GetIterParentName().c_str() ); } //============================================================================= -HOMARD::HOMARD_Iteration_ptr HOMARD_Iteration_i::GetIterParent() +ADAPT::HOMARD_Iteration_ptr HOMARD_Iteration_i::GetIterParent() { // Nom de l'iteration parent char* NomIterParent = GetIterParentName() ; diff --git a/src/ADAPT_I/HOMARD_Iteration_i.hxx b/src/ADAPT_I/HOMARD_Iteration_i.hxx index 1cc30b67e..87d353e77 100644 --- a/src/ADAPT_I/HOMARD_Iteration_i.hxx +++ b/src/ADAPT_I/HOMARD_Iteration_i.hxx @@ -31,7 +31,7 @@ #define _HOMARD_ITERATION_I_HXX_ #include -#include CORBA_SERVER_HEADER(HOMARD_Gen) +#include CORBA_SERVER_HEADER(ADAPT_Gen) #include CORBA_SERVER_HEADER(HOMARD_Iteration) #include "HOMARD_i.hxx" @@ -45,12 +45,12 @@ class HOMARD_Iteration; class HOMARDENGINE_EXPORT HOMARD_Iteration_i: public virtual Engines_Component_i, - public virtual POA_HOMARD::HOMARD_Iteration, + public virtual POA_ADAPT::HOMARD_Iteration, public virtual PortableServer::ServantBase { public: HOMARD_Iteration_i( CORBA::ORB_ptr orb, - HOMARD::HOMARD_Gen_var gen_i ); + ADAPT::ADAPT_Gen_var gen_i ); HOMARD_Iteration_i(); virtual ~HOMARD_Iteration_i(); @@ -95,9 +95,9 @@ public: // Instants pour un champ a interpoler void SetFieldInterpTimeStep( const char* FieldInterp, CORBA::Long TimeStep ); void SetFieldInterpTimeStepRank( const char* FieldInterp, CORBA::Long TimeStep, CORBA::Long Rank ); - HOMARD::listeFieldInterpTSRsIter* GetFieldInterpsTimeStepRank(); + ADAPT::listeFieldInterpTSRsIter* GetFieldInterpsTimeStepRank(); void SetFieldInterp( const char* FieldInterp ); - HOMARD::listeFieldInterpsIter* GetFieldInterps(); + ADAPT::listeFieldInterpsIter* GetFieldInterps(); void SupprFieldInterps(); void SetLogFile( const char* LogFile ); @@ -113,15 +113,15 @@ public: char* GetFileInfo(); // Liens avec les autres iterations - HOMARD::HOMARD_Iteration_ptr NextIteration( const char* Name) ; + ADAPT::HOMARD_Iteration_ptr NextIteration( const char* Name) ; void LinkNextIteration( const char* NomIteration ); void UnLinkNextIteration( const char* NomIteration ); - HOMARD::listeIterFilles* GetIterations(); + ADAPT::listeIterFilles* GetIterations(); void SetIterParentName( const char* NomIterParent ); char* GetIterParentName(); - HOMARD::HOMARD_Iteration_ptr GetIterParent() ; + ADAPT::HOMARD_Iteration_ptr GetIterParent() ; // Liens avec les autres structures void SetCaseName( const char* NomCas ); @@ -139,7 +139,7 @@ private: ::HOMARD_Iteration* myHomardIteration; CORBA::ORB_ptr _orb; - HOMARD::HOMARD_Gen_var _gen_i; + ADAPT::ADAPT_Gen_var _gen_i; }; #endif diff --git a/src/ADAPT_I/HOMARD_YACS_i.cxx b/src/ADAPT_I/HOMARD_YACS_i.cxx index 749d60d71..ae6977b23 100644 --- a/src/ADAPT_I/HOMARD_YACS_i.cxx +++ b/src/ADAPT_I/HOMARD_YACS_i.cxx @@ -28,7 +28,7 @@ // #include "HOMARD_YACS_i.hxx" -#include "HOMARD_Gen_i.hxx" +#include "ADAPT_Gen_i.hxx" #include "HOMARD_YACS.hxx" #include "HOMARD_DriverTools.hxx" @@ -52,7 +52,7 @@ HOMARD_YACS_i::HOMARD_YACS_i() */ //============================================================================= HOMARD_YACS_i::HOMARD_YACS_i( CORBA::ORB_ptr orb, - HOMARD::HOMARD_Gen_var engine ) + ADAPT::ADAPT_Gen_var engine ) { MESSAGE("constructor"); _gen_i = engine; @@ -101,12 +101,12 @@ char* HOMARD_YACS_i::GetDumpPython() //============================================================================= std::string HOMARD_YACS_i::Dump() const { - return HOMARD::Dump( *myHomardYACS ); + return ADAPT::Dump( *myHomardYACS ); } //============================================================================= bool HOMARD_YACS_i::Restore( const std::string& stream ) { - return HOMARD::Restore( *myHomardYACS, stream ); + return ADAPT::Restore( *myHomardYACS, stream ); } //============================================================================= //============================================================================= diff --git a/src/ADAPT_I/HOMARD_YACS_i.hxx b/src/ADAPT_I/HOMARD_YACS_i.hxx index 806602423..45c17851d 100644 --- a/src/ADAPT_I/HOMARD_YACS_i.hxx +++ b/src/ADAPT_I/HOMARD_YACS_i.hxx @@ -31,7 +31,7 @@ #define _HOMARD_YACS_I_HXX_ #include -#include CORBA_SERVER_HEADER(HOMARD_Gen) +#include CORBA_SERVER_HEADER(ADAPT_Gen) #include CORBA_SERVER_HEADER(HOMARD_YACS) #include "HOMARD_i.hxx" @@ -45,12 +45,12 @@ class HOMARD_YACS; class HOMARDENGINE_EXPORT HOMARD_YACS_i: public virtual Engines_Component_i, - public virtual POA_HOMARD::HOMARD_YACS, + public virtual POA_ADAPT::HOMARD_YACS, public virtual PortableServer::ServantBase { public: HOMARD_YACS_i( CORBA::ORB_ptr orb, - HOMARD::HOMARD_Gen_var gen_i ); + ADAPT::ADAPT_Gen_var gen_i ); HOMARD_YACS_i(); virtual ~HOMARD_YACS_i(); @@ -106,7 +106,7 @@ private: ::HOMARD_YACS* myHomardYACS; CORBA::ORB_ptr _orb; - HOMARD::HOMARD_Gen_var _gen_i; + ADAPT::ADAPT_Gen_var _gen_i; }; #endif diff --git a/src/ADAPT_I/HOMARD_Zone_i.cxx b/src/ADAPT_I/HOMARD_Zone_i.cxx index 4a16ee5dd..b8ee19062 100644 --- a/src/ADAPT_I/HOMARD_Zone_i.cxx +++ b/src/ADAPT_I/HOMARD_Zone_i.cxx @@ -28,7 +28,7 @@ // #include "HOMARD_Zone_i.hxx" -#include "HOMARD_Gen_i.hxx" +#include "ADAPT_Gen_i.hxx" #include "HOMARD_Zone.hxx" #include "HOMARD_DriverTools.hxx" @@ -51,7 +51,7 @@ HOMARD_Zone_i::HOMARD_Zone_i() */ //============================================================================= HOMARD_Zone_i::HOMARD_Zone_i( CORBA::ORB_ptr orb, - HOMARD::HOMARD_Gen_var engine ) + ADAPT::ADAPT_Gen_var engine ) { MESSAGE( "HOMARD_Zone_i" ); _gen_i = engine; @@ -101,12 +101,12 @@ char* HOMARD_Zone_i::GetDumpPython() //============================================================================= std::string HOMARD_Zone_i::Dump() const { - return HOMARD::Dump( *myHomardZone ); + return ADAPT::Dump( *myHomardZone ); } //============================================================================= bool HOMARD_Zone_i::Restore( const std::string& stream ) { - return HOMARD::Restore( *myHomardZone, stream ); + return ADAPT::Restore( *myHomardZone, stream ); } //============================================================================= //============================================================================= @@ -153,10 +153,10 @@ void HOMARD_Zone_i::SetSphere( double Xcentre, double Ycentre, double Zcentre, d myHomardZone->SetSphere( Xcentre, Ycentre, Zcentre, Rayon ); } //============================================================================= -HOMARD::double_array* HOMARD_Zone_i::GetCoords() +ADAPT::double_array* HOMARD_Zone_i::GetCoords() { ASSERT( myHomardZone ); - HOMARD::double_array_var aResult = new HOMARD::double_array(); + ADAPT::double_array_var aResult = new ADAPT::double_array(); std::vector mesCoor = myHomardZone->GetCoords(); aResult->length( mesCoor .size() ); std::vector::const_iterator it; @@ -173,10 +173,10 @@ void HOMARD_Zone_i::SetLimit( double Xincr, double Yincr, double Zincr ) myHomardZone->SetLimit( Xincr, Yincr, Zincr ); } //============================================================================= -HOMARD::double_array* HOMARD_Zone_i::GetLimit() +ADAPT::double_array* HOMARD_Zone_i::GetLimit() { ASSERT( myHomardZone ); - HOMARD::double_array_var aResult = new HOMARD::double_array(); + ADAPT::double_array_var aResult = new ADAPT::double_array(); std::vector mesCoor = myHomardZone->GetLimit(); aResult->length( mesCoor .size() ); std::vector::const_iterator it; @@ -197,11 +197,11 @@ void HOMARD_Zone_i::AddHypo( const char* NomHypo ) myHomardZone->AddHypo( NomHypo ); } //============================================================================= -HOMARD::listeHypo* HOMARD_Zone_i::GetHypo() +ADAPT::listeHypo* HOMARD_Zone_i::GetHypo() { ASSERT( myHomardZone ); const std::list& maListe = myHomardZone->GetHypo(); - HOMARD::listeHypo_var aResult = new HOMARD::listeHypo; + ADAPT::listeHypo_var aResult = new ADAPT::listeHypo; aResult->length( maListe.size() ); std:: list::const_iterator it; int i = 0; diff --git a/src/ADAPT_I/HOMARD_Zone_i.hxx b/src/ADAPT_I/HOMARD_Zone_i.hxx index 84c2d5c00..ee4e29e7c 100644 --- a/src/ADAPT_I/HOMARD_Zone_i.hxx +++ b/src/ADAPT_I/HOMARD_Zone_i.hxx @@ -31,7 +31,7 @@ #define _HOMARD_Zone_I_HXX_ #include -#include CORBA_SERVER_HEADER(HOMARD_Gen) +#include CORBA_SERVER_HEADER(ADAPT_Gen) #include CORBA_SERVER_HEADER(HOMARD_Zone) #include "HOMARD_i.hxx" @@ -45,11 +45,11 @@ class HOMARD_Zone; class HOMARDENGINE_EXPORT HOMARD_Zone_i: public virtual Engines_Component_i, - public virtual POA_HOMARD::HOMARD_Zone, + public virtual POA_ADAPT::HOMARD_Zone, public virtual PortableServer::ServantBase { public: - HOMARD_Zone_i( CORBA::ORB_ptr orb, HOMARD::HOMARD_Gen_var gen_i ); + HOMARD_Zone_i( CORBA::ORB_ptr orb, ADAPT::ADAPT_Gen_var gen_i ); HOMARD_Zone_i(); virtual ~HOMARD_Zone_i(); @@ -84,21 +84,21 @@ public: void SetSphere( double Xcentre, double Ycentre, double ZCentre, double Rayon ); - HOMARD::double_array* GetCoords(); + ADAPT::double_array* GetCoords(); void SetLimit( double Xincr, double Yincr, double Zincr); - HOMARD::double_array* GetLimit(); + ADAPT::double_array* GetLimit(); // Liens avec les autres structures void AddHypo( const char *NomHypo ); - HOMARD::listeHypo* GetHypo(); + ADAPT::listeHypo* GetHypo(); void SupprHypo( const char *NomHypo ); private: ::HOMARD_Zone* myHomardZone; CORBA::ORB_ptr _orb; - HOMARD::HOMARD_Gen_var _gen_i; + ADAPT::ADAPT_Gen_var _gen_i; }; #endif -- 2.39.2