X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.cxx;h=954e789f45028ac10c404ea4ff7056d38026ace0;hb=e7225e329739e01faed6682de0bc83cf84c28de6;hp=91cbb27e626219cebc7b0c45ea94b9dbed0cece9;hpb=dd6cdff692e9ce241c2e5eeb11385a05b3ebbcb3;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx index 91cbb27e..954e789f 100644 --- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx +++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx @@ -31,6 +31,7 @@ #include "HYDROGUI_Region.h" #include +#include #include #include #include @@ -91,7 +92,6 @@ void HYDROGUI_CalculationOp::startOperation() } } - aPanel->reset(); QStringList aList; QStringList anEntryList; @@ -144,6 +144,7 @@ void HYDROGUI_CalculationOp::startOperation() aPolylineName = aPolylineObj->GetName(); aPanel->setBoundary( aPolylineName ); } + aSeq = myEditedObject->GetGeometryObjects(); getNamesAndEntries( aSeq, aList, anEntryList ); aPanel->includeGeomObjects( aList ); @@ -172,8 +173,8 @@ void HYDROGUI_CalculationOp::getNamesAndEntries( const HYDROData_SequenceOfObjec for ( ; anIter.More(); anIter.Next() ) { Handle(HYDROData_Entity) anEntity = anIter.Value(); - if ( !HYDROData_Tool::IsGeometryObject( anEntity ) ) - continue; + //if ( !HYDROData_Tool::IsGeometryObject( anEntity ) ) + // continue; theNames.append( anEntity->GetName() ); theEntries.append( HYDROGUI_DataObject::dataObjectEntry( anEntity ) ); @@ -204,6 +205,8 @@ HYDROGUI_InputPanel* HYDROGUI_CalculationOp::createInputPanel() const // Connect signals and slots connect( aPanel, SIGNAL( addObjects() ), SLOT( onAddObjects() ) ); connect( aPanel, SIGNAL( removeObjects() ), SLOT( onRemoveObjects() ) ); + connect( aPanel, SIGNAL( addGroups() ), SLOT( onAddGroups() ) ); + connect( aPanel, SIGNAL( removeGroups() ), SLOT( onRemoveGroups() ) ); connect( aPanel, SIGNAL( Next( const int ) ), SLOT( onNext( const int ) ) ); connect( aPanel, SIGNAL( Back( const int ) ), SLOT( onHideZones() ) ); //connect( aPanel, SIGNAL( clicked( SUIT_DataObject* ) ), SLOT( onSelected( SUIT_DataObject* ) ) ); @@ -231,7 +234,7 @@ void HYDROGUI_CalculationOp::onBoundarySelected ( const QString & theObjName ) myEditedObject->GetBoundaryPolyline(); if ( !aPrevPolyline.IsNull() ) { - module()->removeObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aPrevPolyline ); + setObjectVisibility( aPrevPolyline, false ); anIsToUpdateViewer = true; } @@ -250,13 +253,13 @@ void HYDROGUI_CalculationOp::onBoundarySelected ( const QString & theObjName ) Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext(); if ( !aCtx.IsNull() ) { - showObject( aNewPolyline, aCtx ); + setObjectVisibility( aNewPolyline, true ); anIsToUpdateViewer = true; } } if ( anIsToUpdateViewer ) - aViewer->update(); + module()->update( UF_OCCViewer ); } } } @@ -391,7 +394,7 @@ void HYDROGUI_CalculationOp::onCreateRegion( const QList& theZ } } -void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theBathymetryName ) +void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theAltitudeName ) { HYDROGUI_CalculationDlg* aPanel = ::qobject_cast( inputPanel() ); @@ -400,7 +403,7 @@ void HYDROGUI_CalculationOp::onSetMergeType( int theMergeType, QString& theBathy HYDROGUI_Zone* aZone = aPanel->getCurrentZone(); if ( aZone ) { - aZone->setMergeType( theMergeType, theBathymetryName ); + aZone->setMergeType( theMergeType, theAltitudeName ); HYDROGUI_Shape* aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aZone->modelObject() ); if ( aShape ) { @@ -461,10 +464,11 @@ void HYDROGUI_CalculationOp::onRemoveObjects() if ( anObject.IsNull() ) continue; - module()->removeObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, anObject ); + setObjectVisibility( anObject, false ); myEditedObject->RemoveGeometryObject( anObject ); } + module()->update( UF_OCCViewer ); aPanel->excludeGeomObjects( aSelectedList ); } @@ -494,14 +498,21 @@ bool HYDROGUI_CalculationOp::confirmRegionsChange() const } bool HYDROGUI_CalculationOp::processApply( int& theUpdateFlags, - QString& theErrorMsg ) + QString& theErrorMsg, + QStringList& theBrowseObjectsEntries ) { HYDROGUI_CalculationDlg* aPanel = ::qobject_cast( inputPanel() ); if ( !aPanel ) return false; - theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced; + if( !myIsEdit ) + { + QString anEntry = HYDROGUI_DataObject::dataObjectEntry( myEditedObject ); + theBrowseObjectsEntries.append( anEntry ); + } + + theUpdateFlags = UF_Model | UF_OCCViewer | UF_OCC_Forced | UF_VTKViewer | UF_VTK_Forced | UF_VTK_Init; return true; } @@ -512,12 +523,13 @@ void HYDROGUI_CalculationOp::onApply() int anUpdateFlags = 0; QString anErrorMsg; + QStringList aBrowseObjectsEntries; bool aResult = false; try { - aResult = processApply( anUpdateFlags, anErrorMsg ); + aResult = processApply( anUpdateFlags, anErrorMsg, aBrowseObjectsEntries ); } catch ( Standard_Failure ) { @@ -536,6 +548,7 @@ void HYDROGUI_CalculationOp::onApply() { module()->update( anUpdateFlags ); commit(); + browseObjects( aBrowseObjectsEntries ); } else { @@ -623,20 +636,13 @@ void HYDROGUI_CalculationOp::setZonesVisible( bool theIsVisible ) HYDROData_SequenceOfObjects::Iterator aZonesIter( aZones ); for ( ; aZonesIter.More(); aZonesIter.Next() ) { - if ( theIsVisible ) - { - showObject( aZonesIter.Value(), aCtx ); - } - else - { - module()->removeObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aZonesIter.Value() ); - } + setObjectVisibility( aZonesIter.Value(), theIsVisible ); } } } } - aViewer->update(); + module()->update( UF_OCCViewer ); } } } @@ -707,30 +713,28 @@ void HYDROGUI_CalculationOp::createPreview() HYDROData_SequenceOfObjects::Iterator anIter( aSeq ); for ( ; anIter.More(); anIter.Next() ) { - showObject( anIter.Value(), aCtx ); + setObjectVisibility( anIter.Value(), true ); } //Process the draw events for viewer - QApplication::processEvents(); + QApplication::processEvents( QEventLoop::ExcludeUserInputEvents ); if ( OCCViewer_ViewWindow* vw = (OCCViewer_ViewWindow*)myPreviewViewManager->getActiveView() ) vw->onTopView(); } - aViewer->update(); + module()->update( UF_OCCViewer | UF_FitAll ); } } -void HYDROGUI_CalculationOp::showObject( Handle(HYDROData_Entity) theEntity, Handle(AIS_InteractiveContext) theCtx ) +void HYDROGUI_CalculationOp::setObjectVisibility( Handle(HYDROData_Entity) theEntity, const bool theIsVisible ) { - if ( !theEntity.IsNull() ) - { - HYDROGUI_Shape* aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, theEntity ); - if ( !aShape ) - { - aShape = new HYDROGUI_Shape( theCtx, theEntity ); - module()->setObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, theEntity, aShape ); - } - aShape->update( false ); + if ( theEntity.IsNull() || !myPreviewViewManager ) { + return; + } + + OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer(); + if ( aViewer ) { + module()->setObjectVisible( (size_t)aViewer, theEntity, theIsVisible ); } } @@ -757,6 +761,19 @@ void HYDROGUI_CalculationOp::closePreview() if( myPreviewViewManager ) { + // Hide all the displayed objects in the preview view + OCCViewer_Viewer* aViewer = myPreviewViewManager->getOCCViewer(); + if ( aViewer ) { + size_t aViewId = (size_t)aViewer; + HYDROData_Iterator anIterator( doc() ); + for( ; anIterator.More(); anIterator.Next() ) { + Handle(HYDROData_Entity) anObject = anIterator.Current(); + if( !anObject.IsNull() ) { + module()->setObjectVisible( aViewId, anObject, false ); + } + } + } + disconnect( myPreviewViewManager, SIGNAL( lastViewClosed( SUIT_ViewManager* ) ), this, SLOT( onLastViewClosed( SUIT_ViewManager* ) ) ); @@ -774,12 +791,92 @@ void HYDROGUI_CalculationOp::closePreview() void HYDROGUI_CalculationOp::setAvailableGroups() { HYDROGUI_CalculationDlg* aPanel = - ::qobject_cast( inputPanel() ); + ::qobject_cast( inputPanel() ); + + HYDROData_SequenceOfObjects aSeq = myEditedObject->GetGeometryGroups(); + QStringList aList, anEntryList; + getNamesAndEntries( aSeq, aList, anEntryList ); + + QStringList aGroupsNames; HYDROData_SequenceOfObjects anObjs = myEditedObject->GetGeometryObjects(); for( int anIndex = 1, aLength = anObjs.Length(); anIndex <= aLength; anIndex++ ) { Handle_HYDROData_Object anObj = Handle_HYDROData_Object::DownCast( anObjs.Value( anIndex ) ); - //TODO: anObj->GetGroups(); + HYDROData_SequenceOfObjects aGroups = anObj->GetGroups(); + for( int aGIndex = 1, aGLength = aGroups.Length(); aGIndex <= aGLength; aGIndex++ ) + { + Handle_HYDROData_ShapesGroup aGroup = Handle_HYDROData_ShapesGroup::DownCast( aGroups.Value( aGIndex ) ); + aGroupsNames.append( aGroup->GetName() ); + } + } + if( myEditedObject->IsMustBeUpdated() ) { + for( int anIndex = 1, aLength = aSeq.Length(); anIndex <= aLength; anIndex++ ) { + Handle(HYDROData_ShapesGroup) aGeomGroup = + Handle(HYDROData_ShapesGroup)::DownCast( aSeq.Value( anIndex ) ); + if ( !aGeomGroup.IsNull() && !aGroupsNames.contains( aGeomGroup->GetName() ) ) { + myEditedObject->RemoveGeometryGroup( aGeomGroup ); + } + } } + + aPanel->setAvailableGroups( aGroupsNames ); + aPanel->includeGroups( aList ); + + bool isUpdated = myEditedObject->IsMustBeUpdated(); +} + +void HYDROGUI_CalculationOp::onAddGroups() +{ + HYDROGUI_CalculationDlg* aPanel = + ::qobject_cast( inputPanel() ); + if ( !aPanel ) + return; + + // Add geometry objects selected in the module browser to the calculation case + QStringList aSelectedList = aPanel->getSelectedAvailableGroups(); + if ( aSelectedList.isEmpty() || !confirmRegionsChange() ) + return; + + QStringList anAddedList; + for (int i = 0; i < aSelectedList.length(); i++) + { + Handle(HYDROData_ShapesGroup) aGroup = Handle(HYDROData_ShapesGroup)::DownCast( + HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at( i ) ) ); + if ( aGroup.IsNull() ) + continue; + + if ( myEditedObject->AddGeometryGroup( aGroup ) ) + anAddedList.append( aGroup->GetName() ); + } + + if ( !anAddedList.isEmpty() ) + { + aPanel->includeGroups( anAddedList ); + } +} + +void HYDROGUI_CalculationOp::onRemoveGroups() +{ + // Remove selected objects from the calculation case + HYDROGUI_CalculationDlg* aPanel = + ::qobject_cast( inputPanel() ); + if ( !aPanel ) + return; + + QStringList aSelectedList = aPanel->getSelectedGroups(); + if ( aSelectedList.isEmpty() || !confirmRegionsChange() ) + return; + + for (int i = 0; i < aSelectedList.length(); i++) + { + Handle(HYDROData_ShapesGroup) aGroup = Handle(HYDROData_ShapesGroup)::DownCast( + HYDROGUI_Tool::FindObjectByName( module(), aSelectedList.at(i) ) ); + if ( aGroup.IsNull() ) + continue; + + myEditedObject->RemoveGeometryGroup( aGroup ); + } + + aPanel->excludeGroups( aSelectedList ); }