+// Copyright (C) 2014-2015 EDF-R&D
+// 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>
#include <TDataStd_Integer.hxx>
#include <TDF_ChildIterator.hxx>
-HYDROData_PriorityQueue::HYDROData_PriorityQueue( HYDROData_CalculationCase* theCalcCase )
+HYDROData_PriorityQueue::HYDROData_PriorityQueue( HYDROData_CalculationCase* theCalcCase,
+ Standard_Integer aTag )
{
- myGeomObjects = theCalcCase->GetGeometryObjects();
- for( int i=myGeomObjects.Lower(), n=myGeomObjects.Upper(); i<=n; i++ )
+ myObjects = theCalcCase->GetGeometryObjects();
+ for( int i=myObjects.Lower(), n=myObjects.Upper(); i<=n; i++ )
{
- Handle(HYDROData_Object) anObj = Handle(HYDROData_Object)::DownCast( myGeomObjects.Value( i ) );
+ Handle(HYDROData_Entity) anObj = myObjects.Value( i );
if( !anObj.IsNull() )
{
QString anObjName = anObj->GetName();
}
}
- myRules = GetRules( theCalcCase->Label().FindChild( HYDROData_CalculationCase::DataTag_CustomRules ) );
+ myRules = GetRules( theCalcCase->Label().FindChild( aTag ) );
}
HYDROData_PriorityQueue::~HYDROData_PriorityQueue()
{
}
-Handle(HYDROData_Object) HYDROData_PriorityQueue::GetMostPriorityObject( const QStringList& theZoneObjects,
- HYDROData_Zone::MergeAltitudesType& theMergeType ) const
+Handle(HYDROData_Entity) HYDROData_PriorityQueue::GetMostPriorityObject( const QStringList& theZoneObjects,
+ HYDROData_Zone::MergeType& theMergeType ) const
{
- Handle(HYDROData_Object) aMostPriorityObj;
- theMergeType = HYDROData_Zone::Merge_Object;
- QStringList::const_iterator anIt = theZoneObjects.begin(), aLast = theZoneObjects.end();
+ QStringList aSortedZoneObjects;
+ for( int i=myObjects.Lower(), n=myObjects.Upper(); i<=n; i++ )
+ {
+ QString aName = myObjects.Value( i )->GetName();
+ if( theZoneObjects.contains( aName ) )
+ aSortedZoneObjects.append( aName );
+ }
+
+ Handle(HYDROData_Entity) aMostPriorityObj;
+ 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];
+ HYDROData_Zone::MergeType aLocalMerge = HYDROData_Zone::Merge_UNKNOWN;
+ Handle(HYDROData_Entity) 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;
}
-bool HYDROData_PriorityQueue::IsMorePriority( const Handle(HYDROData_Object)& theObj1,
- const Handle(HYDROData_Object)& theObj2,
- HYDROData_Zone::MergeAltitudesType& theMergeType ) const
+bool HYDROData_PriorityQueue::IsMorePriority( const Handle(HYDROData_Entity)& theObj1,
+ const Handle(HYDROData_Entity)& theObj2,
+ HYDROData_Zone::MergeType& theMergeType ) const
{
// 1. First we check custom rules
HYDROData_ListOfRules::const_iterator anIt = myRules.begin(), aLast = myRules.end();
}
// 2. If no custom rule found, the standard ordering list is applied
- for( int i=myGeomObjects.Lower(), n=myGeomObjects.Upper(); i<=n; i++ )
+ for( int i=myObjects.Lower(), n=myObjects.Upper(); i<=n; i++ )
{
- if( myGeomObjects.Value( i )->Label() == theObj1->Label() )
+ if( myObjects.Value( i )->Label() == theObj1->Label() )
{
theMergeType = HYDROData_Zone::Merge_Object;
return true;
}
- if( myGeomObjects.Value( i )->Label() == theObj2->Label() )
+ if( myObjects.Value( i )->Label() == theObj2->Label() )
{
theMergeType = HYDROData_Zone::Merge_Object;
return false;
Merge_Tag,
};
-void HYDROData_PriorityQueue::AddRule( TDF_Label& theRulesLabel,
- const Handle(HYDROData_Object)& theObject1,
- HYDROData_PriorityType thePriority,
- const Handle(HYDROData_Object)& theObject2,
- HYDROData_Zone::MergeAltitudesType theMergeType )
+void HYDROData_PriorityQueue::AddRule( TDF_Label& theRulesLabel,
+ const Handle(HYDROData_Entity)& theObject1,
+ HYDROData_PriorityType thePriority,
+ const Handle(HYDROData_Entity)& theObject2,
+ HYDROData_Zone::MergeType 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 )
if( isObj1OK && isPriorityOK && isObj2OK && isMergeOK )
{
HYDROData_CustomRule aRule;
- aRule.Object1 = Handle_HYDROData_Object::DownCast( HYDROData_Iterator::Object( aRefs1->First() ) );
+ aRule.Object1 = HYDROData_Iterator::Object( aRefs1->First() );
aRule.Priority = ( HYDROData_PriorityType ) aPriorityAttr->Get();
- aRule.Object2 = Handle_HYDROData_Object::DownCast( HYDROData_Iterator::Object( aRefs2->First() ) );
- aRule.MergeType = ( HYDROData_Zone::MergeAltitudesType ) aMergeAttr->Get();
+ aRule.Object2 = HYDROData_Iterator::Object( aRefs2->First() );
+ aRule.MergeType = ( HYDROData_Zone::MergeType ) aMergeAttr->Get();
aRules.append( aRule );
}
}
QString HYDROData_PriorityQueue::DumpRules( const TDF_Label& theRulesLab )
{
QString aDump = "Rules:\n";
+
HYDROData_ListOfRules aRules = GetRules( theRulesLab );
HYDROData_ListOfRules::const_iterator anIt = aRules.begin(), aLast = aRules.end();
for( ; anIt!=aLast; anIt++ )
QString aPriority = anIt->Priority == LESS ? "LESS" : "GREATER";
QString aMergeType;
+ HYDROData_CalculationCase::DataTag aDataTag = HYDROData_CalculationCase::DataTag_CustomRules;
+
switch( anIt->MergeType )
{
case HYDROData_Zone::Merge_UNKNOWN:
break;
}
- QString aRule = QString( "%0.AddRule( %1, %2, %3, %4 )" ).
- arg( theCalcCaseName ).arg( anObj1 ).arg( aPriority ).arg( anObj2 ).arg( aMergeType );
+ QString aRule = QString( "%0.AddRule( %1, %2, %3, %4, %5 )" ).
+ arg( theCalcCaseName ).arg( anObj1 ).arg( aPriority ).arg( anObj2 ).arg( aMergeType ).arg( aDataTag );
theScript << aRule;
}
}
-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,
- HYDROData_PriorityType& thePriority,
- Handle(HYDROData_Object)& theObject2,
- HYDROData_Zone::MergeAltitudesType& theMergeType )
+ Handle(HYDROData_Entity)& theObject1,
+ HYDROData_PriorityType& thePriority,
+ Handle(HYDROData_Entity)& theObject2,
+ HYDROData_Zone::MergeType& theMergeType )
{
TDF_Label aRuleLabel = theRulesLab.FindChild( theIndex );
bool isOK = isObj1OK && isPriorityOK && isObj2OK && isMergeOK;
if( isOK )
{
- theObject1 = Handle_HYDROData_Object::DownCast( HYDROData_Iterator::Object( aRefs1->First() ) );
+ theObject1 = HYDROData_Iterator::Object( aRefs1->First() );
thePriority = ( HYDROData_PriorityType ) aPriorityAttr->Get();
- theObject2 = Handle_HYDROData_Object::DownCast( HYDROData_Iterator::Object( aRefs2->First() ) );
- theMergeType = ( HYDROData_Zone::MergeAltitudesType ) aMergeAttr->Get();
+ theObject2 = HYDROData_Iterator::Object( aRefs2->First() );
+ theMergeType = ( HYDROData_Zone::MergeType ) aMergeAttr->Get();
}
return isOK;
}