From 1c6323738abcad71a526a610c347ffeb081cfa44 Mon Sep 17 00:00:00 2001 From: nicolas Date: Tue, 27 Aug 2013 14:26:50 +0000 Subject: [PATCH] InfoCompute --- idl/HOMARD_Iteration.idl | 4 ++++ src/HOMARD/HOMARD_Iteration.cxx | 17 ++++++++++++++++- src/HOMARD/HOMARD_Iteration.hxx | 5 +++++ src/HOMARD/HomardDriver.cxx | 16 +++++++++++++++- src/HOMARD/HomardDriver.hxx | 5 +++-- src/HOMARDGUI/HOMARD_msg_fr.ts | 6 +++--- src/HOMARDGUI/MonEditHypothesis.cxx | 13 +++++-------- src/HOMARD_I/HOMARD_Gen_i.cxx | 5 +++++ src/HOMARD_I/HOMARD_Iteration_i.cxx | 16 ++++++++++++++++ src/HOMARD_I/HOMARD_Iteration_i.hxx | 4 ++++ 10 files changed, 76 insertions(+), 15 deletions(-) diff --git a/idl/HOMARD_Iteration.idl b/idl/HOMARD_Iteration.idl index dafec449..cbf48702 100644 --- a/idl/HOMARD_Iteration.idl +++ b/idl/HOMARD_Iteration.idl @@ -104,6 +104,10 @@ module HOMARD void AssociateHypo(in string NomHypo) raises (SALOME::SALOME_Exception); void SetHypoName(in string NomHypo) raises (SALOME::SALOME_Exception); string GetHypoName() raises (SALOME::SALOME_Exception); + +// Divers + void SetInfoCompute(in long MessInfo) raises (SALOME::SALOME_Exception); + long GetInfoCompute() raises (SALOME::SALOME_Exception); }; }; #endif diff --git a/src/HOMARD/HOMARD_Iteration.cxx b/src/HOMARD/HOMARD_Iteration.cxx index b9f42d92..e9ec4732 100644 --- a/src/HOMARD/HOMARD_Iteration.cxx +++ b/src/HOMARD/HOMARD_Iteration.cxx @@ -47,7 +47,8 @@ HOMARD_Iteration::HOMARD_Iteration(): _LogFile( "" ), _IterParent( "" ), _NomHypo( "" ), _NomCas( "" ), _NomDir( "" ), - _FileInfo( "" ) + _FileInfo( "" ), + _MessInfo( 1 ) { MESSAGE("HOMARD_Iter"); } @@ -286,3 +287,17 @@ std::string HOMARD_Iteration::GetHypoName() const { return _NomHypo; } +//============================================================================= +//============================================================================= +// Divers +//============================================================================= +//============================================================================= +void HOMARD_Iteration::SetInfoCompute( int MessInfo ) +{ + _MessInfo = MessInfo; +} +//============================================================================= +int HOMARD_Iteration::GetInfoCompute() const +{ + return _MessInfo; +} diff --git a/src/HOMARD/HOMARD_Iteration.hxx b/src/HOMARD/HOMARD_Iteration.hxx index 3c76a195..5013783d 100644 --- a/src/HOMARD/HOMARD_Iteration.hxx +++ b/src/HOMARD/HOMARD_Iteration.hxx @@ -94,6 +94,10 @@ public: void SetHypoName( const char* NomHypo ); std::string GetHypoName() const; +// Divers + void SetInfoCompute( int MessInfo ); + int GetInfoCompute() const; + private: std::string _Name; int _Etat; @@ -110,6 +114,7 @@ private: std::string _NomDir; std::list _mesIterFilles; std::string _FileInfo; + int _MessInfo; }; #endif diff --git a/src/HOMARD/HomardDriver.cxx b/src/HOMARD/HomardDriver.cxx index b9136cf2..dc65e673 100644 --- a/src/HOMARD/HomardDriver.cxx +++ b/src/HOMARD/HomardDriver.cxx @@ -932,7 +932,6 @@ void HomardDriver::TexteFieldInterpName( int NumeChamp, const std::string FieldN void HomardDriver::TexteAdvanced( int Pyram, int NivMax, double DiamMin, int AdapInit, int LevelOutput ) { MESSAGE("TexteAdvanced, Pyram ="< HOM_MEN_NEW_ITERATION - Nouvelle itération + Itération suivante HOM_MEN_PURSUE_ITERATION @@ -57,7 +57,7 @@ HOM_TOP_NEW_ITERATION - Nouvelle itération + Itération suivante HOM_TOP_PURSUE_ITERATION @@ -89,7 +89,7 @@ HOM_STB_NEW_ITERATION - Nouvelle itération + Itération suivante HOM_STB_PURSUE_ITERATION diff --git a/src/HOMARDGUI/MonEditHypothesis.cxx b/src/HOMARDGUI/MonEditHypothesis.cxx index 737e0512..cef6f6ca 100644 --- a/src/HOMARDGUI/MonEditHypothesis.cxx +++ b/src/HOMARDGUI/MonEditHypothesis.cxx @@ -194,21 +194,21 @@ void MonEditHypothesis::InitAdaptZone() HOMARD::listeZonesHypo_var mesZonesAvant = _aHypothesis->GetZones(); for (int i=0; ilength(); i++) { - MESSAGE ("i"<rowCount(); j++) { - MESSAGE (". j"<item(j,2)->text().toStdString()); + MESSAGE (". j"<item(j,2)->text().toStdString()); if ( TWZone->item(j,2)->text().toStdString() == string(mesZonesAvant[i]) ) { - MESSAGE ("OK avec "<item( j,0 )->setCheckState( Qt::Checked ); TWZone->item( j,1 )->setCheckState( Qt::Unchecked ); } else { - MESSAGE ("... DERA"); + MESSAGE ("... DERA"); TWZone->item( j,0 )->setCheckState( Qt::Unchecked ); TWZone->item( j,1 )->setCheckState( Qt::Checked ); } break; @@ -246,8 +246,6 @@ void MonEditHypothesis::InitAdaptChamps() RBChamp->setEnabled(false); RBZone->setEnabled(false); - - HOMARD::InfosHypo_var aInfosHypo = _aHypothesis->GetField(); _aFieldName = aInfosHypo->FieldName; _TypeThR = aInfosHypo->TypeThR; @@ -257,7 +255,6 @@ void MonEditHypothesis::InitAdaptChamps() _UsField = aInfosHypo->UsField; _UsCmpI = aInfosHypo->UsCmpI; - CBFieldName->insertItem(0,_aFieldName); CBFieldName->setCurrentIndex(0); CBFieldName->setEnabled(false); diff --git a/src/HOMARD_I/HOMARD_Gen_i.cxx b/src/HOMARD_I/HOMARD_Gen_i.cxx index 02407cd1..f76c9d40 100755 --- a/src/HOMARD_I/HOMARD_Gen_i.cxx +++ b/src/HOMARD_I/HOMARD_Gen_i.cxx @@ -2493,6 +2493,11 @@ CORBA::Long HOMARD_Gen_i::ComputeAdap(HOMARD::HOMARD_Cas_var myCase, HOMARD::HOM MESSAGE ( ". LevelOutput = " << LevelOutput ); myDriver->TexteAdvanced(Pyram, NivMax, DiamMin, AdapInit, LevelOutput); + // E.7. Ajout des informations sur le deroulement de l'execution + int MessInfo = myIteration->GetInfoCompute(); + MESSAGE ( ". MessInfo = " << MessInfo ); + myDriver->TexteInfoCompute(MessInfo); + return codret ; } //============================================================================= diff --git a/src/HOMARD_I/HOMARD_Iteration_i.cxx b/src/HOMARD_I/HOMARD_Iteration_i.cxx index 136228c1..3779a729 100644 --- a/src/HOMARD_I/HOMARD_Iteration_i.cxx +++ b/src/HOMARD_I/HOMARD_Iteration_i.cxx @@ -384,3 +384,19 @@ char* HOMARD_Iteration_i::GetHypoName() ASSERT( myHomardIteration ); return CORBA::string_dup( myHomardIteration->GetHypoName().c_str() ); } +//============================================================================= +//============================================================================= +// Divers +//============================================================================= +//============================================================================= +void HOMARD_Iteration_i::SetInfoCompute( CORBA::Long MessInfo ) +{ + ASSERT( myHomardIteration ); + myHomardIteration->SetInfoCompute( MessInfo ); +} +//============================================================================= +CORBA::Long HOMARD_Iteration_i::GetInfoCompute() +{ + ASSERT( myHomardIteration ); + return myHomardIteration->GetInfoCompute() ; +} diff --git a/src/HOMARD_I/HOMARD_Iteration_i.hxx b/src/HOMARD_I/HOMARD_Iteration_i.hxx index bf57bee9..aaaa2018 100644 --- a/src/HOMARD_I/HOMARD_Iteration_i.hxx +++ b/src/HOMARD_I/HOMARD_Iteration_i.hxx @@ -120,6 +120,10 @@ public: void SetHypoName( const char* NomHypo ); char* GetHypoName(); +// Divers + void SetInfoCompute( CORBA::Long MessInfo ); + CORBA::Long GetInfoCompute(); + private: ::HOMARD_Iteration* myHomardIteration; -- 2.39.2