Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/creaMaracasVisu

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxVtk2DBaseView.h

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.h
index 7a3e47b985107d105e24406e172fd857832842d3..9ea2b96d9d860dcccba7945f0fb1dfa06ae1e8f6 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtk2DBaseView.h
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #ifndef WXVTK2DBASEVIEW_H_
 #define WXVTK2DBASEVIEW_H_
 
@@ -37,11 +62,14 @@ public:
 
        void setColorTransferFunction(vtkColorTransferFunction* colortable);
 
-       void setWindowLevel(double level);
-
-       void setColorLevel(double level);
+       void SetColorWindow(double level);
+       void SetColorLevel(double level);
+       
     virtual int GetDirection();
        void SetImageToVtkViewer(vtkImageData *imageData);
+       
+       //EED 01nov2012
+       void UpdateColorWindowLevel();
 
 
 private: