#2482 creaMaracasVisu Bug New - HighColorLayer refresh missing. The MPR is not...

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / ThresholdImageView / LayerImageBase.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
index 25d0b62e4f349084a4a7a746ef0916c69f97ab62..3b89d1a2f93be5deafdb135839076344a136e19d 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
@@ -30,19 +30,70 @@
 
 #include "LayerImageBase.h"
 
+#include "wxMPRBaseData.h"
 #include "wxVtk2DBaseView.h"
 #include "wxVTKRenderWindowInteractor.h"
 
 
+
+
+//---------------------------------------------------------------------------------------------
+//---------------------------------------------------------------------------------------------
+//---------------------------------------------------------------------------------------------
+
+// Callback for the interaction
+class ColorLayerObserver : public vtkCommand{
+  public:
+       virtual char const *GetClassName() const { return "ColorLayerObserver";}
+
+       static ColorLayerObserver *New()        {      return new ColorLayerObserver;   }
+
+       ColorLayerObserver() 
+       {
+               _layerimagebase = NULL;
+       }
+
+       virtual void Execute(vtkObject *wdg, unsigned long event, void* calldata)       
+       { 
+               if (_layerimagebase!= NULL)
+               {
+
+                       wxVtkBaseView           *wxvtkbaseview = _layerimagebase->GetwxVtkBaseView();
+                       if (wxvtkbaseview!=NULL)
+                       {
+
+                               vtkMPRBaseData  *vtkmprbasedata =       (vtkMPRBaseData*)wxvtkbaseview->GetVtkBaseData();
+                               if (vtkmprbasedata!=NULL)
+                               {
+                                       _layerimagebase->SetX( vtkmprbasedata->GetX() );
+                                       _layerimagebase->SetY( vtkmprbasedata->GetY() );
+                                       _layerimagebase->SetZ( vtkmprbasedata->GetZ() );
+                       _layerimagebase->onThresholdChange();
+                               } // if basedata
+                               
+                       } // if wxvtkbaseview
+               } //if layerimagebase
+       }
+
+       void SetLayerImageBase(LayerImageBase* layerimagebase)
+       {
+       _layerimagebase =       layerimagebase;
+       }
+
+private:
+       LayerImageBase* _layerimagebase;
+};
+
+
 //---------------------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------------------
 
 ColorLayerImageBasevtkInteractor::ColorLayerImageBasevtkInteractor(LayerImageBase* layerImageBase)
 {
-    _state=false;
-    _stateKey=false;
-    _layerImageBase=layerImageBase;
+    _state                             =       false;
+    _stateKey                  =       false;
+    _layerImageBase    =       layerImageBase;
        
 }
 
@@ -72,13 +123,12 @@ bool ColorLayerImageBasevtkInteractor::OnMouseMove()   // vitual
 //     if ( this->_vtkInteractorStyleBaseView->GetParent_refresh_waiting() == true )
 
        if ( interactor->GetControlKey()==1 )  // EED This if for ManaulPaint Interaction compatibility
-        {
+       {
                printf("EED ColorLayerImageBasevtkInteractor::OnMouseMove need Refresh \n" );
                _layerImageBase->onThreshold();
-                       _layerImageBase->GetvtkImageReslice()->Modified();
-       } 
-        else {
-       printf("EED ColorLayerImageBasevtkInteractor::OnMouseMove NOT need Refresh \n" );
+               _layerImageBase->GetvtkImageReslice()->Modified();
+       } else {
+               printf("EED ColorLayerImageBasevtkInteractor::OnMouseMove NOT need Refresh \n" );
        }       
 
        
@@ -120,9 +170,10 @@ bool  ColorLayerImageBasevtkInteractor::OnRightButtonDown() // virtual
 {
        printf("EED ColorLayerImageBasevtkInteractor::OnRightButtonDown \n");
        _state=true;
-       return true;
+   return true;
 }
 
+
 //---------------------------------------------------------------------------------------------
 bool  ColorLayerImageBasevtkInteractor::OnRightButtonUp()  // virtual
 {
@@ -141,23 +192,22 @@ bool  ColorLayerImageBasevtkInteractor::OnRightButtonUp()  // virtual
 LayerImageBase::LayerImageBase()
 {
        _actorPresent                   =       false;
-       _X                              =       0;
-       _Y                              =       0;
-       _Z                              =       0;
-       _thresholdTable                 =       NULL;
+       _X                                                      =       0;
+       _Y                                                      =       0;
+       _Z                                                      =       0;
+       _thresholdTable         =       NULL;
        _thresholdMapper                =       NULL;
-       _scalarbarActor = NULL;
-       _thresholdActor                 =       NULL;
-       _image                          =       NULL;
-       _baseView                       =       NULL;
+       _scalarbarActor         =       NULL;
+       _thresholdActor         =       NULL;
+       _image                                  =       NULL;
+       _baseView                               =       NULL;
        _imageReslicer                  =       vtkImageReslice::New();
-
 }
 
 //----------------------------------------------------------------------------
-  LayerImageBase::~LayerImageBase()
-  {
-  }
+LayerImageBase::~LayerImageBase()
+{
+}
 
 //----------------------------------------------------------------------------
 void LayerImageBase::SetX(int x)
@@ -219,10 +269,16 @@ void LayerImageBase::SetImage(vtkImageData* image)
 void LayerImageBase::SetwxVtkBaseView(wxVtkBaseView *baseview)
 {
        if (_baseView==NULL)
-       {
-         _baseView = baseview;
-         vtkInteractorStyleBaseView *isbv    = (vtkInteractorStyleBaseView*)(_baseView->GetInteractorStyleBaseView());
-         isbv->AddInteractorStyleMaracas( new ColorLayerImageBasevtkInteractor(this) );
+   {
+               _baseView = baseview;
+// Old EED 2014 11 13
+//     vtkInteractorStyleBaseView *isbv    = (vtkInteractorStyleBaseView*)(_baseView->GetInteractorStyleBaseView());
+//     isbv->AddInteractorStyleMaracas( new ColorLayerImageBasevtkInteractor(this) );
+
+               ColorLayerObserver *colorlayerobserver = ColorLayerObserver::New();
+               _baseView->GetVtkBaseData()->AddObserver( 1, colorlayerobserver );
+               colorlayerobserver->SetLayerImageBase(this);
+
        } // if _baseView
 }
 
@@ -452,6 +508,7 @@ vtkLookupTable *LayerImageBase::GetvtkLookupTable()
     return _thresholdTable;
 }
 
+//----------------------------------------------------------------------------
 vtkImageReslice *LayerImageBase::GetvtkImageReslice()
 {
     return _imageReslicer;