X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DataModel.cxx;h=6f1adada33b9121c81a475262fb6489338014aa0;hb=e84c3bdbce884a7e150fff690f0c1a3e0b12ed90;hp=675d2f4898ef2f59c4fdaaf9f72131c11840ee63;hpb=c03ec28a438b3499223cd60f614db21c253ef2b3;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_DataModel.cxx b/src/HYDROGUI/HYDROGUI_DataModel.cxx index 675d2f48..6f1adada 100644 --- a/src/HYDROGUI/HYDROGUI_DataModel.cxx +++ b/src/HYDROGUI/HYDROGUI_DataModel.cxx @@ -30,10 +30,13 @@ #include #include +#include #include +#include #include #include #include +#include #include #include #include @@ -43,9 +46,8 @@ #include #include #include +#include -#include -#include #include #include @@ -53,11 +55,11 @@ #include #include -#include #include #include #include #include +#include #include @@ -67,8 +69,16 @@ #include #include +// #define DEB_GROUPS 1 +#ifdef DEB_GROUPS +#include +#endif + static HYDROData_SequenceOfObjects myCopyingObjects; +const int ENTRY_COLUMN = 2; + + HYDROGUI_DataModel::HYDROGUI_DataModel( CAM_Module* theModule ) : LightApp_DataModel( theModule ) { @@ -87,17 +97,19 @@ bool HYDROGUI_DataModel::open( const QString& theURL, const int aStudyId = theStudy->id(); Data_DocError res = DocError_UnknownProblem; - if( theFileList.count() == 2 ) + if( theFileList.count() >= 2 ) { QString aTmpDir = theFileList[0]; - QString aFileName = theFileList[1]; + QString aDataFileName = theFileList[1]; + QString aStatesFileName = theFileList.count() == 3 ? theFileList[2] : ""; myStudyURL = theURL; - QString aFullPath = SUIT_Tools::addSlash( aTmpDir ) + aFileName; + QString aDataFullPath = SUIT_Tools::addSlash( aTmpDir ) + aDataFileName; + QString aStatesFullPath = aStatesFileName.isEmpty() ? "" : SUIT_Tools::addSlash( aTmpDir ) + aStatesFileName; try { - res = HYDROData_Document::Load( (char*)aFullPath.toLatin1().constData(), aStudyId ); + res = HYDROData_Document::Load( (char*)aDataFullPath.toLatin1().constData(), aStudyId ); } catch(...) { @@ -108,6 +120,16 @@ bool HYDROGUI_DataModel::open( const QString& theURL, module()->application()->putInfo( tr( "LOAD_ERROR" ) ); return false; } + + if( !aStatesFullPath.isEmpty() ) + { + QFile aFile( aStatesFullPath ); + if( aFile.open( QFile::ReadOnly ) ) + { + myStates = aFile.readAll(); + aFile.close(); + } + } } // if the document open was successful, the data model update happens @@ -126,27 +148,41 @@ bool HYDROGUI_DataModel::save( QStringList& theFileList ) LightApp_DataModel::save( theFileList ); QString aTmpDir; - QString aFileName; SUIT_ResourceMgr* resMgr = module()->application()->resourceMgr(); bool isMultiFile = false; if( resMgr ) isMultiFile = resMgr->booleanValue( "Study", "multi_file", false ); - // save data to temporary files + // save module data to temporary files LightApp_Study* aStudy = dynamic_cast( module()->application()->activeStudy() ); aTmpDir = aStudy->GetTmpDir( myStudyURL.toLatin1().constData(), isMultiFile ).c_str(); - aFileName = SUIT_Tools::file( myStudyURL, false ) + "_HYDRO.cbf"; - - QString aFullPath = aTmpDir + aFileName; - Data_DocError res = getDocument()->Save( (char*)aFullPath.toLatin1().constData() ); + + // save OCAF data to a temporary file + QString aDataFileName = SUIT_Tools::file( myStudyURL, false ) + "_HYDRO.cbf"; + QString aDataFullPath = aTmpDir + aDataFileName; + Data_DocError res = getDocument()->Save( (char*)aDataFullPath.toLatin1().constData() ); if( res != DocError_OK ) { module()->application()->putInfo( tr( "SAVE_ERROR" ) ); return false; } + // save tree state data to a temporary file + LightApp_Application* anApp = dynamic_cast( module()->application() ); + QByteArray aStatesData = anApp->objectBrowser()->getOpenStates( ENTRY_COLUMN ); + QString aStatesFileName = SUIT_Tools::file( myStudyURL, false ) + "_HYDRO_tree_states.txt"; + QString aStatesFullPath = aTmpDir + aStatesFileName; + QFile aFile( aStatesFullPath ); + if( aFile.open( QFile::WriteOnly ) ) + { + aFile.write( aStatesData ); + aFile.close(); + } + + // add temporary files to the list theFileList.append( aTmpDir ); - theFileList.append( aFileName ); + theFileList.append( aDataFileName ); + theFileList.append( aStatesFileName ); return true; } @@ -178,13 +214,13 @@ bool HYDROGUI_DataModel::dumpPython( const QString& theURL, if ( aDocument.IsNull() || !aStudy ) return false; - QString aFileToExport = aStudy->GetTmpDir( theURL.toLatin1().constData(), isMultiFile ).c_str(); - aFileToExport += QString( QDir::separator() ) + "HYDRO.py"; - - bool aRes = aDocument->DumpToPython( aFileToExport ); + QString aDir = aStudy->GetTmpDir( theURL.toLatin1().constData(), isMultiFile ).c_str(); + QString aFileToExport = aDir + QString( QDir::separator() ) + "HYDRO.py"; + bool aRes = aDocument->DumpToPython( aFileToExport, isMultiFile ); if ( aRes ) { + theListOfFiles.append( aDir ); theListOfFiles.append( aFileToExport ); } @@ -211,19 +247,8 @@ void HYDROGUI_DataModel::update( const int theStudyId ) if( !aStudyRoot ) return; - // create root object if not exist - CAM_DataObject* aRootObj = root(); - if( !aRootObj ) - aRootObj = createRootModuleObject( aStudyRoot ); - - if( !aRootObj ) - return; - - DataObjectList aList; - aRootObj->children( aList ); - QListIterator anIter( aList ); - while( anIter.hasNext() ) - removeChild( aRootObj, anIter.next() ); + // create a new root object + CAM_DataObject* aNewRootObj = new CAM_DataObject(); Handle(HYDROData_Document) aDocument = HYDROData_Document::Document( theStudyId ); if( aDocument.IsNull() ) @@ -232,31 +257,34 @@ void HYDROGUI_DataModel::update( const int theStudyId ) // Create root objects: // IMAGES - LightApp_DataObject* anImageRootObj = createObject( aRootObj, tr( partitionName( KIND_IMAGE ).toAscii() ) ); + LightApp_DataObject* anImageRootObj = createObject( aNewRootObj, tr( partitionName( KIND_IMAGE ).toAscii() ) ); // BATHYMETRY - LightApp_DataObject* aBathymetryRootObj = createObject( aRootObj, tr( partitionName( KIND_BATHYMETRY ).toAscii() ) ); + LightApp_DataObject* aBathymetryRootObj = createObject( aNewRootObj, tr( partitionName( KIND_BATHYMETRY ).toAscii() ) ); // ARTIFICIAL OBJECTS - LightApp_DataObject* anArtificialObjectsRootObj = createObject( aRootObj, tr( partitionName( KIND_ARTIFICIAL_OBJECT ).toAscii() ) ); + LightApp_DataObject* anArtificialObjectsRootObj = createObject( aNewRootObj, tr( partitionName( KIND_ARTIFICIAL_OBJECT ).toAscii() ) ); // NATURAL OBJECTS - LightApp_DataObject* aNaturalObjectsRootObj = createObject( aRootObj, tr( partitionName( KIND_NATURAL_OBJECT ).toAscii() ) ); + LightApp_DataObject* aNaturalObjectsRootObj = createObject( aNewRootObj, tr( partitionName( KIND_NATURAL_OBJECT ).toAscii() ) ); // OBSTACLES - LightApp_DataObject* anObstaclesRootObj = createObject( aRootObj, tr( partitionName( KIND_OBSTACLE ).toAscii() ) ); + LightApp_DataObject* anObstaclesRootObj = createObject( aNewRootObj, tr( partitionName( KIND_OBSTACLE ).toAscii() ) ); // CALCULATION CASES - LightApp_DataObject* aCalculRootObj = createObject( aRootObj, tr( partitionName( KIND_CALCULATION ).toAscii() ) ); + LightApp_DataObject* aCalculRootObj = createObject( aNewRootObj, tr( partitionName( KIND_CALCULATION ).toAscii() ) ); + + // POLYLINES + LightApp_DataObject* aPolylineRootObj = createObject( aNewRootObj, tr( partitionName( KIND_POLYLINEXY ).toAscii() ) ); // POLYLINES - LightApp_DataObject* aPolylineRootObj = createObject( aRootObj, tr( partitionName( KIND_POLYLINEXY ).toAscii() ) ); + LightApp_DataObject* aPolyline3DRootObj = createObject( aNewRootObj, tr( partitionName( KIND_POLYLINE ).toAscii() ) ); // PROFILES - LightApp_DataObject* aProfileRootObj = createObject( aRootObj, tr( partitionName( KIND_PROFILE ).toAscii() ) ); + LightApp_DataObject* aProfileRootObj = createObject( aNewRootObj, tr( partitionName( KIND_PROFILE ).toAscii() ) ); // VISUAL STATES - LightApp_DataObject* aVisualStateRootObj = createObject( aRootObj, tr( partitionName( KIND_VISUAL_STATE ).toAscii() ) ); + LightApp_DataObject* aVisualStateRootObj = createObject( aNewRootObj, tr( partitionName( KIND_VISUAL_STATE ).toAscii() ) ); HYDROData_Iterator anIterator( aDocument, KIND_UNKNOWN ); for( ; anIterator.More(); anIterator.Next() ) { @@ -325,6 +353,16 @@ void HYDROGUI_DataModel::update( const int theStudyId ) break; } + case KIND_STREAM: + { + Handle(HYDROData_Stream) aStreamObj = + Handle(HYDROData_Stream)::DownCast( anObj ); + if( !aStreamObj.IsNull() ) { + createObject( aNaturalObjectsRootObj, aStreamObj ); + } + + break; + } case KIND_OBSTACLE: { Handle(HYDROData_Obstacle) anObstacleObj = @@ -355,6 +393,16 @@ void HYDROGUI_DataModel::update( const int theStudyId ) break; } + case KIND_POLYLINE: + { + Handle(HYDROData_Polyline3D) aPolylineObj = + Handle(HYDROData_Polyline3D)::DownCast( anObj ); + if( !aPolylineObj.IsNull() ) { + createObject( aPolyline3DRootObj, aPolylineObj ); + } + + break; + } case KIND_PROFILE: { Handle(HYDROData_Profile) aProfileObj = @@ -379,10 +427,27 @@ void HYDROGUI_DataModel::update( const int theStudyId ) } } - if( SUIT_DataBrowser* anObjectBrowser = anApp->objectBrowser() ) + //if( SUIT_DataBrowser* anObjectBrowser = anApp->objectBrowser() ) + //{ + // anObjectBrowser->setAutoOpenLevel( 3 ); + // anObjectBrowser->openLevels(); + //} + + HYDROGUI_DataModelSync aSync( aNewRootObj ); + SUIT_DataObject* aRoot = root(); + bool isNewDoc = aRoot==0; + if( isNewDoc ) + aRoot = createRootModuleObject( aStudyRoot ); + ::synchronize < suitPtr, suitPtr, HYDROGUI_DataModelSync > + ( aNewRootObj, aRoot, aSync ); + + + if( !myStates.isEmpty() ) { - anObjectBrowser->setAutoOpenLevel( 3 ); - anObjectBrowser->openLevels(); + LightApp_Application* anApp = dynamic_cast( module()->application() ); + anApp->objectBrowser()->updateTree(); + anApp->objectBrowser()->setOpenStates( myStates, ENTRY_COLUMN ); + myStates.clear(); } } @@ -413,7 +478,8 @@ void HYDROGUI_DataModel::update( LightApp_DataObject* theObject, CAM_DataObject* HYDROGUI_DataModel::createRootModuleObject( SUIT_DataObject* theParent ) { - CAM_DataObject* aRootObj = createModuleObject( theParent ); + CAM_ModuleObject* aRootObj = createModuleObject( theParent ); + aRootObj->setDataModel( this ); setRoot( aRootObj ); return aRootObj; } @@ -515,21 +581,25 @@ bool HYDROGUI_DataModel::redo() bool HYDROGUI_DataModel::canCopy() { HYDROData_SequenceOfObjects aSeq = HYDROGUI_Tool::GetSelectedObjects( (HYDROGUI_Module*)module() ); - if( aSeq.Length() != 1 ) - return false; - - Handle(HYDROData_Entity) anObject = aSeq.First(); - if( anObject.IsNull() ) - return false; - - ObjectKind aKind = anObject->GetKind(); - if( aKind == KIND_IMAGE || - aKind == KIND_POLYLINE || - aKind == KIND_PROFILE || - aKind == KIND_CALCULATION ) - return true; + bool isCanCopy = !aSeq.IsEmpty(); - return false; + for ( Standard_Integer anIndex = 1, aLength = aSeq.Length(); anIndex <= aLength; anIndex++ ) { + Handle(HYDROData_Entity) anObject = aSeq.Value( anIndex ); + if( !anObject.IsNull() ) { + ObjectKind aKind = anObject->GetKind(); + bool isUnrecognized = aKind <= KIND_UNKNOWN || aKind > KIND_LAST; + bool isChildObject = aKind == KIND_DUMMY_3D || + aKind == KIND_ZONE || + aKind == KIND_SHAPES_GROUP || + aKind == KIND_SPLITTED_GROUP; + if ( isUnrecognized || isChildObject ) { + isCanCopy = false; + break; + } + } + } + + return isCanCopy; } bool HYDROGUI_DataModel::canPaste() @@ -565,6 +635,9 @@ bool HYDROGUI_DataModel::paste() anObject->CopyTo( aClone ); 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 @@ -598,6 +671,7 @@ QString HYDROGUI_DataModel::partitionName( const ObjectKind theObjectKind ) switch( theObjectKind ) { case KIND_IMAGE: return "IMAGES"; + case KIND_POLYLINE: return "POLYLINES_3D"; case KIND_POLYLINEXY: return "POLYLINES"; case KIND_PROFILE: return "PROFILES"; case KIND_VISUAL_STATE: return "VISUAL_STATES"; @@ -635,11 +709,12 @@ LightApp_DataObject* HYDROGUI_DataModel::createObject( SUIT_DataObject* LightApp_DataObject* HYDROGUI_DataModel::buildObject( SUIT_DataObject* theParent, HYDROGUI_DataObject* theObject, const QString& theParentEntry, - const bool theIsBuildTree ) + const bool theIsBuildTree, + const bool theIsInOperation ) { if ( theIsBuildTree ) { - buildObjectTree( theParent, theObject, theParentEntry ); + buildObjectTree( theParent, theObject, theParentEntry, theIsInOperation ); } return theObject; } @@ -647,17 +722,21 @@ LightApp_DataObject* HYDROGUI_DataModel::buildObject( SUIT_DataObject* thePa LightApp_DataObject* HYDROGUI_DataModel::createZone( SUIT_DataObject* theParent, Handle(HYDROData_Zone) theModelObject, const QString& theParentEntry, - const bool theIsBuildTree ) + const bool theIsBuildTree, + const bool theIsInOperation ) { - return buildObject( theParent, new HYDROGUI_Zone( theParent, theModelObject, theParentEntry ), theParentEntry, theIsBuildTree ); + return buildObject( theParent, new HYDROGUI_Zone( theParent, theModelObject, theParentEntry, theIsInOperation ), + theParentEntry, theIsBuildTree, theIsInOperation ); } LightApp_DataObject* HYDROGUI_DataModel::createRegion( SUIT_DataObject* theParent, Handle(HYDROData_Region) theModelObject, const QString& theParentEntry, - const bool theIsBuildTree ) + const bool theIsBuildTree, + const bool theIsInOperation ) { - return buildObject( theParent, new HYDROGUI_Region( theParent, theModelObject, theParentEntry ), theParentEntry, theIsBuildTree ); + return buildObject( theParent, new HYDROGUI_Region( theParent, theModelObject, theParentEntry, theIsInOperation ), + theParentEntry, theIsBuildTree, theIsInOperation ); } LightApp_DataObject* HYDROGUI_DataModel::createObject( SUIT_DataObject* theParent, @@ -667,9 +746,34 @@ LightApp_DataObject* HYDROGUI_DataModel::createObject( SUIT_DataObject* theParen return new HYDROGUI_NamedObject( theParent, theName, theParentEntry ); } +void HYDROGUI_DataModel::buildObjectPartition( SUIT_DataObject* theObject, + const HYDROData_SequenceOfObjects& theObjects, + const QString& thePartName, + const bool theIsCreateEmpty ) +{ + if ( theObjects.IsEmpty() && !theIsCreateEmpty ) + return; + + HYDROGUI_DataObject* aGuiObj = dynamic_cast( theObject ); + if ( !aGuiObj ) + return; + + LightApp_DataObject* aPartSect = + createObject( aGuiObj, thePartName, aGuiObj->entry() ); + + HYDROData_SequenceOfObjects::Iterator anIter( theObjects ); + for ( ; anIter.More(); anIter.Next() ) + { + Handle(HYDROData_Entity) anObj = anIter.Value(); + if( !anObj.IsNull() && !anObj->IsRemoved() ) + createObject( aPartSect, anObj, aGuiObj->entry(), false ); + } +} + void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent, SUIT_DataObject* theObject, - const QString& theParentEntry ) + const QString& theParentEntry, + const bool theIsInOperation ) { HYDROGUI_DataObject* aGuiObj = dynamic_cast( theObject ); if ( !aGuiObj ) @@ -679,6 +783,21 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent, if ( aDataObj.IsNull() ) return; + if ( aDataObj->IsKind( STANDARD_TYPE(HYDROData_Object) ) ) + { + Handle(HYDROData_Object) aGeomObj = + Handle(HYDROData_Object)::DownCast( aDataObj ); + + Handle(HYDROData_DummyObject3D) anObject3D = aGeomObj->GetObject3D(); + if ( !anObject3D.IsNull() ) + createObject( aGuiObj, anObject3D, "", false ); + +#ifdef DEB_GROUPS + HYDROData_SequenceOfObjects anObjGroups = aGeomObj->GetGroups(); + buildObjectPartition( aGuiObj, anObjGroups, tr( "OBJECT_GROUPS" ), false ); +#endif + } + ObjectKind anObjectKind = aDataObj->GetKind(); if ( anObjectKind == KIND_IMAGE ) @@ -707,15 +826,83 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent, LightApp_DataObject* aBathSect = createObject( aGuiObj, tr( "ZONE_BATHYMETRY" ), aGuiObj->entry() ); - Handle(HYDROData_Bathymetry) aBathymetry = aZoneObj->GetBathymetry(); - if ( !aBathymetry.IsNull() && !aBathymetry->IsRemoved() ) - createObject( aBathSect, aBathymetry, aGuiObj->entry(), false ); + Handle(HYDROData_IAltitudeObject) anAltitudeObj = aZoneObj->GetAltitudeObject(); + if ( !anAltitudeObj.IsNull() && !anAltitudeObj->IsRemoved() ) + createObject( aBathSect, anAltitudeObj, aGuiObj->entry(), false ); + } + else if ( anObjectKind == KIND_POLYLINE ) + { + Handle(HYDROData_Polyline3D) aPolyline3D = + Handle(HYDROData_Polyline3D)::DownCast( aDataObj ); + + LightApp_DataObject* aPolylineSect = + createObject( aGuiObj, tr( "POLYLINE3D_POLYLINE" ), aGuiObj->entry() ); + + Handle(HYDROData_PolylineXY) aPolylineXY = aPolyline3D->GetPolylineXY(); + if ( !aPolylineXY.IsNull() && !aPolylineXY->IsRemoved() ) + createObject( aPolylineSect, aPolylineXY, aGuiObj->entry(), false ); + + LightApp_DataObject* aProfileSect = + createObject( aGuiObj, tr( "POLYLINE3D_PROFILE" ), aGuiObj->entry() ); + + Handle(HYDROData_ProfileUZ) aProfileUZ = aPolyline3D->GetProfileUZ(); + if ( aProfileUZ.IsNull() || aProfileUZ->IsRemoved() ) + aProfileUZ = aPolyline3D->GetChildProfileUZ( false ); + + if ( !aProfileUZ.IsNull() && !aProfileUZ->IsRemoved() ) + { + Handle(HYDROData_Profile) aProfile = + Handle(HYDROData_Profile)::DownCast( aProfileUZ->GetFatherObject() ); + if ( !aProfile.IsNull() && !aProfile->IsRemoved() ) + createObject( aProfileSect, aProfile, aGuiObj->entry(), false ); + } + + LightApp_DataObject* aBathSect = + createObject( aGuiObj, tr( "POLYLINE3D_BATHYMETRY" ), aGuiObj->entry() ); + + Handle(HYDROData_IAltitudeObject) anAltitudeObj = aPolyline3D->GetAltitudeObject(); + if ( !anAltitudeObj.IsNull() && !anAltitudeObj->IsRemoved() ) + createObject( aBathSect, anAltitudeObj, aGuiObj->entry(), false ); } else if ( anObjectKind == KIND_CALCULATION ) { Handle(HYDROData_CalculationCase) aCaseObj = Handle(HYDROData_CalculationCase)::DownCast( aDataObj ); + LightApp_DataObject* aPolylineSect = + createObject( aGuiObj, tr( "CASE_BOUNDARY" ), aGuiObj->entry() ); + + Handle(HYDROData_PolylineXY) aPolyline = aCaseObj->GetBoundaryPolyline(); + if ( !aPolyline.IsNull() && !aPolyline->IsRemoved() ) + createObject( aPolylineSect, aPolyline, aGuiObj->entry(), false ); + + LightApp_DataObject* aCaseAOSect = + createObject( aGuiObj, tr( partitionName( KIND_ARTIFICIAL_OBJECT ).toAscii() ), + aGuiObj->entry() ); + LightApp_DataObject* aCaseNOSect = + createObject( aGuiObj, tr( partitionName( KIND_NATURAL_OBJECT ).toAscii() ), + aGuiObj->entry() ); + + HYDROData_SequenceOfObjects aSeq = aCaseObj->GetGeometryObjects(); + HYDROData_SequenceOfObjects::Iterator aGOIter( aSeq ); + Handle(HYDROData_Entity) anEntity; + Handle(HYDROData_ArtificialObject) anAObject; + Handle(HYDROData_NaturalObject) aNObject; + for ( ; aGOIter.More(); aGOIter.Next() ) + { + anEntity = aGOIter.Value(); + if ( anEntity.IsNull() ) + continue; + anAObject = Handle(HYDROData_ArtificialObject)::DownCast( anEntity ); + if ( !anAObject.IsNull() ) + createObject( aCaseAOSect, anAObject, aGuiObj->entry(), false ); + else + { + aNObject = Handle(HYDROData_NaturalObject)::DownCast( anEntity ); + if ( !aNObject.IsNull() ) + createObject( aCaseNOSect, aNObject, aGuiObj->entry(), false ); + } + } LightApp_DataObject* aCaseRegionsSect = createObject( aGuiObj, tr( "CASE_REGIONS" ), aGuiObj->entry() ); @@ -726,8 +913,17 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent, Handle(HYDROData_Region) aCaseRegion = Handle(HYDROData_Region)::DownCast( anIter.Value() ); if( !aCaseRegion.IsNull() && !aCaseRegion->IsRemoved() ) - createRegion( aCaseRegionsSect, aCaseRegion, "", true ); + createRegion( aCaseRegionsSect, aCaseRegion, "", 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 ); +#endif + } else if ( anObjectKind == KIND_REGION ) { @@ -741,8 +937,49 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent, Handle(HYDROData_Zone) aRegionZone = Handle(HYDROData_Zone)::DownCast( anIter.Value() ); if( !aRegionZone.IsNull() && !aRegionZone->IsRemoved() ) - createZone( aGuiObj, aRegionZone, "", true ); + createZone( aGuiObj, aRegionZone, "", true, theIsInOperation ); + } + } + else if ( anObjectKind == KIND_PROFILE ) + { + Handle(HYDROData_Profile) aProfileObj = + Handle(HYDROData_Profile)::DownCast( aDataObj ); + + aGuiObj->setIsValid( aProfileObj->IsValid() ); + } + else if ( anObjectKind == KIND_CHANNEL || anObjectKind == KIND_DIGUE ) + { + Handle(HYDROData_Channel) aChannelObj = + Handle(HYDROData_Channel)::DownCast( aDataObj ); + + LightApp_DataObject* aGuideLineSect = + createObject( aGuiObj, tr( "CHANNEL_GUIDE_LINE" ), aGuiObj->entry() ); + Handle(HYDROData_Polyline3D) aGuideLine = aChannelObj->GetGuideLine(); + if ( !aGuideLine.IsNull() && !aGuideLine->IsRemoved() ) { + createObject( aGuideLineSect, aGuideLine, aGuiObj->entry(), false ); + } + + LightApp_DataObject* aProfileSect = + createObject( aGuiObj, tr( "CHANNEL_PROFILE" ), aGuiObj->entry() ); + Handle(HYDROData_Profile) aProfile = aChannelObj->GetProfile(); + if ( !aProfile.IsNull() && !aProfile->IsRemoved() ) { + createObject( aProfileSect, aProfile, aGuiObj->entry(), false ); + } + } + else if ( anObjectKind == KIND_STREAM ) + { + Handle(HYDROData_Stream) aStreamObj = + Handle(HYDROData_Stream)::DownCast( aDataObj ); + + LightApp_DataObject* aHydraulicAxisSect = + createObject( aGuiObj, tr( "STREAM_HYDRAULIC_AXIS" ), aGuiObj->entry() ); + Handle(HYDROData_PolylineXY) aHydraulicAxis = aStreamObj->GetHydraulicAxis(); + if ( !aHydraulicAxis.IsNull() && !aHydraulicAxis->IsRemoved() ) { + createObject( aHydraulicAxisSect, aHydraulicAxis, aGuiObj->entry(), false ); } + + HYDROData_SequenceOfObjects aProfiles = aStreamObj->GetProfiles(); + buildObjectPartition( aGuiObj, aProfiles, tr( "STREAM_PROFILES" ), true ); } } @@ -750,7 +987,17 @@ void HYDROGUI_DataModel::buildCaseTree( SUIT_DataObject* theParent, Handle(HYDRO { if ( !theCase.IsNull() ) { - new HYDROGUI_DropTargetObject( theParent, tr( "NEW_REGION" ), "" ); + if ( theParent ) + { + // Remove previous objects tree + DataObjectList aList; + theParent->children( aList ); + QListIterator anIter( aList ); + while( anIter.hasNext() ) + removeChild( theParent, anIter.next() ); + } + + new HYDROGUI_DropTargetObject( theParent, tr( "NEW_REGION" ), "", true ); HYDROData_SequenceOfObjects aCaseRegions = theCase->GetRegions(); HYDROData_SequenceOfObjects::Iterator anIter( aCaseRegions ); @@ -759,7 +1006,43 @@ void HYDROGUI_DataModel::buildCaseTree( SUIT_DataObject* theParent, Handle(HYDRO Handle(HYDROData_Region) aCaseRegion = Handle(HYDROData_Region)::DownCast( anIter.Value() ); if( !aCaseRegion.IsNull() && !aCaseRegion->IsRemoved() ) - createRegion( theParent, aCaseRegion, "", true ); + createRegion( theParent, aCaseRegion, "", true, true ); + } + } +} + +void HYDROGUI_DataModel::updateObjectTree( Handle(HYDROData_Entity)& theObj ) +{ + if ( !theObj.IsNull() ) + { + HYDROGUI_DataObject* aGuiObj = dynamic_cast( + findObject( HYDROGUI_DataObject::dataObjectEntry( theObj ) ) ); + if ( aGuiObj ) + { + // Remove previous objects tree + DataObjectList aList; + aGuiObj->children( aList ); + QListIterator anIter( aList ); + while( anIter.hasNext() ) + removeChild( aGuiObj, anIter.next() ); + + // Rebuild the subtree + QString aParentEntry; + HYDROGUI_DataObject* aParent = dynamic_cast( aGuiObj->parent() ); + if ( aParent ) + { + aParentEntry = aParent->entry(); + } + buildObjectTree( aParent, aGuiObj, aParentEntry, aGuiObj->isInOperation() ); + } + else + { + // workaround for the bug in SalomeApp_Study::findObjectByEntry - it can't find LightApp_DataObjects + HYDROGUI_Module* aModule = dynamic_cast( module() ); + if( aModule ) + { + aModule->getApp()->updateObjectBrowser(); + } } } } @@ -816,3 +1099,24 @@ bool HYDROGUI_DataModel::createNewRegion( Handle(HYDROData_CalculationCase) theC } return isOk; } + +bool HYDROGUI_DataModel::rename( Handle(HYDROData_Entity) theEntity, const QString& theName ) +{ + if ( theName.isEmpty() ) + return false; + + try + { + getDocument()->StartOperation(); + theEntity->SetName( theName ); + getDocument()->CommitOperation( HYDROGUI_Tool::ToExtString( tr("RENAME_TO").arg( theName ) ) ); + module()->application()->activeStudy()->Modified(); + } + catch ( Standard_Failure ) + { + getDocument()->AbortOperation(); + return false; + } + return true; +} +