X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DataModel.cxx;h=23d8dc989bd03acc10bea47d8638a5ce7ebf8850;hb=6dd1807886655d96b021fbfb6ba736d79d49a492;hp=6255c5e5a2548e9c10aff48adf998b887a11c9c2;hpb=cb497021e2c2cdc6af7ed757955b3297033d31f7;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_DataModel.cxx b/src/HYDROGUI/HYDROGUI_DataModel.cxx index 6255c5e5..23d8dc98 100644 --- a/src/HYDROGUI/HYDROGUI_DataModel.cxx +++ b/src/HYDROGUI/HYDROGUI_DataModel.cxx @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include @@ -87,6 +87,14 @@ HYDROGUI_DataModel::~HYDROGUI_DataModel() { } +bool HYDROGUI_DataModel::create( CAM_Study* theStudy ) +{ + bool status = LightApp_DataModel::create( theStudy ); + if ( status ) + updateDocument(); + return status; +} + bool HYDROGUI_DataModel::open( const QString& theURL, CAM_Study* theStudy, QStringList theFileList ) @@ -113,13 +121,14 @@ bool HYDROGUI_DataModel::open( const QString& theURL, { res = DocError_UnknownProblem; } - if( res != DocError_OK ) + + if ( res != DocError_OK ) { module()->application()->putInfo( tr( "LOAD_ERROR" ) ); return false; } - if( !aStatesFullPath.isEmpty() ) + if ( !aStatesFullPath.isEmpty() ) { QFile aFile( aStatesFullPath ); if( aFile.open( QFile::ReadOnly ) ) @@ -128,11 +137,13 @@ bool HYDROGUI_DataModel::open( const QString& theURL, aFile.close(); } } + + updateDocument(); } // if the document open was successful, the data model update happens // in the set mode of the module - if( res == DocError_OK ) + if ( res == DocError_OK ) update( aStudyId ); return true; @@ -148,7 +159,7 @@ bool HYDROGUI_DataModel::save( QStringList& theFileList ) QString aTmpDir; SUIT_ResourceMgr* resMgr = module()->application()->resourceMgr(); bool isMultiFile = false; - if( resMgr ) + if ( resMgr ) isMultiFile = resMgr->booleanValue( "Study", "multi_file", false ); // save module data to temporary files @@ -195,6 +206,9 @@ bool HYDROGUI_DataModel::saveAs( const QString& theURL, bool HYDROGUI_DataModel::close() { + HYDROGUI_Module* aModule = dynamic_cast( module() ); + if ( aModule ) + aModule->clearCache(); return true; } @@ -272,8 +286,8 @@ void HYDROGUI_DataModel::update( const int theStudyId ) // 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() ) ); @@ -390,12 +404,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; @@ -665,7 +679,7 @@ bool HYDROGUI_DataModel::paste() Handle(HYDROData_Entity) aClone = getDocument()->CreateObject( aKind ); if( !aClone.IsNull() ) { - anObject->CopyTo( aClone ); + anObject->CopyTo( aClone, true ); anIsChanged = true; // remove Z layer @@ -696,7 +710,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(); @@ -720,7 +734,7 @@ LightApp_DataObject* HYDROGUI_DataModel::createObject( SUIT_DataObject* aKind == KIND_SHAPES_GROUP || aKind == KIND_SPLITTED_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 ); @@ -793,7 +807,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() ) @@ -978,7 +992,7 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent, 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() ) { @@ -987,20 +1001,7 @@ 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 ); @@ -1071,19 +1072,19 @@ 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 );*/ } } -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() ) { @@ -1099,7 +1100,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() ) { @@ -1170,8 +1171,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 ) @@ -1185,7 +1185,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 @@ -1221,6 +1221,15 @@ bool HYDROGUI_DataModel::rename( Handle(HYDROData_Entity) theEntity, const QStri return true; } +void HYDROGUI_DataModel::updateDocument() +{ + // Sets the default strickler coefficient from preferences to document. + Handle(HYDROData_Document) aDoc = getDocument(); + SUIT_ResourceMgr* resMgr = module()->application()->resourceMgr(); + if ( resMgr && !aDoc.IsNull() ) + aDoc->SetDefaultStricklerCoefficient( resMgr->doubleValue( "preferences", "default_strickler_coefficient", 0 ) ); +} + void HYDROGUI_DataModel::setObjectVisibilityState( Handle(HYDROData_Entity) theModelObject, HYDROGUI_DataObject* theObject ) {