X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_CalculationCase.cxx;h=3d3d918b7521712f904aba29a71516aba1fa2466;hb=545854182f0363f61284d5abe34c3627d4f3b088;hp=6d0facdebc964cb098a194c8bbd8066c98a08049;hpb=fdfbecc502e984321f7e660d64e6031df35e26c2;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx index 6d0facde..3d3d918b 100644 --- a/src/HYDROData/HYDROData_CalculationCase.cxx +++ b/src/HYDROData/HYDROData_CalculationCase.cxx @@ -25,7 +25,7 @@ #include "HYDROData_NaturalObject.h" #include "HYDROData_PolylineXY.h" #include "HYDROData_StricklerTable.h" -#include "HYDROData_LandCover.h" +#include "HYDROData_LandCoverMap.h" #include "HYDROData_SplittedShapesGroup.h" #include "HYDROData_Region.h" #include "HYDROData_Tool.h" @@ -69,7 +69,6 @@ #endif #define CALCULATION_REGIONS_PREF GetName() + "_Reg" #define CALCULATION_ZONES_PREF GetName() + "_Zone" -#define CALCULATION_LANDCOVER_ZONES_PREF GetName() + "_LandCoverZone" #define CALCULATION_GROUPS_PREF GetName() + "_" //#define DEB_CLASS2D 1 #ifdef DEB_CLASS2D @@ -96,9 +95,7 @@ void HYDROData_CalculationCase::SetName( const QString& theName ) if ( anOldCaseName != theName ) { // Update names of regions and its zones - UpdateRegionsNames( GetRegions( false ), anOldCaseName, theName ); - // Update names of land cover regions and its zones - UpdateRegionsNames( GetRegions( true ), anOldCaseName, theName ); + UpdateRegionsNames( GetRegions(), anOldCaseName, theName ); HYDROData_SequenceOfObjects aGroups = GetSplittedGroups(); @@ -129,10 +126,6 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre QString aModeStr = aMode==MANUAL ? "HYDROData_CalculationCase.MANUAL" : "HYDROData_CalculationCase.AUTOMATIC"; aResList << QString( "%0.SetAssignmentMode( %1 )" ).arg( aCalculName ).arg( aModeStr ); - AssignmentMode aModeLC = GetAssignmentLandCoverMode(); - QString aModeLCStr = aModeLC==MANUAL ? "HYDROData_CalculationCase.MANUAL" : "HYDROData_CalculationCase.AUTOMATIC"; - aResList << QString( "%0.SetAssignmentLandCoverMode( %1 )" ).arg( aCalculName ).arg( aModeLCStr ); - HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects(); HYDROData_SequenceOfObjects::Iterator anIter( aGeomObjects ); for ( ; anIter.More(); anIter.Next() ) @@ -171,8 +164,6 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre if( aMode==AUTOMATIC ) DumpRulesToPython( aCalculName, aResList ); - if( aModeLC==AUTOMATIC ) - DumpLandCoverRulesToPython( aCalculName, aResList ); aResList << QString( "" ); aResList << "# Start the algorithm of the partition and assignment"; @@ -182,14 +173,7 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre { // Now we restore the // - regions and zones order - DumpRegionsToPython( aResList, theTreatedObjects, GetRegions( false ) ); - } - - if( aModeLC==MANUAL ) - { - // Now we restore the - // - land cover regions and zones order - DumpRegionsToPython( aResList, theTreatedObjects, GetRegions( true ) ); + DumpRegionsToPython( aResList, theTreatedObjects, GetRegions() ); } // Export calculation case @@ -265,13 +249,9 @@ HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetAllReferenceObjects() aResSeq.Append( aSeqOfGeomObjs ); // Regions - HYDROData_SequenceOfObjects aSeqOfRegions = GetRegions( false ); + HYDROData_SequenceOfObjects aSeqOfRegions = GetRegions(); aResSeq.Append( aSeqOfRegions ); - // Land cover regions - HYDROData_SequenceOfObjects aSeqOfLandCoverRegions = GetRegions( true ); - aResSeq.Append( aSeqOfLandCoverRegions ); - return aResSeq; } @@ -281,8 +261,7 @@ void HYDROData_CalculationCase::Update() SetWarning(); // At first we remove previously created objects - RemoveRegions( false ); - RemoveRegions( true ); + RemoveRegions(); RemoveSplittedGroups(); Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); @@ -311,40 +290,13 @@ void HYDROData_CalculationCase::Update() } } - // Split to land cover zones - HYDROData_SplitToZonesTool::SplitDataList aLandCoverZonesList; - - HYDROData_SequenceOfObjects aLandCovers = GetLandCovers(); - if ( !aLandCovers.IsEmpty() ) { - HYDROData_SplitToZonesTool::SplitDataList aSplitLandCoverObjects = - HYDROData_SplitToZonesTool::Split( aLandCovers ); - if ( !aSplitLandCoverObjects.isEmpty() ) { - HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitLandCoverObjects ); - while( anIter.hasNext() ) { - const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next(); - if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Zone ) - aLandCoverZonesList.append( aSplitData ); - } - } - } - switch( GetAssignmentMode() ) { case MANUAL: - CreateRegionsDef( aDocument, aZonesList, false ); + CreateRegionsDef( aDocument, aZonesList ); break; case AUTOMATIC: - CreateRegionsAuto( aDocument, aZonesList, false ); - break; - } - - switch( GetAssignmentLandCoverMode() ) - { - case MANUAL: - CreateRegionsDef( aDocument, aLandCoverZonesList, true ); - break; - case AUTOMATIC: - CreateRegionsAuto( aDocument, aLandCoverZonesList, true ); + CreateRegionsAuto( aDocument, aZonesList ); break; } @@ -352,19 +304,18 @@ void HYDROData_CalculationCase::Update() } void HYDROData_CalculationCase::CreateRegionsDef( const Handle(HYDROData_Document)& theDoc, - const HYDROData_SplitToZonesTool::SplitDataList& theZones, - const bool theLandCover ) + const HYDROData_SplitToZonesTool::SplitDataList& theZones ) { // Create result regions for case, by default one zone for one region QString aRegsPref = CALCULATION_REGIONS_PREF; - QString aZonesPref = theLandCover ? CALCULATION_LANDCOVER_ZONES_PREF : CALCULATION_ZONES_PREF; + QString aZonesPref = CALCULATION_ZONES_PREF; HYDROData_SplitToZonesTool::SplitDataListIterator anIter( theZones ); while( anIter.hasNext() ) { const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next(); // Create new region - Handle(HYDROData_Region) aRegion = addNewRegion( theDoc, aRegsPref, theLandCover ); + Handle(HYDROData_Region) aRegion = addNewRegion( theDoc, aRegsPref ); // Add the zone for region Handle(HYDROData_Zone) aRegionZone = aRegion->addNewZone( theDoc, aZonesPref, aSplitData.Face(), aSplitData.ObjectNames ); @@ -372,16 +323,15 @@ void HYDROData_CalculationCase::CreateRegionsDef( const Handle(HYDROData_Documen } void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Document)& theDoc, - const HYDROData_SplitToZonesTool::SplitDataList& theZones, - const bool theLandCover ) + const HYDROData_SplitToZonesTool::SplitDataList& theZones ) { QMap aRegionsMap; //object name to region QMap aRegionNameToObjNameMap; - QString aZonesPref = theLandCover ? CALCULATION_LANDCOVER_ZONES_PREF : CALCULATION_ZONES_PREF; - HYDROData_PriorityQueue aPr( this, theLandCover ? DataTag_CustomLandCoverRules : DataTag_CustomRules ); + QString aZonesPref = CALCULATION_ZONES_PREF; + HYDROData_PriorityQueue aPr( this, DataTag_CustomRules ); // 1. First we create a default region for each object included into the calculation case - HYDROData_SequenceOfObjects anObjects = theLandCover ? GetLandCovers() : GetGeometryObjects(); + HYDROData_SequenceOfObjects anObjects = GetGeometryObjects(); for( int i = anObjects.Lower(), n = anObjects.Upper(); i<=n; i++ ) { Handle(HYDROData_Entity) anObj = anObjects.Value( i ); @@ -389,7 +339,7 @@ void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Docume continue; QString anObjName = anObj->GetName(); QString aRegName = anObjName + "_reg"; - Handle(HYDROData_Region) aRegion = addNewRegion( theDoc, aRegName, theLandCover, false ); + Handle(HYDROData_Region) aRegion = addNewRegion( theDoc, aRegName, false ); aRegionsMap.insert( anObjName, aRegion ); aRegionNameToObjNameMap.insert( aRegName, anObjName ); } @@ -415,11 +365,9 @@ void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Docume } Handle(HYDROData_Entity) aMergeEntity = aRegObj; - if ( !theLandCover ) { - Handle(HYDROData_Object) aMergeObject = Handle(HYDROData_Object)::DownCast( aMergeEntity ); - if ( !aMergeObject.IsNull() ) { - aMergeEntity = aMergeObject->GetAltitudeObject(); - } + Handle(HYDROData_Object) aMergeObject = Handle(HYDROData_Object)::DownCast( aMergeEntity ); + if ( !aMergeObject.IsNull() ) { + aMergeEntity = aMergeObject->GetAltitudeObject(); } switch( aMergeType ) @@ -628,48 +576,20 @@ void HYDROData_CalculationCase::RemoveStricklerTable() Changed( Geom_No ); } -bool HYDROData_CalculationCase::AddLandCover( const Handle(HYDROData_LandCover)& theLandCover ) -{ - if ( HasReference( theLandCover, DataTag_LandCover ) ) - return false; // Land cover is already in reference list - - AddReferenceObject( theLandCover, DataTag_LandCover ); - - // Indicate model of the need to update land covers partition - Changed( Geom_No ); - - return true; -} - -HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetLandCovers() const +Handle(HYDROData_LandCoverMap) HYDROData_CalculationCase::GetLandCoverMap() const { - return GetReferenceObjects( DataTag_LandCover ); + // TODO + Handle(HYDROData_LandCoverMap) aLandCoverMap = NULL; + return aLandCoverMap; } -void HYDROData_CalculationCase::RemoveLandCover( const Handle(HYDROData_LandCover)& theLandCover ) +Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(HYDROData_Zone)& theZone ) { - if ( theLandCover.IsNull() ) - return; - - RemoveReferenceObject( theLandCover->Label(), DataTag_LandCover ); - - // Indicate model of the need to update land cover partition Changed( Geom_No ); -} - -void HYDROData_CalculationCase::RemoveLandCovers() -{ - ClearReferenceObjects( DataTag_LandCover ); - - // Indicate model of the need to update land cover partition Changed( Geom_No ); -} - -Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(HYDROData_Zone)& theZone, - const bool theLandCover ) -{ + Changed( Geom_No ); Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); - Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF, theLandCover ); + Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF ); if ( aNewRegion.IsNull() ) return aNewRegion; @@ -678,16 +598,14 @@ Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(H return aNewRegion; } -bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRegion, - const bool theLandCover ) +bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRegion ) { Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); if ( theRegion.IsNull() ) return false; - HYDROData_CalculationCase::DataTag aDataTag = - theLandCover ? DataTag_LandCoverRegion : DataTag_Region; + HYDROData_CalculationCase::DataTag aDataTag = DataTag_Region; if ( HasReference( theRegion, aDataTag ) ) return false; // Object is already in reference list @@ -697,10 +615,10 @@ bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRe Handle(HYDROData_CalculationCase)::DownCast( theRegion->GetFatherObject() ); if ( !aFatherCalc.IsNull() && aFatherCalc->Label() != myLab ) { - Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF, theLandCover ); + Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF ); theRegion->CopyTo( aNewRegion, true ); - aFatherCalc->RemoveRegion( theRegion, theLandCover ); + aFatherCalc->RemoveRegion( theRegion ); theRegion->SetLabel( aNewRegion->Label() ); } @@ -712,9 +630,9 @@ bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRe return true; } -HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetRegions( const bool theLandCover ) const +HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetRegions() const { - return GetReferenceObjects( theLandCover ? DataTag_LandCoverRegion : DataTag_Region ); + return GetReferenceObjects( DataTag_Region ); } void HYDROData_CalculationCase::UpdateRegionsOrder() @@ -723,10 +641,7 @@ void HYDROData_CalculationCase::UpdateRegionsOrder() if ( aDocument.IsNull() ) return; - HYDROData_SequenceOfObjects aRegions = GetRegions( false ); - HYDROData_SequenceOfObjects aRegionsLC = GetRegions( true ); - aRegions.Append( aRegionsLC ); - + HYDROData_SequenceOfObjects aRegions = GetRegions(); HYDROData_SequenceOfObjects::Iterator anIter( aRegions ); for ( ; anIter.More(); anIter.Next() ) { @@ -753,14 +668,12 @@ void HYDROData_CalculationCase::UpdateRegionsOrder() } } -void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& theRegion, - const bool theLandCover ) +void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& theRegion ) { if ( theRegion.IsNull() ) return; - HYDROData_CalculationCase::DataTag aDataTag = - theLandCover ? DataTag_LandCoverRegion : DataTag_Region; + HYDROData_CalculationCase::DataTag aDataTag = DataTag_Region; RemoveReferenceObject( theRegion->Label(), aDataTag ); // Remove region from data model @@ -770,9 +683,9 @@ void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& th theRegion->Remove(); } -void HYDROData_CalculationCase::RemoveRegions( const bool theLandCover ) +void HYDROData_CalculationCase::RemoveRegions() { - myLab.FindChild( theLandCover ? DataTag_ChildLandCoverRegion : DataTag_ChildRegion ).ForgetAllAttributes(); + myLab.FindChild( DataTag_ChildRegion ).ForgetAllAttributes(); } HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetSplittedGroups() const @@ -787,7 +700,7 @@ void HYDROData_CalculationCase::RemoveSplittedGroups() double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) const { - Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint, false ); + Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint ); return GetAltitudeForPoint( thePoint, aZone ); } @@ -796,7 +709,7 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& { double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude(); - Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint, false ); + Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint ); if ( !aZone.IsNull() ) { Handle(HYDROData_Region) aRefRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() ); @@ -930,54 +843,26 @@ NCollection_Sequence HYDROData_CalculationCase::GetAltitudesForPoints( double HYDROData_CalculationCase::GetStricklerCoefficientForPoint( const gp_XY& thePoint ) const { - double aCoeff = 0; - Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); - if ( !aDocument.IsNull() ) - aCoeff = aDocument->GetDefaultStricklerCoefficient(); - - Handle(HYDROData_LandCover) aLandCover; - Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint, Standard_True ); - if ( !aZone.IsNull() ) - { - HYDROData_SequenceOfObjects anObjList = aZone->GetObjects(); - if ( anObjList.Length() == 1 ) - aLandCover = Handle(HYDROData_LandCover)::DownCast( anObjList.First() ); - else - aLandCover = Handle(HYDROData_LandCover)::DownCast( aZone->GetMergeObject() ); - } - - if ( !aLandCover.IsNull() ) - { - QString aType = aLandCover->GetStricklerType(); - Handle(HYDROData_StricklerTable) aTable = GetStricklerTable(); - if ( !aTable.IsNull() ) - { - if ( aTable->GetTypes().contains( aType ) ) - aCoeff = aTable->Get( aType, aCoeff ); - } - } - - return aCoeff; + //TODO: #652 + return 0.0; } -Handle(HYDROData_Region) HYDROData_CalculationCase::GetRegionFromPoint( const gp_XY& thePoint, - const bool theLandCover ) const +Handle(HYDROData_Region) HYDROData_CalculationCase::GetRegionFromPoint( const gp_XY& thePoint ) const { Handle(HYDROData_Region) aResRegion; - Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint, theLandCover ); + Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint ); if ( !aZone.IsNull() ) aResRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() ); return aResRegion; } -Handle(HYDROData_Zone) HYDROData_CalculationCase::GetZoneFromPoint( const gp_XY& thePoint, - const bool theLandCover ) const +Handle(HYDROData_Zone) HYDROData_CalculationCase::GetZoneFromPoint( const gp_XY& thePoint ) const { Handle(HYDROData_Zone) aResZone; - HYDROData_SequenceOfObjects aRegions = GetRegions( theLandCover ); + HYDROData_SequenceOfObjects aRegions = GetRegions(); HYDROData_SequenceOfObjects::Iterator anIter( aRegions ); for ( ; anIter.More() && aResZone.IsNull(); anIter.Next() ) @@ -1038,15 +923,14 @@ HYDROData_CalculationCase::PointClassification HYDROData_CalculationCase::GetPoi Handle(HYDROData_Region) HYDROData_CalculationCase::addNewRegion( const Handle(HYDROData_Document)& theDoc, const QString& thePrefixOrName, - const bool theLandCover, bool isPrefix ) { - TDF_Label aNewLab = myLab.FindChild( theLandCover ? DataTag_ChildLandCoverRegion : DataTag_ChildRegion ).NewChild(); + TDF_Label aNewLab = myLab.FindChild( DataTag_ChildRegion ).NewChild(); int aTag = aNewLab.Tag(); Handle(HYDROData_Region) aNewRegion = Handle(HYDROData_Region)::DownCast( HYDROData_Iterator::CreateObject( aNewLab, KIND_REGION ) ); - AddRegion( aNewRegion, theLandCover ); + AddRegion( aNewRegion ); QString aRegionName = isPrefix ? HYDROData_Tool::GenerateObjectName( theDoc, thePrefixOrName ) : thePrefixOrName; aNewRegion->SetName( aRegionName ); @@ -1113,7 +997,7 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine, // Get faces bool isAllNotSubmersible = true; TopTools_ListOfShape aFaces; - HYDROData_SequenceOfObjects aCaseRegions = GetRegions( false ); + HYDROData_SequenceOfObjects aCaseRegions = GetRegions(); HYDROData_SequenceOfObjects::Iterator aRegionIter( aCaseRegions ); for ( ; aRegionIter.More(); aRegionIter.Next() ) { @@ -1329,12 +1213,6 @@ QString HYDROData_CalculationCase::DumpRules() const return HYDROData_PriorityQueue::DumpRules( aRulesLab ); } -QString HYDROData_CalculationCase::DumpLandCoverRules() const -{ - TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomLandCoverRules ); - return HYDROData_PriorityQueue::DumpRules( aRulesLab ); -} - void HYDROData_CalculationCase::SetAssignmentMode( AssignmentMode theMode ) { TDF_Label aModeLab = myLab.FindChild( DataTag_AssignmentMode ); @@ -1361,13 +1239,6 @@ void HYDROData_CalculationCase::DumpRulesToPython( const QString& theCalcCaseNam HYDROData_PriorityQueue::DumpRulesToPython( aRulesLab, theCalcCaseName, theScript ); } -void HYDROData_CalculationCase::DumpLandCoverRulesToPython( const QString& theCalcCaseName, - QStringList& theScript ) const -{ - TDF_Label aRulesLab = myLab.FindChild( DataTag_CustomLandCoverRules ); - HYDROData_PriorityQueue::DumpRulesToPython( aRulesLab, theCalcCaseName, theScript ); -} - HYDROData_Warning HYDROData_CalculationCase::GetLastWarning() const { return myLastWarning; @@ -1437,22 +1308,3 @@ bool HYDROData_CalculationCase::GetRule( int theIndex, return HYDROData_PriorityQueue::GetRule( aRulesLab, theIndex, theObject1, thePriority, theObject2, theMergeType ); } - -void HYDROData_CalculationCase::SetAssignmentLandCoverMode( AssignmentMode theMode ) -{ - TDF_Label aModeLab = myLab.FindChild( DataTag_AssignmentLandCoverMode ); - TDataStd_Integer::Set( aModeLab, ( int ) theMode ); - - // Indicate model of the need to update land covers partition - Changed( Geom_No ); -} - -HYDROData_CalculationCase::AssignmentMode HYDROData_CalculationCase::GetAssignmentLandCoverMode() const -{ - Handle(TDataStd_Integer) aModeAttr; - bool isOK = myLab.FindChild( DataTag_AssignmentLandCoverMode ).FindAttribute( TDataStd_Integer::GetID(), aModeAttr ); - if( isOK ) - return ( AssignmentMode ) aModeAttr->Get(); - else - return MANUAL; -}