-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
Handle(HYDROData_Object) anObject1, anObject2;
HYDROData_PriorityType aPriority;
HYDROData_Zone::MergeAltitudesType aMergeType;
- int aRulesNb = myEditedObject->GetRulesCount();
- for ( int anIndex = 0; anIndex < aRulesNb; anIndex++ ) {
+ for ( int anIndex = 0; ; anIndex++ )
+ {
if ( myEditedObject->GetRule( anIndex, anObject1, aPriority, anObject2, aMergeType ) ) {
HYDROData_CustomRule aRule;
aRule.Object1 = anObject1;
aRules << aRule;
}
+ else
+ break;
}
aPanel->setRules( aRules );
}
}
// For manual mode priority rules are redundant
- if ( aPanel->getMode() == HYDROData_CalculationCase::MANUAL &&
- myEditedObject->GetRulesCount() > 0 ) {
+ if ( aPanel->getMode() == HYDROData_CalculationCase::MANUAL ) {
myEditedObject->ClearRules( false );
}
}
// Clear priority rules
- if ( myEditedObject->GetRulesCount() > 0 ) {
+ //@ASL if ( myEditedObject->GetRulesCount() > 0 ) {
myEditedObject->ClearRules( true );
- }
+ //@ASL }
// Set priority rules
foreach ( const HYDROData_CustomRule& aRule, aPanel->getRules() ) {
myEditedObject->AddRule( aRule.Object1, aRule.Priority,