+// 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, 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
#include <HYDROData_PriorityQueue.h>
#include <HYDROData_CalculationCase.h>
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;
}
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 );
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 )
}
}
-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,