X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DataModel.cxx;h=23d8dc989bd03acc10bea47d8638a5ce7ebf8850;hb=6dd1807886655d96b021fbfb6ba736d79d49a492;hp=956015e624e16ab4f95388430448140b23ba1c3a;hpb=eb0aa6166eb966e3f3d41b75311e67cfcb364aee;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_DataModel.cxx b/src/HYDROGUI/HYDROGUI_DataModel.cxx index 956015e6..23d8dc98 100644 --- a/src/HYDROGUI/HYDROGUI_DataModel.cxx +++ b/src/HYDROGUI/HYDROGUI_DataModel.cxx @@ -43,6 +43,8 @@ #include #include #include +#include +#include #include #include @@ -85,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 ) @@ -111,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 ) ) @@ -126,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; @@ -146,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 @@ -193,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; } @@ -267,6 +283,12 @@ void HYDROGUI_DataModel::update( const int theStudyId ) // 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 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() ) ); @@ -282,6 +304,7 @@ void HYDROGUI_DataModel::update( const int theStudyId ) // VISUAL STATES LightApp_DataObject* aVisualStateRootObj = createObject( aNewRootObj, tr( partitionName( KIND_VISUAL_STATE ).toAscii() ) ); + int aNoStricklerTableObj = 0; HYDROData_Iterator anIterator( aDocument, KIND_UNKNOWN ); for( ; anIterator.More(); anIterator.Next() ) { LightApp_DataObject* obj = 0; @@ -368,6 +391,27 @@ void HYDROGUI_DataModel::update( const int theStudyId ) obj = createObject( anObstaclesRootObj, anObstacleObj ); } + break; + } + case KIND_STRICKLER_TABLE: + { + Handle(HYDROData_StricklerTable) aStricklerTableObj = + Handle(HYDROData_StricklerTable)::DownCast( anObj ); + if( !aStricklerTableObj.IsNull() ) { + obj = createObject( aStricklerTablesRootObj, aStricklerTableObj ); + } + aNoStricklerTableObj++; + + break; + } + case KIND_LAND_COVER_MAP: + { + Handle(HYDROData_LandCoverMap) aLandCoverMapObj = + Handle(HYDROData_LandCoverMap)::DownCast( anObj ); + if( !aLandCoverMapObj.IsNull() ) { + obj = createObject( aLandCoversRootObj, aLandCoverMapObj ); + } + break; } case KIND_CALCULATION: @@ -424,6 +468,10 @@ void HYDROGUI_DataModel::update( const int theStudyId ) } } + // Create default Strickler table object + if ( aNoStricklerTableObj == 0 ) + createDefaultStricklerTable( aDocument, aStricklerTablesRootObj ); + //if( SUIT_DataBrowser* anObjectBrowser = anApp->objectBrowser() ) //{ // anObjectBrowser->setAutoOpenLevel( 3 ); @@ -631,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 @@ -661,6 +709,8 @@ QString HYDROGUI_DataModel::partitionName( const ObjectKind theObjectKind ) case KIND_OBSTACLE: return "OBSTACLES"; 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_MAP: return "LAND_COVER_MAPS"; default: break; } return QString(); @@ -684,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_DIGUE || aKind == KIND_DUMMY_3D || aKind == KIND_LAND_COVER_MAP; if ( !visibility ) { Handle(HYDROData_Profile) aProfObj = Handle(HYDROData_Profile)::DownCast( theModelObject ); @@ -747,6 +797,34 @@ LightApp_DataObject* HYDROGUI_DataModel::createRegion( SUIT_DataObject* theParentEntry, theIsBuildTree, theIsInOperation ); } +void HYDROGUI_DataModel::createDefaultStricklerTable( const Handle(HYDROData_Document)& theDocument, + LightApp_DataObject* theParent ) +{ + // Create default Strickler table object + Handle(HYDROData_StricklerTable) aStricklerTableObj = + Handle(HYDROData_StricklerTable)::DownCast( theDocument->CreateObject(KIND_STRICKLER_TABLE) ); + if ( !aStricklerTableObj.IsNull() ) + { + SUIT_ResourceMgr* resMgr = module()->application()->resourceMgr(); + QString defTablePath = resMgr->path( "resources", module()->name(), tr( "DEFAULT_STRICKLER_TABLE_FILE" ) ); + aStricklerTableObj->Import( defTablePath ); + // Set name + QString aStricklerTableName; + if ( aStricklerTableObj->GetName().isEmpty() ) + { + HYDROGUI_Module* aModule = dynamic_cast( module() ); + if ( aModule ) + aStricklerTableName = HYDROGUI_Tool::GenerateObjectName( aModule, tr( "DEFAULT_STRICKLER_TABLE_NAME" ) ); + } + if ( aStricklerTableObj->GetName() != aStricklerTableName ) + aStricklerTableObj->SetName( aStricklerTableName ); + + aStricklerTableObj->Update(); + + LightApp_DataObject* obj = createObject( theParent, aStricklerTableObj ); + } +} + LightApp_DataObject* HYDROGUI_DataModel::createObject( SUIT_DataObject* theParent, const QString& theName, const QString& theParentEntry ) @@ -923,7 +1001,7 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent, if( !aCaseRegion.IsNull() && !aCaseRegion->IsRemoved() ) createRegion( aCaseRegionsSect, aCaseRegion, "", true, theIsInOperation ); } - + #ifdef DEB_GROUPS HYDROData_SequenceOfObjects aCalcGroups = aCaseObj->GetGeometryGroups(); buildObjectPartition( aGuiObj, aCalcGroups, tr( "OBJECT_GROUPS" ), false ); @@ -994,6 +1072,16 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent, createObject( aGuiObj, aBottomPolyline, aGuiObj->entry(), false ); } } + else if ( anObjectKind == KIND_LAND_COVER_MAP ) + { + Handle(HYDROData_LandCoverMap) aLandCoverMapObj = + Handle(HYDROData_LandCoverMap)::DownCast( aDataObj ); + + /*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 ) @@ -1133,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 ) { @@ -1148,4 +1245,4 @@ void HYDROGUI_DataModel::setObjectVisibilityState( Handle(HYDROData_Entity) theM Qtx::VisibilityState aVisState = isVisible ? Qtx::ShownState : Qtx::HiddenState; treeModel->setVisibilityState( theObject->text( theObject->customData( Qtx::IdType ).toInt() ), aVisState, false ); } -} \ No newline at end of file +}