]> SALOME platform Git repositories - modules/hydro.git/commitdiff
Salome HOME
Bug #485: rules in calculation case are lost.
authormzn <mzn@opencascade.com>
Wed, 5 Nov 2014 11:23:22 +0000 (11:23 +0000)
committermzn <mzn@opencascade.com>
Wed, 5 Nov 2014 11:23:22 +0000 (11:23 +0000)
src/HYDROData/HYDROData_PriorityQueue.cxx

index 95e167bd2c7fa8440230efd9d7b8f9c2c4c1c126..075f70a0bf819feb85f438f551aab8b300de90a1 100644 (file)
@@ -121,7 +121,14 @@ void HYDROData_PriorityQueue::AddRule( TDF_Label&                         theRul
                                        const Handle(HYDROData_Object)&    theObject2,
                                        HYDROData_Zone::MergeAltitudesType theMergeType )
 {
-  TDF_Label aNewRuleLab = theRulesLabel.NewChild();
+  // Get the last rule index
+  Standard_Integer aRuleIndex = 0;
+  Handle(TDataStd_Integer) anIntVal;
+  if ( theRulesLabel.FindAttribute( TDataStd_Integer::GetID(), anIntVal ) ) {
+    aRuleIndex = anIntVal->Get();
+  }
+
+  TDF_Label aNewRuleLab = theRulesLabel.FindChild( aRuleIndex );
 
   TDF_Label anObj1Lab = aNewRuleLab.FindChild( Object1_Tag );
   Handle(TDataStd_ReferenceList) aRefs = TDataStd_ReferenceList::Set( anObj1Lab );
@@ -136,6 +143,9 @@ void HYDROData_PriorityQueue::AddRule( TDF_Label&                         theRul
 
   TDF_Label aMergeLab = aNewRuleLab.FindChild( Merge_Tag );
   TDataStd_Integer::Set( aMergeLab, theMergeType );
+
+  // Increment the last rule index
+  TDataStd_Integer::Set( theRulesLabel, aRuleIndex + 1 );
 }
 
 HYDROData_ListOfRules HYDROData_PriorityQueue::GetRules( const TDF_Label& theRulesLabel )