#2482 creaMaracasVisu Bug New High - ColorLayer 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 3b89d1a2f93be5deafdb135839076344a136e19d..eb70d3e92999533420fa33637be5cb1f2d839d45 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
@@ -33,8 +33,7 @@
 #include "wxMPRBaseData.h"
 #include "wxVtk2DBaseView.h"
 #include "wxVTKRenderWindowInteractor.h"
-
-
+#include "vtkTextProperty.h"
 
 
 //---------------------------------------------------------------------------------------------
@@ -85,103 +84,6 @@ private:
 };
 
 
-//---------------------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------------
-
-ColorLayerImageBasevtkInteractor::ColorLayerImageBasevtkInteractor(LayerImageBase* layerImageBase)
-{
-    _state                             =       false;
-    _stateKey                  =       false;
-    _layerImageBase    =       layerImageBase;
-       
-}
-
-//---------------------------------------------------------------------------------------------
-ColorLayerImageBasevtkInteractor::~ColorLayerImageBasevtkInteractor()
-{
-}
-
-//---------------------------------------------------------------------------------------------
-bool ColorLayerImageBasevtkInteractor::OnChar() 
-{
-       return true;
-}
-
-
-//---------------------------------------------------------------------------------------------
-bool ColorLayerImageBasevtkInteractor::OnMouseMove()   // vitual
-{
-       printf("EED ColorLayerImageBasevtkInteractor::OnMouseMove start \n");
-
-       vtkRenderWindowInteractor *interactor = _vtkInteractorStyleBaseView->GetInteractor();
-
-       // For example in ManualPaint Action
-        // This is not working, because the order of insertion events mecanism (_vtkInteractorStyleBaseView)
-        // Layer first Paint after.
-        // the only way to make it works is to take the axes an paint.  this force a first SetParent_refresh_waiting()
-//     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" );
-       }       
-
-       
-       if (  (_state==true) &&  (_layerImageBase->GetActorPresent())  )
-       {
-               wxVtk2DBaseView *wxvtk2Dbaseview = (wxVtk2DBaseView*) _vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
-               wxVTKRenderWindowInteractor *wxVTKiren = wxvtk2Dbaseview->GetWxVTKRenderWindowInteractor();
-               int px, py;
-               wxVTKiren->GetEventPosition(px, py);
-
-//        int     typeView = 1;
-               double X = (double) px;
-               double Y = (double) py;
-               double Z = wxvtk2Dbaseview->GetActualSlice();
-//             wxvtk2Dbaseview->TransFromCoordScreenToWorld(X, Y, Z,true, typeView);
-               wxvtk2Dbaseview->TransFromCoordScreenToWorld(X, Y, Z, true);
-
-//             _manualPaintControler->PaintImage((int) X, (int) Y, (int) Z);
-
-               _layerImageBase->SetX( (int)X );
-               _layerImageBase->SetY( (int)Y );
-               _layerImageBase->SetZ( (int)Z );
-               _layerImageBase->onThreshold();
-//             _layerImageBase->Refresh();
-
-               this->_vtkInteractorStyleBaseView->SetParent_refresh_waiting();
-
-               if  (_vtkInteractorStyleBaseView->GetRefresh_waiting()==true)
-               {
-                               _layerImageBase->GetvtkImageReslice()->Modified();
-               }
-       printf("EED ColorLayerImageBasevtkInteractor::YESSSSSS \n");
-       }
-       return true;
-}
-
-//---------------------------------------------------------------------------------------------
-bool  ColorLayerImageBasevtkInteractor::OnRightButtonDown() // virtual
-{
-       printf("EED ColorLayerImageBasevtkInteractor::OnRightButtonDown \n");
-       _state=true;
-   return true;
-}
-
-
-//---------------------------------------------------------------------------------------------
-bool  ColorLayerImageBasevtkInteractor::OnRightButtonUp()  // virtual
-{
-       printf("EED ColorLayerImageBasevtkInteractor::OnRightButtonUp \n");
-       _state=false;
-       return true;
-}
-
 
 //---------------------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------------------
@@ -445,9 +347,11 @@ void LayerImageBase::onThreshold()
                
 //             _scalarbarActor->SetLookupTable( _thresholdTable );
                _scalarbarActor->SetLookupTable( _thresholdMapper->GetLookupTable() );
-
                _scalarbarActor->SetTitle("Value");
-               _scalarbarActor->SetNumberOfLabels(5);
+               _scalarbarActor->SetNumberOfLabels(4);
+               int fontsize = _scalarbarActor->GetLabelTextProperty()->GetFontSize();
+               _scalarbarActor->GetLabelTextProperty()->SetFontSize(fontsize/2);
+
 //             _scalarbarActor->SetTextPad(4);  ??
 
                } // _image