* Major changes on IOStatus update / propagation

[bbtk.git] / packages / wxvtk / src / bbwxvtkViewer2D.cxx

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index 929147e12b02085c35ee26a838b39b21adee96ed..5d43509e8c0d3bb3ac1c123c78337c4d3cbe601b 100644 (file)
--- a/packages/wxvtk/src/bbwxvtkViewer2D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer2D.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/03 13:35:35 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2008/12/08 12:56:03 $
+  Version:   $Revision: 1.28 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -53,7 +53,7 @@ namespace bbwxvtk
     wxvtkrenderwindowinteractor = new wxVTKRenderWindowInteractor(panel,-1);
     wxvtkrenderwindowinteractor->UseCaptureMouseOn();  
 
-    imageViewer        = vtkImageViewer2::New();
+    imageViewer        = wxvtkImageViewer2::New();
     imageViewer->SetSlice( 1 );
     imageViewer->SetupInteractor ( wxvtkrenderwindowinteractor );
     
@@ -130,18 +130,37 @@ namespace bbwxvtk
   {
     //    std::cout << "Viewer2DWidget::UpdateView() "<<mBox->bbGetFullName() << std::endl;
     //   std::cout << "slice="<<mBox->bbGetInputSlice()<<std::endl;
+    
+    std::cout << "--- Testing status of input connection 'In'" << std::endl;
+    bbtk::BlackBoxInputConnector* c =  mBox->bbGetInputConnectorMap().find("In")->second ;
+    if (c->GetStatus()==bbtk::MODIFIED) 
+      {
+       std::cout << "===> MODIFIED"<<std::endl;
+      }
+    else if (c->GetStatus()==bbtk::UPTODATE) 
+      {
+       std::cout << "===> UPTODATE"<<std::endl;
+      }
+
+
 
 
     if ( ( mBox->bbGetInputIn() == NULL ) &&
         ( backImageData != mDefaultImage ) )
       {
+       // 
+       std::cout << "** Viewer2DWidget::UpdateView() : NULL Input (reset)"
+                 <<std::endl;
        backImageData = mDefaultImage;
        mUpdateCamera = true;
+
       }
     else if ( ( mBox->bbGetInputIn() != NULL ) && 
              //      (true) ) //
              (backImageData != mBox->bbGetInputIn()) ) 
       {
+       std::cout << "** Viewer2DWidget::UpdateView() : Input changed"
+                 <<std::endl;
        backImageData = mBox->bbGetInputIn();
        backImageData->Update();
        imageViewer->SetInput( backImageData );
@@ -150,6 +169,8 @@ namespace bbwxvtk
 
     if (mUpdateCamera)
       {
+       std::cout << "** Viewer2DWidget::UpdateView() : Update Camera"
+                 <<std::endl;
        int x1,x2,y1,y2,z1,z2;
        double spx,spy,spz;
        backImageData->GetSpacing(spx,spy,spz);
@@ -238,10 +259,10 @@ namespace bbwxvtk
                bbtkMessage("Output", 2, "Viewer2D : Orientation was not 0< <2 (shouldn't arrive here!"<<std::endl);
                z = ext[5]; // Why not?
            }
-
+           wxvtkrenderwindowinteractor->Refresh();
+           wxvtkrenderwindowinteractor->Render();
            bbtkDebugMessage("Output",3,"Viewer2D : slice = "<<z<<std::endl);
            imageViewer->SetSliceOrientation (orientation);
-           wxvtkrenderwindowinteractor->Render();
            imageViewer->SetSlice( z );
 
     }