Linux compat

[creaImageIO.git] / src2 / creaImageIOWxViewer.cpp

diff --git a/src2/creaImageIOWxViewer.cpp b/src2/creaImageIOWxViewer.cpp
index f8ae7b917f26ea326f15948c1afc39dedcb7dad7..63b2c887b9c9d7cec35464d076ffc45b8aace0a7 100644 (file)
--- a/src2/creaImageIOWxViewer.cpp
+++ b/src2/creaImageIOWxViewer.cpp
@@ -43,9 +43,15 @@ namespace creaImageIO
     int mx1,mx2,my1,my2,mz1,mz2;
     double mspx,mspy,mspz;
   };
+  
+  //=====================================================================
 
 
-       // CTor
+
+  
+
+  //=====================================================================
+  // CTor
   WxViewer::WxViewer(wxWindow *parent, 
                                               wxWindowID id,
                                               wxString title,
@@ -63,15 +69,15 @@ namespace creaImageIO
     wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
 
        
-        // previewer
+    // previewer
        
-       mInteractor = new crea::creawxVTKRenderWindowInteractor(this,-1);
+    mInteractor = new crea::creawxVTKRenderWindowInteractor(this,-1);
     mInteractor->UseCaptureMouseOn();  
  
     mViewer    = vtkImageViewer2::New();
     mViewer->SetupInteractor ( mInteractor );
-
-       mMovie=new ThreadedMovie(images, mViewer, mInteractor, this);
+    
+    mMovie=new ThreadedMovie(images, mViewer, mInteractor, this);
        
     topsizer-> Add( mInteractor ,1,wxGROW  ,0);
     SetSizer( topsizer );     
@@ -88,23 +94,25 @@ namespace creaImageIO
 
   void WxViewer::ShowImage(vtkImageData* im)
   {
-       mViewer->SetInput(im);
-       mViewer->SetSlice( 0 );
-
-       int x1,x2,y1,y2,z1,z2;
-       double spx,spy,spz;
+    GimmickDebugMessage(5,"WxViewer::ShowImage"
+                       <<std::endl);
+    mViewer->SetInput(im);
+    mViewer->SetSlice( 0 );
+    
+    int x1,x2,y1,y2,z1,z2;
+    double spx,spy,spz;
     im->Update();
     
     im->GetSpacing(spx,spy,spz);
     im->GetExtent (x1,x2,y1,y2,z1,z2);
     /*
     std::cout << "-----------------------------"<<std::endl;
-      std::cout << x1 << "-"<<x2<<std::endl; 
-      std::cout << y1 << "-"<<y2<<std::endl; 
-      std::cout << z1 << "-"<<z2<<std::endl; 
-      std::cout << spx << "-"<<spy<<"-"<<spz<<std::endl; 
+    std::cout << x1 << "-"<<x2<<std::endl; 
+    std::cout << y1 << "-"<<y2<<std::endl; 
+    std::cout << z1 << "-"<<z2<<std::endl; 
+    std::cout << spx << "-"<<spy<<"-"<<spz<<std::endl; 
     */
-   
+    
     if ((x1!=mx1) ||
        (x2!=mx2) ||
        (y1!=my1) ||
@@ -161,8 +169,8 @@ namespace creaImageIO
          
       }
     
-    
-       
+    mInteractor->Render();
+    mViewer->Render(); 
   } 
 
   //================================================================
@@ -239,24 +247,28 @@ namespace creaImageIO
   void*  ThreadedMovie::Entry()
   {
          
+    GimmickMessage(1,"ThreadedMovie::Entry()"<<std::endl);
                        
-       while(true)
-       {               
-                       clock_t endwait;
-                               for(i=mImagesToPlay.begin();i!=mImagesToPlay.end();++i)
-                               {
-                                       if(i!=mImagesToPlay.end())
-                                       {
-                                               ShowImage(*i);
-                                               mParent->Refresh();
-                                               endwait = clock () + 0.2 * CLOCKS_PER_SEC ;
-                                               while (clock() < endwait) {}
-                                       }
-                                       
-                               }
-                                       
-       }
-       return 0;
+    while(true)
+      {                
+       clock_t endwait;
+       for(i=mImagesToPlay.begin();i!=mImagesToPlay.end();++i)
+         {
+           if(i!=mImagesToPlay.end())
+             {   
+
+               GimmickMessage(1,"ThreadedMovie next image"<<std::endl);
+               
+               ShowImage(*i);
+               mParent->Refresh();
+               endwait = clock () + 0.2 * CLOCKS_PER_SEC ;
+               while (clock() < endwait) {}
+             }
+           
+         }
+       
+      }
+    return 0;
   }
 
   //=====================================================================