#define EXPORT_NAME "HYDRO_" + GetName()
+#ifndef LIGHT_MODE
#include <SALOME_NamingService.hxx>
#include <SALOME_LifeCycleCORBA.hxx>
+#endif
#define _DEVDEBUG_
#include "HYDRO_trace.hxx"
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 );
}
Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
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 );
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 )
{
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;
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() ) {
}
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();
//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 );
+ aResAltitude = GetAltitudeForPoint( thePoint, aZone, theMethod );
}
}
else
}
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();
else
{
//DEBTRACE("aZoneInterpolator == NULL");
- aPointAltitude = anObjAltitude->GetAltitudeForPoint( thePoint );
+ aPointAltitude = anObjAltitude->GetAltitudeForPoint( thePoint, theMethod );
}
if ( ValuesEquals( aPointAltitude, HYDROData_IAltitudeObject::GetInvalidAltitude() ) )
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());
+ 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 );
- double anAltitude = GetAltitudeForPoint( thePnt, theRegion );
+ double anAltitude = GetAltitudeForPoint( thePnt, theRegion, theMethod );
aResSeq.Append( anAltitude );
}
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 );
}
return aCoeff;
}
+std::vector<double> HYDROData_CalculationCase::GetStricklerCoefficientForPoints(const std::vector<gp_XY>& thePoints,
+ double DefValue, bool UseMax ) const
+{
+ Handle( HYDROData_LandCoverMap ) aLCM = GetLandCoverMap();
+ Handle( HYDROData_StricklerTable ) aTable = GetStricklerTable();
+ std::vector<double> theCoeffs;
+ if( aLCM.IsNull() || aTable.IsNull() )
+ return theCoeffs;
+
+ aLCM->ClassifyPoints(thePoints, aTable, theCoeffs, DefValue, UseMax );
+
+ return theCoeffs;
+}
+
Handle(HYDROData_Region) HYDROData_CalculationCase::GetRegionFromPoint( const gp_XY& thePoint ) const
{
Handle(HYDROData_Region) aResRegion;
AddRegion( aNewRegion );
QString aRegionName = isPrefix ? HYDROData_Tool::GenerateObjectName( theDoc, thePrefixOrName ) : thePrefixOrName;
- aNewRegion->SetName( aRegionName );
+ aNewRegion->SetName( aRegionName, true );
return aNewRegion;
}
// Get faces
bool isAllNotSubmersible = true;
- TopTools_ListOfShape aFaces;
HYDROData_SequenceOfObjects aCaseRegions = GetRegions();
HYDROData_SequenceOfObjects::Iterator aRegionIter( aCaseRegions );
+ NCollection_IndexedDataMap<TopoDS_Shape, QString> aFacesToNames;
for ( ; aRegionIter.More(); aRegionIter.Next() )
{
Handle(HYDROData_Region) aRegion =
isAllNotSubmersible = false;
TopoDS_Shape aRegionShape = aRegion->GetShape( &aSeqOfGroupsDefs );
- aFaces.Append( aRegionShape );
+ aFacesToNames.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, aFacesToNames, aSeqOfGroupsDefs, theGeomObjEntry );;
}
if( aRes && !GetLandCoverMap().IsNull() && !GetStricklerTable().IsNull() )
bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
SALOMEDS::Study_ptr theStudy,
- const TopTools_ListOfShape& theFaces,
+ const NCollection_IndexedDataMap<TopoDS_Shape, QString>& aFacesToName,
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() )
+ for ( int i = 1; i <= aFacesToName.Extent(); i++ )
{
- TopoDS_Shape aShape = aFaceIter.Value();
+ const TopoDS_Shape& aShape = aFacesToName.FindKey(i);
if ( aShape.IsNull() )
continue;
aSewing.Perform();
TopoDS_Shape aSewedShape = aSewing.SewedShape();
+ NCollection_IndexedDataMap<TopoDS_Shape, QString> aFacesToNameModif;
+
+ for ( int i = 1; i <= aFacesToName.Extent(); i++ )
+ {
+ const TopoDS_Shape& CurShape = aFacesToName.FindKey(i);
+ const QString& Qstr = aFacesToName.FindFromIndex(i);
+ if (aSewing.IsModified(CurShape))
+ aFacesToNameModif.Add(aSewing.Modified(CurShape), Qstr);
+ else
+ aFacesToNameModif.Add(CurShape, Qstr);
+ }
+
+
// If the sewed shape is empty - return false
if ( aSewedShape.IsNull() || !TopoDS_Iterator( aSewedShape ).More() )
return false;
// 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;
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( thePyScriptPath, 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,
return HYDROData_PriorityQueue::GetRule( aRulesLab, theIndex,
theObject1, thePriority, theObject2, theMergeType );
}
+
+bool HYDROData_CalculationCase::AddInterPoly( const Handle(HYDROData_PolylineXY)& theInterPolyline )
+{
+ HYDROData_CalculationCase::DataTag aDataTag = DataTag_InterPoly;
+
+ if ( HasReference( theInterPolyline, aDataTag ) )
+ return false;
+
+ AddReferenceObject( theInterPolyline, aDataTag );
+
+ return true;
+}
+
+HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetInterPolyObjects() const
+{
+ return GetReferenceObjects( DataTag_InterPoly );
+}
+
+void HYDROData_CalculationCase::RemoveInterPolyObject( const Handle(HYDROData_PolylineXY)& theInterPolyline )
+{
+ if ( theInterPolyline.IsNull() )
+ return;
+
+ RemoveReferenceObject( theInterPolyline->Label(), DataTag_InterPoly );
+
+}
+
+
+
