X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FContour%2FContourVOIWidget.cxx;h=997814a3af5660396ed5ecadc68454cdbbeda6bb;hb=096822cf3513065cfa25e378679339a5ae4684cf;hp=5a9ebdf32d16db1672c4cc0c7fa3dee8e24b717a;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx
index 5a9ebdf..997814a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx
@@ -1,11 +1,6 @@
 
 #include "ContourVOIWidget.h"
 
-#include <vtkImageMapToColors.h>
-#include <vtkImageActor.h>
-
-
-
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
 //-------------------------------------------------------------------
@@ -40,12 +35,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 +50,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();
@@ -90,11 +88,11 @@
 	mbarrange -> SetStart( 10 );
 	mbarrange -> SetEnd( 90 );  
 
-	wxWidgetSliderMinMaxVOI * eventHandler = new wxWidgetSliderMinMaxVOI(this, mbarrange);
+	//wxWidgetSliderMinMaxVOI * eventHandler = new wxWidgetSliderMinMaxVOI(this, mbarrange); // JPRx
 
 	wxFlexGridSizer *sizer1 = new wxFlexGridSizer(10);
 	sizer1->AddGrowableCol(0);
-    sizer1->Add(mbarrange,1,wxGROW);
+        sizer1->Add(mbarrange,1,wxGROW);
 	sizer = sizer1;
 	panel -> SetSizer(sizer);
 
@@ -130,7 +128,7 @@
 	
 	// Rectangulo
 	_manRoiControl  = new manualRoiControler();
-	_mContourModel  = new manualContourModel();
+	_mContourModel  = new manualContourModelRoi();
 	_mViewRoi		= new manualViewRoi();
 	_mViewRoi->SetModel( _mContourModel );
 	_mViewRoi->SetWxVtkBaseView( this->wxvtkbaseview );
@@ -141,7 +139,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();