X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FContour%2FContourVOIWidget.cxx;h=aa5e8c4302ec0da75b0f0c7037baf2b562001944;hb=HEAD;hp=0e78c68cc4735a57c730b90ae6b0b9ffbdcbf8fc;hpb=8e7ab74a199d1f05b01dccfb75da7f2c4754ddc5;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx
index 0e78c68..aa5e8c4 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx
@@ -1,11 +1,30 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 "ContourVOIWidget.h"
 
-#include <vtkImageMapToColors.h>
-#include <vtkImageActor.h>
-
-
-
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
@@ -40,12 +59,14 @@
 		}
 		void wxWidgetSliderMinMaxVOI :: onActualChange_Bar(wxCommandEvent& event)
 		{
+std::cout << "wxWidgetSliderMinMaxVOI ::onActualChange_Bar" << std::endl;
 			wxVtk2DBaseView *wxvtk2dbaseview = (wxVtk2DBaseView*)mcontourtool->GetWxVtkBaseView();
 			wxvtk2dbaseview->GetVtkBaseData()->SetZ(modBarRange->GetActual());
 			wxvtk2dbaseview->Refresh();
 		}
 		void wxWidgetSliderMinMaxVOI :: onStartChange_Bar(wxCommandEvent& event)
 		{
+std::cout << "wxWidgetSliderMinMaxVOI ::onStartChange_Bar" << std::endl;
 			wxVtk2DBaseView *wxvtk2dbaseview = (wxVtk2DBaseView*)mcontourtool->GetWxVtkBaseView();
 			wxvtk2dbaseview->GetVtkBaseData()->SetZ(modBarRange->GetStart());
 			wxvtk2dbaseview->Refresh();
@@ -53,6 +74,7 @@
 		}
 		void wxWidgetSliderMinMaxVOI :: onEndChange_Bar(wxCommandEvent& event)
 		{
+std::cout << "wxWidgetSliderMinMaxVOI ::onEndChange_Bar" << std::endl;
 			wxVtk2DBaseView *wxvtk2dbaseview = (wxVtk2DBaseView*)mcontourtool->GetWxVtkBaseView();
 			wxvtk2dbaseview->GetVtkBaseData()->SetZ(modBarRange->GetEnd());
 			wxvtk2dbaseview->Refresh();
@@ -130,7 +152,7 @@
 	
 	// Rectangulo
 	_manRoiControl  = new manualRoiControler();
-	_mContourModel  = new manualContourModel();
+	_mContourModel  = new manualContourModelRoi();
 	_mViewRoi		= new manualViewRoi();
 	_mViewRoi->SetModel( _mContourModel );
 	_mViewRoi->SetWxVtkBaseView( this->wxvtkbaseview );
@@ -141,7 +163,7 @@
 	_mViewRoi->SetSpacing(spc);
 
 	_manRoiControl->SetModelView( _mContourModel , _mViewRoi );
-	 this->wxvtkbaseview->GetInteractorStyleBaseView()->AddInteractorStyleMaracas( _manRoiControl );
+	((vtkInteractorStyleBaseView*)this->wxvtkbaseview->GetInteractorStyleBaseView())->AddInteractorStyleMaracas( _manRoiControl );
 	_manRoiControl->CreateNewManualContour();
 	_manRoiControl->SetActive(true);
 	_mViewRoi->RefreshContour();