X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DataModel.cxx;h=97ec16079ae1c5b00aca7e54d2057fdf79135634;hb=de7cf9bb0a7a41d6487013c87f4a54d0664cd303;hp=ef136fff2abb773ad85c7f2b61fa748dfcc680d1;hpb=bd1a4992da8d54929ec556df6db4e7e0ebbfbbd7;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_DataModel.cxx b/src/HYDROGUI/HYDROGUI_DataModel.cxx index ef136fff..97ec1607 100644 --- a/src/HYDROGUI/HYDROGUI_DataModel.cxx +++ b/src/HYDROGUI/HYDROGUI_DataModel.cxx @@ -25,14 +25,18 @@ #include "HYDROGUI_DataObject.h" #include "HYDROGUI_Module.h" #include "HYDROGUI_Tool.h" +#include "HYDROGUI_Zone.h" +#include "HYDROGUI_Region.h" #include -#include +#include #include #include +#include #include #include #include +#include #include #include @@ -220,7 +224,7 @@ void HYDROGUI_DataModel::update( const int theStudyId ) if( aDocument.IsNull() ) return; - LightApp_DataObject* anImageRootObj = createObject( aRootObj, partitionName( KIND_IMAGE ) ); + LightApp_DataObject* anImageRootObj = createObject( aRootObj, tr( partitionName( KIND_IMAGE ).toAscii() ) ); HYDROData_Iterator anIterator( aDocument, KIND_IMAGE ); for( ; anIterator.More(); anIterator.Next() ) @@ -231,7 +235,7 @@ void HYDROGUI_DataModel::update( const int theStudyId ) createObject( anImageRootObj, anImageObj ); } - LightApp_DataObject* aBathymetryRootObj = createObject( aRootObj, partitionName( KIND_BATHYMETRY ) ); + LightApp_DataObject* aBathymetryRootObj = createObject( aRootObj, tr( partitionName( KIND_BATHYMETRY ).toAscii() ) ); anIterator = HYDROData_Iterator( aDocument, KIND_BATHYMETRY ); for( ; anIterator.More(); anIterator.Next() ) @@ -242,18 +246,7 @@ void HYDROGUI_DataModel::update( const int theStudyId ) createObject( aBathymetryRootObj, aBathymetryObj ); } - LightApp_DataObject* aCalculRootObj = createObject( aRootObj, partitionName( KIND_CALCULATION ) ); - - anIterator = HYDROData_Iterator( aDocument, KIND_CALCULATION ); - for( ; anIterator.More(); anIterator.Next() ) - { - Handle(HYDROData_Calculation) aCalculObj = - Handle(HYDROData_Calculation)::DownCast( anIterator.Current() ); - if( !aCalculObj.IsNull() ) - createObject( aCalculRootObj, aCalculObj ); - } - - LightApp_DataObject* aPolylineRootObj = createObject( aRootObj, partitionName( KIND_POLYLINE ) ); + LightApp_DataObject* aPolylineRootObj = createObject( aRootObj, tr( partitionName( KIND_POLYLINE ).toAscii() ) ); anIterator = HYDROData_Iterator( aDocument, KIND_POLYLINE ); for( ; anIterator.More(); anIterator.Next() ) @@ -264,18 +257,29 @@ void HYDROGUI_DataModel::update( const int theStudyId ) createObject( aPolylineRootObj, aPolylineObj ); } - LightApp_DataObject* aZonesRootObj = createObject( aRootObj, partitionName( KIND_ZONE ) ); + LightApp_DataObject* aZonesRootObj = createObject( aRootObj, tr( partitionName( KIND_IMMERSIBLE_ZONE ).toAscii() ) ); - anIterator = HYDROData_Iterator( aDocument, KIND_ZONE ); + anIterator = HYDROData_Iterator( aDocument, KIND_IMMERSIBLE_ZONE ); for( ; anIterator.More(); anIterator.Next() ) { - Handle(HYDROData_Zone) aZoneObj = - Handle(HYDROData_Zone)::DownCast( anIterator.Current() ); + Handle(HYDROData_ImmersibleZone) aZoneObj = + Handle(HYDROData_ImmersibleZone)::DownCast( anIterator.Current() ); if( !aZoneObj.IsNull() ) createObject( aZonesRootObj, aZoneObj ); } - LightApp_DataObject* aVisualStateRootObj = createObject( aRootObj, partitionName( KIND_VISUAL_STATE ) ); + LightApp_DataObject* aCalculRootObj = createObject( aRootObj, tr( partitionName( KIND_CALCULATION ).toAscii() ) ); + + anIterator = HYDROData_Iterator( aDocument, KIND_CALCULATION ); + for( ; anIterator.More(); anIterator.Next() ) + { + Handle(HYDROData_CalculationCase) aCalculObj = + Handle(HYDROData_CalculationCase)::DownCast( anIterator.Current() ); + if( !aCalculObj.IsNull() ) + createObject( aCalculRootObj, aCalculObj ); + } + + LightApp_DataObject* aVisualStateRootObj = createObject( aRootObj, tr( partitionName( KIND_VISUAL_STATE ).toAscii() ) ); anIterator = HYDROData_Iterator( aDocument, KIND_VISUAL_STATE ); for( ; anIterator.More(); anIterator.Next() ) @@ -293,7 +297,7 @@ void HYDROGUI_DataModel::update( const int theStudyId ) } } -HYDROGUI_DataObject* HYDROGUI_DataModel::getDataObject( const Handle(HYDROData_Object)& theModelObject ) +HYDROGUI_DataObject* HYDROGUI_DataModel::getDataObject( const Handle(HYDROData_Entity)& theModelObject ) { return NULL; // to do if necessary } @@ -332,7 +336,7 @@ void HYDROGUI_DataModel::updateModel() update( aModule->getStudyId() ); } -Handle(HYDROData_Object) HYDROGUI_DataModel::objectByEntry( const QString& theEntry, +Handle(HYDROData_Entity) HYDROGUI_DataModel::objectByEntry( const QString& theEntry, const ObjectKind theObjectKind ) { QString anEntry = theEntry; @@ -345,7 +349,7 @@ Handle(HYDROData_Object) HYDROGUI_DataModel::objectByEntry( const QString& theEn HYDROData_Iterator anIterator( aDocument, theObjectKind ); for( ; anIterator.More(); anIterator.Next() ) { - Handle(HYDROData_Object) anObject = anIterator.Current(); + Handle(HYDROData_Entity) anObject = anIterator.Current(); if( !anObject.IsNull() ) { QString anEntryRef = HYDROGUI_DataObject::dataObjectEntry( anObject ); @@ -425,7 +429,7 @@ bool HYDROGUI_DataModel::canCopy() if( aSeq.Length() != 1 ) return false; - Handle(HYDROData_Object) anObject = aSeq.First(); + Handle(HYDROData_Entity) anObject = aSeq.First(); if( anObject.IsNull() ) return false; @@ -442,7 +446,7 @@ bool HYDROGUI_DataModel::canPaste() { for( int anIndex = 1, aLength = myCopyingObjects.Length(); anIndex <= aLength; anIndex++ ) { - Handle(HYDROData_Object) anObject = myCopyingObjects.Value( anIndex ); + Handle(HYDROData_Entity) anObject = myCopyingObjects.Value( anIndex ); if( !anObject.IsNull() && !anObject->IsRemoved() ) return true; } @@ -461,11 +465,11 @@ bool HYDROGUI_DataModel::paste() bool anIsChanged = false; for( int anIndex = 1, aLength = myCopyingObjects.Length(); anIndex <= aLength; anIndex++ ) { - Handle(HYDROData_Object) anObject = myCopyingObjects.Value( anIndex ); + Handle(HYDROData_Entity) anObject = myCopyingObjects.Value( anIndex ); if( !anObject.IsNull() && !anObject->IsRemoved() ) { ObjectKind aKind = anObject->GetKind(); - Handle(HYDROData_Object) aClone = getDocument()->CreateObject( aKind ); + Handle(HYDROData_Entity) aClone = getDocument()->CreateObject( aKind ); if( !aClone.IsNull() ) { anObject->CopyTo( aClone ); @@ -503,12 +507,12 @@ QString HYDROGUI_DataModel::partitionName( const ObjectKind theObjectKind ) { switch( theObjectKind ) { - case KIND_IMAGE: return "IMAGES"; - case KIND_POLYLINE: return "POLYLINES"; - case KIND_VISUAL_STATE: return "VISUAL_STATES"; - case KIND_BATHYMETRY: return "BATHYMETRIES"; - case KIND_CALCULATION: return "CALCULATION_CASES"; - case KIND_ZONE: return "ZONES"; + case KIND_IMAGE: return "IMAGES"; + case KIND_POLYLINE: return "POLYLINES"; + case KIND_VISUAL_STATE: return "VISUAL_STATES"; + case KIND_BATHYMETRY: return "BATHYMETRIES"; + case KIND_CALCULATION: return "CALCULATION_CASES"; + case KIND_IMMERSIBLE_ZONE: return "IMMERSIBLE_ZONES"; default: break; } return QString(); @@ -521,12 +525,11 @@ Handle(HYDROData_Document) HYDROGUI_DataModel::getDocument() const } LightApp_DataObject* HYDROGUI_DataModel::createObject( SUIT_DataObject* theParent, - Handle(HYDROData_Object) theModelObject, + Handle(HYDROData_Entity) theModelObject, const QString& theParentEntry, const bool theIsBuildTree ) { - HYDROGUI_DataObject* aResObj = - new HYDROGUI_DataObject( theParent, theModelObject, theParentEntry ); + HYDROGUI_DataObject* aResObj = new HYDROGUI_DataObject( theParent, theModelObject, theParentEntry ); if ( theIsBuildTree ) { @@ -536,6 +539,34 @@ LightApp_DataObject* HYDROGUI_DataModel::createObject( SUIT_DataObject* return aResObj; } +LightApp_DataObject* HYDROGUI_DataModel::buildObject( SUIT_DataObject* theParent, + HYDROGUI_DataObject* theObject, + const QString& theParentEntry, + const bool theIsBuildTree ) +{ + if ( theIsBuildTree ) + { + buildObjectTree( theParent, theObject, theParentEntry ); + } + return theObject; +} + +LightApp_DataObject* HYDROGUI_DataModel::createZone( SUIT_DataObject* theParent, + Handle(HYDROData_Zone) theModelObject, + const QString& theParentEntry, + const bool theIsBuildTree ) +{ + return buildObject( theParent, new HYDROGUI_Zone( theParent, theModelObject, theParentEntry ), theParentEntry, theIsBuildTree ); +} + +LightApp_DataObject* HYDROGUI_DataModel::createRegion( SUIT_DataObject* theParent, + Handle(HYDROData_Region) theModelObject, + const QString& theParentEntry, + const bool theIsBuildTree ) +{ + return buildObject( theParent, new HYDROGUI_Region( theParent, theModelObject, theParentEntry ), theParentEntry, theIsBuildTree ); +} + LightApp_DataObject* HYDROGUI_DataModel::createObject( SUIT_DataObject* theParent, const QString& theName, const QString& theParentEntry ) @@ -551,7 +582,7 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent, if ( !aGuiObj ) return; - Handle(HYDROData_Object) aDataObj = aGuiObj->modelObject(); + Handle(HYDROData_Entity) aDataObj = aGuiObj->modelObject(); if ( aDataObj.IsNull() ) return; @@ -563,15 +594,15 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent, Handle(HYDROData_Image)::DownCast( aDataObj ); for ( int anIndex = 0, aNbRef = anImageObj->NbReferences(); anIndex < aNbRef; anIndex++ ) { - Handle(HYDROData_Object) aRefObj = anImageObj->Reference( anIndex ); + Handle(HYDROData_Entity) aRefObj = anImageObj->Reference( anIndex ); if ( !aRefObj.IsNull() && !aRefObj->IsRemoved() ) createObject( aGuiObj, aRefObj, aGuiObj->entry(), false ); } } - else if ( anObjectKind == KIND_ZONE ) + else if ( anObjectKind == KIND_IMMERSIBLE_ZONE ) { - Handle(HYDROData_Zone) aZoneObj = - Handle(HYDROData_Zone)::DownCast( aDataObj ); + Handle(HYDROData_ImmersibleZone) aZoneObj = + Handle(HYDROData_ImmersibleZone)::DownCast( aDataObj ); LightApp_DataObject* aPolylineSect = createObject( aGuiObj, tr( "ZONE_POLYLINE" ), aGuiObj->entry() ); @@ -580,55 +611,62 @@ void HYDROGUI_DataModel::buildObjectTree( SUIT_DataObject* theParent, if ( !aPolyline.IsNull() && !aPolyline->IsRemoved() ) createObject( aPolylineSect, aPolyline, aGuiObj->entry(), false ); - LightApp_DataObject* aBathsSect = - createObject( aGuiObj, tr( "ZONE_BATHYMETRIES" ), aGuiObj->entry() ); + LightApp_DataObject* aBathSect = + createObject( aGuiObj, tr( "ZONE_BATHYMETRY" ), aGuiObj->entry() ); - HYDROData_SequenceOfObjects aZoneBaths = aZoneObj->GetBathymetries(); - HYDROData_SequenceOfObjects::Iterator aBathsIter( aZoneBaths ); - for ( ; aBathsIter.More(); aBathsIter.Next() ) - { - Handle(HYDROData_Bathymetry) aRefBath = - Handle(HYDROData_Bathymetry)::DownCast( aBathsIter.Value() ); - if( !aRefBath.IsNull() && !aRefBath->IsRemoved() ) - createObject( aBathsSect, aRefBath, aGuiObj->entry(), false ); - } + Handle(HYDROData_Bathymetry) aBathymetry = aZoneObj->GetBathymetry(); + if ( !aBathymetry.IsNull() && !aBathymetry->IsRemoved() ) + createObject( aBathSect, aBathymetry, aGuiObj->entry(), false ); } else if ( anObjectKind == KIND_CALCULATION ) { - Handle(HYDROData_Calculation) aCaseObj = - Handle(HYDROData_Calculation)::DownCast( aDataObj ); - - LightApp_DataObject* aPolylineSect = - createObject( aGuiObj, tr( "CASE_BND_POLYLINE" ), aGuiObj->entry() ); + Handle(HYDROData_CalculationCase) aCaseObj = + Handle(HYDROData_CalculationCase)::DownCast( aDataObj ); - Handle(HYDROData_Polyline) aPolyline = aCaseObj->GetBoundaryPolyline(); - if ( !aPolyline.IsNull() && !aPolyline->IsRemoved() ) - createObject( aPolylineSect, aPolyline, aGuiObj->entry(), false ); + LightApp_DataObject* aCaseRegionsSect = + createObject( aGuiObj, tr( "CASE_REGIONS" ), aGuiObj->entry() ); - LightApp_DataObject* aRefZonesSect = - createObject( aGuiObj, tr( "CASE_REFERENCE_ZONES" ), aGuiObj->entry() ); + HYDROData_SequenceOfObjects aCaseRegions = aCaseObj->GetRegions(); + HYDROData_SequenceOfObjects::Iterator anIter( aCaseRegions ); + for ( ; anIter.More(); anIter.Next() ) + { + Handle(HYDROData_Region) aCaseRegion = + Handle(HYDROData_Region)::DownCast( anIter.Value() ); + if( !aCaseRegion.IsNull() && !aCaseRegion->IsRemoved() ) + createRegion( aCaseRegionsSect, aCaseRegion, "", true ); + } + } + else if ( anObjectKind == KIND_REGION ) + { + Handle(HYDROData_Region) aRegionObj = + Handle(HYDROData_Region)::DownCast( aDataObj ); - HYDROData_SequenceOfObjects aRefZones = aCaseObj->GetZones(); - HYDROData_SequenceOfObjects::Iterator anIter( aRefZones ); + HYDROData_SequenceOfObjects aRegionZones = aRegionObj->GetZones(); + HYDROData_SequenceOfObjects::Iterator anIter( aRegionZones ); for ( ; anIter.More(); anIter.Next() ) { - Handle(HYDROData_Zone) aRefZone = + Handle(HYDROData_Zone) aRegionZone = Handle(HYDROData_Zone)::DownCast( anIter.Value() ); - if( !aRefZone.IsNull() && !aRefZone->IsRemoved() ) - createObject( aRefZonesSect, aRefZone, aGuiObj->entry(), false ); + if( !aRegionZone.IsNull() && !aRegionZone->IsRemoved() ) + createZone( aGuiObj, aRegionZone, "", true ); } + } +} - LightApp_DataObject* aSplittedZonesSect = - createObject( aGuiObj, tr( "CASE_SPLITTED_ZONES" ), aGuiObj->entry() ); +void HYDROGUI_DataModel::buildCaseTree( SUIT_DataObject* theParent, Handle(HYDROData_CalculationCase) theCase ) +{ + if ( !theCase.IsNull() ) + { + new HYDROGUI_DropTargetObject( theParent, tr( "NEW_REGION" ), "" ); - HYDROData_SequenceOfObjects aSplittedZones = aCaseObj->GetSplittedZones(); - anIter.Init( aSplittedZones ); + HYDROData_SequenceOfObjects aCaseRegions = theCase->GetRegions(); + HYDROData_SequenceOfObjects::Iterator anIter( aCaseRegions ); for ( ; anIter.More(); anIter.Next() ) { - Handle(HYDROData_Zone) aSplittedZone = - Handle(HYDROData_Zone)::DownCast( anIter.Value() ); - if( !aSplittedZone.IsNull() && !aSplittedZone->IsRemoved() ) - createObject( aSplittedZonesSect, aSplittedZone, aGuiObj->entry(), false ); + Handle(HYDROData_Region) aCaseRegion = + Handle(HYDROData_Region)::DownCast( anIter.Value() ); + if( !aCaseRegion.IsNull() && !aCaseRegion->IsRemoved() ) + createRegion( theParent, aCaseRegion, "", true ); } } } @@ -654,3 +692,34 @@ SUIT_DataObject* HYDROGUI_DataModel::findChildByName( const SUIT_DataObject* the } return NULL; // not found } + +bool HYDROGUI_DataModel::createNewRegion( Handle(HYDROData_CalculationCase) theCase, + const QList& theZonesList ) +{ + bool isOk = !theCase.IsNull(); + if ( isOk ) + { + Handle(HYDROData_Region) aRegion; + Handle(HYDROData_Zone) aZone; + for (int i = 0; i < theZonesList.length(); i++ ) + { + aZone = Handle(HYDROData_Zone)::DownCast( theZonesList.at(i)->modelObject() ); + if ( !aZone.IsNull() ) + { + if ( aRegion.IsNull() ) + { + aRegion = theCase->AddNewRegion( aZone ); + isOk = !aRegion.IsNull(); + } + else + { + if ( !( aRegion->AddZone( aZone ) ) ) + { + isOk = false; + } + } + } + } + } + return isOk; +}