X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FLayerImageBase.cxx;h=6f0d5e14b8d1747d126d032830d3f891dc7ec51b;hb=7030de3ff8576fd8111ad4d2cbb4335d169418b6;hp=ee8a7fc05c54faee672f02d9ba9ce1a757f41369;hpb=965c602117e9de99019d49bd78ca1d707a1a6bd2;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
index ee8a7fc..6f0d5e1 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
@@ -6,6 +6,41 @@
 
 #include "LayerImageBase.h"
 
+
+//---------------------------------------------------------------------------------------------
+//---------------------------------------------------------------------------------------------
+//---------------------------------------------------------------------------------------------
+
+ColorLayerImageBasevtkInteractor::ColorLayerImageBasevtkInteractor(LayerImageBase* layerImageBase)
+{
+    _layerImageBase=layerImageBase;
+}
+
+//---------------------------------------------------------------------------------------------
+ColorLayerImageBasevtkInteractor::~ColorLayerImageBasevtkInteractor()
+{
+}
+
+
+//---------------------------------------------------------------------------------------------
+bool ColorLayerImageBasevtkInteractor::OnMouseMove()
+{
+	printf("EED ColorLayerImageBasevtkInteractor::OnMouseMove \n");
+    if  (_vtkInteractorStyleBaseView->GetRefresh_waiting()==true)
+    {
+        _layerImageBase->GetvtkImageReslice()->Modified();
+    }
+
+    return true;
+}
+
+
+//---------------------------------------------------------------------------------------------
+//---------------------------------------------------------------------------------------------
+//---------------------------------------------------------------------------------------------
+
+
+
 LayerImageBase::LayerImageBase()
 {
 	_actorPresent			=	false;
@@ -59,7 +94,14 @@ void LayerImageBase::SetImage(vtkImageData* image)
 //----------------------------------------------------------------------------
 void LayerImageBase::SetwxVtkBaseView(wxVtkBaseView *baseview)
 {
+	printf("EED LayerImageBase::SetwxVtkBaseView start baseview:%p \n", baseview);
+
 	_baseView = baseview;
+
+    vtkInteractorStyleBaseView *isbv    = (vtkInteractorStyleBaseView*)(_baseView->GetInteractorStyleBaseView());
+    isbv->AddInteractorStyleMaracas( new ColorLayerImageBasevtkInteractor(this) );
+	
+	printf("EED LayerImageBase::SetwxVtkBaseView end \n");
 }
 
 //----------------------------------------------------------------------------
@@ -71,6 +113,7 @@ wxVtkBaseView *LayerImageBase::GetwxVtkBaseView()
 //----------------------------------------------------------------------------
 void LayerImageBase::Refresh()
 {
+    printf("EED LayerImageBase::Refresh\n");
     if (_baseView!=NULL)
     {
         _baseView->Refresh();
@@ -106,7 +149,9 @@ int LayerImageBase::CleanZ(int z)
 //----------------------------------------------------------------------------
 void LayerImageBase::onThreshold()
 {
-
+	
+	printf("EED LayerImageBase::onThreshold start \n");
+	
 	if ((_image!=NULL) && (_baseView!=NULL))
 	{
 		int z=CleanZ( GetZ() );
@@ -129,7 +174,7 @@ void LayerImageBase::onThreshold()
 				_thresholdActor = vtkImageActor::New( );
 				_thresholdActor->SetOpacity( 0.6 );
 				_thresholdActor->InterpolateOn(  );
-				_thresholdActor->SetPosition( 0,0, 900-1 );
+				_thresholdActor->SetPosition( 0,0, -900-1 );
 			} // _thresholdActor
 			_baseView->GetRenderer()->AddActor( _thresholdActor );
 			_actorPresent = true;
@@ -140,7 +185,8 @@ void LayerImageBase::onThreshold()
 		_imageReslicer->SetInformationInput( GetImage() );
 		_imageReslicer->SetResliceAxesDirectionCosines(1,0,0, 0,1,0 ,0,0,1);
 		_imageReslicer->SetOutputDimensionality(2);
-		_imageReslicer->SetInterpolationModeToLinear();
+//		_imageReslicer->SetInterpolationModeToLinear();
+		_imageReslicer->SetInterpolationModeToNearestNeighbor();
 		_imageReslicer->SetResliceAxesOrigin(0,0,z);
 
 		vtkImageData *img = _imageReslicer->GetOutput();
@@ -150,7 +196,12 @@ void LayerImageBase::onThreshold()
 		_thresholdMapper->SetInput( img );
 		_thresholdMapper->SetLookupTable( _thresholdTable );
 		_thresholdActor->SetInput( _thresholdMapper->GetOutput() );
+
+		printf("EED LayerImageBase::onThreshold working \n");
+		
+		
 		} // _image
+	printf("EED LayerImageBase::onThreshold end");
 }
 
 
@@ -200,6 +251,16 @@ void LayerImageBase::onThresholdRemove()
 	}
 }
 
+//----------------------------------------------------------------------------
+vtkLookupTable *LayerImageBase::GetvtkLookupTable()
+{
+    return _thresholdTable;
+}
+
+vtkImageReslice *LayerImageBase::GetvtkImageReslice()
+{
+    return _imageReslicer;
+}