Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/visu.git] / src / PIPELINE / VISU_ScalarBarCtrl.cxx

diff --git a/src/PIPELINE/VISU_ScalarBarCtrl.cxx b/src/PIPELINE/VISU_ScalarBarCtrl.cxx
index 624159f5a83a2e46e70caa1851fb322031f410ab..5dbf6e47845fbcb471eba2af6b5a238ca41bbe15 100644 (file)
--- a/src/PIPELINE/VISU_ScalarBarCtrl.cxx
+++ b/src/PIPELINE/VISU_ScalarBarCtrl.cxx
@@ -25,16 +25,16 @@
 // Module : VISU
 
 #include "VISU_ScalarBarCtrl.hxx"
+#include <VISU_LookupTable.hxx>
+#include <VISU_ScalarBarActor.hxx>
 
 #include <vtkObjectFactory.h>
 #include <vtkActor2D.h> 
 #include <vtkCoordinate.h>
 #include <vtkRenderer.h>
 #include <vtkScalarsToColors.h>
-#include <vtkLookupTable.h>
 #include <vtkTextProperty.h>
-#include <vtkScalarBarActor.h>
-#include <vtkIdType.h>
+#include <vtkType.h>
 
 #include <string.h>
 
@@ -44,7 +44,7 @@ namespace
 {
   inline
   void
-  MarkValueByColor(vtkLookupTable* theTable,
+  MarkValueByColor(VISU_LookupTable* theTable,
                   vtkFloatingPointType theValue,
                   unsigned char* theColor)
   { 
@@ -65,7 +65,7 @@ namespace
   }
 
   void
-  FillByColor(vtkLookupTable* theTable,
+  FillByColor(VISU_LookupTable* theTable,
              unsigned char* theColor)
   {
     vtkIdType aNbColors = theTable->GetNumberOfColors();
@@ -76,7 +76,7 @@ namespace
   }
 
   void
-  MakeBiColor(vtkLookupTable* theTable)
+  MakeBiColor(VISU_LookupTable* theTable)
   {
     unsigned char aRedPtr[3] = {255, 0, 0};
     unsigned char aBluePtr[3] = {0, 0, 255};
@@ -119,18 +119,18 @@ VISU_ScalarBarCtrl
   SetMode(eSimple);
 
   // Initilize global scalar bar
-  myGlobalLookupTable = vtkLookupTable::New();
+  myGlobalLookupTable = VISU_LookupTable::New();
   myGlobalLookupTable->SetHueRange(0.667,0.0);
 
-  myGlobalScalarBar = vtkScalarBarActor::New();
+  myGlobalScalarBar = VISU_ScalarBarActor::New();
   myGlobalScalarBar->SetLookupTable(myGlobalLookupTable);
   myGlobalLookupTable->Delete();
 
   // Initilize local scalar bar
-  myLocalLookupTable = vtkLookupTable::New();
+  myLocalLookupTable = VISU_LookupTable::New();
   myLocalLookupTable->SetHueRange(0.667,0.0);
 
-  myLocalScalarBar = vtkScalarBarActor::New();
+  myLocalScalarBar = VISU_ScalarBarActor::New();
   myLocalScalarBar->SetLookupTable(myLocalLookupTable);
   myLocalLookupTable->Delete();
 
@@ -245,14 +245,14 @@ VISU_ScalarBarCtrl
 
 
 //----------------------------------------------------------------------------
-vtkScalarBarActor* 
+VISU_ScalarBarActor* 
 VISU_ScalarBarCtrl
 ::GetLocalBar() 
 {
   return myLocalScalarBar;
 }
 
-vtkScalarBarActor* 
+VISU_ScalarBarActor* 
 VISU_ScalarBarCtrl
 ::GetGlobalBar() 
 {
@@ -261,14 +261,14 @@ VISU_ScalarBarCtrl
 
 
 //----------------------------------------------------------------------------
-vtkLookupTable* 
+VISU_LookupTable* 
 VISU_ScalarBarCtrl
 ::GetLocalTable() 
 {
   return myLocalLookupTable;
 }
 
-vtkLookupTable* 
+VISU_LookupTable* 
 VISU_ScalarBarCtrl
 ::GetGlobalTable() 
 {
@@ -452,8 +452,8 @@ VISU_ScalarBarCtrl
 //----------------------------------------------------------------------------
 void
 VISU_ScalarBarCtrl
-::PrepareTables(vtkScalarBarActor* theScalarBarActor,
-               vtkLookupTable *theLookupTable,
+::PrepareTables(VISU_ScalarBarActor* theScalarBarActor,
+               VISU_LookupTable *theLookupTable,
                vtkIdType theId)
 {
   vtkCoordinate * aCoordinate = theScalarBarActor->GetPositionCoordinate();