X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_CalculationCase.cxx;h=3d3d918b7521712f904aba29a71516aba1fa2466;hb=545854182f0363f61284d5abe34c3627d4f3b088;hp=1bd1057d6dd42ccc548a86640b9901e5ff4e2f9b;hpb=f7598de0de5abad3f557c8b2c52d0e0163a0951c;p=modules%2Fhydro.git diff --git a/src/HYDROData/HYDROData_CalculationCase.cxx b/src/HYDROData/HYDROData_CalculationCase.cxx index 1bd1057d..3d3d918b 100644 --- a/src/HYDROData/HYDROData_CalculationCase.cxx +++ b/src/HYDROData/HYDROData_CalculationCase.cxx @@ -17,7 +17,6 @@ // #include "HYDROData_CalculationCase.h" - #include "HYDROData_ArtificialObject.h" #include "HYDROData_IAltitudeObject.h" #include "HYDROData_Document.h" @@ -26,13 +25,23 @@ #include "HYDROData_NaturalObject.h" #include "HYDROData_PolylineXY.h" #include "HYDROData_StricklerTable.h" -#include "HYDROData_LandCover.h" +#include "HYDROData_LandCoverMap.h" #include "HYDROData_SplittedShapesGroup.h" #include "HYDROData_Region.h" #include "HYDROData_Tool.h" #include "HYDROData_GeomTool.h" +#ifdef WIN32 + #pragma warning ( disable: 4251 ) +#endif + +#ifndef LIGHT_MODE #include +#endif + +#ifdef WIN32 + #pragma warning ( default: 4251 ) +#endif #include @@ -60,7 +69,6 @@ #endif #define CALCULATION_REGIONS_PREF GetName() + "_Reg" #define CALCULATION_ZONES_PREF GetName() + "_Zone" -#define CALCULATION_LANDCOVER_ZONES_PREF GetName() + "_LandCoverZone" #define CALCULATION_GROUPS_PREF GetName() + "_" //#define DEB_CLASS2D 1 #ifdef DEB_CLASS2D @@ -73,7 +81,7 @@ 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 ) { } @@ -87,9 +95,7 @@ void HYDROData_CalculationCase::SetName( const QString& theName ) if ( anOldCaseName != theName ) { // Update names of regions and its zones - UpdateRegionsNames( GetRegions( false ), anOldCaseName, theName ); - // Update names of land cover regions and its zones - UpdateRegionsNames( GetRegions( true ), anOldCaseName, theName ); + UpdateRegionsNames( GetRegions(), anOldCaseName, theName ); HYDROData_SequenceOfObjects aGroups = GetSplittedGroups(); @@ -116,7 +122,7 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre 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 ); @@ -167,9 +173,7 @@ QStringList HYDROData_CalculationCase::DumpToPython( MapOfTreatedObjects& theTre { // Now we restore the // - regions and zones order - DumpRegionsToPython( aResList, theTreatedObjects, GetRegions( false ) ); - // - land cover regions and zones order - DumpRegionsToPython( aResList, theTreatedObjects, GetRegions( true ) ); + DumpRegionsToPython( aResList, theTreatedObjects, GetRegions() ); } // Export calculation case @@ -241,14 +245,13 @@ HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetAllReferenceObjects() 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; } @@ -258,8 +261,7 @@ void HYDROData_CalculationCase::Update() SetWarning(); // At first we remove previously created objects - RemoveRegions( false ); - RemoveRegions( true ); + RemoveRegions(); RemoveSplittedGroups(); Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); @@ -288,51 +290,32 @@ void HYDROData_CalculationCase::Update() } } - // Split to land cover zones - HYDROData_SplitToZonesTool::SplitDataList aLandCoverZonesList; - - HYDROData_SequenceOfObjects aLandCovers = GetLandCovers(); - if ( !aLandCovers.IsEmpty() ) { - HYDROData_SplitToZonesTool::SplitDataList aSplitLandCoverObjects = - HYDROData_SplitToZonesTool::Split( aLandCovers ); - if ( !aSplitLandCoverObjects.isEmpty() ) { - HYDROData_SplitToZonesTool::SplitDataListIterator anIter( aSplitLandCoverObjects ); - while( anIter.hasNext() ) { - const HYDROData_SplitToZonesTool::SplitData& aSplitData = anIter.next(); - if ( aSplitData.Type == HYDROData_SplitToZonesTool::SplitData::Data_Zone ) - aLandCoverZonesList.append( aSplitData ); - } - } - } - switch( GetAssignmentMode() ) { case MANUAL: - CreateRegionsDef( aDocument, aZonesList, false ); - CreateRegionsDef( aDocument, aLandCoverZonesList, true ); + CreateRegionsDef( aDocument, aZonesList ); break; case AUTOMATIC: - CreateRegionsAuto( aDocument, aZonesList, false ); - CreateRegionsAuto( aDocument, aLandCoverZonesList, true ); + CreateRegionsAuto( aDocument, aZonesList ); break; } + CreateEdgeGroupsDef( aDocument, anEdgesList ); } 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 ); @@ -340,16 +323,15 @@ void HYDROData_CalculationCase::CreateRegionsDef( const Handle(HYDROData_Documen } void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Document)& theDoc, - const HYDROData_SplitToZonesTool::SplitDataList& theZones, - const bool theLandCover ) + const HYDROData_SplitToZonesTool::SplitDataList& theZones ) { QMap aRegionsMap; //object name to region QMap aRegionNameToObjNameMap; - QString aZonesPref = theLandCover ? CALCULATION_LANDCOVER_ZONES_PREF : CALCULATION_ZONES_PREF; - HYDROData_PriorityQueue aPr( this, theLandCover ? DataTag_CustomLandCoverRules : DataTag_CustomRules ); + QString aZonesPref = CALCULATION_ZONES_PREF; + HYDROData_PriorityQueue aPr( this, DataTag_CustomRules ); // 1. First we create a default region for each object included into the calculation case - HYDROData_SequenceOfObjects anObjects = theLandCover ? GetLandCovers() : GetGeometryObjects(); + HYDROData_SequenceOfObjects anObjects = GetGeometryObjects(); for( int i = anObjects.Lower(), n = anObjects.Upper(); i<=n; i++ ) { Handle(HYDROData_Entity) anObj = anObjects.Value( i ); @@ -357,7 +339,7 @@ void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Docume continue; QString anObjName = anObj->GetName(); QString aRegName = anObjName + "_reg"; - Handle(HYDROData_Region) aRegion = addNewRegion( theDoc, aRegName, theLandCover, false ); + Handle(HYDROData_Region) aRegion = addNewRegion( theDoc, aRegName, false ); aRegionsMap.insert( anObjName, aRegion ); aRegionNameToObjNameMap.insert( aRegName, anObjName ); } @@ -383,11 +365,9 @@ void HYDROData_CalculationCase::CreateRegionsAuto( const Handle(HYDROData_Docume } Handle(HYDROData_Entity) aMergeEntity = aRegObj; - if ( !theLandCover ) { - Handle(HYDROData_Object) aMergeObject = Handle(HYDROData_Object)::DownCast( aMergeEntity ); - if ( !aMergeObject.IsNull() ) { - aMergeEntity = aMergeObject->GetAltitudeObject(); - } + Handle(HYDROData_Object) aMergeObject = Handle(HYDROData_Object)::DownCast( aMergeEntity ); + if ( !aMergeObject.IsNull() ) { + aMergeEntity = aMergeObject->GetAltitudeObject(); } switch( aMergeType ) @@ -473,7 +453,7 @@ bool HYDROData_CalculationCase::AddGeometryObject( const Handle(HYDROData_Object AddReferenceObject( theObject, DataTag_GeometryObject ); // Indicate model of the need to update splitting - SetToUpdate( true ); + Changed( Geom_2d ); return true; } @@ -491,7 +471,7 @@ void HYDROData_CalculationCase::RemoveGeometryObject( const Handle(HYDROData_Obj RemoveReferenceObject( theObject->Label(), DataTag_GeometryObject ); // Indicate model of the need to update splitting - SetToUpdate( true ); + Changed( Geom_2d ); } void HYDROData_CalculationCase::RemoveGeometryObjects() @@ -499,7 +479,7 @@ 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 ) @@ -513,7 +493,7 @@ bool HYDROData_CalculationCase::AddGeometryGroup( const Handle(HYDROData_ShapesG AddReferenceObject( theGroup, DataTag_GeometryGroup ); // Indicate model of the need to update splitting - SetToUpdate( true ); + Changed( Geom_Groups ); return true; } @@ -531,7 +511,7 @@ void HYDROData_CalculationCase::RemoveGeometryGroup( const Handle(HYDROData_Shap RemoveReferenceObject( theGroup->Label(), DataTag_GeometryGroup ); // Indicate model of the need to update splitting - SetToUpdate( true ); + Changed( Geom_Groups ); } void HYDROData_CalculationCase::RemoveGeometryGroups() @@ -539,7 +519,7 @@ 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 ) @@ -549,7 +529,8 @@ void HYDROData_CalculationCase::SetBoundaryPolyline( const Handle(HYDROData_Poly 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 @@ -565,7 +546,7 @@ void HYDROData_CalculationCase::RemoveBoundaryPolyline() 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 ) @@ -575,7 +556,8 @@ void HYDROData_CalculationCase::SetStricklerTable( const Handle(HYDROData_Strick 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 @@ -591,51 +573,23 @@ void HYDROData_CalculationCase::RemoveStricklerTable() ClearReferenceObjects( DataTag_StricklerTable ); // Indicate model of the need to update land covers partition - SetToUpdate( !aPrevStricklerTable.IsNull() || IsMustBeUpdated() ); -} - -bool HYDROData_CalculationCase::AddLandCover( const Handle(HYDROData_LandCover)& theLandCover ) -{ - if ( HasReference( theLandCover, DataTag_LandCover ) ) - return false; // Land cover is already in reference list - - AddReferenceObject( theLandCover, DataTag_LandCover ); - - // Indicate model of the need to update land covers partition - SetToUpdate( true ); - - return true; -} - -HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetLandCovers() const -{ - return GetReferenceObjects( DataTag_LandCover ); -} - -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 ); + Changed( Geom_No ); } -void HYDROData_CalculationCase::RemoveLandCovers() +Handle(HYDROData_LandCoverMap) HYDROData_CalculationCase::GetLandCoverMap() const { - ClearReferenceObjects( DataTag_LandCover ); - - // Indicate model of the need to update land cover partition - SetToUpdate( true ); + // TODO + Handle(HYDROData_LandCoverMap) aLandCoverMap = NULL; + return aLandCoverMap; } -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; @@ -644,16 +598,14 @@ Handle(HYDROData_Region) HYDROData_CalculationCase::AddNewRegion( const Handle(H return aNewRegion; } -bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRegion, - const bool theLandCover ) +bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRegion ) { Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( myLab ); if ( theRegion.IsNull() ) return false; - HYDROData_CalculationCase::DataTag aDataTag = - theLandCover ? DataTag_LandCoverRegion : DataTag_Region; + HYDROData_CalculationCase::DataTag aDataTag = DataTag_Region; if ( HasReference( theRegion, aDataTag ) ) return false; // Object is already in reference list @@ -663,10 +615,10 @@ bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRe Handle(HYDROData_CalculationCase)::DownCast( theRegion->GetFatherObject() ); if ( !aFatherCalc.IsNull() && aFatherCalc->Label() != myLab ) { - Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF, theLandCover ); - theRegion->CopyTo( aNewRegion ); + Handle(HYDROData_Region) aNewRegion = addNewRegion( aDocument, CALCULATION_REGIONS_PREF ); + theRegion->CopyTo( aNewRegion, true ); - aFatherCalc->RemoveRegion( theRegion, theLandCover ); + aFatherCalc->RemoveRegion( theRegion ); theRegion->SetLabel( aNewRegion->Label() ); } @@ -678,9 +630,9 @@ bool HYDROData_CalculationCase::AddRegion( const Handle(HYDROData_Region)& theRe return true; } -HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetRegions( const bool theLandCover ) const +HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetRegions() const { - return GetReferenceObjects( theLandCover ? DataTag_LandCoverRegion : DataTag_Region ); + return GetReferenceObjects( DataTag_Region ); } void HYDROData_CalculationCase::UpdateRegionsOrder() @@ -689,9 +641,7 @@ void HYDROData_CalculationCase::UpdateRegionsOrder() if ( aDocument.IsNull() ) return; - HYDROData_SequenceOfObjects aRegions = GetRegions( false ); - aRegions.Append( GetRegions( true ) ); - + HYDROData_SequenceOfObjects aRegions = GetRegions(); HYDROData_SequenceOfObjects::Iterator anIter( aRegions ); for ( ; anIter.More(); anIter.Next() ) { @@ -718,14 +668,12 @@ void HYDROData_CalculationCase::UpdateRegionsOrder() } } -void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& theRegion, - const bool theLandCover ) +void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& theRegion ) { if ( theRegion.IsNull() ) return; - HYDROData_CalculationCase::DataTag aDataTag = - theLandCover ? DataTag_LandCoverRegion : DataTag_Region; + HYDROData_CalculationCase::DataTag aDataTag = DataTag_Region; RemoveReferenceObject( theRegion->Label(), aDataTag ); // Remove region from data model @@ -735,9 +683,9 @@ void HYDROData_CalculationCase::RemoveRegion( const Handle(HYDROData_Region)& th theRegion->Remove(); } -void HYDROData_CalculationCase::RemoveRegions( const bool theLandCover ) +void HYDROData_CalculationCase::RemoveRegions() { - myLab.FindChild( theLandCover ? DataTag_ChildLandCoverRegion : DataTag_ChildRegion ).ForgetAllAttributes(); + myLab.FindChild( DataTag_ChildRegion ).ForgetAllAttributes(); } HYDROData_SequenceOfObjects HYDROData_CalculationCase::GetSplittedGroups() const @@ -752,7 +700,7 @@ void HYDROData_CalculationCase::RemoveSplittedGroups() double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& thePoint ) const { - Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint, false ); + Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint ); return GetAltitudeForPoint( thePoint, aZone ); } @@ -761,7 +709,7 @@ double HYDROData_CalculationCase::GetAltitudeForPoint( const gp_XY& { double aResAltitude = HYDROData_IAltitudeObject::GetInvalidAltitude(); - Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint, false ); + Handle(HYDROData_Zone) aZone = GetZoneFromPoint( thePoint ); if ( !aZone.IsNull() ) { Handle(HYDROData_Region) aRefRegion = Handle(HYDROData_Region)::DownCast( aZone->GetFatherObject() ); @@ -893,24 +841,28 @@ NCollection_Sequence HYDROData_CalculationCase::GetAltitudesForPoints( return aResSeq; } -Handle(HYDROData_Region) HYDROData_CalculationCase::GetRegionFromPoint( const gp_XY& thePoint, - const bool theLandCover ) const +double HYDROData_CalculationCase::GetStricklerCoefficientForPoint( const gp_XY& thePoint ) const +{ + //TODO: #652 + return 0.0; +} + +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() ) @@ -971,15 +923,14 @@ HYDROData_CalculationCase::PointClassification HYDROData_CalculationCase::GetPoi Handle(HYDROData_Region) HYDROData_CalculationCase::addNewRegion( const Handle(HYDROData_Document)& theDoc, const QString& thePrefixOrName, - const bool theLandCover, bool isPrefix ) { - TDF_Label aNewLab = myLab.FindChild( theLandCover ? DataTag_ChildLandCoverRegion : DataTag_ChildRegion ).NewChild(); + TDF_Label aNewLab = myLab.FindChild( DataTag_ChildRegion ).NewChild(); int aTag = aNewLab.Tag(); Handle(HYDROData_Region) aNewRegion = Handle(HYDROData_Region)::DownCast( HYDROData_Iterator::CreateObject( aNewLab, KIND_REGION ) ); - AddRegion( aNewRegion, theLandCover ); + AddRegion( aNewRegion ); QString aRegionName = isPrefix ? HYDROData_Tool::GenerateObjectName( theDoc, thePrefixOrName ) : thePrefixOrName; aNewRegion->SetName( aRegionName ); @@ -1003,17 +954,23 @@ Handle(HYDROData_SplittedShapesGroup) HYDROData_CalculationCase::addNewSplittedG QString HYDROData_CalculationCase::Export( int theStudyId ) const { +#ifdef LIGHT_MODE + return ""; +#else 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(); +#endif } +#ifndef LIGHT_MODE 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; @@ -1038,8 +995,9 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine, } // Get faces + bool isAllNotSubmersible = true; TopTools_ListOfShape aFaces; - HYDROData_SequenceOfObjects aCaseRegions = GetRegions( false ); + HYDROData_SequenceOfObjects aCaseRegions = GetRegions(); HYDROData_SequenceOfObjects::Iterator aRegionIter( aCaseRegions ); for ( ; aRegionIter.More(); aRegionIter.Next() ) { @@ -1047,12 +1005,25 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var theGeomEngine, 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, @@ -1209,6 +1180,7 @@ bool HYDROData_CalculationCase::Export( GEOM::GEOM_Gen_var return true; } +#endif void HYDROData_CalculationCase::ClearRules( HYDROData_CalculationCase::DataTag theDataTag, const bool theIsSetToUpdate ) @@ -1218,7 +1190,7 @@ void HYDROData_CalculationCase::ClearRules( HYDROData_CalculationCase::DataTag t // Indicate model of the need to update splitting if ( theIsSetToUpdate ) { - SetToUpdate( true ); + Changed( Geom_2d ); } } @@ -1232,7 +1204,7 @@ void HYDROData_CalculationCase::AddRule( const Handle(HYDROData_Entity)& theO 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 @@ -1247,7 +1219,7 @@ void HYDROData_CalculationCase::SetAssignmentMode( AssignmentMode theMode ) 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 @@ -1336,22 +1308,3 @@ bool HYDROData_CalculationCase::GetRule( int theIndex, return HYDROData_PriorityQueue::GetRule( aRulesLab, theIndex, theObject1, thePriority, theObject2, theMergeType ); } - -void HYDROData_CalculationCase::SetAssignmentLandCoverMode( AssignmentMode theMode ) -{ - TDF_Label aModeLab = myLab.FindChild( DataTag_AssignmentLandCoverMode ); - TDataStd_Integer::Set( aModeLab, ( int ) theMode ); - - // Indicate model of the need to update land covers partition - 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; -}