X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_OCCDisplayer.cxx;h=310e84de0cdb63dd854393fc4a98ff9c9342eee5;hb=a5961fd772bf86c3153bbc2388b8fc98974537de;hp=f702ecbfef8940d99c13c439139ddba49d11dac3;hpb=211bcb44a23680ed63bcca9066a2afc8cdc40786;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx index f702ecbf..310e84de 100644 --- a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx +++ b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx @@ -26,11 +26,19 @@ #include "HYDROGUI_Module.h" #include "HYDROGUI_Tool.h" #include "HYDROGUI_Shape.h" +#include "HYDROGUI_Operation.h" +#include "HYDROGUI_DataObject.h" +#include "HYDROGUI_ZLayers.h" #include #include #include +#include + +#include +#include + #include #include #include @@ -65,6 +73,46 @@ void HYDROGUI_OCCDisplayer::SetToUpdate( const HYDROData_SequenceOfObjects& theO } } +int HYDROGUI_OCCDisplayer::AddPreviewZLayer( OCCViewer_ViewManager* theMgr ) +{ + int aLayer = -1; + OCCViewer_Viewer* aViewer = theMgr->getOCCViewer(); + if ( !aViewer ) + return aLayer; + + aLayer = CreateTopZLayer( aViewer->getViewer3d() ); + + // Hilight presentation should be on top + Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext(); + if( !aCtx.IsNull() ) { + int aTopLayer = CreateTopZLayer( aViewer->getViewer3d() ); + if ( aTopLayer > 0 ) { + UpdateZLayersOfHilightPresentationsOfDisplayedObjects( aCtx, aTopLayer ); + } + } + + return aLayer; +} + +void HYDROGUI_OCCDisplayer::RemoveZLayer( OCCViewer_ViewManager* theMgr, + const int theLayer ) +{ + if ( theLayer < 0 ) + return; + + OCCViewer_Viewer* aViewer = theMgr->getOCCViewer(); + if ( !aViewer ) + return; + + // Get existing Z layers + TColStd_SequenceOfInteger anExistingZLayers; + aViewer->getViewer3d()->GetAllZLayers( anExistingZLayers ); + int aNbLayers = anExistingZLayers.Length(); + + if ( theLayer < aNbLayers ) + aViewer->getViewer3d()->RemoveZLayer( theLayer ); +} + void HYDROGUI_OCCDisplayer::EraseAll( const int theViewerId ) { OCCViewer_Viewer* aViewer = module()->getOCCViewer( theViewerId ); @@ -89,6 +137,7 @@ void HYDROGUI_OCCDisplayer::Erase( const HYDROData_SequenceOfObjects& theObjs, module()->removeObjectShape( (size_t)aViewer, anObj ); } + aViewer->update(); } HYDROGUI_Shape* HYDROGUI_OCCDisplayer::createShape( const int theViewerId, @@ -99,15 +148,7 @@ HYDROGUI_Shape* HYDROGUI_OCCDisplayer::createShape( const int if ( theContext.IsNull() || theObject.IsNull() ) return aResShape; - ObjectKind anObjectKind = theObject->GetKind(); - if ( anObjectKind != KIND_IMAGE && - anObjectKind != KIND_POLYLINEXY && - anObjectKind != KIND_IMMERSIBLE_ZONE && - anObjectKind != KIND_REGION && - anObjectKind != KIND_ZONE && - anObjectKind != KIND_OBSTACLE && - anObjectKind != KIND_PROFILE && - anObjectKind != KIND_STREAM ) + if ( !HYDROGUI_Tool::IsObjectHasPresentation( theObject, OCCViewer_Viewer::Type() ) ) return aResShape; aResShape = new HYDROGUI_Shape( theContext, theObject ); @@ -121,51 +162,118 @@ void HYDROGUI_OCCDisplayer::Display( const HYDROData_SequenceOfObjects& theObjs, const bool theIsForced, const bool theDoFitAll ) { + // Get OCC viewer by id OCCViewer_Viewer* aViewer = module()->getOCCViewer( theViewerId ); if( !aViewer ) return; + // Get interactive context Handle(AIS_InteractiveContext) aCtx = aViewer->getAISContext(); if( aCtx.IsNull() ) return; - for ( int i = 1, n = theObjs.Length(); i <= n; i++ ) - { - Handle(HYDROData_Entity) anObj = theObjs.Value( i ); - if ( anObj.IsNull() || anObj->IsRemoved() ) - continue; - - HYDROGUI_Shape* anObjShape = module()->getObjectShape( (size_t)aViewer, anObj ); - - if ( !anObjShape || anObjShape->getIsToUpdate() || theIsForced ) - { - if ( !anObjShape ) - anObjShape = createShape( (size_t)aViewer, aCtx, anObj ); + // Get the document + Handle(HYDROData_Document) aDoc = HYDROData_Document::Document( module()->getStudyId() ); + if ( !aDoc ) + return; + + // Assign Z layer indexes to the objects + aDoc->Show( theObjs ); + + // Sort objects by display order ( needed for Z layers assignment only ) + HYDROData_SequenceOfObjects anUnorderedToDisplay = theObjs; + HYDROData_SequenceOfObjects anOrderedToDisplay; + HYDROData_SequenceOfObjects anAllOrderedObjects = aDoc->GetObjectsLayerOrder(); + + HYDROData_SequenceOfObjects::Iterator anAllOrderedIter( anAllOrderedObjects ); + for ( ; anAllOrderedIter.More(); anAllOrderedIter.Next() ) { + QString anOrderedEntry = + HYDROGUI_DataObject::dataObjectEntry( anAllOrderedIter.Value() ); + + HYDROData_SequenceOfObjects::Iterator aToDisplayIter( anUnorderedToDisplay ); + for ( ; aToDisplayIter.More(); aToDisplayIter.Next() ) { + Handle(HYDROData_Entity) anObjToDisplay = aToDisplayIter.Value(); + QString anEntry = HYDROGUI_DataObject::dataObjectEntry( anObjToDisplay ); + if ( anEntry == anOrderedEntry ) { + anOrderedToDisplay.Prepend( anObjToDisplay ); + anUnorderedToDisplay.Remove( aToDisplayIter ); + break; + } + } + } + + // Get 3d viewer + Handle(V3d_Viewer) aViewer3d = aViewer->getViewer3d(); + + // Display objects: + HYDROGUI_ZLayersIterator aZLayersIt( aViewer->getViewer3d() ); + if ( !aZLayersIt.More() ) { + aZLayersIt.Next(); + } - if ( anObjShape ) - anObjShape->update( false ); + // 1. Display the ordered objects: + HYDROData_SequenceOfObjects::Iterator anOrderedIter( anOrderedToDisplay ); + for ( ; anOrderedIter.More(); anOrderedIter.Next() ) { + Handle(HYDROData_Entity) anObj = anOrderedIter.Value(); + if ( Display( anObj, aViewer, theIsForced ) ) { + // set Z layer ( one Z layer for each ordered object ) + int aZLayerId = aZLayersIt.LayerId(); + SetZLayer( aViewer, anObj, aZLayerId ); + SetZLayerSettings( aViewer3d, aZLayerId, true ); + aZLayersIt.Next(); } + } - if ( anObjShape ) - { - bool anIsVisible = module()->isObjectVisible( (size_t)aViewer, anObj ); - anObjShape->setVisible( anIsVisible, false ); + // 2. Display the unordered objects: + bool isDisplayed = false; + int anUnorderedZLayerId = aZLayersIt.LayerId(); + HYDROData_SequenceOfObjects::Iterator anUnorderedIter( anUnorderedToDisplay ); + for ( ; anUnorderedIter.More(); anUnorderedIter.Next() ) { + Handle(HYDROData_Entity) anObj = anUnorderedIter.Value(); + if ( Display( anObj, aViewer, theIsForced) ) { + // set Z layer ( one Z layer for all unordered objects ) + SetZLayer( aViewer, anObj, anUnorderedZLayerId ); + if ( !isDisplayed ) { + SetZLayerSettings( aViewer3d, anUnorderedZLayerId, false ); + } + isDisplayed = true; } } + + // 3. Update the top Z layer index + if ( isDisplayed ) { + aZLayersIt.Next(); + } - if ( theDoFitAll ) - { + // Update Z layer of the active operation + int aPreviewZLayerId = aZLayersIt.LayerId(); + + HYDROGUI_Module* aModule = module(); + SUIT_Operation* anOp = aModule->activeOperation(); + HYDROGUI_Operation* aHOp = anOp ? dynamic_cast( anOp ) : 0; + if ( aHOp && aHOp->getPreviewZLayer() >= 0 ) { + aHOp->updatePreviewZLayer( aPreviewZLayerId ); + aZLayersIt.Next(); + } + + // Update Z layer of hilight presentations + int aHilightLayer = aZLayersIt.TopLayer(); + UpdateZLayersOfHilightPresentationsOfDisplayedObjects( aCtx, aHilightLayer ); + + // Fit all / update selection + if ( theDoFitAll ) { OCCViewer_ViewManager* aViewManager = ::qobject_cast( aViewer->getViewManager() ); - if ( aViewManager ) - { + if ( aViewManager ) { OCCViewer_ViewWindow* aViewWindow = ::qobject_cast( aViewManager->getActiveView() ); - if ( aViewWindow ) - { + if ( aViewWindow ) { aViewWindow->onFitAll(); } } + } + else if ( !aCtx.IsNull() ) { // TODO: determine if this code is necessary (added as a fix for issue# 359) + aCtx->UpdateSelected(); } } @@ -200,3 +308,75 @@ QString HYDROGUI_OCCDisplayer::GetType() const { return OCCViewer_Viewer::Type(); } + +bool HYDROGUI_OCCDisplayer::Display( const Handle(HYDROData_Entity)& theObject, + const OCCViewer_Viewer* theViewer, + const bool theIsForced ) +{ + bool aRes = false; + + if ( theObject.IsNull() || theObject->IsRemoved() || !theViewer ) { + return aRes; + } + + // Get interactive context + Handle(AIS_InteractiveContext) aCtx = theViewer->getAISContext(); + if( aCtx.IsNull() ) { + return aRes; + } + + // Viewer id + size_t aViewerId = (size_t)theViewer; + + // Object shape + HYDROGUI_Shape* anObjShape = module()->getObjectShape( aViewerId, theObject ); + // create if needed + if ( !anObjShape ) { + anObjShape = createShape( aViewerId, aCtx, theObject ); + if ( anObjShape ) { + anObjShape->setIsToUpdate( true ); + } + } + + // Process the shape + if ( anObjShape ) { + // update if needed + if ( anObjShape->getIsToUpdate() || theIsForced ) { + anObjShape->update( false ); + } + + // Set visibility + bool anIsVisible = module()->isObjectVisible( aViewerId, theObject ); + anObjShape->setVisible( anIsVisible, false ); + + aRes = true; + } + + return aRes; +} + +void HYDROGUI_OCCDisplayer::SetZLayer( const OCCViewer_Viewer* theViewer, + const Handle(HYDROData_Entity)& theObject, + const int theZLayerId ) +{ + if ( !theViewer || ( theZLayerId < 0 ) ) { + return; + } + + // Get interactive context + Handle(AIS_InteractiveContext) aCtx = theViewer->getAISContext(); + if( aCtx.IsNull() ) { + return; + } + + // Get viewer id + size_t aViewerId = (size_t)theViewer; + + // Get object shape + HYDROGUI_Shape* anObjShape = module()->getObjectShape( aViewerId, theObject ); + + // Set Z layer + if ( anObjShape ) { + aCtx->SetZLayer( anObjShape->getAISShape(), theZLayerId ); + } +} \ No newline at end of file