X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2Finclude%2FwxImageViewerWidget.cxx;h=932e1c7c6d10cb3d2e947a5fe0534a15399870b1;hb=1622b6214967015983b3fb53dabeb599e4c8cda2;hp=ea2808be1fdd6bae7712287db1c347dc166640fc;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/wxImageViewerWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/wxImageViewerWidget.cxx
index ea2808b..932e1c7 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/wxImageViewerWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/include/wxImageViewerWidget.cxx
@@ -113,7 +113,7 @@ void wxVtk2DView_TMP::Configure() // virtual
 	interactorstylebaseview = vtkInteractorStyleBaseView2D::New();
 
     SetInteractorStyleBaseView(interactorstylebaseview);
-	wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor();
+	crea::wxVTKRenderWindowInteractor *iren = GetWxVTKRenderWindowInteractor();
 	interactorstylebaseview->SetInteractor ( iren );
 	iren->SetInteractorStyle(interactorstylebaseview);
 	interactorstylebaseview->SetwxVtkBaseView(this);  
@@ -124,7 +124,7 @@ void wxVtk2DView_TMP::SetWxVTKRenderWindowInteractor( wxVTKRenderWindowInteracto
 	_wxVTKiren = wxVTKiren;
 }
 //----------------------------------------------------------------------------
-wxVTKRenderWindowInteractor *wxVtk2DView_TMP::GetWxVTKRenderWindowInteractor() // virtual
+crea::wxVTKRenderWindowInteractor *wxVtk2DView_TMP::GetWxVTKRenderWindowInteractor() // virtual
 {
 	return _wxVTKiren;
 }
@@ -526,9 +526,10 @@ void wxImageViewerWidgetRoi::ExecuteEvent(vtkObject *wdg, unsigned long event, v
         _pts->SetPoint(2, XX	, YY	, p0[2]);
         _pts->SetPoint(3, p0[0]	, YY	, p0[2]);
         _imageViewer->Render();
-      }
+      } // if
     }
-  if ( event == vtkCommand::LeftButtonReleaseEvent ){
+  if ( event == vtkCommand::LeftButtonReleaseEvent )
+	{
        _bboxEnabled = false;
     //EED} else if ( event == vtkCommand::MouseWheelForwardEvent ){
     } else if ( event == wxEVT_MOUSEWHEEL+10000 ){
@@ -545,7 +546,7 @@ void wxImageViewerWidgetRoi::ExecuteEvent(vtkObject *wdg, unsigned long event, v
         } else {
           //neither ctrl nor shift has been pressed:
           slice += 5;
-        }
+        } // if
 
         slice = slice > min ? slice : min;
         slice = slice < max ? slice : max;
@@ -571,7 +572,8 @@ void wxImageViewerWidgetRoi::ExecuteEvent(vtkObject *wdg, unsigned long event, v
     } else if ( event == wxEVT_MOUSEWHEEL+10001 ){
 
 //      _sliceEnabled = false;
-        if( _wxVTKiren->GetControlKey () ){
+        if( _wxVTKiren->GetControlKey () )
+		{
           slice -= 10;
         } else if( _wxVTKiren->GetShiftKey () ) {
           slice--;
@@ -579,35 +581,33 @@ void wxImageViewerWidgetRoi::ExecuteEvent(vtkObject *wdg, unsigned long event, v
           //neither ctrl nor shift has been pressed:
           slice -= 5;
 		  slice = (slice /5) * 5;
-        }
+        } // if
 
         slice = slice > min ? slice : min;
         slice = slice < max ? slice : max;
 
-
 #if (VTK_MAJOR_VERSION >= 5)
 		_imageViewer->SetSlice( slice );
 #else
 		_imageViewer->SetZSlice( slice );
 #endif
 
-
         //This is not nedeed any more since vtkImageViewer2.cxx -r1.9
         //imageViewer->GetRenderer()->ResetCameraClippingRange();
 
 		wxMouseEvent mouseEvent;
 		mouseEvent.m_wheelRotation=-130;
-		if (_intVtkPanWid!=NULL) { 
+		if (_intVtkPanWid!=NULL) 
+		{ 
 			_intVtkPanWid->CallBackOnMouseWheel(mouseEvent);
-		}
+		} // if
         _imageViewer->Render();
-
     }
-
 }
-//----------------------------------------------------------------------------
-void wxImageViewerWidgetRoi::ConstructVTK(vtkImageData *imageData){
 
+//----------------------------------------------------------------------------
+void wxImageViewerWidgetRoi::ConstructVTK(vtkImageData *imageData)
+{
   wxImageViewerWidget::ConstructVTK(imageData);
   _interactorStyle2DMaracas->SetObserver(_Observer);
 
@@ -619,7 +619,6 @@ void wxImageViewerWidgetRoi::ConstructVTK(vtkImageData *imageData){
   _pts->SetPoint(2,  1000	,  1000	,  1000 );
   _pts->SetPoint(3, -1000	,  1000	,     0 );
 
-
   vtkCellArray *lines = vtkCellArray::New();
   lines->InsertNextCell(5);
   lines->InsertCellPoint(0);
@@ -633,7 +632,6 @@ void wxImageViewerWidgetRoi::ConstructVTK(vtkImageData *imageData){
   _pd->SetLines( lines );
   lines->Delete();  //do not delete lines ??
 
-
 	_bboxActor						=	vtkActor::New();
     _bboxMapper						=	vtkPolyDataMapper::New();
 
@@ -650,6 +648,7 @@ void wxImageViewerWidgetRoi::ConstructVTK(vtkImageData *imageData){
 }
 
 //----------------------------------------------------------------------------
-bool wxImageViewerWidgetRoi::GetRoiSelected(){
+bool wxImageViewerWidgetRoi::GetRoiSelected()
+{
 	return _RoiSelected;
 }