// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#include "HYDROData_CalculationCase.h"
+#ifdef WIN32
+ #pragma warning ( disable: 4251 )
+#endif
+#include "HYDROData_CalculationCase.h"
#include "HYDROData_ArtificialObject.h"
#include "HYDROData_IAltitudeObject.h"
#include "HYDROData_Document.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
#include <BRepBuilderAPI_MakeVertex.hxx>
#endif
+#ifdef WIN32
+ #pragma warning ( default: 4251 )
+#endif
+
#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)
QString aCalculName = GetObjPyName();
- AssignmentMode aMode = GetAssignmentMode();
+ AssignmentMode aMode = GetAssignmentMode();
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() )
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 ) );
+ DumpRegionsToPython( aResList, theTreatedObjects, GetRegions( false ) );
+ }
+
+ if( aModeLC==MANUAL )
+ {
+ // Now we restore the
// - land cover regions and zones order
DumpRegionsToPython( aResList, theTreatedObjects, GetRegions( true ) );
}
return;
// Split to zones
- Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
- HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
- if ( aGeomObjects.IsEmpty() )
- return;
-
- HYDROData_SequenceOfObjects aGeomGroups = GetGeometryGroups();
-
- HYDROData_SplitToZonesTool::SplitDataList aSplitObjects =
- HYDROData_SplitToZonesTool::Split( aGeomObjects, aGeomGroups, aBoundaryPolyline );
- if ( aSplitObjects.isEmpty() )
- return;
-
HYDROData_SplitToZonesTool::SplitDataList aZonesList, anEdgesList;
- 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 )
- anEdgesList.append( aSplitData );
+ Handle(HYDROData_PolylineXY) aBoundaryPolyline = GetBoundaryPolyline();
+ HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
+ if ( !aGeomObjects.IsEmpty() ) {
+ HYDROData_SequenceOfObjects aGeomGroups = GetGeometryGroups();
+
+ HYDROData_SplitToZonesTool::SplitDataList aSplitObjects =
+ HYDROData_SplitToZonesTool::Split( aGeomObjects, aGeomGroups, aBoundaryPolyline );
+ 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 )
+ anEdgesList.append( aSplitData );
+ }
+ }
}
- // TODO: Split to land cover zones
- /*HYDROData_SequenceOfObjects aLandCovers = GetLandCovers();
- if ( aLandCovers.IsEmpty() )
- return;
-
- HYDROData_SplitToZonesTool::SplitDataList aSplitLandCoverObjects =
- HYDROData_SplitToZonesTool::Split( aLandCovers, ... );
- if ( aSplitLandCoverObjects.isEmpty() )
- return;
-
- HYDROData_SplitToZonesTool::SplitDataList aLandCoverZonesList, aLandCoverEdgesList;
+ // 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 );
+ }
+ }
+ }
- HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitLandCoverObjects );
- while( anIter.hasNext() )
+ switch( GetAssignmentMode() )
{
- const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
- if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Zone )
- aLandCoverZonesList.append( aSplitData );
- else if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Edge )
- aLandCoverEdgesList.append( aSplitData );
- }*/
+ case MANUAL:
+ CreateRegionsDef( aDocument, aZonesList, false );
+ break;
+ case AUTOMATIC:
+ CreateRegionsAuto( aDocument, aZonesList, false );
+ break;
+ }
- switch( GetAssignmentMode() )
+ switch( GetAssignmentLandCoverMode() )
{
case MANUAL:
- CreateRegionsDef( aDocument, aZonesList, false );
- // TODO: Create land cover regions in manual mode
- //CreateRegionsDef( aDocument, aLandCoverZonesList, true );
+ CreateRegionsDef( aDocument, aLandCoverZonesList, true );
break;
case AUTOMATIC:
- CreateRegionsAuto( aDocument, aZonesList, false );
- // TODO: Create land cover regions in automatic mode
- //CreateRegionsAuto( aDocument, aLandCoverZonesList, true );
+ CreateRegionsAuto( aDocument, aLandCoverZonesList, true );
break;
}
+
CreateEdgeGroupsDef( aDocument, anEdgesList );
- // TODO: Process land cover edges
- //CreateEdgeGroupsDef( aDocument, aLandCoverEdgesList );
}
void HYDROData_CalculationCase::CreateRegionsDef( const Handle(HYDROData_Document)& theDoc,
{
// Create result regions for case, by default one zone for one region
QString aRegsPref = CALCULATION_REGIONS_PREF;
- QString aZonesPref = CALCULATION_ZONES_PREF;
+ QString aZonesPref = theLandCover ? CALCULATION_LANDCOVER_ZONES_PREF : CALCULATION_ZONES_PREF;
HYDROData_SplitToZonesTool::SplitDataListIterator anIter( theZones );
while( anIter.hasNext() )
const HYDROData_SplitToZonesTool::SplitDataList& theZones,
const bool theLandCover )
{
+ DEBTRACE("HYDROData_CalculationCase::CreateRegionsAuto");
QMap<QString, Handle(HYDROData_Region)> aRegionsMap; //object name to region
QMap<QString, QString> aRegionNameToObjNameMap;
- QString aZonesPref = CALCULATION_ZONES_PREF;
- HYDROData_PriorityQueue aPr( this, DataTag_CustomRules );
+ QString aZonesPref = theLandCover ? CALCULATION_LANDCOVER_ZONES_PREF : CALCULATION_ZONES_PREF;
+ HYDROData_PriorityQueue aPr( this, theLandCover ? DataTag_CustomLandCoverRules : DataTag_CustomRules );
// 1. First we create a default region for each object included into the calculation case
- HYDROData_SequenceOfObjects aGeomObjects = GetGeometryObjects();
- for( int i=aGeomObjects.Lower(), n=aGeomObjects.Upper(); i<=n; i++ )
+ HYDROData_SequenceOfObjects anObjects = theLandCover ? GetLandCovers() : GetGeometryObjects();
+ for( int i = anObjects.Lower(), n = anObjects.Upper(); i<=n; i++ )
{
- Handle(HYDROData_Object) anObj = Handle(HYDROData_Object)::DownCast( aGeomObjects.Value( i ) );
+ Handle(HYDROData_Entity) anObj = anObjects.Value( i );
if( anObj.IsNull() )
continue;
QString anObjName = anObj->GetName();
while( anIter.hasNext() )
{
const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next();
- HYDROData_Zone::MergeAltitudesType aMergeType;
- Handle(HYDROData_Object) aRegObj =
- Handle(HYDROData_Object)::DownCast( aPr.GetMostPriorityObject( aSplitData.ObjectNames, aMergeType ) );
+ HYDROData_Zone::MergeType aMergeType;
+ Handle(HYDROData_Entity) aRegObj = aPr.GetMostPriorityObject( aSplitData.ObjectNames, aMergeType );
if( aRegObj.IsNull() )
continue;
Handle(HYDROData_Region) aRegion = aRegionsMap[aRegObj->GetName()];
qDebug( "Error in algorithm: unresolved conflicts" );
}
+ Handle(HYDROData_Entity) aMergeEntity = aRegObj;
+ if ( !theLandCover ) {
+ Handle(HYDROData_Object) aMergeObject = Handle(HYDROData_Object)::DownCast( aMergeEntity );
+ if ( !aMergeObject.IsNull() ) {
+ DEBTRACE("aMergeEntity " << aMergeEntity->GetName().toStdString());
+ aMergeEntity = aMergeObject->GetAltitudeObject();
+ }
+ }
+
switch( aMergeType )
{
case HYDROData_Zone::Merge_ZMIN:
break;
case HYDROData_Zone::Merge_Object:
aRegionZone->SetMergeType( aMergeType );
- aRegionZone->RemoveMergeAltitude();
- aRegionZone->SetMergeAltitude( aRegObj->GetAltitudeObject() );
+ aRegionZone->RemoveMergeObject();
+ aRegionZone->SetMergeObject( aMergeEntity );
break;
}
}
if ( theRegion.IsNull() )
return false;
- if ( HasReference( theRegion, DataTag_Region ) )
+ HYDROData_CalculationCase::DataTag aDataTag =
+ theLandCover ? DataTag_LandCoverRegion : DataTag_Region;
+
+ if ( HasReference( theRegion, aDataTag ) )
return false; // Object is already in reference list
// Move the region from other calculation
Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF, theLandCover );
theRegion->CopyTo( aNewRegion );
- aFatherCalc->RemoveRegion( theRegion );
+ aFatherCalc->RemoveRegion( theRegion, theLandCover );
theRegion->SetLabel( aNewRegion->Label() );
}
else
{
- AddReferenceObject( theRegion, DataTag_Region );
+ AddReferenceObject( theRegion, aDataTag );
}
return true;
return;
HYDROData_SequenceOfObjects aRegions = GetRegions( false );
- aRegions.Append( GetRegions( true ) );
+ HYDROData_SequenceOfObjects aRegionsLC = GetRegions( true );
+ aRegions.Append( aRegionsLC );
HYDROData_SequenceOfObjects::Iterator anIter( aRegions );
for ( ; anIter.More(); anIter.Next() )
}
}
-void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& theRegion )
+void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& theRegion,
+ const bool theLandCover )
{
if ( theRegion.IsNull() )
return;
- RemoveReferenceObject( theRegion->Label(), DataTag_Region );
+ HYDROData_CalculationCase::DataTag aDataTag =
+ theLandCover ? DataTag_LandCoverRegion : DataTag_Region;
+ RemoveReferenceObject( theRegion->Label(), aDataTag );
// Remove region from data model
Handle(HYDROData_CalculationCase) aFatherCalc =
Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint, false );
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::MergeAltitudesType aZoneMergeType = theZone->GetMergeType();
+ 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;
}
HYDROData_IInterpolator* aZoneInterpolator = theZone->GetInterpolator();
if ( aZoneMergeType == HYDROData_Zone::Merge_Object )
{
- Handle(HYDROData_IAltitudeObject) aMergeAltitude = theZone->GetMergeAltitude();
+ Handle(HYDROData_IAltitudeObject) aMergeAltitude =
+ Handle(HYDROData_IAltitudeObject)::DownCast( theZone->GetMergeObject() );
if ( !aMergeAltitude.IsNull() )
{
if ( aZoneInterpolator != NULL )
{
+ DEBTRACE("aZoneInterpolator != NULL");
aZoneInterpolator->SetAltitudeObject( aMergeAltitude );
aResAltitude = aZoneInterpolator->GetAltitudeForPoint( thePoint );
}
else
+ {
+ DEBTRACE("aZoneInterpolator == NULL");
aResAltitude = aMergeAltitude->GetAltitudeForPoint( thePoint );
+ }
}
}
else
{
- HYDROData_SequenceOfObjects aZoneObjects = theZone->GetGeometryObjects();
+ 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 )
return aResSeq;
}
+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;
+}
+
Handle(HYDROData_Region) HYDROData_CalculationCase::GetRegionFromPoint( const gp_XY& thePoint,
const bool theLandCover ) const
{
GEOM::GEOM_Gen_var aGEOMEngine = HYDROData_GeomTool::GetGeomGen();
SALOMEDS::Study_var aDSStudy = HYDROData_GeomTool::GetStudyByID( theStudyId );
- QString aGeomObjEntry;
- bool isOK = Export( aGEOMEngine, aDSStudy, aGeomObjEntry );
+ QString aGeomObjEntry, anErrorMsg;
+ bool isOK = Export( aGEOMEngine, aDSStudy, aGeomObjEntry, anErrorMsg );
return isOK ? aGeomObjEntry : QString();
}
bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
SALOMEDS::Study_ptr theStudy,
- QString& theGeomObjEntry ) const
+ QString& theGeomObjEntry,
+ QString& theErrorMsg ) const
{
HYDROData_ShapesGroup::SeqOfGroupsDefs aSeqOfGroupsDefs;
}
// Get faces
+ bool isAllNotSubmersible = true;
TopTools_ListOfShape aFaces;
HYDROData_SequenceOfObjects aCaseRegions = GetRegions( false );
- // TODO: process land cover faces
- //aCaseRegions.Append( GetRegions( true ) );
HYDROData_SequenceOfObjects::Iterator aRegionIter( aCaseRegions );
for ( ; aRegionIter.More(); aRegionIter.Next() )
{
Handle(HYDROData_Region)::DownCast( aRegionIter.Value() );
if( aRegion.IsNull() || !aRegion->IsSubmersible() )
continue;
+
+ if ( isAllNotSubmersible )
+ isAllNotSubmersible = false;
TopoDS_Shape aRegionShape = aRegion->GetShape( &aSeqOfGroupsDefs );
aFaces.Append( aRegionShape );
}
- return Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs, theGeomObjEntry );
+ bool aRes = false;
+
+ if ( aCaseRegions.IsEmpty() ) {
+ theErrorMsg = QString("the list of regions is empty.");
+ } else if ( isAllNotSubmersible ) {
+ theErrorMsg = QString("there are no submersible regions.");
+ } else {
+ aRes = Export( theGeomEngine, theStudy, aFaces, aSeqOfGroupsDefs, theGeomObjEntry );;
+ }
+
+ return aRes;
}
bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine,
// Publish the sewed shape
QString aName = EXPORT_NAME;
GEOM::GEOM_Object_ptr aMainShape =
- publishShapeInGEOM( theGeomEngine, theStudy, aSewedShape, aName, theGeomObjEntry );
+ HYDROData_GeomTool::publishShapeInGEOM( theGeomEngine, theStudy, aSewedShape, aName, theGeomObjEntry );
if ( aMainShape->_is_nil() )
return false;
return true;
}
-GEOM::GEOM_Object_ptr HYDROData_CalculationCase::publishShapeInGEOM(
- GEOM::GEOM_Gen_var theGeomEngine, SALOMEDS::Study_ptr theStudy,
- const TopoDS_Shape& theShape, const QString& theName,
- QString& theGeomObjEntry ) const
-{
- theGeomObjEntry = "";
- GEOM::GEOM_Object_var aGeomObj;
-
- if ( theGeomEngine->_is_nil() || theStudy->_is_nil() ||
- theShape.IsNull() ) {
- return aGeomObj._retn();
- }
-
- std::ostringstream aStreamShape;
- // Write TopoDS_Shape in ASCII format to the stream
- BRepTools::Write( theShape, aStreamShape );
- // Returns the number of bytes that have been stored in the stream's buffer.
- int aSize = aStreamShape.str().size();
- // Allocate octect buffer of required size
- CORBA::Octet* anOctetBuf = SALOMEDS::TMPFile::allocbuf( aSize );
- // Copy ostrstream content to the octect buffer
- memcpy( anOctetBuf, aStreamShape.str().c_str(), aSize );
- // Create TMPFile
- SALOMEDS::TMPFile_var aSeqFile = new SALOMEDS::TMPFile( aSize, aSize, anOctetBuf, 1 );
-
- // Restore shape from the stream and get the GEOM object
- GEOM::GEOM_IInsertOperations_var anInsOp = theGeomEngine->GetIInsertOperations( theStudy->StudyId() );
- aGeomObj = anInsOp->RestoreShape( aSeqFile );
-
- // Puplish the GEOM object
- if ( !aGeomObj->_is_nil() ) {
- QString aName = HYDROData_GeomTool::GetFreeName( theStudy, theName );
-
- SALOMEDS::SObject_var aResultSO =
- theGeomEngine->PublishInStudy( theStudy, SALOMEDS::SObject::_nil(),
- aGeomObj, qPrintable( aName ) );
- if ( aResultSO->_is_nil() ) {
- aGeomObj = GEOM::GEOM_Object::_nil();
- }
- else
- theGeomObjEntry = aResultSO->GetID();
- }
-
- return aGeomObj._retn();
-}
-
void HYDROData_CalculationCase::ClearRules( HYDROData_CalculationCase::DataTag theDataTag,
const bool theIsSetToUpdate )
{
void HYDROData_CalculationCase::AddRule( const Handle(HYDROData_Entity)& theObject1,
HYDROData_PriorityType thePriority,
const Handle(HYDROData_Entity)& theObject2,
- HYDROData_Zone::MergeAltitudesType theMergeType,
+ HYDROData_Zone::MergeType theMergeType,
HYDROData_CalculationCase::DataTag theDataTag )
{
TDF_Label aRulesLab = myLab.FindChild( theDataTag );
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 );
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;
Handle(HYDROData_Entity)& theObject1,
HYDROData_PriorityType& thePriority,
Handle(HYDROData_Entity)& theObject2,
- HYDROData_Zone::MergeAltitudesType& theMergeType,
+ HYDROData_Zone::MergeType& theMergeType,
HYDROData_CalculationCase::DataTag& theDataTag) const
{
TDF_Label aRulesLab = myLab.FindChild( theDataTag );
