refs #673: Strickler coefficient should be written for Telemac instead of Strickler...

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

diff --git a/src/HYDROData/HYDROData_PriorityQueue.cxx b/src/HYDROData/HYDROData_PriorityQueue.cxx
index 12d39ce61e005ebe64d848db4b84e81f70bded24..27427dd4c7e6f7570c254f435e9720f01125b019 100644 (file)
--- a/src/HYDROData/HYDROData_PriorityQueue.cxx
+++ b/src/HYDROData/HYDROData_PriorityQueue.cxx
@@ -19,7 +19,6 @@
 #include <HYDROData_PriorityQueue.h>
 #include <HYDROData_CalculationCase.h>
 #include <HYDROData_Iterator.h>
-#include <HYDROData_LandCover.h>
 #include <TDataStd_ReferenceList.hxx>
 #include <TDataStd_Integer.hxx>
 #include <TDF_ChildIterator.hxx>
@@ -27,8 +26,7 @@
 HYDROData_PriorityQueue::HYDROData_PriorityQueue( HYDROData_CalculationCase* theCalcCase,
                                                   Standard_Integer aTag )
 {
-  bool isLandCover = aTag == HYDROData_CalculationCase::DataTag_CustomLandCoverRules;
-  myObjects = isLandCover ? theCalcCase->GetLandCovers() : theCalcCase->GetGeometryObjects();
+  myObjects = theCalcCase->GetGeometryObjects();
   for( int i=myObjects.Lower(), n=myObjects.Upper(); i<=n; i++ )
   {
     Handle(HYDROData_Entity) anObj = myObjects.Value( i );
@@ -201,8 +199,7 @@ HYDROData_ListOfRules HYDROData_PriorityQueue::GetRules( const TDF_Label& theRul
 
 QString HYDROData_PriorityQueue::DumpRules( const TDF_Label& theRulesLab )
 {
-  bool isLandCover = theRulesLab.Tag() == HYDROData_CalculationCase::DataTag_CustomLandCoverRules;
-  QString aDump =  isLandCover ? "Land Cover rules:\n" : "Rules:\n";
+  QString aDump = "Rules:\n";
 
   HYDROData_ListOfRules aRules = GetRules( theRulesLab );
   HYDROData_ListOfRules::const_iterator anIt = aRules.begin(), aLast = aRules.end();
@@ -246,10 +243,6 @@ void HYDROData_PriorityQueue::DumpRulesToPython( const TDF_Label& theRulesLab,
     QString aMergeType;
 
     HYDROData_CalculationCase::DataTag aDataTag = HYDROData_CalculationCase::DataTag_CustomRules;
-    Handle(HYDROData_LandCover) aLandCover1 = Handle(HYDROData_LandCover)::DownCast( anIt->Object1 );
-    Handle(HYDROData_LandCover) aLandCover2 = Handle(HYDROData_LandCover)::DownCast( anIt->Object2 );
-    if ( !aLandCover1.IsNull() && !aLandCover2.IsNull() )
-      aDataTag = HYDROData_CalculationCase::DataTag_CustomLandCoverRules;
 
     switch( anIt->MergeType )
     {