X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_OCCDisplayer.cxx;h=310e84de0cdb63dd854393fc4a98ff9c9342eee5;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=5e7efdf31f2331b6d4d915dabdf04341bf9bb173;hpb=f52e5973a9c5d2a9cb98d77e585eba71ac606c5b;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
index 5e7efdf3..310e84de 100644
--- a/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
+++ b/src/HYDROGUI/HYDROGUI_OCCDisplayer.cxx
@@ -28,6 +28,7 @@
 #include "HYDROGUI_Shape.h"
 #include "HYDROGUI_Operation.h"
 #include "HYDROGUI_DataObject.h"
+#include "HYDROGUI_ZLayers.h"
 
 #include <AIS_InteractiveContext.hxx>
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
@@ -72,16 +73,23 @@ void HYDROGUI_OCCDisplayer::SetToUpdate( const HYDROData_SequenceOfObjects& theO
   }
 }
 
-int HYDROGUI_OCCDisplayer::AddTopZLayer( OCCViewer_ViewManager* theMgr )
+int HYDROGUI_OCCDisplayer::AddPreviewZLayer( OCCViewer_ViewManager* theMgr )
 {
   int aLayer = -1;
   OCCViewer_Viewer* aViewer = theMgr->getOCCViewer();
   if ( !aViewer )
     return aLayer;
 
-  Standard_Integer aNewId = -1;
-  if ( aViewer->getViewer3d()->AddZLayer( aNewId ) )
-    aLayer = aNewId;
+  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;
 }
@@ -197,73 +205,74 @@ void HYDROGUI_OCCDisplayer::Display( const HYDROData_SequenceOfObjects& theObjs,
   // Get 3d viewer
   Handle(V3d_Viewer) aViewer3d = aViewer->getViewer3d();
 
-  // Get existing Z layers
-  TColStd_SequenceOfInteger anExistingZLayers;
-  aViewer3d->GetAllZLayers( anExistingZLayers );
-  int aNbLayers = anExistingZLayers.Length();
-
-  // Display objects
-  int aNextZLayerIndex = 2; // don't use the first default Z layer ( which index = 1 )
+  // Display objects:
+  HYDROGUI_ZLayersIterator aZLayersIt( aViewer->getViewer3d() );
+  if ( !aZLayersIt.More() ) {
+    aZLayersIt.Next();
+  }
 
   // 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, aNextZLayerIndex, true ) ) {
-      aNextZLayerIndex++;
+    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();
     }
   }
 
   // 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, aNextZLayerIndex, false ) ) {
+    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 ) {
-    aNextZLayerIndex++;
+    aZLayersIt.Next();
   }
 
   // Update Z layer of the active operation
-  aViewer3d->GetAllZLayers( anExistingZLayers );
+  int aPreviewZLayerId = aZLayersIt.LayerId();
 
   HYDROGUI_Module* aModule = module();
   SUIT_Operation* anOp = aModule->activeOperation();
   HYDROGUI_Operation* aHOp = anOp ? dynamic_cast<HYDROGUI_Operation*>( anOp ) : 0;
   if ( aHOp && aHOp->getPreviewZLayer() >= 0 ) {
-    Standard_Integer aLayerId = -1;
-    if ( aNextZLayerIndex <= aNbLayers )
-      aLayerId = anExistingZLayers.Value( aNextZLayerIndex );
-    else {
-      Standard_Integer aNewId = -1;
-      if ( aViewer->getViewer3d()->AddZLayer( aNewId ) ) {
-        aLayerId = aNewId;
-      }
-    }
-    aHOp->updatePreviewZLayer( aLayerId );
+    aHOp->updatePreviewZLayer( aPreviewZLayerId );
+    aZLayersIt.Next();
   }
 
