X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FLayerImageBase.cxx;h=c6d8465096bfd21a7ec43484e7ed82244e2eef78;hb=d725af03e25b41e03b212c26068be2c04dacd270;hp=beb17eadd2e087b32286cc0c074bf8137f403d0d;hpb=54bb3fba5f59ca71cb82d87043e21354dd85e7aa;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 beb17ea..c6d8465 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()
+{
+
+    if  (_vtkInteractorStyleBaseView->GetRefresh_waiting()==true)
+    {
+        _layerImageBase->GetvtkImageReslice()->Modified();
+    }
+
+    return true;
+}
+
+
+//---------------------------------------------------------------------------------------------
+//---------------------------------------------------------------------------------------------
+//---------------------------------------------------------------------------------------------
+
+
+
 LayerImageBase::LayerImageBase()
 {
 	_actorPresent			=	false;
@@ -60,6 +95,9 @@ void LayerImageBase::SetImage(vtkImageData* image)
 void LayerImageBase::SetwxVtkBaseView(wxVtkBaseView *baseview)
 {
 	_baseView = baseview;
+
+    vtkInteractorStyleBaseView *isbv    = (vtkInteractorStyleBaseView*)(_baseView->GetInteractorStyleBaseView());
+    isbv->AddInteractorStyleMaracas( new ColorLayerImageBasevtkInteractor(this) );
 }
 
 //----------------------------------------------------------------------------
@@ -71,6 +109,7 @@ wxVtkBaseView *LayerImageBase::GetwxVtkBaseView()
 //----------------------------------------------------------------------------
 void LayerImageBase::Refresh()
 {
+    printf("EED LayerImageBase::Refresh\n");
     if (_baseView!=NULL)
     {
         _baseView->Refresh();
@@ -144,8 +183,8 @@ void LayerImageBase::onThreshold()
 		_imageReslicer->SetResliceAxesOrigin(0,0,z);
 
 		vtkImageData *img = _imageReslicer->GetOutput();
-		img->Update();
-		img->UpdateInformation();
+//		img->Update();
+//		img->UpdateInformation();
 
 		_thresholdMapper->SetInput( img );
 		_thresholdMapper->SetLookupTable( _thresholdTable );
@@ -200,6 +239,16 @@ void LayerImageBase::onThresholdRemove()
 	}
 }
 
+//----------------------------------------------------------------------------
+vtkLookupTable *LayerImageBase::GetvtkLookupTable()
+{
+    return _thresholdTable;
+}
+
+vtkImageReslice *LayerImageBase::GetvtkImageReslice()
+{
+    return _imageReslicer;
+}