#3012 creaMaracasVisu Bug New Normal - Update Image in ViewerNV

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / manualInteractorWindowLevel.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx
index db587e3f890180f89e9967235996e0835487afbf..f058df7f60adf1a9693f76a39a496d44c7c3609f 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualInteractorWindowLevel.cxx
@@ -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.
+# ------------------------------------------------------------------------ */
+
 
 #include "manualInteractorWindowLevel.h"
 #include "wxVtk2DBaseView.h"
@@ -24,7 +49,6 @@ manualInteractorWindowLevel::~manualInteractorWindowLevel()
 
 bool manualInteractorWindowLevel::OnMouseMove()                        // virtual 
 {
-
        if (_stateWindowLevel==true)
        {
                int tmpPx,tmpPy;
@@ -64,21 +88,35 @@ bool manualInteractorWindowLevel::OnMouseMove()                     // virtual
                { 
                        colorWin=100000;
                }       
-
-               if (colorLev<0)
-               { 
-                       colorLev=0;
-               }
+               
+//EED 2 Nov 2012  This lets see negative values with the interaction of Window-Level Color
+//             if (colorLev<0)
+//             { 
+//                     colorLev=0;
+//             }
+               
                if (colorLev>100000)
                { 
                        colorLev=100000;
                }
-               vtkImageViewer2 *vtkimageviewer2;
-               vtkimageviewer2=((wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView())->_imageViewer2XYZ->GetVtkImageViewer2();
-               vtkimageviewer2->SetColorWindow(colorWin);
-               vtkimageviewer2->SetColorLevel(colorLev);
+               
+               wxVtk2DBaseView *wxvtk2Dbaseview        = (wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
+               vtkBaseData *vtkbasedata                        = wxvtk2Dbaseview->GetVtkBaseData();
+               
+//EED Borrame
+//             vtkImageViewer2 *vtkimageviewer2        = wxvtk2Dbaseview->_imageViewer2XYZ->GetVtkImageViewer2();              
+//             vtkimageviewer2->SetColorWindow(colorWin);
+//             vtkimageviewer2->SetColorLevel(colorLev);
+               
+               vtkbasedata->SetColorWindow(colorWin);
+               vtkbasedata->SetColorLevel(colorLev);
+               
+               this->_vtkInteractorStyleBaseView->SetParent_refresh_waiting();
+               
 //             vtkimageviewer2->Render();
        }
+
+
        return true;
 }