Merge from V5_1_main 14/05/2010

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

diff --git a/src/PIPELINE/VISU_ScalarBarCtrl.cxx b/src/PIPELINE/VISU_ScalarBarCtrl.cxx
index fda224a3c4010d0130a116e80bf46ea5e9a250e3..cb2807a213735c38487499d010617e5e6eec226d 100644 (file)
--- a/src/PIPELINE/VISU_ScalarBarCtrl.cxx
+++ b/src/PIPELINE/VISU_ScalarBarCtrl.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,14 +19,15 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_ScalarBarCtrl.cxx
 // Author:  Peter KURNEV
 // Module : VISU
 //
 #include "VISU_ScalarBarCtrl.hxx"
-#include <VISU_LookupTable.hxx>
-#include <VISU_ScalarBarActor.hxx>
+#include "VISU_LookupTable.hxx"
+#include "VISU_ScalarBarActor.hxx"
 
 #include <vtkObjectFactory.h>
 #include <vtkActor2D.h> 
@@ -152,7 +153,7 @@ VISU_ScalarBarCtrl
 void
 VISU_ScalarBarCtrl
 ::SetRangeLocal(vtkFloatingPointType theMin,
-               vtkFloatingPointType theMax)
+                vtkFloatingPointType theMax)
 {
   myLocalLookupTable->SetTableRange(theMin,theMax);
 }
@@ -169,7 +170,7 @@ VISU_ScalarBarCtrl
 void
 VISU_ScalarBarCtrl
 ::SetRangeGlobal(vtkFloatingPointType theMin,
-                vtkFloatingPointType theMax)
+                 vtkFloatingPointType theMax)
 {
   myGlobalLookupTable->SetTableRange(theMin,theMax);
 }
@@ -391,8 +392,8 @@ VISU_ScalarBarCtrl
 void
 VISU_ScalarBarCtrl
 ::PrepareTables(VISU_ScalarBarActor* theScalarBarActor,
-               VISU_LookupTable *theLookupTable,
-               vtkIdType theId)
+                VISU_LookupTable *theLookupTable,
+                vtkIdType theId)
 {
   vtkCoordinate * aCoordinate = theScalarBarActor->GetPositionCoordinate();
   aCoordinate->SetCoordinateSystemToNormalizedViewport();