ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-23 22:00:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

changement homardGen ==> adaptGen

Browse Source
This commit is contained in:
Gérald NICOLAS 2020-05-28 10:40:28 +02:00
parent aa70584c33
commit 029e6c0c45
49 changed files with 244 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ADAPTGUI/MonCreateBoundaryAn.cxx
View File

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

6
src/ADAPTGUI/MonCreateBoundaryAn.h
View File

@ -39,13 +39,13 @@ class HOMARD_EXPORT MonCreateBoundaryAn : public QDialog, public Ui_CreateBounda
public: public:
MonCreateBoundaryAn( MonCreateCase* parent, bool modal, MonCreateBoundaryAn( MonCreateCase* parent, bool modal,
ADAPT::ADAPT_Gen_var myHomardGen, ADAPT::ADAPT_Gen_var myAdaptGen,
QString caseName); QString caseName);
virtual ~MonCreateBoundaryAn(); virtual ~MonCreateBoundaryAn();
protected : protected :
MonCreateBoundaryAn( MonCreateCase* parent, MonCreateBoundaryAn( MonCreateCase* parent,
ADAPT::ADAPT_Gen_var myHomardGen, ADAPT::ADAPT_Gen_var myAdaptGen,
QString caseName); QString caseName);
MonCreateCase * _parent; MonCreateCase * _parent;
@ -71,7 +71,7 @@ protected :
bool Chgt; bool Chgt;
ADAPT::HOMARD_Boundary_var aBoundaryAn ; ADAPT::HOMARD_Boundary_var aBoundaryAn ;
ADAPT::ADAPT_Gen_var myHomardGen; ADAPT::ADAPT_Gen_var myAdaptGen;
virtual void InitConnect(); virtual void InitConnect();
virtual void InitValBoundaryAn(); virtual void InitValBoundaryAn();

12
src/ADAPTGUI/MonCreateBoundaryCAO.cxx
View File

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

4
src/ADAPTGUI/MonCreateBoundaryCAO.h
View File

@ -39,7 +39,7 @@ class HOMARD_EXPORT MonCreateBoundaryCAO : public QDialog, public Ui_CreateBound
public: public:
MonCreateBoundaryCAO( MonCreateCase* parent, bool modal, MonCreateBoundaryCAO( MonCreateCase* parent, bool modal,
ADAPT::ADAPT_Gen_var myHomardGen, ADAPT::ADAPT_Gen_var myAdaptGen,
QString caseName, QString BoundaryName ); QString caseName, QString BoundaryName );
~MonCreateBoundaryCAO(); ~MonCreateBoundaryCAO();
virtual void setGroups (QStringList listGroup); virtual void setGroups (QStringList listGroup);
@ -53,7 +53,7 @@ protected :
ADAPT::HOMARD_Boundary_var aBoundary; ADAPT::HOMARD_Boundary_var aBoundary;
ADAPT::ADAPT_Gen_var myHomardGen; ADAPT::ADAPT_Gen_var myAdaptGen;
QStringList _listeGroupesBoundary; QStringList _listeGroupesBoundary;

12
src/ADAPTGUI/MonCreateBoundaryDi.cxx
View File

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

4
src/ADAPTGUI/MonCreateBoundaryDi.h
View File

@ -39,7 +39,7 @@ class HOMARD_EXPORT MonCreateBoundaryDi : public QDialog, public Ui_CreateBounda
public: public:
MonCreateBoundaryDi( MonCreateCase* parent, bool modal, MonCreateBoundaryDi( MonCreateCase* parent, bool modal,
ADAPT::ADAPT_Gen_var myHomardGen, ADAPT::ADAPT_Gen_var myAdaptGen,
QString caseName, QString BoundaryName ); QString caseName, QString BoundaryName );
~MonCreateBoundaryDi(); ~MonCreateBoundaryDi();
virtual void setGroups (QStringList listGroup); virtual void setGroups (QStringList listGroup);
@ -53,7 +53,7 @@ protected :
ADAPT::HOMARD_Boundary_var aBoundary; ADAPT::HOMARD_Boundary_var aBoundary;
ADAPT::ADAPT_Gen_var myHomardGen; ADAPT::ADAPT_Gen_var myAdaptGen;
QStringList _listeGroupesBoundary; QStringList _listeGroupesBoundary;

72
src/ADAPTGUI/MonCreateCase.cxx
View File

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

4
src/ADAPTGUI/MonCreateCase.h
View File

@ -37,7 +37,7 @@ class HOMARD_EXPORT MonCreateCase : public QDialog, public Ui_CreateCase
Q_OBJECT Q_OBJECT
public: public:
MonCreateCase( bool modal, ADAPT::ADAPT_Gen_var myHomardGen ); MonCreateCase( bool modal, ADAPT::ADAPT_Gen_var myAdaptGen );
~MonCreateCase(); ~MonCreateCase();
void AddBoundaryCAO(QString newBoundary); void AddBoundaryCAO(QString newBoundary);
@ -54,7 +54,7 @@ protected :
int _Pyram; int _Pyram;
ADAPT::HOMARD_Cas_var aCase ; ADAPT::HOMARD_Cas_var aCase ;
ADAPT::ADAPT_Gen_var myHomardGen; ADAPT::ADAPT_Gen_var myAdaptGen;
virtual void InitConnect(); virtual void InitConnect();
virtual void InitBoundarys(); virtual void InitBoundarys();

