X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DataModel.cxx;h=23d8dc989bd03acc10bea47d8638a5ce7ebf8850;hb=6dd1807886655d96b021fbfb6ba736d79d49a492;hp=d061b7de74f35da887fea150b29845eb1d2a2797;hpb=474c2cd65280d793f1c81ca528bc92e1cff988e6;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_DataModel.cxx b/src/HYDROGUI/HYDROGUI_DataModel.cxx index d061b7de..23d8dc98 100644 --- a/src/HYDROGUI/HYDROGUI_DataModel.cxx +++ b/src/HYDROGUI/HYDROGUI_DataModel.cxx @@ -1,8 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// +// Copyright (C) 2014-2015 EDF-R&D // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either @@ -47,6 +43,8 @@ #include #include #include +#include +#include #include #include @@ -89,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 ) @@ -115,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 ) ) @@ -130,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; @@ -150,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 @@ -197,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; } @@ -271,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() ) ); @@ -286,8 +304,10 @@ 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; Handle(HYDROData_Entity) anObj = anIterator.Current(); if ( !anObj.IsNull() ) @@ -298,7 +318,7 @@ void HYDROGUI_DataModel::update( const int theStudyId ) Handle(HYDROData_Image) anImageObj = Handle(HYDROData_Image)::DownCast( anObj ); if( !anImageObj.IsNull() ) { - createObject( anImageRootObj, anImageObj ); + obj = createObject( anImageRootObj, anImageObj ); } break; @@ -308,7 +328,7 @@ void HYDROGUI_DataModel::update( const int theStudyId ) Handle(HYDROData_Bathymetry) aBathymetryObj = Handle(HYDROData_Bathymetry)::DownCast( anObj ); if( !aBathymetryObj.IsNull() ) { - createObject( aBathymetryRootObj, aBathymetryObj ); + obj = createObject( aBathymetryRootObj, aBathymetryObj ); } break; @@ -318,7 +338,7 @@ void HYDROGUI_DataModel::update( const int theStudyId ) Handle(HYDROData_Channel) aChannelObj = Handle(HYDROData_Channel)::DownCast( anObj ); if( !aChannelObj.IsNull() ) { - createObject( anArtificialObjectsRootObj, aChannelObj ); + obj = createObject( anArtificialObjectsRootObj, aChannelObj ); } break; @@ -328,7 +348,7 @@ void HYDROGUI_DataModel::update( const int theStudyId ) Handle(HYDROData_Digue) aDigueObj = Handle(HYDROData_Digue)::DownCast( anObj ); if( !aDigueObj.IsNull() ) { - createObject( anArtificialObjectsRootObj, aDigueObj ); + obj = createObject( anArtificialObjectsRootObj, aDigueObj ); } break; @@ -338,7 +358,7 @@ void HYDROGUI_DataModel::update( const int theStudyId ) Handle(HYDROData_ImmersibleZone) anImmersibleZoneObj = Handle(HYDROData_ImmersibleZone)::DownCast( anObj ); if( !anImmersibleZoneObj.IsNull() ) { - createObject( aNaturalObjectsRootObj, anImmersibleZoneObj ); + obj = createObject( aNaturalObjectsRootObj, anImmersibleZoneObj ); } break; @@ -348,7 +368,7 @@ void HYDROGUI_DataModel::update( const int theStudyId ) Handle(HYDROData_River) aRiverObj = Handle(HYDROData_River)::DownCast( anObj ); if( !aRiverObj.IsNull() ) { - createObject( aNaturalObjectsRootObj, aRiverObj ); + obj = createObject( aNaturalObjectsRootObj, aRiverObj ); } break; @@ -358,7 +378,7 @@ void HYDROGUI_DataModel::update( const int theStudyId ) Handle(HYDROData_Stream) aStreamObj = Handle(HYDROData_Stream)::DownCast( anObj ); if( !aStreamObj.IsNull() ) { - createObject( aNaturalObjectsRootObj, aStreamObj ); + obj = createObject( aNaturalObjectsRootObj, aStreamObj ); } break; @@ -368,7 +388,28 @@ void HYDROGUI_DataModel::update( const int theStudyId ) Handle(HYDROData_Obstacle) anObstacleObj = Handle(HYDROData_Obstacle)::DownCast( anObj ); if( !anObstacleObj.IsNull() ) { - createObject( anObstaclesRootObj, anObstacleObj ); + 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; @@ -378,7 +419,7 @@ void HYDROGUI_DataModel::update( const int theStudyId ) Handle(HYDROData_CalculationCase) aCalculObj = Handle(HYDROData_CalculationCase)::DownCast( anObj ); if( !aCalculObj.IsNull() ) { - createObject( aCalculRootObj, aCalculObj ); + obj = createObject( aCalculRootObj, aCalculObj ); } break; @@ -388,7 +429,7 @@ void HYDROGUI_DataModel::update( const int theStudyId ) Handle(HYDROData_PolylineXY) aPolylineObj = Handle(HYDROData_PolylineXY)::DownCast( anObj ); if( !aPolylineObj.IsNull() ) { - createObject( aPolylineRootObj, aPolylineObj ); + obj = createObject( aPolylineRootObj, aPolylineObj ); } break; @@ -398,7 +439,7 @@ void HYDROGUI_DataModel::update( const int theStudyId ) Handle(HYDROData_Polyline3D) aPolylineObj = Handle(HYDROData_Polyline3D)::DownCast( anObj ); if( !aPolylineObj.IsNull() ) { - createObject( aPolyline3DRootObj, aPolylineObj ); + obj = createObject( aPolyline3DRootObj, aPolylineObj ); } break; @@ -408,7 +449,7 @@ void HYDROGUI_DataModel::update( const int theStudyId ) Handle(HYDROData_Profile) aProfileObj = Handle(HYDROData_Profile)::DownCast( anObj ); if( !aProfileObj.IsNull() ) { - createObject( aProfileRootObj, aProfileObj ); + obj = createObject( aProfileRootObj, aProfileObj ); } break; @@ -418,7 +459,7 @@ void HYDROGUI_DataModel::update( const int theStudyId ) Handle(HYDROData_VisualState) aVisualStateObj = Handle(HYDROData_VisualState)::DownCast( anObj ); if( !aVisualStateObj.IsNull() ) { - createObject( aVisualStateRootObj, aVisualStateObj ); + obj = createObject( aVisualStateRootObj, aVisualStateObj ); } break; @@ -427,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 ); @@ -441,12 +486,12 @@ void HYDROGUI_DataModel::update( const int theStudyId ) ::synchronize < suitPtr, suitPtr, HYDROGUI_DataModelSync > ( aNewRootObj, aRoot, aSync ); + SUIT_DataBrowser* ob = anApp->objectBrowser(); - if( !myStates.isEmpty() ) + if ( !myStates.isEmpty() ) { - LightApp_Application* anApp = dynamic_cast( module()->application() ); - anApp->objectBrowser()->updateTree(); - anApp->objectBrowser()->setOpenStates( myStates, ENTRY_COLUMN ); + ob->updateTree(); + ob->setOpenStates( myStates, ENTRY_COLUMN ); myStates.clear(); } } @@ -634,29 +679,11 @@ 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 aClone->RemoveZLevel(); - - // generate a new unique name for the clone object: - // case 1: Image_1 -> Image_2 - // case 2: ImageObj -> ImageObj_1 - QString aName = aClone->GetName(); - QString aPrefix = aName; - if( aName.contains( '_' ) ) // case 1 - { - QString aSuffix = aName.section( '_', -1 ); - bool anIsInteger = false; - aSuffix.toInt( &anIsInteger ); - if( anIsInteger ) - aPrefix = aName.section( '_', 0, -2 ); - } - else // case 2 - aPrefix = aName; - aName = HYDROGUI_Tool::GenerateObjectName( (HYDROGUI_Module*)module(), aPrefix ); - aClone->SetName( aName ); } } } @@ -682,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(); @@ -699,7 +728,30 @@ LightApp_DataObject* HYDROGUI_DataModel::createObject( SUIT_DataObject* const bool theIsBuildTree ) { HYDROGUI_DataObject* aResObj = new HYDROGUI_DataObject( theParent, theModelObject, theParentEntry ); - + + 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_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_MAP; + if ( !visibility ) + { + Handle(HYDROData_Profile) aProfObj = Handle(HYDROData_Profile)::DownCast( theModelObject ); + visibility = !aProfObj.IsNull() && aProfObj->IsValid(); + } + + if ( aKind == KIND_REGION ) + { + QString an = aResObj->name(); + int a = 0; + } + + if ( visibility ) + { + setObjectVisibilityState( theModelObject, aResObj ); + } + if ( theIsBuildTree ) { buildObjectTree( theParent, aResObj, theParentEntry ); @@ -727,8 +779,12 @@ LightApp_DataObject* HYDROGUI_DataModel::createZone( SUIT_DataObject* theP const bool theIsBuildTree, const bool theIsInOperation ) { - return buildObject( theParent, new HYDROGUI_Zone( theParent, theModelObject, theParentEntry, theIsInOperation ), - theParentEntry, theIsBuildTree, theIsInOperation ); + HYDROGUI_Zone* aZone = new HYDROGUI_Zone( theParent, theModelObject, theParentEntry, theIsInOperation ); + LightApp_DataObject* aDataObj = buildObject( theParent, aZone, theParentEntry, theIsBuildTree, theIsInOperation ); + + setObjectVisibilityState( theModelObject, aZone ); + + return aDataObj; } LightApp_DataObject* HYDROGUI_DataModel::createRegion( SUIT_DataObject* theParent, @@ -741,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 ) @@ -917,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 ); @@ -982,7 +1066,22 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent, HYDROData_SequenceOfObjects aProfiles = aStreamObj->GetProfiles(); buildObjectPartition( aGuiObj, aProfiles, tr( "STREAM_PROFILES" ), true ); + + Handle(HYDROData_Polyline3D) aBottomPolyline = aStreamObj->GetBottomPolyline(); + if ( !aBottomPolyline.IsNull() && !aBottomPolyline->IsRemoved() ) { + 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 ) @@ -1122,3 +1221,28 @@ 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 ) +{ + SUIT_AbstractModel* treeModel = 0; + LightApp_Application* app = dynamic_cast( module()->application() ); + if ( app ) + treeModel = dynamic_cast( app->objectBrowser()->model() ); + + if ( treeModel ) + { + HYDROGUI_Module* aModule = dynamic_cast( module() ); + bool isVisible = aModule->isObjectVisible( -1, theModelObject ); + Qtx::VisibilityState aVisState = isVisible ? Qtx::ShownState : Qtx::HiddenState; + treeModel->setVisibilityState( theObject->text( theObject->customData( Qtx::IdType ).toInt() ), aVisState, false ); + } +}