X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DataModel.cxx;h=8968fad7be8a87e9c08e1e37aea0f3b9269725f1;hb=282328072477a3e3cde6d02204129828c4c7ac23;hp=1478a7473c2deaedb6d26afbaf15645ea102e83e;hpb=d6a8c59ee076938a924fcfd1e3f83ef1395b7336;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_DataModel.cxx b/src/HYDROGUI/HYDROGUI_DataModel.cxx index 1478a747..8968fad7 100644 --- a/src/HYDROGUI/HYDROGUI_DataModel.cxx +++ b/src/HYDROGUI/HYDROGUI_DataModel.cxx @@ -21,6 +21,7 @@ #include "HYDROGUI_DataObject.h" #include "HYDROGUI_Module.h" #include "HYDROGUI_Tool.h" +#include "HYDROGUI_Tool2.h" #include "HYDROGUI_Zone.h" #include "HYDROGUI_Region.h" @@ -44,7 +45,7 @@ #include #include #include -#include +#include #include #include @@ -274,33 +275,33 @@ void HYDROGUI_DataModel::update( const int theStudyId ) // BATHYMETRY LightApp_DataObject* aBathymetryRootObj = createObject( aNewRootObj, tr( partitionName( KIND_BATHYMETRY ).toAscii() ) ); - // ARTIFICIAL OBJECTS - LightApp_DataObject* anArtificialObjectsRootObj = createObject( aNewRootObj, tr( partitionName( KIND_ARTIFICIAL_OBJECT ).toAscii() ) ); + // POLYLINES + LightApp_DataObject* aPolylineRootObj = createObject( aNewRootObj, tr( partitionName( KIND_POLYLINEXY ).toAscii() ) ); + + // PROFILES + LightApp_DataObject* aProfileRootObj = createObject( aNewRootObj, tr( partitionName( KIND_PROFILE ).toAscii() ) ); + + // POLYLINES 3D + LightApp_DataObject* aPolyline3DRootObj = createObject( aNewRootObj, tr( partitionName( KIND_POLYLINE ).toAscii() ) ); // NATURAL OBJECTS LightApp_DataObject* aNaturalObjectsRootObj = createObject( aNewRootObj, tr( partitionName( KIND_NATURAL_OBJECT ).toAscii() ) ); + // ARTIFICIAL OBJECTS + LightApp_DataObject* anArtificialObjectsRootObj = createObject( aNewRootObj, tr( partitionName( KIND_ARTIFICIAL_OBJECT ).toAscii() ) ); + // OBSTACLES LightApp_DataObject* anObstaclesRootObj = createObject( aNewRootObj, tr( partitionName( KIND_OBSTACLE ).toAscii() ) ); // STRICKLER TABLES LightApp_DataObject* aStricklerTablesRootObj = createObject( aNewRootObj, tr( partitionName( KIND_STRICKLER_TABLE ).toAscii() ) ); - // LAND COVERS - LightApp_DataObject* aLandCoversRootObj = createObject( aNewRootObj, tr( partitionName( KIND_LAND_COVER ).toAscii() ) ); + // LAND COVER MAPS + LightApp_DataObject* aLandCoversRootObj = createObject( aNewRootObj, tr( partitionName( KIND_LAND_COVER_MAP ).toAscii() ) ); // CALCULATION CASES LightApp_DataObject* aCalculRootObj = createObject( aNewRootObj, tr( partitionName( KIND_CALCULATION ).toAscii() ) ); - // POLYLINES - LightApp_DataObject* aPolylineRootObj = createObject( aNewRootObj, tr( partitionName( KIND_POLYLINEXY ).toAscii() ) ); - - // POLYLINES - LightApp_DataObject* aPolyline3DRootObj = createObject( aNewRootObj, tr( partitionName( KIND_POLYLINE ).toAscii() ) ); - - // PROFILES - LightApp_DataObject* aProfileRootObj = createObject( aNewRootObj, tr( partitionName( KIND_PROFILE ).toAscii() ) ); - // VISUAL STATES LightApp_DataObject* aVisualStateRootObj = createObject( aNewRootObj, tr( partitionName( KIND_VISUAL_STATE ).toAscii() ) ); @@ -404,12 +405,12 @@ void HYDROGUI_DataModel::update( const int theStudyId ) break; } - case KIND_LAND_COVER: + case KIND_LAND_COVER_MAP: { - Handle(HYDROData_LandCover) aLandCoverObj = - Handle(HYDROData_LandCover)::DownCast( anObj ); - if( !aLandCoverObj.IsNull() ) { - obj = createObject( aLandCoversRootObj, aLandCoverObj ); + Handle(HYDROData_LandCoverMap) aLandCoverMapObj = + Handle(HYDROData_LandCoverMap)::DownCast( anObj ); + if( !aLandCoverMapObj.IsNull() ) { + obj = createObject( aLandCoversRootObj, aLandCoverMapObj ); } break; @@ -638,7 +639,7 @@ bool HYDROGUI_DataModel::canCopy() bool isChildObject = aKind == KIND_DUMMY_3D || aKind == KIND_ZONE || aKind == KIND_SHAPES_GROUP || - aKind == KIND_SPLITTED_GROUP; + aKind == KIND_SPLIT_GROUP; if ( isUnrecognized || isChildObject ) { isCanCopy = false; break; @@ -710,7 +711,7 @@ QString HYDROGUI_DataModel::partitionName( const ObjectKind theObjectKind ) case KIND_ARTIFICIAL_OBJECT: return "ARTIFICIAL_OBJECTS"; case KIND_NATURAL_OBJECT: return "NATURAL_OBJECTS"; case KIND_STRICKLER_TABLE: return "STRICKLER_TABLES"; - case KIND_LAND_COVER: return "LAND_COVERS"; + case KIND_LAND_COVER_MAP: return "LAND_COVER_MAPS"; default: break; } return QString(); @@ -731,10 +732,10 @@ LightApp_DataObject* HYDROGUI_DataModel::createObject( SUIT_DataObject* const ObjectKind aKind = theModelObject->GetKind(); bool visibility = aKind == KIND_IMAGE || aKind == KIND_POLYLINEXY || aKind == KIND_POLYLINE || - aKind == KIND_SHAPES_GROUP || aKind == KIND_SPLITTED_GROUP || aKind == KIND_ZONE || + aKind == KIND_SHAPES_GROUP || aKind == KIND_SPLIT_GROUP || aKind == KIND_ZONE || aKind == KIND_IMMERSIBLE_ZONE || aKind == KIND_REGION || aKind == KIND_BATHYMETRY || aKind == KIND_OBSTACLE || aKind == KIND_STREAM || aKind == KIND_CHANNEL || - aKind == KIND_DIGUE || aKind == KIND_DUMMY_3D || aKind == KIND_LAND_COVER; + aKind == KIND_DIGUE || aKind == KIND_DUMMY_3D || aKind == KIND_LAND_COVER_MAP; if ( !visibility ) { Handle(HYDROData_Profile) aProfObj = Handle(HYDROData_Profile)::DownCast( theModelObject ); @@ -807,7 +808,7 @@ void HYDROGUI_DataModel::createDefaultStricklerTable( const Handle(HYDROData_Doc { SUIT_ResourceMgr* resMgr = module()->application()->resourceMgr(); QString defTablePath = resMgr->path( "resources", module()->name(), tr( "DEFAULT_STRICKLER_TABLE_FILE" ) ); - aStricklerTableObj->Import( HYDROGUI_Tool::ToAsciiString( defTablePath ) ); + aStricklerTableObj->Import( defTablePath ); // Set name QString aStricklerTableName; if ( aStricklerTableObj->GetName().isEmpty() ) @@ -989,10 +990,18 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent, createObject( aCaseNOSect, aNObject, aGuiObj->entry(), false ); } } + + LightApp_DataObject* aLandCoverMapSect = + createObject( aGuiObj, tr( "CASE_LAND_COVER_MAP" ), aGuiObj->entry() ); + + Handle(HYDROData_LandCoverMap) aLandCoverMap = aCaseObj->GetLandCoverMap(); + if ( !aLandCoverMap.IsNull() && !aLandCoverMap->IsRemoved() ) + createObject( aLandCoverMapSect, aLandCoverMap, aGuiObj->entry(), false ); + LightApp_DataObject* aCaseRegionsSect = createObject( aGuiObj, tr( "CASE_REGIONS" ), aGuiObj->entry() ); - HYDROData_SequenceOfObjects aCaseRegions = aCaseObj->GetRegions( false ); + HYDROData_SequenceOfObjects aCaseRegions = aCaseObj->GetRegions(); HYDROData_SequenceOfObjects::Iterator anIter( aCaseRegions ); for ( ; anIter.More(); anIter.Next() ) { @@ -1001,26 +1010,13 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent, if( !aCaseRegion.IsNull() && !aCaseRegion->IsRemoved() ) createRegion( aCaseRegionsSect, aCaseRegion, "", true, theIsInOperation ); } - - LightApp_DataObject* aCaseLandCoverRegionsSect = - createObject( aGuiObj, tr( "CASE_LAND_COVER_REGIONS" ), aGuiObj->entry() ); - - HYDROData_SequenceOfObjects aCaseLandCoverRegions = aCaseObj->GetRegions( true ); - anIter.Init( aCaseLandCoverRegions ); - for ( ; anIter.More(); anIter.Next() ) - { - Handle(HYDROData_Region) aCaseLCRegion = - Handle(HYDROData_Region)::DownCast( anIter.Value() ); - if( !aCaseLCRegion.IsNull() && !aCaseLCRegion->IsRemoved() ) - createRegion( aCaseLandCoverRegionsSect, aCaseLCRegion, "", true, theIsInOperation ); - } - + #ifdef DEB_GROUPS HYDROData_SequenceOfObjects aCalcGroups = aCaseObj->GetGeometryGroups(); buildObjectPartition( aGuiObj, aCalcGroups, tr( "OBJECT_GROUPS" ), false ); - HYDROData_SequenceOfObjects aCalcSplitGroups = aCaseObj->GetSplittedGroups(); - buildObjectPartition( aGuiObj, aCalcSplitGroups, tr( "CASE_SPLITTED_GROUPS" ), false ); + HYDROData_SequenceOfObjects aCalcSplitGroups = aCaseObj->GetSplitGroups(); + buildObjectPartition( aGuiObj, aCalcSplitGroups, tr( "CASE_SPLIT_GROUPS" ), false ); #endif } @@ -1085,19 +1081,23 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent, createObject( aGuiObj, aBottomPolyline, aGuiObj->entry(), false ); } } - else if ( anObjectKind == KIND_LAND_COVER ) + else if ( anObjectKind == KIND_LAND_COVER_MAP ) { - Handle(HYDROData_LandCover) aLandCoverObj = - Handle(HYDROData_LandCover)::DownCast( aDataObj ); + Handle(HYDROData_LandCoverMap) aLandCoverMapObj = + Handle(HYDROData_LandCoverMap)::DownCast( aDataObj ); - HYDROData_SequenceOfObjects aPolylines = aLandCoverObj->GetPolylines(); - buildObjectPartition( aGuiObj, aPolylines, tr( "LAND_COVER_POLYLINES" ), true ); + /*TODO: reference objects of the land cover map + HYDROData_SequenceOfObjects aPolylines = aLandCoverMapObj->GetPolylines(); + buildObjectPartition( aGuiObj, aPolylines, tr( "LAND_COVER_POLYLINES" ), true );*/ } + HYDROGUI_Module* aModule = dynamic_cast( module() ); + if( aModule ) + aModule->enableLCMActions(); + } -void HYDROGUI_DataModel::buildCaseTree( SUIT_DataObject* theParent, Handle(HYDROData_CalculationCase) theCase, - const bool theLandCover ) +void HYDROGUI_DataModel::buildCaseTree( SUIT_DataObject* theParent, Handle(HYDROData_CalculationCase) theCase ) { if ( !theCase.IsNull() ) { @@ -1113,7 +1113,7 @@ void HYDROGUI_DataModel::buildCaseTree( SUIT_DataObject* theParent, Handle(HYDRO new HYDROGUI_DropTargetObject( theParent, tr( "NEW_REGION" ), "", true ); - HYDROData_SequenceOfObjects aCaseRegions = theCase->GetRegions( theLandCover ); + HYDROData_SequenceOfObjects aCaseRegions = theCase->GetRegions(); HYDROData_SequenceOfObjects::Iterator anIter( aCaseRegions ); for ( ; anIter.More(); anIter.Next() ) { @@ -1184,8 +1184,7 @@ SUIT_DataObject* HYDROGUI_DataModel::findChildByName( const SUIT_DataObject* the } bool HYDROGUI_DataModel::createNewRegion( Handle(HYDROData_CalculationCase) theCase, - const QList& theZonesList, - const bool theLandCover ) + const QList& theZonesList ) { bool isOk = !theCase.IsNull(); if ( isOk ) @@ -1199,7 +1198,7 @@ bool HYDROGUI_DataModel::createNewRegion( Handle(HYDROData_CalculationCase) theC { if ( aRegion.IsNull() ) { - aRegion = theCase->AddNewRegion( aZone, theLandCover ); + aRegion = theCase->AddNewRegion( aZone ); isOk = !aRegion.IsNull(); } else