#3582 ResetRefresh mechanism

diff --git a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx
index b5261021ec264bdfa0112716e0d7117baf2c334b..34e8ebff19f02393e92d34ee9b5793848860f25b 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx
+++ b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx
@@ -75,6 +75,8 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ColorLayerImageView,bbtk::WxBlackBox);
 //=====
 void ColorLayerImageView::Process()
 {
+    printf("EED ColorLayerImageView::Process Start \n");
+
     if (bbGetInputIn()!=NULL) {
         if ( !( (bbGetInputWxVtkBaseView()==NULL) && (bbGetInputWxVtkBaseView1()==NULL) && (bbGetInputWxVtkBaseView2()==NULL))  )
         {
@@ -86,21 +88,29 @@ void ColorLayerImageView::Process()
                     //      firsttime=false;
                     clivp->SetActive( bbGetInputActive() );
                 }
+                
+                printf("EED ColorLayerImageView::Process 1 \n");
                 std::vector<double> range                           = bbGetInputlstRangeForColorBar();
                 std::vector<int>    colorbarposition                = bbGetInputColorBarPosition();
                 std::vector<double> base_color                      = bbGetInputlstBaseColor();
                 std::vector<double> grey_level_boundaries           = bbGetInputlstGreyLevelBoundaries();
                 std::vector<double> transparence_level_boundaries   = bbGetInputlstTransparenceBoundaries();
+                printf("EED ColorLayerImageView::Process 1.1 \n");
                 clivp->GetColorLayerImageViewManager()->SetwxVtkBaseView( 0 , bbGetInputWxVtkBaseView() );
                 clivp->GetColorLayerImageViewManager()->SetwxVtkBaseView( 1 , bbGetInputWxVtkBaseView1() );
                 clivp->GetColorLayerImageViewManager()->SetwxVtkBaseView( 2 , bbGetInputWxVtkBaseView2() );
+                printf("EED ColorLayerImageView::Process 1.2 \n");
                 clivp->GetColorLayerImageViewManager()->ResetRefresh( );
+                printf("EED ColorLayerImageView::Process 1.3 \n");
                 clivp->GetColorLayerImageViewManager()->SetRangeForColorBar( range );
+                printf("EED ColorLayerImageView::Process 1.4 \n");
                 clivp->GetColorLayerImageViewManager()->SetColorBarPosition( colorbarposition );
                 clivp->GetColorLayerImageViewManager()->SetBaseColors( base_color );
                 clivp->GetColorLayerImageViewManager()->SetGreyLevelBoundaries( grey_level_boundaries );
+                printf("EED ColorLayerImageView::Process 1.5 \n");
                 clivp->GetColorLayerImageViewManager()->SetBaseTransparence( transparence_level_boundaries );
                 clivp->GetColorLayerImageViewManager()->SetPlainOrGradientColor( bbGetInputPlainOrGradientColor() );
+                printf("EED ColorLayerImageView::Process 1.6 \n");
                 clivp->SetFittingMode( bbGetInputFittingMode() );
                 clivp->SetImage( bbGetInputIn() );
 
@@ -108,6 +118,7 @@ void ColorLayerImageView::Process()
                 bbSetOutputLookupTable( clivp->GetColorLayerImageViewManager()->GetLookupTable(0) );
                 bbSetOutputOutOpacity( clivp->GetOpacity() );
                 bbSetOutputInterpolation( clivp->GetInterpolation() );
+                printf("EED ColorLayerImageView::Process 2 \n");
                 if (firsttime==true)
                 {
                     firsttime=false;
@@ -119,6 +130,9 @@ void ColorLayerImageView::Process()
             printf("EED Error!!!  ColorLayerImageView::Process   (%s)  Missing Inputs:  WxVtkBaseView , WxVtkBaseView1 , WxVtkBaseView2 \n", bbGetFullName().c_str() );
         }// if xxVtkBaseView
     } // if In
+    
+    printf("EED ColorLayerImageView::Process End \n");
+
 }
 //=====
 // Don't edit this file. This file is generated from xml description..

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.cxx
index 4a39be930597ad272b773fac7dc0403a64ce75a7..e69f291a93eaf64d38285f4fbbd8dcdd490c13d7 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageViewManager.cxx
@@ -57,9 +57,14 @@ ColorLayerImageViewManager::~ColorLayerImageViewManager()
 void ColorLayerImageViewManager::ResetRefresh()
 {
     int i,size =_colorLayerImageViewLst.size();
-    for (i=0;i<size;i++)
+    for ( i=0 ; i<size ; i++ )
     {
-        _colorLayerImageViewLst[i]->ResetRefresh();
+        printf("EED ColorLayerImageViewManager::ResetRefresh 1 %p \n", _colorLayerImageViewLst[i] );
+        if ( _colorLayerImageViewLst[i] !=NULL )
+        {
+            _colorLayerImageViewLst[i]->ResetRefresh();
+        }
+        printf("EED ColorLayerImageViewManager::ResetRefresh 2 \n");
     } // for i
 }
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
index 7ec645cf3e01faf470a06957e79682aad98a640d..f6c85e71251459f7f3dd613b3e607843c74325a8 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/LayerImageBase.cxx
@@ -363,9 +363,11 @@ void LayerImageBase::GetRangeForColorBar(double &minRange, double &maxRange)
 //----------------------------------------------------------------------------
 void LayerImageBase::ResetRefresh()
 {
+    printf("EED LayerImageBase::ResetRefresh A \n");
     _Xback      = -9999;
     _Yback      = -9999;
     _Zback      = -9999;
+    printf("EED LayerImageBase::ResetRefresh B \n");
 }
 
 //----------------------------------------------------------------------------

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkBaseData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkBaseData.cxx
index d2b2e7cdfa60e860adb131b14d5e11b89967cbc8..e2e7c36616df9ae28f724415f595ac9339a2f845 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkBaseData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkBaseData.cxx
@@ -96,7 +96,7 @@ void vtkBaseData::Configure()  // virtual
 }
 
 //-------------------------------------------------------------------
-void vtkBaseData::SetZ(double z, bool withObserver)   // default  withObserver=true
+void vtkBaseData::SetZ(double z, bool withObserver)
 {
        //int maxZ;
 //     int dim[3];

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
index e78285f99bc9c47974f057ec4f32bdaa4b915f29..6a43c628d8d1fd7740358bc3f278f0a1b30d61e1 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
@@ -23,13 +23,9 @@
 #  knowledge of the CeCILL-B license and that you accept its terms.
 # ------------------------------------------------------------------------ */
 
-
-
 #ifndef __WX_VTK__BASE__VIEW__H
 #define __WX_VTK__BASE__VIEW__H
 
-
-
 #include <vtkRenderer.h>
 #include <vtkRenderWindow.h>
 #include <vtkCamera.h>
@@ -39,7 +35,6 @@
 #include <vtkProperty.h>
 #include <vtkActor.h>
 
-
 #include <vtkImageViewer2.h> 
 #include <vtkInteractorStyleImage.h> 
 
@@ -48,8 +43,6 @@
 
 #include <wx/wx.h>
 
-
-
 #include <vector>
 #include "marTypes.h"
 
@@ -61,7 +54,6 @@
 //class vtkInteractorStyleBaseView;  
  */
 
-
 #include "vtkInteractorStyleImage.h"
 
 class creaMaracasVisu_EXPORT wxVtkBaseView{