* Viewer2D now works !!!

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

diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index 5d43509e8c0d3bb3ac1c123c78337c4d3cbe601b..a8c63eebcbb73b714c9f57ecb828685132f8c16b 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/08 12:56:03 $
-  Version:   $Revision: 1.28 $
+  Date:      $Date: 2008/12/09 12:54:07 $
+  Version:   $Revision: 1.29 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -131,36 +131,24 @@ 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;
+       //      std::cout << "** Viewer2DWidget::UpdateView() : NULL Input (reset)"
+       //                <<std::endl;
        backImageData = mDefaultImage;
        mUpdateCamera = true;
 
       }
     else if ( ( mBox->bbGetInputIn() != NULL ) && 
-             //      (true) ) //
-             (backImageData != mBox->bbGetInputIn()) ) 
+             ( mBox->bbGetInputStatus("In") != bbtk::UPTODATE  )
+             )
+             //(backImageData != mBox->bbGetInputIn()) ) 
       {
-       std::cout << "** Viewer2DWidget::UpdateView() : Input changed"
-                 <<std::endl;
+       //      std::cout << "** Viewer2DWidget::UpdateView() : Input changed"
+       //                <<std::endl;
        backImageData = mBox->bbGetInputIn();
        backImageData->Update();
        imageViewer->SetInput( backImageData );
@@ -169,8 +157,8 @@ namespace bbwxvtk
 
     if (mUpdateCamera)
       {
-       std::cout << "** Viewer2DWidget::UpdateView() : Update Camera"
-                 <<std::endl;
+       //      std::cout << "** Viewer2DWidget::UpdateView() : Update Camera"
+       //                <<std::endl;
        int x1,x2,y1,y2,z1,z2;
        double spx,spy,spz;
        backImageData->GetSpacing(spx,spy,spz);