#include <AIS_ListIteratorOfListOfInteractive.hxx>
#include <AIS_ListOfInteractive.hxx>
+#include <TColStd_SequenceOfInteger.hxx>
+
#include <OCCViewer_ViewManager.h>
#include <OCCViewer_ViewModel.h>
#include <OCCViewer_ViewWindow.h>
if ( theContext.IsNull() || theObject.IsNull() )
return aResShape;
- ObjectKind anObjectKind = theObject->GetKind();
- if ( anObjectKind != KIND_IMAGE &&
- anObjectKind != KIND_POLYLINEXY &&
- anObjectKind != KIND_POLYLINE &&
- anObjectKind != KIND_IMMERSIBLE_ZONE &&
- anObjectKind != KIND_REGION &&
- anObjectKind != KIND_ZONE &&
- anObjectKind != KIND_OBSTACLE &&
- anObjectKind != KIND_PROFILE &&
- anObjectKind != KIND_STREAM &&
- anObjectKind != KIND_CHANNEL )
+ if ( !HYDROGUI_Tool::IsObjectHasPresentation( theObject, OCCViewer_Viewer::Type() ) )
return aResShape;
aResShape = new HYDROGUI_Shape( theContext, theObject );
if( aCtx.IsNull() )
return;
- for ( int i = 1, n = theObjs.Length(); i <= n; i++ )
- {
+ // Sort objects by display order ( needed for Z layers assignment only )
+ HYDROData_SequenceOfObjects anObjects;
+ int aMaxIndex = -1;
+ for ( int i = 1, n = theObjs.Length(); i <= n; i++ ) {
Handle(HYDROData_Entity) anObj = theObjs.Value( i );
+ if ( anObj.IsNull() || anObj->IsRemoved() ) {
+ continue;
+ }
+
+ int aDisplayOrderIndex = module()->getObjectDisplayOrder( (size_t)aViewer, anObj );
+ if ( aDisplayOrderIndex > aMaxIndex ) {
+ anObjects.Append( anObj );
+ aMaxIndex = aDisplayOrderIndex;
+ } else {
+ anObjects.Prepend( anObj );
+ }
+ }
+
+ // Get existing Z layers
+ TColStd_SequenceOfInteger anExistingZLayers;
+ aViewer->getViewer3d()->GetAllZLayers( anExistingZLayers );
+ int aNbLayers = anExistingZLayers.Length();
+
+ // Display
+ for ( int i = 1, n = anObjects.Length(); i <= n; i++ )
+ {
+ Handle(HYDROData_Entity) anObj = anObjects.Value( i );
if ( anObj.IsNull() || anObj->IsRemoved() )
continue;
{
bool anIsVisible = module()->isObjectVisible( (size_t)aViewer, anObj );
anObjShape->setVisible( anIsVisible, false );
+
+ // Set Z layer
+ Standard_Integer aLayerId = -1;
+ if ( i <= aNbLayers ) {
+ aLayerId = anExistingZLayers.Value( i );
+ } else {
+ Standard_Integer aNewId = -1;
+ if ( aViewer->getViewer3d()->AddZLayer( aNewId ) ) {
+ aLayerId = aNewId;
+ }
+ }
+ if ( aLayerId >= 0 ) {
+ aCtx->SetZLayer( anObjShape->getAISShape(), aLayerId );
+ }
}
}
}
}
}
+ else if ( aCtx.IsNull() )
+ {
+ aCtx->UpdateSelected();
+ }
}
void HYDROGUI_OCCDisplayer::purgeObjects( const int theViewerId )