#include "HYDROData_NaturalObject.h"
#include "HYDROData_PolylineXY.h"
#include "HYDROData_StricklerTable.h"
-#include "HYDROData_LandCover.h"
-#include "HYDROData_SplittedShapesGroup.h"
+#include "HYDROData_LandCoverMap.h"
+#include "HYDROData_SplitShapesGroup.h"
#include "HYDROData_Region.h"
#include "HYDROData_Tool.h"
#include "HYDROData_GeomTool.h"
#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
#define EXPORT_NAME "HYDRO_" + GetName()
+#include <SALOME_NamingService.hxx>
+#include <SALOME_LifeCycleCORBA.hxx>
+
+#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
IMPLEMENT_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_CalculationCase, HYDROData_Entity)
HYDROData_CalculationCase::HYDROData_CalculationCase()
-: HYDROData_Entity()
+: HYDROData_Entity( Geom_2d_and_groups )
{
}
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();
+ HYDROData_SequenceOfObjects aGroups = GetSplitGroups();
HYDROData_SequenceOfObjects::Iterator anIter;
anIter.Init( aGroups );
for ( ; anIter.More(); anIter.Next() )
{
- Handle(HYDROData_SplittedShapesGroup) aGroup =
- Handle(HYDROData_SplittedShapesGroup)::DownCast( anIter.Value() );
+ Handle(HYDROData_SplitShapesGroup) aGroup =
+ Handle(HYDROData_SplitShapesGroup)::DownCast( anIter.Value() );
if ( aGroup.IsNull() )
continue;
HYDROData_Entity::SetName( theName );
}
-QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const
+QStringList HYDROData_CalculationCase::DumpToPython( const QString& thePyScriptPath,
+ MapOfTreatedObjects& theTreatedObjects ) const
{
QStringList aResList = dumpObjectCreation( theTreatedObjects );
aResList.prepend( "# Calculation case" );
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() )
{
Handle(HYDROData_Object) aRefGeomObj =
Handle(HYDROData_Object)::DownCast( anIter.Value() );
- setPythonReferenceObject( theTreatedObjects, aResList, aRefGeomObj, "AddGeometryObject" );
+ setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aRefGeomObj, "AddGeometryObject" );
}
aResList << QString( "" );
}
Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
- setPythonReferenceObject( theTreatedObjects, aResList, aBoundaryPolyline, "SetBoundaryPolyline" );
+ setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aBoundaryPolyline, "SetBoundaryPolyline" );
if( aMode==AUTOMATIC )
DumpRulesToPython( aCalculName, aResList );
- if( aModeLC==AUTOMATIC )
- DumpLandCoverRulesToPython( aCalculName, aResList );
aResList << QString( "" );
aResList << "# Start the algorithm of the partition and assignment";
{
// 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, thePyScriptPath, theTreatedObjects, GetRegions() );
}
// Export calculation case
if ( !aBoundaryPolyline.IsNull() )
aResSeq.Append( aBoundaryPolyline );
+ HYDROData_SequenceOfObjects aSeqOfGeomObjs = GetGeometryObjects();
+ 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;
}
SetWarning();
// At first we remove previously created objects
- RemoveRegions( false );
- RemoveRegions( true );
- RemoveSplittedGroups();
+ RemoveRegions();
+ RemoveSplitGroups();
Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab );
if ( aDocument.IsNull() )
}
}
- // 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 );
- break;
- case AUTOMATIC:
- CreateRegionsAuto( aDocument, aZonesList, false );
- break;
- }
-
- switch( GetAssignmentLandCoverMode() )
- {
- case MANUAL:
- CreateRegionsDef( aDocument, aLandCoverZonesList, true );
+ CreateRegionsDef( aDocument, aZonesList );
break;
case AUTOMATIC:
- CreateRegionsAuto( aDocument, aLandCoverZonesList, true );
+ CreateRegionsAuto( aDocument, aZonesList );
break;
}
}
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 );
}
void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Document)& theDoc,
- const HYDROData_SplitToZonesTool::SplitDataList& theZones,
- const bool theLandCover )
+ const HYDROData_SplitToZonesTool::SplitDataList& theZones )
{
+ DEBTRACE("HYDROData_CalculationCase::CreateRegionsAuto");
QMap<QString, Handle(HYDROData_Region)> aRegionsMap; //object name to region
QMap<QString, QString> 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 );
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 );
}
}
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() ) {
+ DEBTRACE("aMergeEntity " << aMergeEntity->GetName().toStdString());
+ aMergeEntity = aMergeObject->GetAltitudeObject();
}
switch( aMergeType )
void HYDROData_CalculationCase::CreateEdgeGroupsDef( const Handle(HYDROData_Document)& theDoc,
const HYDROData_SplitToZonesTool::SplitDataList& theEdges )
{
- QMap<QString,Handle(HYDROData_SplittedShapesGroup)> aSplittedEdgesGroupsMap;
+ QMap<QString,Handle(HYDROData_SplitShapesGroup)> aSplitEdgesGroupsMap;
HYDROData_SplitToZonesTool::SplitDataListIterator anIter( theEdges );
while( anIter.hasNext() )
QString aStr = aSplitData.ObjectNames.join(" ");
cout << " CCase: Names = "<<aStr.toStdString() << " size = " <<aSplitData.ObjectNames.size() <<endl;
#endif
- Handle(HYDROData_SplittedShapesGroup) aSplittedGroup;
- if ( !aSplittedEdgesGroupsMap.contains( anObjName ) )
+ Handle(HYDROData_SplitShapesGroup) aSplitGroup;
+ if ( !aSplitEdgesGroupsMap.contains( anObjName ) )
{
- aSplittedGroup = addNewSplittedGroup( CALCULATION_GROUPS_PREF + anObjName );
- aSplittedEdgesGroupsMap.insert( anObjName, aSplittedGroup );
+ aSplitGroup = addNewSplitGroup( CALCULATION_GROUPS_PREF + anObjName );
+ aSplitEdgesGroupsMap.insert( anObjName, aSplitGroup );
}
else
{
- aSplittedGroup = aSplittedEdgesGroupsMap[ anObjName ];
+ aSplitGroup = aSplitEdgesGroupsMap[ anObjName ];
}
- if ( aSplittedGroup.IsNull() )
+ if ( aSplitGroup.IsNull() )
continue;
- aSplittedGroup->AddShape( aSplitData.Shape );
+ aSplitGroup->AddShape( aSplitData.Shape );
}
}
AddReferenceObject( theObject, DataTag_GeometryObject );
// Indicate model of the need to update splitting
- SetToUpdate( true );
+ Changed( Geom_2d );
return true;
}
RemoveReferenceObject( theObject->Label(), DataTag_GeometryObject );
// Indicate model of the need to update splitting
- SetToUpdate( true );
+ Changed( Geom_2d );
}
void HYDROData_CalculationCase::RemoveGeometryObjects()
ClearReferenceObjects( DataTag_GeometryObject );
// Indicate model of the need to update splitting
- SetToUpdate( true );
+ Changed( Geom_2d );
}
bool HYDROData_CalculationCase::AddGeometryGroup( const Handle(HYDROData_ShapesGroup)& theGroup )
AddReferenceObject( theGroup, DataTag_GeometryGroup );
// Indicate model of the need to update splitting
- SetToUpdate( true );
+ Changed( Geom_Groups );
return true;
}
RemoveReferenceObject( theGroup->Label(), DataTag_GeometryGroup );
// Indicate model of the need to update splitting
- SetToUpdate( true );
+ Changed( Geom_Groups );
}
void HYDROData_CalculationCase::RemoveGeometryGroups()
ClearReferenceObjects( DataTag_GeometryGroup );
// Indicate model of the need to update splitting
- SetToUpdate( true );
+ Changed( Geom_Groups );
}
void HYDROData_CalculationCase::SetBoundaryPolyline( const Handle(HYDROData_PolylineXY)& thePolyline )
SetReferenceObject( thePolyline, DataTag_Polyline );
// Indicate model of the need to update zones splitting
- SetToUpdate( !IsEqual( aPrevPolyline, thePolyline ) || IsMustBeUpdated() );
+ if( !IsEqual( aPrevPolyline, thePolyline ) )
+ Changed( Geom_2d );
}
Handle(HYDROData_PolylineXY) HYDROData_CalculationCase::GetBoundaryPolyline() const
ClearReferenceObjects( DataTag_Polyline );
// Indicate model of the need to update zones splitting
- SetToUpdate( !aPrevPolyline.IsNull() || IsMustBeUpdated() );
+ Changed( Geom_2d );
}
void HYDROData_CalculationCase::SetStricklerTable( const Handle(HYDROData_StricklerTable)& theStricklerTable )
SetReferenceObject( theStricklerTable, DataTag_StricklerTable );
// Indicate model of the need to update land covers partition
- SetToUpdate( !IsEqual( aPrevStricklerTable, theStricklerTable ) || IsMustBeUpdated() );
+ if( !IsEqual( aPrevStricklerTable, theStricklerTable ) )
+ Changed( Geom_No );
}
Handle(HYDROData_StricklerTable) HYDROData_CalculationCase::GetStricklerTable() const
ClearReferenceObjects( DataTag_StricklerTable );
// Indicate model of the need to update land covers partition
- SetToUpdate( !aPrevStricklerTable.IsNull() || IsMustBeUpdated() );
+ Changed( Geom_No );
}
-bool HYDROData_CalculationCase::AddLandCover( const Handle(HYDROData_LandCover)& theLandCover )
+Handle(HYDROData_LandCoverMap) HYDROData_CalculationCase::GetLandCoverMap() const
{
- 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
- SetToUpdate( true );
-
- return true;
+ Handle(HYDROData_LandCoverMap) aMap = Handle(HYDROData_LandCoverMap)::DownCast(
+ GetReferenceObject( DataTag_LandCoverMap ) );
+ return aMap;
}
-HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetLandCovers() const
+void HYDROData_CalculationCase::SetLandCoverMap( const Handle(HYDROData_LandCoverMap)& theMap )
{
- return GetReferenceObjects( DataTag_LandCover );
+ SetReferenceObject( theMap, DataTag_LandCoverMap );
}
-void HYDROData_CalculationCase::RemoveLandCover( const Handle(HYDROData_LandCover)& theLandCover )
-{
- if ( theLandCover.IsNull() )
- return;
-
- RemoveReferenceObject( theLandCover->Label(), DataTag_LandCover );
-
- // Indicate model of the need to update land cover partition
- SetToUpdate( true );
-}
-
-void HYDROData_CalculationCase::RemoveLandCovers()
-{
- ClearReferenceObjects( DataTag_LandCover );
-
- // Indicate model of the need to update land cover partition
- SetToUpdate( true );
-}
-
-Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(HYDROData_Zone)& theZone,
- const bool theLandCover )
+Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(HYDROData_Zone)& theZone )
{
+ Changed( Geom_No );
+ Changed( Geom_No );
+ 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;
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
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() );
}
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()
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() )
{
}
}
-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
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
+HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetSplitGroups() const
{
- return GetReferenceObjects( DataTag_SplittedGroups );
+ return GetReferenceObjects( DataTag_SplitGroups );
}
-void HYDROData_CalculationCase::RemoveSplittedGroups()
+void HYDROData_CalculationCase::RemoveSplitGroups()
{
- myLab.FindChild( DataTag_SplittedGroups ).ForgetAllAttributes();
+ myLab.FindChild( DataTag_SplitGroups ).ForgetAllAttributes();
}
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 );
}
{
double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
- Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint, false );
+ Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint );
if ( !aZone.IsNull() )
{
+ //DEBTRACE("GetAltitudeForPoint Region " << theRegion->GetName().toStdString() << " Zone " << aZone->GetName().toStdString());
Handle(HYDROData_Region) aRefRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() );
if ( IsEqual( aRefRegion, theRegion ) )
aResAltitude = GetAltitudeForPoint( thePoint, aZone );
+ else
+ {
+ DEBTRACE("GetAltitudeForPoint Region " << aRefRegion->GetName().toStdString() << " Zone " << aZone->GetName().toStdString() << " ---------------------------");
+ aResAltitude = GetAltitudeForPoint( thePoint, aZone );
+ }
}
+ else
+ {
+ DEBTRACE(" --- GetAltitudeForPoint No Zone ---");
+ }
return aResAltitude;
}
double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint,
const Handle(HYDROData_Zone)& theZone ) const
{
+ //DEBTRACE("GetAltitudeForPoint Zone " << theZone->GetName().toStdString());
double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude();
if ( theZone.IsNull() )
+ {
+ DEBTRACE("Zone nulle");
return aResAltitude;
+ }
HYDROData_Zone::MergeType aZoneMergeType = theZone->GetMergeType();
+ //DEBTRACE("aZoneMergeType " << aZoneMergeType);
if ( !theZone->IsMergingNeed() )
{
aZoneMergeType = HYDROData_Zone::Merge_UNKNOWN;
+ //DEBTRACE("---");
}
else if ( aZoneMergeType == HYDROData_Zone::Merge_UNKNOWN )
{
+ DEBTRACE("GetAltitudeForPoint Zone " << theZone->GetName().toStdString() << " Merge_UNKNOWN");
return aResAltitude;
}
{
if ( aZoneInterpolator != NULL )
{
+ DEBTRACE("aZoneInterpolator != NULL");
aZoneInterpolator->SetAltitudeObject( aMergeAltitude );
aResAltitude = aZoneInterpolator->GetAltitudeForPoint( thePoint );
}
else
+ {
+ DEBTRACE("aZoneInterpolator == NULL");
aResAltitude = aMergeAltitude->GetAltitudeForPoint( thePoint );
+ }
}
}
else
{
+ //DEBTRACE("aZoneMergeType != HYDROData_Zone::Merge_Object");
HYDROData_SequenceOfObjects aZoneObjects = theZone->GetObjects();
HYDROData_SequenceOfObjects::Iterator anIter( aZoneObjects );
for ( ; anIter.More(); anIter.Next() )
double aPointAltitude = 0.0;
if ( aZoneInterpolator != NULL )
{
+ DEBTRACE("aZoneInterpolator != NULL");
aZoneInterpolator->SetAltitudeObject( anObjAltitude );
aPointAltitude = aZoneInterpolator->GetAltitudeForPoint( thePoint );
}
else
+ {
+ //DEBTRACE("aZoneInterpolator == NULL");
aPointAltitude = anObjAltitude->GetAltitudeForPoint( thePoint );
+ }
if ( ValuesEquals( aPointAltitude, HYDROData_IAltitudeObject::GetInvalidAltitude() ) )
continue;
const NCollection_Sequence<gp_XY>& thePoints,
const Handle(HYDROData_Region)& theRegion ) const
{
+ //DEBTRACE("HYDROData_CalculationCase::GetAltitudesForPoints " << theRegion->GetName().toStdString());
NCollection_Sequence<double> aResSeq;
for ( int i = 1, n = thePoints.Length(); i <= n; ++i )
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 );
- }
- }
+ Handle( HYDROData_LandCoverMap ) aMap = GetLandCoverMap();
+ Handle( HYDROData_StricklerTable ) aTable = GetStricklerTable();
+ if( aMap.IsNull() )
+ return 0.0;
- return aCoeff;
+ QString aType;
+ aMap->FindByPoint( thePoint, aType );
+ double aCoeff = aTable->Get( aType, 0.0 );
+ return aCoeff;
}
-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() )
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 );
return aNewRegion;
}
-Handle(HYDROData_SplittedShapesGroup) HYDROData_CalculationCase::addNewSplittedGroup( const QString& theName )
+Handle(HYDROData_SplitShapesGroup) HYDROData_CalculationCase::addNewSplitGroup( const QString& theName )
{
- TDF_Label aNewLab = myLab.FindChild( DataTag_SplittedGroups ).NewChild();
+ TDF_Label aNewLab = myLab.FindChild( DataTag_SplitGroups ).NewChild();
- Handle(HYDROData_SplittedShapesGroup) aNewGroup =
- Handle(HYDROData_SplittedShapesGroup)::DownCast(
- HYDROData_Iterator::CreateObject( aNewLab, KIND_SPLITTED_GROUP ) );
- AddReferenceObject( aNewGroup, DataTag_SplittedGroups );
+ Handle(HYDROData_SplitShapesGroup) aNewGroup =
+ Handle(HYDROData_SplitShapesGroup)::DownCast(
+ HYDROData_Iterator::CreateObject( aNewLab, KIND_SPLIT_GROUP ) );
+ AddReferenceObject( aNewGroup, DataTag_SplitGroups );
aNewGroup->SetName( theName );
HYDROData_ShapesGroup::SeqOfGroupsDefs aSeqOfGroupsDefs;
// Get groups definitions
- HYDROData_SequenceOfObjects aSplittedGroups = GetSplittedGroups();
+ HYDROData_SequenceOfObjects aSplitGroups = GetSplitGroups();
- HYDROData_SequenceOfObjects::Iterator anIter( aSplittedGroups );
+ HYDROData_SequenceOfObjects::Iterator anIter( aSplitGroups );
for ( ; anIter.More(); anIter.Next() )
{
// Get shapes group
// 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() )
{
aRes = Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs, theGeomObjEntry );;
}
+ if( aRes && !GetLandCoverMap().IsNull() && !GetStricklerTable().IsNull() )
+ {
+ QString aTelemacFileName = GetName() + ".telemac";
+ aRes = GetLandCoverMap()->ExportTelemac( aTelemacFileName, 1E-2, GetStricklerTable() );
+ }
return aRes;
}
// Indicate model of the need to update splitting
if ( theIsSetToUpdate ) {
- SetToUpdate( true );
+ Changed( Geom_2d );
}
}
HYDROData_PriorityQueue::AddRule( aRulesLab, theObject1, thePriority, theObject2, theMergeType );
// Indicate model of the need to update splitting
- SetToUpdate( true );
+ Changed( Geom_2d );
}
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 );
TDataStd_Integer::Set( aModeLab, ( int ) theMode );
// Indicate model of the need to update splitting
- SetToUpdate( true );
+ Changed( Geom_2d );
}
HYDROData_CalculationCase::AssignmentMode HYDROData_CalculationCase::GetAssignmentMode() const
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;
}
void HYDROData_CalculationCase::DumpRegionsToPython( QStringList& theResList,
+ const QString& thePyScriptPath,
MapOfTreatedObjects& theTreatedObjects,
const HYDROData_SequenceOfObjects& theRegions ) const
{
continue;
theTreatedObjects.insert( aRegion->GetName(), aRegion );
- QStringList aRegDump = aRegion->DumpToPython( theTreatedObjects );
+ QStringList aRegDump = aRegion->DumpToPython( thePyScriptPath, theTreatedObjects );
theResList << aRegDump;
}
}
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
- SetToUpdate( true );
-}
-
-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;
-}
