#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"
+#include <HYDROData_Tool.h>
+#include <HYDROData_BCPolygon.h>
+#include <HYDROData_BoundaryPolygonTools.h>
#ifdef WIN32
#pragma warning ( disable: 4251 )
#endif
#include <QSet>
+#include <QFuture>
+#include <QtConcurrent/QtConcurrent>
+#include <QThread>
#include <TopoDS.hxx>
#include <TopoDS_Shell.hxx>
#include <BRep_Builder.hxx>
#include <BRepBuilderAPI_Sewing.hxx>
#include <BRepTopAdaptor_FClass2d.hxx>
+#include <BRepTools_ReShape.hxx>
+#include <BRepLib_MakeWire.hxx>
#include <BRepTools.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
#include <TDataStd_Integer.hxx>
+#include <Message_ProgressSentry.hxx>
+
//#define DEB_CALCULATION 1
#ifdef DEB_CALCULATION
#include <BRepTools.hxx>
#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()
-IMPLEMENT_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)
+#ifndef LIGHT_MODE
+#include <SALOME_NamingService.hxx>
+#include <SALOME_LifeCycleCORBA.hxx>
+#endif
+
+//#define _DEVDEBUG_
+#include "HYDRO_trace.hxx"
+
IMPLEMENT_STANDARD_RTTIEXT(HYDROData_CalculationCase, HYDROData_Entity)
HYDROData_CalculationCase::HYDROData_CalculationCase()
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( "" );
continue;
int aGroupId = aFatherGeom->GetGroupId( aGeomGroup );
- aResList << QString( "%1 = %2.GetGroup( %3 );" )
+ aResList << QString( "%1 = %2.GetGroup( %3 )" )
.arg( aGroupName ).arg( aFatherGeom->GetObjPyName() ).arg( aGroupId );
- aResList << QString( "%1.AddGeometryGroup( %2 );" ).arg( aCalculName ).arg( aGroupName );
+ aResList << QString( "%1.AddGeometryGroup( %2 )" ).arg( aCalculName ).arg( aGroupName );
}
+ HYDROData_SequenceOfObjects aBPolygons = GetBoundaryPolygons();
+ for (int i = 1; i <= aBPolygons.Size(); i++ )
+ {
+ Handle(HYDROData_BCPolygon) aBCPoly = Handle(HYDROData_BCPolygon)::DownCast( aBPolygons(i) );
+ setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aBCPoly, "AddBoundaryPolygon" );
+ }
+ aResList << QString( "" );
+
Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
- setPythonReferenceObject( theTreatedObjects, aResList, aBoundaryPolyline, "SetBoundaryPolyline" );
+ setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aBoundaryPolyline, "SetBoundaryPolyline" );
+
+ Handle(HYDROData_StricklerTable) aStricklerTable = GetStricklerTable();
+ setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aStricklerTable, "SetStricklerTable" );
+
+ Handle(HYDROData_LandCoverMap) aLandCoverMap = GetLandCoverMap();
+ setPythonReferenceObject( thePyScriptPath, theTreatedObjects, aResList, aLandCoverMap, "SetLandCoverMap" );
if( aMode==AUTOMATIC )
DumpRulesToPython( aCalculName, aResList );
- if( aModeLC==AUTOMATIC )
- DumpLandCoverRulesToPython( aCalculName, aResList );
aResList << QString( "" );
aResList << "# Start the algorithm of the partition and assignment";
- aResList << QString( "%1.Update();" ).arg( aCalculName );
+ aResList << QString( "%1.Update()" ).arg( aCalculName );
if( aMode==MANUAL )
{
// 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
aResList << "import GEOM";
aResList << QString( "print \"Entry:\", %1" ).arg( anEntryVar );
QString aGeomShapeName = aCalculName + "_geom";
- aResList << QString( "%1 = salome.IDToObject( str( %2 ) )" ).arg( aGeomShapeName ).arg( anEntryVar );
- aResList << QString( "print \"Geom shape:\", %1" ).arg( aGeomShapeName );
- aResList << QString( "print \"Geom shape name:\", %1.GetName()" ).arg( aGeomShapeName );
+ aResList << QString( "HYDRO_%1 = salome.IDToObject( str( %2 ) )" ).arg( GetName() ).arg( anEntryVar );
+ aResList << QString( "print \"Geom shape:\", HYDRO_%1" ).arg( GetName() );
+ aResList << QString( "print \"Geom shape name:\", HYDRO_%1.GetName()" ).arg( GetName() );
+
- DumpSampleMeshing( aResList, aStudyName, aGeomShapeName, aCalculName+"_mesh" );
+ //DumpSampleMeshing( aResList, aStudyName, aGeomShapeName, aCalculName+"_mesh" );
aResList << QString( "" );
return aResList;
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;
}
+static void FilterEdgesByIncludeSelectionBoundaryPolygons( const HYDROData_SplitToZonesTool::SplitDataList& anEdgesList,
+ HYDROData_SequenceOfObjects aBoundaryPolygons,
+ HYDROData_SplitToZonesTool::SplitDataList& outEdgesList)
+{
+ //perform boundary condition polygons on EdgesList
+ TopTools_SequenceOfShape IncTools, SelectionTools;
+ HYDROData_SplitToZonesTool::SplitDataListIterator anIter(anEdgesList);
+ for (int i=1; i<=aBoundaryPolygons.Size();i++)
+ {
+ Handle(HYDROData_BCPolygon) aBCPoly = Handle(HYDROData_BCPolygon)::DownCast( aBoundaryPolygons(i));
+ TopoDS_Shape aPolyTopShape = aBCPoly->GetTopShape();
+ int bType = aBCPoly->GetBoundaryType();
+ if (bType == 2)
+ IncTools.Append(aPolyTopShape);
+ else if (bType == 3)
+ SelectionTools.Append(aPolyTopShape);
+ }
+
+ while( anIter.hasNext() )
+ {
+ const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
+ if ( aSplitData.ObjectNames.isEmpty() || aSplitData.Shape.IsNull() )
+ continue;
+ if (aSplitData.Shape.ShapeType() != TopAbs_EDGE)
+ continue;
+ if (HYDROData_BoundaryPolygonTools::IncludeTool(IncTools, aSplitData.Shape) && HYDROData_BoundaryPolygonTools::SelectionTool(SelectionTools, aSplitData.Shape))
+ outEdgesList.append(aSplitData);
+ }
+}
+
+
+static void SplitEdgesByBoundaryPolygons( const HYDROData_SplitToZonesTool::SplitDataList& anEdgesList,
+ const HYDROData_SequenceOfObjects& aBoundaryPolygons,
+ NCollection_IndexedDataMap<TopoDS_Shape, TopoDS_Shape>& ObjToRes)
+{
+ //perform boundary condition polygons on EdgesList
+ TopTools_SequenceOfShape CutTools;
+ ObjToRes.Clear();
+ HYDROData_SplitToZonesTool::SplitDataListIterator anIter(anEdgesList);
+ for (int i=1; i<=aBoundaryPolygons.Size();i++)
+ {
+ Handle(HYDROData_BCPolygon) aBCPoly = Handle(HYDROData_BCPolygon)::DownCast( aBoundaryPolygons(i));
+ TopoDS_Shape aPolyTopShape = aBCPoly->GetTopShape();
+ int bType = aBCPoly->GetBoundaryType();
+ if (bType == 1)
+ CutTools.Append(aPolyTopShape);
+ }
+
+ while( anIter.hasNext() )
+ {
+ const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
+ if ( aSplitData.ObjectNames.isEmpty() || aSplitData.Shape.IsNull() )
+ continue;
+ if (aSplitData.Shape.ShapeType() != TopAbs_EDGE)
+ continue;
+ ObjToRes.Add(aSplitData.Shape, TopoDS_Shape());
+ }
+
+ HYDROData_BoundaryPolygonTools::CutTool(CutTools, ObjToRes);
+}
+
+
+static void PerformEdgeReplInZones(const HYDROData_SplitToZonesTool::SplitDataList& ZoneList,
+ const NCollection_IndexedDataMap<TopoDS_Shape, TopoDS_Shape>& ObjToRes,
+ HYDROData_SplitToZonesTool::SplitDataList& outZoneList)
+{
+ HYDROData_SplitToZonesTool::SplitDataListIterator it( ZoneList );
+ BRepTools_ReShape reshaper;
+ for (;it.hasNext();)
+ {
+ const HYDROData_SplitToZonesTool::SplitData& aSplitData = it.next();
+ if ( aSplitData.ObjectNames.isEmpty() || aSplitData.Shape.IsNull() )
+ continue;
+
+ TopoDS_Shape mS = aSplitData.Shape;
+ for (int i=1; i<=ObjToRes.Extent();i++)
+ {
+ TopoDS_Shape K = ObjToRes.FindKey(i);
+ TopoDS_Shape V = ObjToRes.FindFromIndex(i);
+ if (V.ShapeType() != TopAbs_EDGE && V.ShapeType() != TopAbs_WIRE && V.ShapeType() != TopAbs_COMPOUND)
+ continue;
+ if (V.ShapeType() == TopAbs_COMPOUND)
+ {
+ TopExp_Explorer exp(V, TopAbs_EDGE);
+ TopTools_ListOfShape lE;
+ for (;exp.More();exp.Next())
+ lE.Append(exp.Current());
+ if (lE.Extent() == 1)
+ V = lE.First();
+ else if (lE.Extent() > 1)
+ {
+ BRepLib_MakeWire MW;
+ MW.Add(lE);
+ if (MW.IsDone())
+ V = MW.Wire();
+ else
+ continue;
+ }
+ else
+ continue;
+ }
+ reshaper.Replace(K, V);
+ }
+ TopoDS_Shape nS = reshaper.Apply(mS);
+ HYDROData_SplitToZonesTool::SplitData aNS(aSplitData.Type, nS, aSplitData.ObjectNames);
+ outZoneList.append(aNS);
+ }
+}
+
+static void CreateNewEdgeList( const HYDROData_SplitToZonesTool::SplitDataList& theEdges,
+ const NCollection_IndexedDataMap<TopoDS_Shape, TopoDS_Shape>& ObjToRes,
+ HYDROData_SplitToZonesTool::SplitDataList& newEdges)
+{
+ HYDROData_SplitToZonesTool::SplitDataListIterator anIter( theEdges );
+ while( anIter.hasNext() )
+ {
+ const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
+ if ( aSplitData.ObjectNames.isEmpty() || aSplitData.Shape.IsNull() )
+ continue;
+
+ const TopoDS_Shape* aDivShape = ObjToRes.Seek(aSplitData.Shape);
+ if (aDivShape)
+ {
+ TopExp_Explorer exp(*aDivShape, TopAbs_EDGE);
+ for (;exp.More();exp.Next())
+ {
+ HYDROData_SplitToZonesTool::SplitData anNewSData(aSplitData.Type, exp.Current(), aSplitData.ObjectNames);
+ newEdges.append(anNewSData);
+ }
+ }
+ else
+ newEdges.append(aSplitData);
+ }
+}
+
+
void HYDROData_CalculationCase::Update()
{
HYDROData_Entity::Update();
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() )
HYDROData_SplitToZonesTool::SplitDataList aZonesList, anEdgesList;
Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
+
+ HYDROData_SequenceOfObjects InterPolys = GetInterPolyObjects();
+
HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
if ( !aGeomObjects.IsEmpty() ) {
HYDROData_SequenceOfObjects aGeomGroups = GetGeometryGroups();
HYDROData_SplitToZonesTool::SplitDataList aSplitObjects =
- HYDROData_SplitToZonesTool::Split( aGeomObjects, aGeomGroups, aBoundaryPolyline );
+ HYDROData_SplitToZonesTool::Split( aGeomObjects, aGeomGroups, aBoundaryPolyline, InterPolys );
if ( !aSplitObjects.isEmpty() ) {
HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitObjects );
while( anIter.hasNext() ) {
const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Zone )
aZonesList.append( aSplitData );
- else if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Edge )
+ else if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Edge ||
+ aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_IntEdge)
anEdgesList.append( aSplitData );
}
}
}
- // 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 );
- }
- }
- }
-
+ //
+ //split edges by boundary polygons
+ HYDROData_SequenceOfObjects aBoundaryPolygons = GetBoundaryPolygons();
+ //edge to splitted edge (compound of edges or original edge)
+ NCollection_IndexedDataMap<TopoDS_Shape, TopoDS_Shape> ObjToRes;
+ //split edge list by BP
+ SplitEdgesByBoundaryPolygons(anEdgesList, aBoundaryPolygons, ObjToRes);
+ HYDROData_SplitToZonesTool::SplitDataList aNewZonesList;
+ //replace splitted edges in zone list (faces)
+ PerformEdgeReplInZones(aZonesList, ObjToRes, aNewZonesList);
+ //
+ //create new edges list based on splitting info from ObjToRes
+ HYDROData_SplitToZonesTool::SplitDataList newEdgesList1,newEdgesList2;
+ CreateNewEdgeList(anEdgesList, ObjToRes, newEdgesList1);
+ //filter out edges list by include&selection tools
+ FilterEdgesByIncludeSelectionBoundaryPolygons(newEdgesList1,aBoundaryPolygons,newEdgesList2);
+
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,aNewZonesList );
break;
case AUTOMATIC:
- CreateRegionsAuto( aDocument, aLandCoverZonesList, true );
+ CreateRegionsAuto( aDocument,aNewZonesList );
break;
}
- CreateEdgeGroupsDef( aDocument, anEdgesList );
+ CreateEdgeGroupsDef( aDocument, newEdgesList2 );
}
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 );
+
+ TopTools_SequenceOfShape theShapes;
+ aSplitGroup->GetShapes(theShapes);
+
+ if (aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_IntEdge)
+ aSplitGroup->SetInternal(true);
}
}
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
- Changed( Geom_No );
-
- return true;
+ Handle(HYDROData_LandCoverMap) aMap = Handle(HYDROData_LandCoverMap)::DownCast(
+ GetReferenceObject( DataTag_LandCoverMap ) );
+ DEBTRACE("GetLandCoverMap " << aMap.IsNull());
+ 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 )
+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;
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 );
-
+ QString aRegsPref = CALCULATION_REGIONS_PREF;
+ std::map<int, Handle(HYDROData_Region)> IndToRegion; //index in the name of region to region itself
+ HYDROData_SequenceOfObjects aRegions = GetRegions();
HYDROData_SequenceOfObjects::Iterator anIter( aRegions );
+ QString aName;
+ int aVal;
for ( ; anIter.More(); anIter.Next() )
{
- Handle(HYDROData_Region) aRegion =
- Handle(HYDROData_Region)::DownCast( anIter.Value() );
+ Handle(HYDROData_Region) aRegion = Handle(HYDROData_Region)::DownCast( anIter.Value() );
if ( aRegion.IsNull() )
continue;
- aRegion->SetName( "" );
+ if (HYDROData_Tool::ExtractGeneratedObjectName(aRegion->GetName(), aVal, aName) && aName == aRegsPref)
+ IndToRegion[aVal] = aRegion;
}
- QString aRegsPref = CALCULATION_REGIONS_PREF;
-
- anIter.Init( aRegions );
- for ( ; anIter.More(); anIter.Next() )
- {
- Handle(HYDROData_Region) aRegion =
- Handle(HYDROData_Region)::DownCast( anIter.Value() );
- if ( aRegion.IsNull() )
- continue;
-
- QString aRegionName = HYDROData_Tool::GenerateObjectName( aDocument, aRegsPref );
- aRegion->SetName( aRegionName );
- }
+ int nbR = aRegions.Length();
+ std::map<int, Handle(HYDROData_Region)>::iterator it = IndToRegion.begin();
+ for( int i = 1; it != IndToRegion.end(); ++it )
+ if (it->first <= nbR + 1)
+ {
+ QString aNewName = QString("%1_%2").arg(aRegsPref).arg(QString::number(i));
+ it->second->SetName(aNewName);
+ i++;
+ }
}
-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 HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint,
- const Handle(HYDROData_Region)& theRegion ) const
+ const Handle(HYDROData_Region)& theRegion,
+ int theMethod) const
{
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 );
+ aResAltitude = GetAltitudeForPoint( thePoint, aZone, theMethod );
+ else
+ {
+ DEBTRACE("GetAltitudeForPoint Region " << aRefRegion->GetName().toStdString() << " Zone " << aZone->GetName().toStdString() << " ---------------------------");
+ aResAltitude = GetAltitudeForPoint( thePoint, aZone, theMethod );
+ }
}
+ else
+ {
+ DEBTRACE(" --- GetAltitudeForPoint No Zone ---");
+ }
return aResAltitude;
}
double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint,
- const Handle(HYDROData_Zone)& theZone ) const
+ const Handle(HYDROData_Zone)& theZone,
+ int theMethod) 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
- aResAltitude = aMergeAltitude->GetAltitudeForPoint( thePoint );
+ {
+ DEBTRACE("aZoneInterpolator == NULL");
+ aResAltitude = aMergeAltitude->GetAltitudeForPoint( thePoint, theMethod );
+ }
}
}
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
- aPointAltitude = anObjAltitude->GetAltitudeForPoint( thePoint );
+ {
+ DEBTRACE("aZoneInterpolator == NULL");
+ aPointAltitude = anObjAltitude->GetAltitudeForPoint( thePoint, theMethod );
+ }
if ( ValuesEquals( aPointAltitude, HYDROData_IAltitudeObject::GetInvalidAltitude() ) )
continue;
NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints(
const NCollection_Sequence<gp_XY>& thePoints,
- const Handle(HYDROData_Region)& theRegion ) const
+ const Handle(HYDROData_Region)& theRegion,
+ int theMethod) const
{
+ DEBTRACE("HYDROData_CalculationCase::GetAltitudesForPoints " << theRegion->GetName().toStdString());
NCollection_Sequence<double> aResSeq;
- for ( int i = 1, n = thePoints.Length(); i <= n; ++i )
- {
- const gp_XY& thePnt = thePoints.Value( i );
+ Handle(Message_ProgressIndicator) aZIProgress = HYDROData_Tool::GetZIProgress();
+ //DEBTRACE("aZIProgress=" << aZIProgress);
+ if ( aZIProgress ) {
+ aZIProgress->Reset();
+ }
+
+ QFuture<void> aFuture = QtConcurrent::run([&]() {
+ int aNbPoints = thePoints.Length();
+
+ Message_ProgressSentry aPSentry(HYDROData_Tool::GetZIProgress(), "GetAltitudesForPoints", 0, aNbPoints, 1);
+ for ( int i = 1, n = aNbPoints; i <= n && aPSentry.More(); ++i, aPSentry.Next() )
+ {
+ const gp_XY& thePnt = thePoints.Value( i );
- double anAltitude = GetAltitudeForPoint( thePnt, theRegion );
- aResSeq.Append( anAltitude );
+ double anAltitude = GetAltitudeForPoint( thePnt, theRegion, theMethod );
+ aResSeq.Append( anAltitude );
+ }
+ });
+
+ while( aFuture.isRunning() ) {
+ if ( aZIProgress ) {
+ aZIProgress->Show( Standard_True );
+ QThread::usleep(500);
+ }
}
+ //DEBTRACE("aZIProgress=" << aZIProgress);
+ if ( aZIProgress )
+ aZIProgress->Show( Standard_True );
return aResSeq;
}
NCollection_Sequence<double> HYDROData_CalculationCase::GetAltitudesForPoints(
const NCollection_Sequence<gp_XY>& thePoints,
- const Handle(HYDROData_Zone)& theZone ) const
+ const Handle(HYDROData_Zone)& theZone,
+ int theMethod) const
{
NCollection_Sequence<double> aResSeq;
{
const gp_XY& thePnt = thePoints.Value( i );
- double anAltitude = GetAltitudeForPoint( thePnt, theZone );
+ double anAltitude = GetAltitudeForPoint( thePnt, theZone, theMethod );
aResSeq.Append( anAltitude );
}
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_LandCoverMap ) aMap = GetLandCoverMap();
+ Handle( HYDROData_StricklerTable ) aTable = GetStricklerTable();
+ if( aMap.IsNull() )
+ return 0.0;
- 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() );
- }
+ QString aType;
+ aMap->FindByPoint( thePoint, aType );
+ double aCoeff = aTable->Get( aType, 0.0 );
+ return aCoeff;
+}
- 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 );
- }
+std::vector<double> HYDROData_CalculationCase::GetStricklerCoefficientForPoints(const std::vector<gp_XY>& thePoints,
+ double DefValue, bool UseMax ) const
+{
+ DEBTRACE("GetStricklerCoefficientForPoints");
+ Handle( HYDROData_LandCoverMap ) aLCM = GetLandCoverMap();
+ Handle( HYDROData_StricklerTable ) aTable = GetStricklerTable();
+ std::vector<double> theCoeffs;
+ DEBTRACE("aLCM.IsNull() " << aLCM.IsNull());
+ DEBTRACE("aTable.IsNull() "<< aTable.IsNull());
+ if( aLCM.IsNull() || aTable.IsNull() )
+ return theCoeffs;
+
+ Handle(Message_ProgressIndicator) aSIProgress = HYDROData_Tool::GetSIProgress();
+ if ( aSIProgress ) {
+ aSIProgress->Reset();
+ }
+
+ QFuture<void> aFuture = QtConcurrent::run([&]() {
+ aLCM->ClassifyPoints(thePoints, aTable, theCoeffs, DefValue, UseMax );
+ });
+
+ while( aFuture.isRunning() ) {
+ if ( aSIProgress ) {
+ aSIProgress->Show( Standard_True );
+ QThread::usleep(500);
}
+ }
- return aCoeff;
+ return theCoeffs;
}
-Handle(HYDROData_Region) HYDROData_CalculationCase::GetRegionFromPoint( const gp_XY& thePoint,
- const bool theLandCover ) const
+std::vector<int> HYDROData_CalculationCase::GetStricklerTypeForPoints( const std::vector<gp_XY>& thePoints ) const
+{
+ Handle( HYDROData_LandCoverMap ) aLCM = GetLandCoverMap();
+ Handle( HYDROData_StricklerTable ) aTable = GetStricklerTable();
+ std::vector<int> types;
+ if( aLCM.IsNull() || aTable.IsNull() )
+ return types;
+
+ aLCM->ClassifyPoints(thePoints, aTable, types );
+ return types;
+}
+
+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 );
+ aNewRegion->SetName( aRegionName, true );
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 );
SALOMEDS::Study_var aDSStudy = HYDROData_GeomTool::GetStudyByID( theStudyId );
QString aGeomObjEntry, anErrorMsg;
- bool isOK = Export( aGEOMEngine, aDSStudy, aGeomObjEntry, anErrorMsg );
+ QString statMess;
+ bool isOK = Export( aGEOMEngine, aDSStudy, aGeomObjEntry, anErrorMsg, statMess );
return isOK ? aGeomObjEntry : QString();
#endif
}
bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
SALOMEDS::Study_ptr theStudy,
QString& theGeomObjEntry,
- QString& theErrorMsg ) const
+ QString& theErrorMsg,
+ QString& statMess) const
{
+ DEBTRACE("Export");
HYDROData_ShapesGroup::SeqOfGroupsDefs aSeqOfGroupsDefs;
// Get groups definitions
- HYDROData_SequenceOfObjects aSplittedGroups = GetSplittedGroups();
+ HYDROData_SequenceOfObjects aSplitGroups = GetSplitGroups();
- HYDROData_SequenceOfObjects::Iterator anIter( aSplittedGroups );
+ TopTools_SequenceOfShape IntSh; //internal edges
+ HYDROData_SequenceOfObjects::Iterator anIter( aSplitGroups );
for ( ; anIter.More(); anIter.Next() )
{
// Get shapes group
aGroup->GetShapes( aGroupDef.Shapes );
aSeqOfGroupsDefs.Append( aGroupDef );
+
+ Handle(HYDROData_SplitShapesGroup) aSSGroup = Handle(HYDROData_SplitShapesGroup)::DownCast( anIter.Value() );
+ TopTools_SequenceOfShape dummy;
+ if (!aSSGroup.IsNull())
+ if (aSSGroup->GetInternal())
+ {
+ aSSGroup->GetShapes(dummy);
+ IntSh.Append(dummy);
+ }
+
}
// Get faces
bool isAllNotSubmersible = true;
- TopTools_ListOfShape aFaces;
- HYDROData_SequenceOfObjects aCaseRegions = GetRegions( false );
+ HYDROData_SequenceOfObjects aCaseRegions = GetRegions();
HYDROData_SequenceOfObjects::Iterator aRegionIter( aCaseRegions );
+ NCollection_IndexedDataMap<TopoDS_Shape, QString> aShToNames;
for ( ; aRegionIter.More(); aRegionIter.Next() )
{
Handle(HYDROData_Region) aRegion =
if ( isAllNotSubmersible )
isAllNotSubmersible = false;
- TopoDS_Shape aRegionShape = aRegion->GetShape( &aSeqOfGroupsDefs );
- aFaces.Append( aRegionShape );
+ TopoDS_Shape aRegionShape = aRegion->GetShape( &aSeqOfGroupsDefs, &IntSh );
+ aShToNames.Add( aRegionShape, aRegion->GetName() );
}
bool aRes = false;
} else if ( isAllNotSubmersible ) {
theErrorMsg = QString("there are no submersible regions.");
} else {
- aRes = Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs, theGeomObjEntry );;
+ aRes = Export( theGeomEngine, theStudy, aShToNames, aSeqOfGroupsDefs, theGeomObjEntry );;
}
+ if( aRes && !GetLandCoverMap().IsNull() && !GetStricklerTable().IsNull() )
+ {
+ QString aTelemacFileName = GetName() + ".telemac";
+ aRes = GetLandCoverMap()->ExportTelemac( aTelemacFileName, 1E-2, GetStricklerTable(), statMess );
+ if (!aRes)
+ theErrorMsg = QString( "The export to TELEMAC %1 failed" ).arg( aTelemacFileName );
+ }
return aRes;
}
bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
SALOMEDS::Study_ptr theStudy,
- const TopTools_ListOfShape& theFaces,
+ const NCollection_IndexedDataMap<TopoDS_Shape, QString>& aShToName,
const HYDROData_ShapesGroup::SeqOfGroupsDefs& theGroupsDefs,
QString& theGeomObjEntry ) const
{
TCollection_AsciiString aNam("Sh_");
int i=1;
#endif
- TopTools_ListIteratorOfListOfShape aFaceIter( theFaces );
- for ( ; aFaceIter.More(); aFaceIter.Next() )
+ TopTools_DataMapOfShapeListOfShape SH2M;
+ for ( int i = 1; i <= aShToName.Extent(); i++ )
{
- TopoDS_Shape aShape = aFaceIter.Value();
+ const TopoDS_Shape& aShape = aShToName.FindKey(i);
if ( aShape.IsNull() )
continue;
- if ( aShape.ShapeType() == TopAbs_FACE )
+ SH2M.Bind(aShape, TopTools_ListOfShape());
+ TopTools_ListOfShape& LM = SH2M.ChangeFind(aShape);
+ if ( aShape.ShapeType() == TopAbs_FACE || aShape.ShapeType() == TopAbs_SHELL )
{
aSewing.Add( aShape );
-#ifdef DEB_CALCULATION
- TCollection_AsciiString aName = aNam + ++i + ".brep";
- BRepTools::Write(aShape ,aName.ToCString());
-#endif
+ LM.Append(aShape);
}
- else
+ else if (aShape.ShapeType() == TopAbs_COMPOUND)
{
-#ifdef DEB_CALCULATION
- int j = 1;
-#endif
- TopExp_Explorer anExp( aShape, TopAbs_FACE );
- for (; anExp.More(); anExp.Next() ) {
+ TopExp_Explorer anExp( aShape, TopAbs_SHELL );
+ for (; anExp.More(); anExp.Next() )
+ {
aSewing.Add( anExp.Current() );
-#ifdef DEB_CALCULATION
-
- TCollection_AsciiString aName = aNam + i + "_" + ++j + ".brep";
- BRepTools::Write(anExp.Current() ,aName.ToCString());
-#endif
+ LM.Append(anExp.Current());
+ }
+ anExp.Init( aShape, TopAbs_FACE, TopAbs_SHELL );
+ for (; anExp.More(); anExp.Next() )
+ {
+ aSewing.Add( anExp.Current() );
+ LM.Append(anExp.Current());
}
}
} // faces iterator
aSewing.Perform();
TopoDS_Shape aSewedShape = aSewing.SewedShape();
+ NCollection_IndexedDataMap<TopoDS_Shape, QString, TopTools_ShapeMapHasher> aFacesToNameModif;
+
+ for ( int i = 1; i <= aShToName.Extent(); i++ )
+ {
+ const TopoDS_Shape& CurShape = aShToName.FindKey(i);
+ const QString& Qstr = aShToName.FindFromIndex(i);
+ const TopTools_ListOfShape& LM = SH2M(CurShape);
+ for (TopTools_ListIteratorOfListOfShape it(LM); it.More(); it.Next())
+ {
+ const TopoDS_Shape& csh = it.Value();
+ if (aSewing.IsModified(csh))
+ aFacesToNameModif.Add(aSewing.Modified(csh), Qstr);
+ else
+ aFacesToNameModif.Add(csh, Qstr);
+ }
+ }
+
+
// If the sewed shape is empty - return false
if ( aSewedShape.IsNull() || !TopoDS_Iterator( aSewedShape ).More() )
return false;
#ifdef DEB_CALCULATION
BRepTools::Write(aSewedShape ,"Sew.brep");
-#endif
- // Publish the sewed shape
+#endif // Publish the sewed shape
QString aName = EXPORT_NAME;
GEOM::GEOM_Object_ptr aMainShape =
- HYDROData_GeomTool::publishShapeInGEOM( theGeomEngine, theStudy, aSewedShape, aName, theGeomObjEntry );
+ HYDROData_GeomTool::ExplodeShapeInGEOMandPublish( theGeomEngine, theStudy, aSewedShape, aFacesToNameModif, aName, theGeomObjEntry );
if ( aMainShape->_is_nil() )
return false;
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 );
-
+ Handle(TDataStd_Integer) anAttr = TDataStd_Integer::Set( aModeLab, ( int ) theMode );
+ anAttr->SetID(TDataStd_Integer::GetID());
// Indicate model of the need to update splitting
Changed( Geom_2d );
}
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
{
HYDROData_SequenceOfObjects::Iterator anIter;
- anIter.Init( theRegions );
- for ( ; anIter.More(); anIter.Next() )
- {
- Handle(HYDROData_Region) aRegion =
- Handle(HYDROData_Region)::DownCast( anIter.Value() );
- if ( aRegion.IsNull() )
- continue;
-
- theTreatedObjects.insert( aRegion->GetName(), aRegion );
- QStringList aRegDump = aRegion->DumpToPython( theTreatedObjects );
- theResList << aRegDump;
- }
+ anIter.Init(theRegions);
+ for (int ireg = 1; anIter.More(); anIter.Next(), ireg++)
+ {
+ Handle(HYDROData_Region) aRegion = Handle(HYDROData_Region)::DownCast(anIter.Value());
+ if (aRegion.IsNull())
+ continue;
+ QString defRegName = this->GetName();
+ QString regSuffix = QString("_Reg_%1").arg(ireg);
+ defRegName += regSuffix;
+ theTreatedObjects.insert(aRegion->GetName(), aRegion);
+ QStringList aRegDump = aRegion->DumpToPython(thePyScriptPath, theTreatedObjects, defRegName);
+ theResList << aRegDump;
+ }
+ for (anIter.Init(theRegions); anIter.More(); anIter.Next())
+ {
+ Handle(HYDROData_Region) aRegion = Handle(HYDROData_Region)::DownCast(anIter.Value());
+ if (aRegion.IsNull())
+ continue;
+ QStringList aRegDump;
+ aRegion->SetNameInDumpPython(aRegDump);
+ theResList << aRegDump;
+ }
}
bool HYDROData_CalculationCase::GetRule( int theIndex,
theObject1, thePriority, theObject2, theMergeType );
}
-void HYDROData_CalculationCase::SetAssignmentLandCoverMode( AssignmentMode theMode )
+bool HYDROData_CalculationCase::AddInterPoly( const Handle(HYDROData_PolylineXY)& theInterPolyline )
{
- TDF_Label aModeLab = myLab.FindChild( DataTag_AssignmentLandCoverMode );
- TDataStd_Integer::Set( aModeLab, ( int ) theMode );
+ HYDROData_CalculationCase::DataTag aDataTag = DataTag_InterPoly;
- // Indicate model of the need to update land covers partition
- Changed( Geom_No );
+ if ( HasReference( theInterPolyline, aDataTag ) )
+ return false;
+
+ AddReferenceObject( theInterPolyline, aDataTag );
+
+ Changed( Geom_2d );
+
+ return true;
}
-HYDROData_CalculationCase::AssignmentMode HYDROData_CalculationCase::GetAssignmentLandCoverMode() const
+HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetInterPolyObjects() 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;
+ return GetReferenceObjects( DataTag_InterPoly );
}
+
+void HYDROData_CalculationCase::RemoveInterPolyObject( const Handle(HYDROData_PolylineXY)& theInterPolyline )
+{
+ if ( theInterPolyline.IsNull() )
+ return;
+
+ RemoveReferenceObject( theInterPolyline->Label(), DataTag_InterPoly );
+
+ Changed( Geom_2d );
+}
+
+bool HYDROData_CalculationCase::AddBoundaryPolygon( const Handle(HYDROData_BCPolygon)& theBCPolygon )
+{
+ HYDROData_CalculationCase::DataTag aDataTag = DataTag_BCPolygon;
+
+ if ( HasReference( theBCPolygon, aDataTag ) )
+ return false;
+
+ AddReferenceObject( theBCPolygon, aDataTag );
+
+ Changed( Geom_2d );
+
+ return true;
+}
+
+HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetBoundaryPolygons() const
+{
+ return GetReferenceObjects( DataTag_BCPolygon );
+}
+
+void HYDROData_CalculationCase::RemoveBoundaryPolygon( const Handle(HYDROData_BCPolygon)& theBCPolygon )
+{
+ if ( theBCPolygon.IsNull() )
+ return;
+
+ RemoveReferenceObject( theBCPolygon->Label(), DataTag_BCPolygon );
+
+ Changed( Geom_2d );
+}
+
+
+
+
