Bug #490: batch mode error.

[modules/hydro.git] / src / HYDROData / HYDROData_PriorityQueue.cxx

diff --git a/src/HYDROData/HYDROData_PriorityQueue.cxx b/src/HYDROData/HYDROData_PriorityQueue.cxx
index 52ba2b2ebd2321930f687a31f00055149da5d98b..075f70a0bf819feb85f438f551aab8b300de90a1 100644 (file)
--- a/src/HYDROData/HYDROData_PriorityQueue.cxx
+++ b/src/HYDROData/HYDROData_PriorityQueue.cxx
@@ -29,19 +29,38 @@ HYDROData_PriorityQueue::~HYDROData_PriorityQueue()
 Handle(HYDROData_Object) HYDROData_PriorityQueue::GetMostPriorityObject( const QStringList& theZoneObjects,
                                                                          HYDROData_Zone::MergeAltitudesType& theMergeType ) const
 {
+  QStringList aSortedZoneObjects;
+  for( int i=myGeomObjects.Lower(), n=myGeomObjects.Upper(); i<=n; i++ )
+  {
+    QString aName = myGeomObjects.Value( i )->GetName();
+    if( theZoneObjects.contains( aName ) )
+      aSortedZoneObjects.append( aName );
+  }
+
   Handle(HYDROData_Object) aMostPriorityObj;
-  theMergeType = HYDROData_Zone::Merge_Object;
-  QStringList::const_iterator anIt = theZoneObjects.begin(), aLast = theZoneObjects.end();
+  theMergeType = HYDROData_Zone::Merge_UNKNOWN;
+  QStringList::const_iterator anIt = aSortedZoneObjects.begin(), aLast = aSortedZoneObjects.end();
   for( ; anIt!=aLast; anIt++ )
   {
     HYDROData_Zone::MergeAltitudesType aLocalMerge = HYDROData_Zone::Merge_UNKNOWN;
     Handle(HYDROData_Object) anObj = myNames[*anIt];
     if( !anObj.IsNull() )
-      if( aMostPriorityObj.IsNull() || IsMorePriority( anObj, aMostPriorityObj, aLocalMerge ) )
+    {
+      if( aMostPriorityObj.IsNull() )
       {
         aMostPriorityObj = anObj;
-        theMergeType = aLocalMerge;
+        continue;
       }
+
+      bool isMorePriority = IsMorePriority( anObj, aMostPriorityObj, aLocalMerge );
+
+      if( isMorePriority )
+        aMostPriorityObj = anObj;
+
+      if( aLocalMerge != HYDROData_Zone::Merge_UNKNOWN && 
+          ( theMergeType==HYDROData_Zone::Merge_UNKNOWN || isMorePriority ) )
+        theMergeType = aLocalMerge;
+    }
   }
   return aMostPriorityObj;
 }
@@ -102,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 );
@@ -117,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 )
@@ -197,16 +226,16 @@ void HYDROData_PriorityQueue::DumpRulesToPython( const TDF_Label& theRulesLab,
     switch( anIt->MergeType )
     {
     case HYDROData_Zone::Merge_UNKNOWN:
-      aMergeType = "Merge_UNKNOWN";
+      aMergeType = "HYDROData_Zone.Merge_UNKNOWN";
       break;
     case HYDROData_Zone::Merge_ZMIN:
-      aMergeType = "Merge_ZMIN";
+      aMergeType = "HYDROData_Zone.Merge_ZMIN";
       break;
     case HYDROData_Zone::Merge_ZMAX:
-      aMergeType = "Merge_ZMAX";
+      aMergeType = "HYDROData_Zone.Merge_ZMAX";
       break;
     case HYDROData_Zone::Merge_Object:
-      aMergeType = "Merge_Object";
+      aMergeType = "HYDROData_Zone.Merge_Object";
       break;
     }
 
@@ -217,11 +246,6 @@ void HYDROData_PriorityQueue::DumpRulesToPython( const TDF_Label& theRulesLab,
   }
 }
 
-int HYDROData_PriorityQueue::GetRulesCount( const TDF_Label& theRulesLab )
-{
-  return theRulesLab.NbChildren();
-}
-
 bool HYDROData_PriorityQueue::GetRule( const TDF_Label& theRulesLab,
                                        int theIndex, 
                                        Handle(HYDROData_Object)&           theObject1,