-  if ( theDoFitAll )
-  {
+  // Update Z layer of hilight presentations
+  int aHilightLayer = aZLayersIt.TopLayer();
+  UpdateZLayersOfHilightPresentationsOfDisplayedObjects( aCtx, aHilightLayer );
+
+  // Fit all / update selection
+  if ( theDoFitAll ) {
     OCCViewer_ViewManager* aViewManager
       = ::qobject_cast<OCCViewer_ViewManager*>( aViewer->getViewManager() );
-    if ( aViewManager )
-    {
+    if ( aViewManager ) {
       OCCViewer_ViewWindow* aViewWindow = 
         ::qobject_cast<OCCViewer_ViewWindow*>( 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)
-  {
+  } 
+  else if ( !aCtx.IsNull() ) { // TODO: determine if this code is necessary (added as a fix for issue# 359)
     aCtx->UpdateSelected();
   }
 }
@@ -302,9 +311,7 @@ QString HYDROGUI_OCCDisplayer::GetType() const
 
 bool HYDROGUI_OCCDisplayer::Display( const Handle(HYDROData_Entity)& theObject,
                                      const OCCViewer_Viewer* theViewer,
-                                     const bool theIsForced,
-                                     const int theZLayerIndex,
-                                     const bool theIsOrdered )
+                                     const bool theIsForced )
 {
   bool aRes = false;
 
@@ -326,7 +333,9 @@ bool HYDROGUI_OCCDisplayer::Display( const Handle(HYDROData_Entity)& theObject,
   // create if needed
   if ( !anObjShape ) {
     anObjShape = createShape( aViewerId, aCtx, theObject );
-    anObjShape->setIsToUpdate( true );
+    if ( anObjShape ) {
+      anObjShape->setIsToUpdate( true );
+    }
   }
   
   // Process the shape
@@ -340,55 +349,34 @@ bool HYDROGUI_OCCDisplayer::Display( const Handle(HYDROData_Entity)& theObject,
     bool anIsVisible = module()->isObjectVisible( aViewerId, theObject );
     anObjShape->setVisible( anIsVisible, false );
 
-    // Set Z layer
-    Handle(V3d_Viewer) aViewer3d = theViewer->getViewer3d();
-    if ( !aViewer3d.IsNull() ) {
-      // Get existing layers
-      TColStd_SequenceOfInteger anExistingZLayers;
-      aViewer3d->GetAllZLayers( anExistingZLayers );
-      int aNbLayers = anExistingZLayers.Length();
-      
-      // Get or create the appropriate layer
-      Standard_Integer aLayerId = -1;
-      if ( theZLayerIndex <= aNbLayers ) {
-        aLayerId = anExistingZLayers.Value( theZLayerIndex );
-      } else {
-        Standard_Integer aNewId = -1;
-        if ( aViewer3d->AddZLayer( aNewId ) ) {
-          aLayerId = aNewId;
-        }
-      }
-
-      if ( aLayerId >= 0 ) {
-        // set Z layer
-        aCtx->SetZLayer( anObjShape->getAISShape(), aLayerId );
-          
-        // set Z layer settings for the 3d viewer:
-        // current settings
-        Graphic3d_ZLayerSettings aSettings = aViewer3d->ZLayerSettings( aLayerId );
-        // enable depth write
-        aSettings.EnableSetting( Graphic3d_ZLayerDepthWrite );
-        // disable depth clear
-        aSettings.DisableSetting( Graphic3d_ZLayerDepthClear );
-        if ( theIsOrdered ) {
-          // disable depth test
-          aSettings.DisableSetting( Graphic3d_ZLayerDepthTest );
-          // disable depth offset
-          aSettings.DisableSetting( Graphic3d_ZLayerDepthOffset );
-        } else {
-          // enable depth test
-          aSettings.EnableSetting( Graphic3d_ZLayerDepthTest );
-          // set depth offset
-          aSettings.SetDepthOffsetPositive();
-        }
-
-        // set new settings
-        aViewer3d->SetZLayerSettings( aLayerId, aSettings );
-
-        aRes = true;
-      }
-    }
+    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