From: Gerald Nicolas <D68518@claui2t3.der.edf.fr>
Date: Thu, 27 Mar 2014 13:43:06 +0000 (+0100)
Subject: correction du choix d'une valeur relative pour le champ de pilotage
X-Git-Tag: V7_4_0a1~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=69cb62d8a451a4c0f88fc5ea1288503829e1e341;p=modules%2Fhomard.git

correction du choix d'une valeur relative pour le champ de pilotage
---

diff --git a/src/HOMARD/HomardDriver.cxx b/src/HOMARD/HomardDriver.cxx
index 30810476..e7282115 100644
--- a/src/HOMARD/HomardDriver.cxx
+++ b/src/HOMARD/HomardDriver.cxx
@@ -588,7 +588,7 @@ void HomardDriver::TexteField( const std::string FieldName, const std::string Fi
   if ( UsCmpI == 1 )
   { saux = "INFINI" ; }
   if ( UsCmpI == 2 )
-  { saux = "V_RELATIVE" ; }
+  { saux = "RELATIF" ; }
   if ( saux != " " )
   {
     _Texte += "CCUsCmpI " + saux  + "\n" ;
diff --git a/src/HOMARDGUI/MonCreateHypothesis.cxx b/src/HOMARDGUI/MonCreateHypothesis.cxx
index 77de5219..f3be9366 100644
--- a/src/HOMARDGUI/MonCreateHypothesis.cxx
+++ b/src/HOMARDGUI/MonCreateHypothesis.cxx
@@ -685,7 +685,8 @@ void MonCreateHypothesis::SetUCL2()
 void MonCreateHypothesis::SetUCInf()
 // ------------------------------------------------------------------------
 {
-  _UsCmpI = 1 ;
+  if ( TWCMP->rowCount() == 1 ) { _UsCmpI = 2 ; }
+  else                          { _UsCmpI = 1 ; }
   RBInf->setChecked(true);
 }
 // ------------------------------------------------------------------------
diff --git a/src/HOMARD_I/HOMARD_Hypothesis_i.cxx b/src/HOMARD_I/HOMARD_Hypothesis_i.cxx
index 73c279e9..c9850946 100644
--- a/src/HOMARD_I/HOMARD_Hypothesis_i.cxx
+++ b/src/HOMARD_I/HOMARD_Hypothesis_i.cxx
@@ -116,6 +116,7 @@ bool HOMARD_Hypothesis_i::Restore( const std::string& stream )
 void HOMARD_Hypothesis_i::SetUnifRefinUnRef( CORBA::Long TypeRaffDera )
 {
   ASSERT( myHomardHypothesis );
+  VERIFICATION( (TypeRaffDera==1) || (TypeRaffDera==-1) );
   int TypeRaff, TypeDera ;
   if ( TypeRaffDera == 1 )
   {
@@ -127,10 +128,6 @@ void HOMARD_Hypothesis_i::SetUnifRefinUnRef( CORBA::Long TypeRaffDera )
     TypeRaff = 0 ;
     TypeDera = 1 ;
   }
-  else
-  {
-    ASSERT( "TypeRaffDera should be 1 or -1" == 0 );
-  }
   myHomardHypothesis->SetAdapType( -1 );
   myHomardHypothesis->SetRefinTypeDera( TypeRaff, TypeDera );
 }
@@ -444,6 +441,7 @@ void HOMARD_Hypothesis_i::AddZone( const char* NomZone, CORBA::Long TypeUse )
 {
   MESSAGE ("Dans AddZone pour " << NomZone << " et TypeUse = " << TypeUse ) ;
   ASSERT( myHomardHypothesis );
+  VERIFICATION( (TypeUse==1) || (TypeUse==-1) );
   myHomardHypothesis->SetAdapType( 0 );
   int TypeRaff, TypeDera ;
   if ( TypeUse == 1 )
@@ -456,10 +454,6 @@ void HOMARD_Hypothesis_i::AddZone( const char* NomZone, CORBA::Long TypeUse )
     TypeRaff = myHomardHypothesis->GetRefinType() ;
     TypeDera = 1 ;
   }
-  else
-  {
-    ASSERT( "TypeUse should be 1 or -1" == 0 );
-  }
   myHomardHypothesis->SetRefinTypeDera( TypeRaff, TypeDera );
   char* NomHypo = GetName() ;
   return _gen_i->AssociateHypoZone(NomHypo, NomZone, TypeUse) ;