18
src/ADAPTGUI/MonCreateHypothesis.cxx
View File

@ -35,7 +35,7 @@ using namespace std;
// ------------------------------------------------------------------------------- // -------------------------------------------------------------------------------
MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal, MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal,
ADAPT::ADAPT_Gen_var myHomardGen0, ADAPT::ADAPT_Gen_var myAdaptGen0,
QString Name, QString Name,
QString caseName, QString aFieldFile) QString caseName, QString aFieldFile)
// --------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------
@ -56,7 +56,7 @@ MonCreateHypothesis::MonCreateHypothesis(MonCreateIteration* parent, bool modal,
{ {
MESSAGE("Constructeur") ; MESSAGE("Constructeur") ;
myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0); myAdaptGen=ADAPT::ADAPT_Gen::_duplicate(myAdaptGen0);
setupUi(this); setupUi(this);
if ( modal ) { setWindowModality(Qt::WindowModal); } if ( modal ) { setWindowModality(Qt::WindowModal); }
else { setWindowModality(Qt::NonModal); } else { setWindowModality(Qt::NonModal); }
@ -158,7 +158,7 @@ bool MonCreateHypothesis::PushOnApply()
_Name=LEName->text().trimmed(); _Name=LEName->text().trimmed();
try try
{ {
aHypothesis=myHomardGen->CreateHypothesis(CORBA::string_dup(_Name.toStdString().c_str()) ); aHypothesis=myAdaptGen->CreateHypothesis(CORBA::string_dup(_Name.toStdString().c_str()) );
_parent->addHypothese(_Name); _parent->addHypothese(_Name);
} }
catch( SALOME::SALOME_Exception& S_ex ) catch( SALOME::SALOME_Exception& S_ex )
@ -223,7 +223,7 @@ void MonCreateHypothesis::PushOnOK()
void MonCreateHypothesis::PushOnHelp() void MonCreateHypothesis::PushOnHelp()
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
{ {
std::string LanguageShort = myHomardGen->GetLanguageShort(); std::string LanguageShort = myAdaptGen->GetLanguageShort();
HOMARD_UTILS::PushOnHelp(QString("gui_create_hypothese.html"), QString(""), QString(LanguageShort.c_str())); HOMARD_UTILS::PushOnHelp(QString("gui_create_hypothese.html"), QString(""), QString(LanguageShort.c_str()));
} }
// ------------------------------------------------- // -------------------------------------------------
@ -231,7 +231,7 @@ void MonCreateHypothesis::SetNewName()
// -------------------------------------------------- // --------------------------------------------------
{ {
ADAPT::listeHypotheses_var MyObjects = myHomardGen->GetAllHypothesesName(); ADAPT::listeHypotheses_var MyObjects = myAdaptGen->GetAllHypothesesName();
int num = 0;// int num = 0;//
QString aName=""; QString aName="";
while (aName=="" ) while (aName=="" )
@ -318,7 +318,7 @@ void MonCreateHypothesis::PushZoneNew()
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
{ {
MESSAGE("Debut de MonCreateHypothesis::PushZoneNew") MESSAGE("Debut de MonCreateHypothesis::PushZoneNew")
MonCreateZone *aDlg = new MonCreateZone(this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName) ; MonCreateZone *aDlg = new MonCreateZone(this, true, ADAPT::ADAPT_Gen::_duplicate(myAdaptGen), _aCaseName) ;
aDlg->show(); aDlg->show();
} }
@ -336,7 +336,7 @@ void MonCreateHypothesis::PushZoneEdit()
return; return;
} }
QString zoneName = monItem->text().trimmed(); QString zoneName = monItem->text().trimmed();
MonEditZone *aDlg = new MonEditZone(this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), _aCaseName, zoneName) ; MonEditZone *aDlg = new MonEditZone(this, true, ADAPT::ADAPT_Gen::_duplicate(myAdaptGen), _aCaseName, zoneName) ;
aDlg->show(); aDlg->show();
} }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@ -357,7 +357,7 @@ void MonCreateHypothesis::GetAllZones()
// Par defaut, aucune n'est selectionnee // Par defaut, aucune n'est selectionnee
{ {
MESSAGE("Debut de GetAllZones") ; MESSAGE("Debut de GetAllZones") ;
ADAPT::listeZones_var mesZones = myHomardGen->GetAllZonesName(); ADAPT::listeZones_var mesZones = myAdaptGen->GetAllZonesName();
int nbrow=TWZone->rowCount(); int nbrow=TWZone->rowCount();
for ( int row=0; row< nbrow; row++) for ( int row=0; row< nbrow; row++)
{ {
@ -711,7 +711,7 @@ void MonCreateHypothesis::SetFiltrage()
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
{ {
if (!CBGroupe->isChecked()) return; if (!CBGroupe->isChecked()) return;
MonCreateListGroup *aDlg = new MonCreateListGroup(this, NULL, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),_aCaseName, _aListeGroupes) ; MonCreateListGroup *aDlg = new MonCreateListGroup(this, NULL, true, ADAPT::ADAPT_Gen::_duplicate(myAdaptGen),_aCaseName, _aListeGroupes) ;
aDlg->show(); aDlg->show();
} }

6
src/ADAPTGUI/MonCreateHypothesis.h
View File

@ -38,7 +38,7 @@ class HOMARD_EXPORT MonCreateHypothesis : public QScrollArea, public Ui_CreateHy
Q_OBJECT Q_OBJECT
public: public:
MonCreateHypothesis( MonCreateIteration* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, MonCreateHypothesis( MonCreateIteration* parent, bool modal, ADAPT::ADAPT_Gen_var myAdaptGen,
QString aHypotheseName, QString caseName, QString aFieldFile); QString aHypotheseName, QString caseName, QString aFieldFile);
~MonCreateHypothesis(); ~MonCreateHypothesis();
@ -46,7 +46,7 @@ public:
virtual void setGroups(QStringList listGroup); virtual void setGroups(QStringList listGroup);
protected : protected :
// MonCreateHypothesis( MonCreateIteration* parent, ADAPT::ADAPT_Gen_var myHomardGen, // MonCreateHypothesis( MonCreateIteration* parent, ADAPT::ADAPT_Gen_var myAdaptGen,
// QString caseName, QString aFieldFile); // QString caseName, QString aFieldFile);
MonCreateIteration *_parent; MonCreateIteration *_parent;
@ -75,7 +75,7 @@ protected :
int _ExtraOutput; int _ExtraOutput;
ADAPT::HOMARD_Hypothesis_var aHypothesis; ADAPT::HOMARD_Hypothesis_var aHypothesis;
ADAPT::ADAPT_Gen_var myHomardGen; ADAPT::ADAPT_Gen_var myAdaptGen;
QStringList _aListeZone; QStringList _aListeZone;
QStringList _aListeComposant; QStringList _aListeComposant;

24
src/ADAPTGUI/MonCreateIteration.cxx
View File

@ -33,7 +33,7 @@ using namespace std;
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
MonCreateIteration::MonCreateIteration(QWidget* parent, bool modal, MonCreateIteration::MonCreateIteration(QWidget* parent, bool modal,
ADAPT::ADAPT_Gen_var myHomardGen0, QString IterParentName ): ADAPT::ADAPT_Gen_var myAdaptGen0, QString IterParentName ):
// ----------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------
/* Constructs a MonCreateIteration /* Constructs a MonCreateIteration
* Inherits from CasHomard * Inherits from CasHomard
@ -46,7 +46,7 @@ MonCreateIteration::MonCreateIteration(QWidget* parent, bool modal,
_CaseName("") _CaseName("")
{ {
MESSAGE("Constructeur"); MESSAGE("Constructeur");
myHomardGen=ADAPT::ADAPT_Gen::_duplicate(myHomardGen0); myAdaptGen=ADAPT::ADAPT_Gen::_duplicate(myAdaptGen0);
setupUi(this); setupUi(this);
if ( modal ) { setWindowModality(Qt::WindowModal); } if ( modal ) { setWindowModality(Qt::WindowModal); }
else { setWindowModality(Qt::NonModal); } else { setWindowModality(Qt::NonModal); }
@ -87,7 +87,7 @@ void MonCreateIteration::InitConnect()
void MonCreateIteration::GetHypotheses() void MonCreateIteration::GetHypotheses()
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
{ {
ADAPT::listeHypotheses_var mesHypotheses = myHomardGen->GetAllHypothesesName(); ADAPT::listeHypotheses_var mesHypotheses = myAdaptGen->GetAllHypothesesName();
for (int i=0; i<mesHypotheses->length(); i++) for (int i=0; i<mesHypotheses->length(); i++)
{ {
CBHypothese->addItem(QString(mesHypotheses[i])); CBHypothese->addItem(QString(mesHypotheses[i]));
@ -128,7 +128,7 @@ bool MonCreateIteration::PushOnApply()
QObject::tr("HOM_ITER_HYPO") ); QObject::tr("HOM_ITER_HYPO") );
return false; return false;
} }
ADAPT::HOMARD_Hypothesis_var _myHypothesis = myHomardGen->GetHypothesis(monHypoName.toStdString().c_str()); ADAPT::HOMARD_Hypothesis_var _myHypothesis = myAdaptGen->GetHypothesis(monHypoName.toStdString().c_str());
ADAPT::listeTypes_var ListTypes (_myHypothesis->GetAdapRefinUnRef()); ADAPT::listeTypes_var ListTypes (_myHypothesis->GetAdapRefinUnRef());
int TypeAdap = ListTypes[0]; int TypeAdap = ListTypes[0];
if ( TypeAdap == 1 && LEFieldFile->text().trimmed() == QString("") ) if ( TypeAdap == 1 && LEFieldFile->text().trimmed() == QString("") )
@ -149,7 +149,7 @@ bool MonCreateIteration::PushOnApply()
{ {
_Name = aName; _Name = aName;
std::cerr << _Name.toStdString() << std::endl; std::cerr << _Name.toStdString() << std::endl;
aIter = myHomardGen->CreateIteration( \ aIter = myAdaptGen->CreateIteration( \
CORBA::string_dup(_Name.toStdString().c_str()), CORBA::string_dup(_Name.toStdString().c_str()),
CORBA::string_dup(_IterParentName.toStdString().c_str())); CORBA::string_dup(_IterParentName.toStdString().c_str()));
} }
@ -172,7 +172,7 @@ bool MonCreateIteration::PushOnApply()
if ( step == -2 ) { aIter->SetTimeStepRankLast(); } if ( step == -2 ) { aIter->SetTimeStepRankLast(); }
else { aIter->SetTimeStepRank(step,rank); } else { aIter->SetTimeStepRank(step,rank); }
} }
myHomardGen->AssociateIterHypo (IterName.c_str(), monHypoName.toStdString().c_str()); myAdaptGen->AssociateIterHypo (IterName.c_str(), monHypoName.toStdString().c_str());
aIter->SetMeshName(CORBA::string_dup(aMeshName_np1.toStdString().c_str())); aIter->SetMeshName(CORBA::string_dup(aMeshName_np1.toStdString().c_str()));
HOMARD_UTILS::updateObjBrowser() ; HOMARD_UTILS::updateObjBrowser() ;
@ -190,7 +190,7 @@ void MonCreateIteration::PushOnOK()
void MonCreateIteration::PushOnHelp() void MonCreateIteration::PushOnHelp()
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
{ {
std::string LanguageShort = myHomardGen->GetLanguageShort(); std::string LanguageShort = myAdaptGen->GetLanguageShort();
HOMARD_UTILS::PushOnHelp(QString("gui_create_iteration.html"), QString(""), QString(LanguageShort.c_str())); HOMARD_UTILS::PushOnHelp(QString("gui_create_iteration.html"), QString(""), QString(LanguageShort.c_str()));
} }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------
@ -202,7 +202,7 @@ void MonCreateIteration::SetIterParentName()
if (_IterParentName == QString("")) { raise();return;}; if (_IterParentName == QString("")) { raise();return;};
} }
_CaseName=HOMARD_QT_COMMUN::SelectionCasEtude(); _CaseName=HOMARD_QT_COMMUN::SelectionCasEtude();
ADAPT::HOMARD_Iteration_var aIterParent = myHomardGen->GetIteration(_IterParentName.toStdString().c_str()) ; ADAPT::HOMARD_Iteration_var aIterParent = myAdaptGen->GetIteration(_IterParentName.toStdString().c_str()) ;
QString MeshName = aIterParent->GetMeshName(); QString MeshName = aIterParent->GetMeshName();
LEMeshName_n->setText(MeshName); LEMeshName_n->setText(MeshName);
@ -217,7 +217,7 @@ void MonCreateIteration::SetNewName()
{ {
// Recherche d'un nom par defaut qui n'existe pas encore // Recherche d'un nom par defaut qui n'existe pas encore
ADAPT::listeIterations_var MyObjects=myHomardGen->GetAllIterationsName(); ADAPT::listeIterations_var MyObjects=myAdaptGen->GetAllIterationsName();
int num = 0;// int num = 0;//
QString aName=""; QString aName="";
while (aName=="" ) while (aName=="" )
@ -249,7 +249,7 @@ void MonCreateIteration::PushHypoEdit()
return; return;
} }
QString aFieldFile=LEFieldFile->text().trimmed(); QString aFieldFile=LEFieldFile->text().trimmed();
MonEditHypothesis *HypoDlg = new MonEditHypothesis(this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen),CBHypothese->currentText(), _CaseName, aFieldFile) ; MonEditHypothesis *HypoDlg = new MonEditHypothesis(this, true, ADAPT::ADAPT_Gen::_duplicate(myAdaptGen),CBHypothese->currentText(), _CaseName, aFieldFile) ;
HypoDlg->show(); HypoDlg->show();
} }
@ -273,11 +273,11 @@ void MonCreateIteration::PushHypoNew()
} }
if ( _CaseName == QString("")) if ( _CaseName == QString(""))
{ {
ADAPT::HOMARD_Iteration_var aIterParent = myHomardGen->GetIteration(_IterParentName.toStdString().c_str()) ; ADAPT::HOMARD_Iteration_var aIterParent = myAdaptGen->GetIteration(_IterParentName.toStdString().c_str()) ;
_CaseName = aIterParent->GetCaseName(); _CaseName = aIterParent->GetCaseName();
} }
QString aFieldFile=LEFieldFile->text().trimmed(); QString aFieldFile=LEFieldFile->text().trimmed();
MonCreateHypothesis *HypoDlg = new MonCreateHypothesis(this, true, ADAPT::ADAPT_Gen::_duplicate(myHomardGen), QString(""), _CaseName, aFieldFile) ; MonCreateHypothesis *HypoDlg = new MonCreateHypothesis(this, true, ADAPT::ADAPT_Gen::_duplicate(myAdaptGen), QString(""), _CaseName, aFieldFile) ;
HypoDlg->show(); HypoDlg->show();
} }
// ------------------------------------------------------------------------ // ------------------------------------------------------------------------

6
src/ADAPTGUI/MonCreateIteration.h
View File

@ -37,14 +37,14 @@ class HOMARD_EXPORT MonCreateIteration : public QScrollArea, public Ui_CreateIte
Q_OBJECT Q_OBJECT
public: public:
MonCreateIteration( QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString IterParentName ); MonCreateIteration( QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myAdaptGen, QString IterParentName );
~MonCreateIteration(); ~MonCreateIteration();
void addHypothese(QString newHypothese); void addHypothese(QString newHypothese);
protected : protected :
MonCreateIteration( QWidget* parent, ADAPT::ADAPT_Gen_var myHomardGen, QString IterParentName ); MonCreateIteration( QWidget* parent, ADAPT::ADAPT_Gen_var myAdaptGen, QString IterParentName );
QString _Name; QString _Name;
QString _IterParentName; QString _IterParentName;
@ -54,7 +54,7 @@ protected :
ADAPT::HOMARD_Iteration_var aIter ; ADAPT::HOMARD_Iteration_var aIter ;
ADAPT::HOMARD_Iteration_var aIterParent ; ADAPT::HOMARD_Iteration_var aIterParent ;
ADAPT::HOMARD_Cas_var aCas ; ADAPT::HOMARD_Cas_var aCas ;
ADAPT::ADAPT_Gen_var myHomardGen; ADAPT::ADAPT_Gen_var myAdaptGen;
virtual void InitConnect(); virtual void InitConnect();

12
src/ADAPTGUI/MonCreateListGroup.cxx
View File

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

6
src/ADAPTGUI/MonCreateListGroup.h
View File

@ -38,13 +38,13 @@ class HOMARD_EXPORT MonCreateListGroup : public QDialog, public Ui_CreateListGro
Q_OBJECT Q_OBJECT
public: public:
MonCreateListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo); MonCreateListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, ADAPT::ADAPT_Gen_var myAdaptGen, QString aCaseName, QStringList listeGroupesHypo);
MonCreateListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo); MonCreateListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, ADAPT::ADAPT_Gen_var myAdaptGen, QString aCaseName, QStringList listeGroupesHypo);
virtual ~MonCreateListGroup(); virtual ~MonCreateListGroup();
protected : protected :
ADAPT::ADAPT_Gen_var myHomardGen; ADAPT::ADAPT_Gen_var myAdaptGen;
MonCreateHypothesis * _parentHyp; MonCreateHypothesis * _parentHyp;
MonCreateBoundaryDi * _parentBound; MonCreateBoundaryDi * _parentBound;

12
src/ADAPTGUI/MonCreateListGroupCAO.cxx
View File

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

6
src/ADAPTGUI/MonCreateListGroupCAO.h
View File

@ -38,13 +38,13 @@ class HOMARD_EXPORT MonCreateListGroupCAO : public QDialog, public Ui_CreateList
Q_OBJECT Q_OBJECT
public: public:
MonCreateListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo); MonCreateListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal, ADAPT::ADAPT_Gen_var myAdaptGen, QString aCaseName, QStringList listeGroupesHypo);
MonCreateListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo); MonCreateListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, ADAPT::ADAPT_Gen_var myAdaptGen, QString aCaseName, QStringList listeGroupesHypo);
virtual ~MonCreateListGroupCAO(); virtual ~MonCreateListGroupCAO();
protected : protected :
ADAPT::ADAPT_Gen_var myHomardGen; ADAPT::ADAPT_Gen_var myAdaptGen;
MonCreateHypothesis * _parentHyp; MonCreateHypothesis * _parentHyp;
MonCreateBoundaryCAO * _parentBound; MonCreateBoundaryCAO * _parentBound;

22
src/ADAPTGUI/MonCreateYACS.cxx
View File

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

6
src/ADAPTGUI/MonCreateYACS.h
View File

@ -37,11 +37,11 @@ class HOMARD_EXPORT MonCreateYACS : public QScrollArea, public Ui_CreateYACS
Q_OBJECT Q_OBJECT
public: public:
MonCreateYACS( bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString CaseName); MonCreateYACS( bool modal, ADAPT::ADAPT_Gen_var myAdaptGen, QString CaseName);
virtual ~MonCreateYACS(); virtual ~MonCreateYACS();
protected : protected :
MonCreateYACS( ADAPT::ADAPT_Gen_var myHomardGen, QString CaseName); MonCreateYACS( ADAPT::ADAPT_Gen_var myAdaptGen, QString CaseName);
QString _Name; QString _Name;
QString _aCaseName; QString _aCaseName;
@ -57,7 +57,7 @@ class HOMARD_EXPORT MonCreateYACS : public QScrollArea, public Ui_CreateYACS
bool Chgt; bool Chgt;
ADAPT::HOMARD_YACS_var aYACS; ADAPT::HOMARD_YACS_var aYACS;
ADAPT::ADAPT_Gen_var myHomardGen; ADAPT::ADAPT_Gen_var myAdaptGen;
virtual void InitConnect(); virtual void InitConnect();
virtual bool CreateOrUpdate(); virtual bool CreateOrUpdate();

40
src/ADAPTGUI/MonCreateZone.cxx
View File

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

6
src/ADAPTGUI/MonCreateZone.h
View File

@ -38,13 +38,13 @@ class HOMARD_EXPORT MonCreateZone : public QDialog, public Ui_CreateZone
public: public:
MonCreateZone( MonCreateHypothesis* parent, bool modal, MonCreateZone( MonCreateHypothesis* parent, bool modal,
ADAPT::ADAPT_Gen_var myHomardGen, ADAPT::ADAPT_Gen_var myAdaptGen,
QString caseName); QString caseName);
virtual ~MonCreateZone(); virtual ~MonCreateZone();
protected : protected :
MonCreateZone( MonCreateHypothesis* parent, MonCreateZone( MonCreateHypothesis* parent,
ADAPT::ADAPT_Gen_var myHomardGen, ADAPT::ADAPT_Gen_var myAdaptGen,
QString caseName); QString caseName);
MonCreateHypothesis * _parent; MonCreateHypothesis * _parent;
@ -65,7 +65,7 @@ protected :
bool Chgt; bool Chgt;
ADAPT::HOMARD_Zone_var aZone ; ADAPT::HOMARD_Zone_var aZone ;
ADAPT::ADAPT_Gen_var myHomardGen; ADAPT::ADAPT_Gen_var myAdaptGen;
virtual void InitConnect(); virtual void InitConnect();
virtual void InitValZone(); virtual void InitValZone();

12
src/ADAPTGUI/MonEditBoundaryAn.cxx
View File

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

2
src/ADAPTGUI/MonEditBoundaryAn.h
View File

@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditBoundaryAn : public MonCreateBoundaryAn
Q_OBJECT Q_OBJECT
public: public:
MonEditBoundaryAn( MonCreateCase* parent, bool modal, MonEditBoundaryAn( MonCreateCase* parent, bool modal,
ADAPT::ADAPT_Gen_var myHomardGen, ADAPT::ADAPT_Gen_var myAdaptGen,
QString caseName, QString Name); QString caseName, QString Name);
virtual ~MonEditBoundaryAn(); virtual ~MonEditBoundaryAn();

10
src/ADAPTGUI/MonEditBoundaryCAO.cxx
View File

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

2
src/ADAPTGUI/MonEditBoundaryCAO.h
View File

@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditBoundaryCAO : public MonCreateBoundaryCAO
Q_OBJECT Q_OBJECT
public: public:
MonEditBoundaryCAO( MonCreateCase* parent, bool modal, MonEditBoundaryCAO( MonCreateCase* parent, bool modal,
ADAPT::ADAPT_Gen_var myHomardGen, ADAPT::ADAPT_Gen_var myAdaptGen,
QString caseName, QString Name ); QString caseName, QString Name );
virtual ~MonEditBoundaryCAO(); virtual ~MonEditBoundaryCAO();

10
src/ADAPTGUI/MonEditBoundaryDi.cxx
View File

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

2
src/ADAPTGUI/MonEditBoundaryDi.h
View File

@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditBoundaryDi : public MonCreateBoundaryDi
Q_OBJECT Q_OBJECT
public: public:
MonEditBoundaryDi( MonCreateCase* parent, bool modal, MonEditBoundaryDi( MonCreateCase* parent, bool modal,
ADAPT::ADAPT_Gen_var myHomardGen, ADAPT::ADAPT_Gen_var myAdaptGen,
QString caseName, QString Name ); QString caseName, QString Name );
virtual ~MonEditBoundaryDi(); virtual ~MonEditBoundaryDi();

10
src/ADAPTGUI/MonEditCase.cxx
View File

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

2
src/ADAPTGUI/MonEditCase.h
View File

@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditCase : public MonCreateCase
Q_OBJECT Q_OBJECT
public: public:
MonEditCase( bool modal, MonEditCase( bool modal,
ADAPT::ADAPT_Gen_var myHomardGen, ADAPT::ADAPT_Gen_var myAdaptGen,
QString Name ); QString Name );
virtual ~MonEditCase(); virtual ~MonEditCase();

2
src/ADAPTGUI/MonEditFile.cxx
View File

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

4
src/ADAPTGUI/MonEditFile.h
View File

@ -42,14 +42,14 @@ class HOMARD_EXPORT MonEditFile : public QWidget, public Ui_EditFile
public: public:
MonEditFile( QWidget* parent, bool modal, MonEditFile( QWidget* parent, bool modal,
ADAPT::ADAPT_Gen_var myHomardGen, ADAPT::ADAPT_Gen_var myAdaptGen,
QString FileName, int option ); QString FileName, int option );
~MonEditFile(); ~MonEditFile();
int _codret ; int _codret ;
protected : protected :
ADAPT::ADAPT_Gen_var myHomardGen; ADAPT::ADAPT_Gen_var myAdaptGen;
QString _aFileName ; QString _aFileName ;
int _option ; int _option ;

10
src/ADAPTGUI/MonEditHypothesis.cxx
View File

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

2
src/ADAPTGUI/MonEditHypothesis.h
View File

@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditHypothesis : public MonCreateHypothesis
Q_OBJECT Q_OBJECT
public: public:
MonEditHypothesis( MonCreateIteration* parent, bool modal, MonEditHypothesis( MonCreateIteration* parent, bool modal,
ADAPT::ADAPT_Gen_var myHomardGen, ADAPT::ADAPT_Gen_var myAdaptGen,
QString caseName, QString Name, QString aFieldFile ); QString caseName, QString Name, QString aFieldFile );
virtual ~MonEditHypothesis(); virtual ~MonEditHypothesis();

12
src/ADAPTGUI/MonEditIteration.cxx
View File

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

2
src/ADAPTGUI/MonEditIteration.h
View File

@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditIteration : public MonCreateIteration
Q_OBJECT Q_OBJECT
public: public:
MonEditIteration( QWidget* parent, bool modal, MonEditIteration( QWidget* parent, bool modal,
ADAPT::ADAPT_Gen_var myHomardGen, ADAPT::ADAPT_Gen_var myAdaptGen,
QString IterParentName, QString Name ); QString IterParentName, QString Name );
virtual ~MonEditIteration(); virtual ~MonEditIteration();

4
src/ADAPTGUI/MonEditListGroup.cxx
View File

@ -25,11 +25,11 @@ using namespace std;
MonEditListGroup::MonEditListGroup( MonCreateHypothesis* parentHyp, MonEditListGroup::MonEditListGroup( MonCreateHypothesis* parentHyp,
MonCreateBoundaryDi* parentBound, MonCreateBoundaryDi* parentBound,
bool modal, bool modal,
ADAPT::ADAPT_Gen_var myHomardGen, ADAPT::ADAPT_Gen_var myAdaptGen,
QString aCaseName, QString aCaseName,
QStringList listeGroupesHypo): QStringList listeGroupesHypo):
//--------------------------------------------------------------------- //---------------------------------------------------------------------
MonCreateListGroup(parentHyp,parentBound,myHomardGen,aCaseName,listeGroupesHypo) MonCreateListGroup(parentHyp,parentBound,myAdaptGen,aCaseName,listeGroupesHypo)
{ {
MESSAGE("Debut de MonEditListGroup"); MESSAGE("Debut de MonEditListGroup");
setWindowTitle(QObject::tr("HOM_GROU_EDIT_WINDOW_TITLE")); setWindowTitle(QObject::tr("HOM_GROU_EDIT_WINDOW_TITLE"));

2
src/ADAPTGUI/MonEditListGroup.h
View File

@ -37,7 +37,7 @@ class HOMARD_EXPORT MonEditListGroup : public MonCreateListGroup
Q_OBJECT Q_OBJECT
public: public:
MonEditListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo); MonEditListGroup( MonCreateHypothesis* parentHyp, MonCreateBoundaryDi* parentBound, bool modal, ADAPT::ADAPT_Gen_var myAdaptGen, QString aCaseName, QStringList listeGroupesHypo);
virtual ~MonEditListGroup(); virtual ~MonEditListGroup();
protected : protected :

4
src/ADAPTGUI/MonEditListGroupCAO.cxx
View File

@ -25,11 +25,11 @@ using namespace std;
MonEditListGroupCAO::MonEditListGroupCAO( MonCreateHypothesis* parentHyp, MonEditListGroupCAO::MonEditListGroupCAO( MonCreateHypothesis* parentHyp,
MonCreateBoundaryCAO* parentBound, MonCreateBoundaryCAO* parentBound,
bool modal, bool modal,
ADAPT::ADAPT_Gen_var myHomardGen, ADAPT::ADAPT_Gen_var myAdaptGen,
QString aCaseName, QString aCaseName,
QStringList listeGroupesHypo): QStringList listeGroupesHypo):
//--------------------------------------------------------------------- //---------------------------------------------------------------------
MonCreateListGroupCAO(parentHyp,parentBound,myHomardGen,aCaseName,listeGroupesHypo) MonCreateListGroupCAO(parentHyp,parentBound,myAdaptGen,aCaseName,listeGroupesHypo)
{ {
MESSAGE("Debut de MonEditListGroupCAO"); MESSAGE("Debut de MonEditListGroupCAO");
setWindowTitle(QObject::tr("HOM_GROU_EDIT_WINDOW_TITLE")); setWindowTitle(QObject::tr("HOM_GROU_EDIT_WINDOW_TITLE"));

2
src/ADAPTGUI/MonEditListGroupCAO.h
View File

@ -37,7 +37,7 @@ class HOMARD_EXPORT MonEditListGroupCAO : public MonCreateListGroupCAO
Q_OBJECT Q_OBJECT
public: public:
MonEditListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString aCaseName, QStringList listeGroupesHypo); MonEditListGroupCAO( MonCreateHypothesis* parentHyp, MonCreateBoundaryCAO* parentBound, bool modal, ADAPT::ADAPT_Gen_var myAdaptGen, QString aCaseName, QStringList listeGroupesHypo);
virtual ~MonEditListGroupCAO(); virtual ~MonEditListGroupCAO();
protected : protected :

8
src/ADAPTGUI/MonEditYACS.cxx
View File

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

2
src/ADAPTGUI/MonEditYACS.h
View File

@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditYACS : public MonCreateYACS
Q_OBJECT Q_OBJECT
public: public:
MonEditYACS( bool modal, MonEditYACS( bool modal,
ADAPT::ADAPT_Gen_var myHomardGen, ADAPT::ADAPT_Gen_var myAdaptGen,
QString Name ); QString Name );
virtual ~MonEditYACS(); virtual ~MonEditYACS();

8
src/ADAPTGUI/MonEditZone.cxx
View File

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

2
src/ADAPTGUI/MonEditZone.h
View File

@ -35,7 +35,7 @@ class HOMARD_EXPORT MonEditZone : public MonCreateZone
Q_OBJECT Q_OBJECT
public: public:
MonEditZone( MonCreateHypothesis* parent, bool modal, MonEditZone( MonCreateHypothesis* parent, bool modal,
ADAPT::ADAPT_Gen_var myHomardGen, ADAPT::ADAPT_Gen_var myAdaptGen,
QString caseName, QString Name); QString caseName, QString Name);
virtual ~MonEditZone(); virtual ~MonEditZone();

10
src/ADAPTGUI/MonIterInfo.cxx
View File

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

6
src/ADAPTGUI/MonIterInfo.h
View File

@ -40,11 +40,11 @@ class HOMARD_EXPORT MonIterInfo : public QDialog, public Ui_IterInfo
Q_OBJECT Q_OBJECT
public: public:
MonIterInfo( QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen, QString IterName); MonIterInfo( QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myAdaptGen, QString IterName);
~MonIterInfo(); ~MonIterInfo();
protected : protected :
MonIterInfo( QWidget* parent, ADAPT::ADAPT_Gen_var myHomardGen, QString IterName ); MonIterInfo( QWidget* parent, ADAPT::ADAPT_Gen_var myAdaptGen, QString IterName );
QString _IterName; QString _IterName;
QString _aCaseName; QString _aCaseName;
@ -57,7 +57,7 @@ protected :
int _Option; int _Option;
ADAPT::HOMARD_Iteration_var aIter ; ADAPT::HOMARD_Iteration_var aIter ;
ADAPT::ADAPT_Gen_var myHomardGen; ADAPT::ADAPT_Gen_var myAdaptGen;
virtual void InitConnect(); virtual void InitConnect();

18
src/ADAPTGUI/MonMeshInfo.cxx
View File

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

4
src/ADAPTGUI/MonMeshInfo.h
View File

@ -37,7 +37,7 @@ class HOMARD_EXPORT MonMeshInfo : public QDialog, public Ui_MeshInfo
Q_OBJECT Q_OBJECT
public: public:
MonMeshInfo( QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myHomardGen); MonMeshInfo( QWidget* parent, bool modal, ADAPT::ADAPT_Gen_var myAdaptGen);
~MonMeshInfo(); ~MonMeshInfo();
protected : protected :
@ -51,7 +51,7 @@ protected :
int _Quality; int _Quality;
ADAPT::HOMARD_Cas_var aCase ; ADAPT::HOMARD_Cas_var aCase ;
ADAPT::ADAPT_Gen_var myHomardGen; ADAPT::ADAPT_Gen_var myAdaptGen;
virtual void InitConnect(); virtual void InitConnect();
virtual void SetNewCaseName(); virtual void SetNewCaseName();

16
src/ADAPTGUI/MonPursueIteration.cxx
View File

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

4
src/ADAPTGUI/MonPursueIteration.h
View File

@ -37,7 +37,7 @@ class HOMARD_EXPORT MonPursueIteration : public QDialog, public Ui_PursueIterati
Q_OBJECT Q_OBJECT
public: public:
MonPursueIteration( bool modal, ADAPT::ADAPT_Gen_var myHomardGen ); MonPursueIteration( bool modal, ADAPT::ADAPT_Gen_var myAdaptGen );
virtual ~MonPursueIteration(); virtual ~MonPursueIteration();
protected : protected :
@ -48,7 +48,7 @@ class HOMARD_EXPORT MonPursueIteration : public QDialog, public Ui_PursueIterati
int _Type ; int _Type ;
ADAPT::HOMARD_Cas_var aCase ; ADAPT::HOMARD_Cas_var aCase ;
ADAPT::ADAPT_Gen_var myHomardGen; ADAPT::ADAPT_Gen_var myAdaptGen;
virtual void InitConnect(); virtual void InitConnect();
virtual void SetNewCaseName(); virtual void SetNewCaseName();

6
src/SMESHGUI/SMESHGUI_AdaptDlg.cxx
View File

@ -187,9 +187,9 @@ bool SMESHGUI_AdaptDlg::OnGUIEvent (int theCommandID)
case 8011: // Creation d un Cas case 8011: // Creation d un Cas
{ {
INFOS("Creation d'un Cas"); INFOS("Creation d'un Cas");
// MonCreateCase *aDlg = new MonCreateCase( true, MonCreateCase *aDlg = new MonCreateCase( true,
// ADAPT::ADAPT_Gen::_duplicate(homardGen) ) ; ADAPT::ADAPT_Gen::_duplicate(homardGen) ) ;
// aDlg->show(); aDlg->show();
break; break;
} }