Fix for the bug #45: check and warning when the same image is used in 2 arguments.

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_VTKPrsBathymetry.cxx

diff --git a/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx b/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx
index 769879de2be344ac39acb438daf4f61eab2c1dbe..31817f2c4b09d4e5245763f62d778ea4b04caba1 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx
+++ b/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx
@@ -33,17 +33,16 @@
 #include <vtkPointData.h>
 #include <vtkPolyDataMapper.h>
 #include <vtkVertex.h>
-#include <vtkLookupTable.h>
+#include <vtkScalarBarActor.h>
 
 #include <QString>
 
-#define NB_COLORS 32
-#define Z_MIN -100
+/*! \def Z_MAX
+    \brief Maximum Z value used in bathymetry presentation.
+
+    This value is used instead of invalid values.
+*/
 #define Z_MAX 1
-#define HUE_START 0.69 
-#define HUE_END   0.41
-#define SATURATION_START 1.0 
-#define SATURATION_END   0.4
 
 //=======================================================================
 // name    : HYDROGUI_VTKPrsBathymetry
@@ -88,19 +87,15 @@ void HYDROGUI_VTKPrsBathymetry::compute()
 
       vtkVertex* aVertex = vtkVertex::New();
 
-      int aZ;
-      int anInvalidZ = aBathymetry->GetInvalidAltitude();
+      double aZ;
+      int anInvalidZ = InvalidZValue();
       for (int i = 0; i < aNbPoints; i++ )
       {
         anAltPnt = anAltPoints.at( i );
         aZ = anAltPnt.Z();
         if ( ValuesLessEquals( aZ, anInvalidZ ) )
         {
-          aZ = Z_MAX;
-        }
-        else
-        {
-          aZ = -aZ;
+          aZ = Z_MAX; // If Z value is invalid then use Z_MAX
         }
         aPoints->InsertPoint( i, anAltPnt.X(), anAltPnt.Y(), aZ );
         aVertex->GetPointIds()->SetId( 0, i );
@@ -113,26 +108,47 @@ void HYDROGUI_VTKPrsBathymetry::compute()
       aVertexGrid->SetPoints( aPoints );
       aVertexGrid->GetPointData()->SetScalars( aZValues );
       
-      vtkLookupTable* aLut = vtkLookupTable::New();
-      aLut->SetHueRange( HUE_START, HUE_END );
-      aLut->SetSaturationRange( SATURATION_START, SATURATION_END );
-      aLut->SetTableRange( Z_MIN, Z_MAX );
-      aLut->SetValueRange( 1.0, 1.0 );
-      aLut->SetAlphaRange( 1.0, 1.0 );
-      aLut->SetNumberOfColors( NB_COLORS );
-      aLut->Build();
-
-      vtkPolyDataMapper* aMapper = vtkPolyDataMapper::New();
-      aMapper->SetScalarRange( Z_MIN, Z_MAX );
-      aMapper->ScalarVisibilityOn();
-      aMapper->SetScalarModeToUsePointData();
-      aMapper->SetLookupTable( aLut );
-      aMapper->SetInputData( aVertexGrid );
+      // Update the lookup table range if this bathymetry is out of it
+      if ( myLookupTable )
+      {
+        aZValues->GetRange( myInternalZRange );
+        double* aGlobalRange = myLookupTable->GetRange();
+        // If the global range is not yet initialized or the current one is out of scope then update the global
+        bool anIsUpdated = false;
+        if (  ValuesEquals( aGlobalRange[0], anInvalidZ ) || ( aGlobalRange[0] > myInternalZRange[0] ) )
+        {
+          aGlobalRange[0] = myInternalZRange[0];
+          anIsUpdated = true;
+        }
+
+        if (  ValuesEquals( aGlobalRange[1], anInvalidZ ) || ( aGlobalRange[1] < myInternalZRange[1] ) )
+        {
+          aGlobalRange[1] = myInternalZRange[1];
+          anIsUpdated = true;
+        }
+
+        if ( anIsUpdated )
+        {
+          myLookupTable->SetRange( aGlobalRange );
+          myLookupTable->Build();
+        }
+
+        myMapper->SetScalarRange( aGlobalRange );
+        myMapper->ScalarVisibilityOn();
+        myMapper->SetScalarModeToUsePointData();
+        myMapper->SetLookupTable( myLookupTable );
+      }
+
+      myMapper->SetInputData( aVertexGrid );
       
       SALOME_Actor* anActor = SALOME_Actor::New();
-      anActor->SetMapper( aMapper );
+      anActor->SetMapper( myMapper.GetPointer() );
       anActor->setIO( getIO() );
       AddObject( anActor );
+
+      anActor->Delete();
+      aVertexGrid->Delete();
+      aZValues->Delete();
     }
   }
 }