#3218 creaImageIO Feature New Normal - vtk8itk4wx3-mingw64

[creaImageIO.git] / src / creaImageIOWxViewer.cpp

diff --git a/src/creaImageIOWxViewer.cpp b/src/creaImageIOWxViewer.cpp
index 784b1c7c3ff596ac2a694ef5e7dfc856262cff70..0b99b6675b06754e6ed90988671a8d511c012cb9 100644 (file)
--- a/src/creaImageIOWxViewer.cpp
+++ b/src/creaImageIOWxViewer.cpp
@@ -78,10 +78,9 @@ namespace creaImageIO
                 size)
   {
     wxMutexLocker lock(mMutex);
-    GimmickDebugMessage(6,"WxViewer::WxViewer"
-                       <<std::endl);
+    GimmickDebugMessage(6,"WxViewer::WxViewer" <<std::endl);
 
-    mNeedRefresh = false;
+    mNeedRefresh       = false;
     mLastImageShown = NULL;
        
        // previewer    
@@ -91,8 +90,8 @@ namespace creaImageIO
     mViewer    = vtkImageViewer2::New();
     mViewer->SetupInteractor ( mInteractor );
     
-    mCurrent = 0;
-       mPlayer = 0;
+    mCurrent   = 0;
+       mPlayer         = NULL;
 
        // Grid to place checkbox and slider 
        mflexSizer = new wxFlexGridSizer(1,2,1,1);
@@ -122,8 +121,7 @@ namespace creaImageIO
   WxViewer::~WxViewer()
   {
     wxMutexLocker lock(mMutex);
-    GimmickDebugMessage(6,"WxViewer::~WxViewer"
-                       <<std::endl);
+    GimmickDebugMessage(6,"WxViewer::~WxViewer"<<std::endl);
     // TO DO : desallocate cleanly
        if(mPlayer)
        {
@@ -158,9 +156,7 @@ namespace creaImageIO
 
   void WxViewer::ShowNextImage()
   {
-        
-       
-         mMutex.Unlock();
+       mMutex.Unlock();
        wxMutexLocker lock(mMutex);
            
     GimmickMessage(2,"WxViewer::ShowNextImage() "
@@ -180,10 +176,8 @@ namespace creaImageIO
                                mNeedRefresh = true;
                                mLastImageShown = currIm;
                        }
-               mCurrent++;
-           }
-               else
-               {
+                       mCurrent++;
+           } else {
                        mCurrent = 0;
                        //ImagePointerHolder* iph=imagePointers[mCurrent];
                        boost::shared_ptr<ImagePointerHolder> iph = imagePointers[mCurrent];
@@ -195,8 +189,8 @@ namespace creaImageIO
                                mLastImageShown = currIm;
                        }
                        mCurrent++;
-               }
-       }
+               } // if mCurrent
+       } // if imagePointers
   }
   //================================================================
 
@@ -207,20 +201,40 @@ namespace creaImageIO
                        <<std::endl);
     if (im==0) return;
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     mViewer->SetInput(im);
+#else
+    mViewer->SetInputData(im);
+#endif
 
     mViewer->SetSlice( 0 );
 
     int x1,x2,y1,y2,z1,z2;
     double spx,spy,spz;
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     im->Update();
+#else
+       // ...
+#endif
+
 
 //std::cout << "in WxViewer::ShowImage PrintSelf() =";
 //im->PrintSelf(std::cout, vtkIndent(2));
 
     im->GetSpacing(spx,spy,spz);
     //im->GetExtent (x1,x2,y1,y2,z1,z2);  // JPR
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     im->GetWholeExtent (x1,x2,y1,y2,z1,z2); 
+#else
+    im->GetExtent (x1,x2,y1,y2,z1,z2); 
+#endif
+
+
 /*       
 std::cout << "in WxViewer::ShowImage GetWholeExtent ext =";
        std::cout << "   [x1]=" << x1;
@@ -280,13 +294,12 @@ std::cout << std::endl;
   bool WxViewer::RefreshIfNecessary()
   {
     if (mNeedRefresh)
-      {
-       GimmickDebugMessage(10,"WxViewer : Refreshing"<<std::endl);
-
-       mInteractor->Render();
-       mNeedRefresh = false;
-       return true;
-      }
+    {
+               GimmickDebugMessage(10,"WxViewer : Refreshing"<<std::endl);
+               mInteractor->Render();
+               mNeedRefresh = false;
+               return true;
+    }
     return false;
   }
   //================================================================
@@ -295,9 +308,9 @@ std::cout << std::endl;
   void WxViewer::StopPlayer()
   {
          wxMutexLocker lock(mMutex);
-         if (mPlayer==0 ) return;
+         if (mPlayer==NULL ) return;
          mPlayer->Delete();  
-         mPlayer=0;
+         mPlayer=NULL;
          mMutex.Unlock();
   }
   //================================================================
@@ -308,15 +321,13 @@ std::cout << std::endl;
                if(mcheck->IsChecked())
                {
                        //      wxMutexLocker lock(mMutex);
-                       if (mPlayer != 0) return;
+                       if (mPlayer != NULL) return;
                        mPlayer = new WxViewerPlayer(this);
                        mPlayer->Create();
                        mPlayer->Run();  
-               }
-               else
-               {
+               } else {
                        ShowNextImage();
-               }
+               } // if
        }
 
   //================================================================
@@ -329,7 +340,7 @@ std::cout << std::endl;
                {
                        mPlayer->Pause();
                        mPlayer->Delete();
-                       mPlayer = 0;
+                       mPlayer = NULL;
                }
                StartPlayer();
        }