Join modifications from BR_Dev_For_4_0 tag V4_1_1.

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

diff --git a/src/PIPELINE/VISU_ScalarBarCtrl.hxx b/src/PIPELINE/VISU_ScalarBarCtrl.hxx
index 6a13c868985d7521afdaffcbeb47dc7240bcf12c..86866d752f95babea17cd0fc0532a15da6b5e612 100644 (file)
--- a/src/PIPELINE/VISU_ScalarBarCtrl.hxx
+++ b/src/PIPELINE/VISU_ScalarBarCtrl.hxx
@@ -27,15 +27,17 @@
 #ifndef VISU_ScalarBarCtrl_HeaderFile
 #define VISU_ScalarBarCtrl_HeaderFile
 
+#include "VISUPipeline.hxx"
+
 #include <vtkObject.h>
 
 #include "VTKViewer.h"
 
 class vtkRenderer;
-class vtkLookupTable;
-class vtkScalarBarActor;
+class VISU_LookupTable;
+class VISU_ScalarBarActor;
 
-class VISU_ScalarBarCtrl :  public vtkObject
+class VISU_PIPELINE_EXPORT VISU_ScalarBarCtrl :  public vtkObject
 {
 public:
   vtkTypeMacro(VISU_ScalarBarCtrl, vtkObject);
@@ -69,16 +71,16 @@ public:
   SetRangeLocal(vtkFloatingPointType *theRange);
   
   // Selectors
-  vtkScalarBarActor* 
+  VISU_ScalarBarActor* 
   GetLocalBar();
 
-  vtkLookupTable* 
+  VISU_LookupTable* 
   GetLocalTable();
 
-  vtkScalarBarActor* 
+  VISU_ScalarBarActor* 
   GetGlobalBar();
 
-  vtkLookupTable* 
+  VISU_LookupTable* 
   GetGlobalTable();
   //
   // Renderer
@@ -170,8 +172,8 @@ protected:
   PrepareTables();
   
   void
-  PrepareTables(vtkScalarBarActor* theScalarBarActor,
-               vtkLookupTable *theLookupTable,
+  PrepareTables(VISU_ScalarBarActor* theScalarBarActor,
+               VISU_LookupTable *theLookupTable,
                vtkIdType theId);
   
 protected:
@@ -189,11 +191,11 @@ protected:
   bool  myMarked;
   vtkFloatingPointType myMarkedValue;
   //
-  vtkScalarBarActor *myGlobalScalarBar;
-  vtkLookupTable *myGlobalLookupTable; 
+  VISU_ScalarBarActor *myGlobalScalarBar;
+  VISU_LookupTable *myGlobalLookupTable; 
 
-  vtkScalarBarActor *myLocalScalarBar;
-  vtkLookupTable *myLocalLookupTable; 
+  VISU_ScalarBarActor *myLocalScalarBar;
+  VISU_LookupTable *myLocalLookupTable; 
 };
 
 #endif