_T

[creaImageIO.git] / src2 / creaImageIOWxViewer.cpp

diff --git a/src2/creaImageIOWxViewer.cpp b/src2/creaImageIOWxViewer.cpp
index 193fedb7881179c91504be980052c55f178f2e13..4a0f2835aabc5bf1732d6dc0ff2d1e71a34a880a 100644 (file)
--- a/src2/creaImageIOWxViewer.cpp
+++ b/src2/creaImageIOWxViewer.cpp
@@ -5,13 +5,13 @@
 #include <vtkCamera.h>
 #include <vtkRenderer.h>
 #include <vtkImageData.h>
-
+#include <creawxVTKRenderWindowInteractor.h>
 #include <creaMessageManager.h>
 #include <stdio.h>
 #include <time.h>
 
 using namespace crea;
-
+// Memory tracking allocation
 namespace creaImageIO
 {
   
@@ -61,8 +61,7 @@ namespace creaImageIO
     wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL);
 
        
-    // previewer
-       
+    // previewer       
     mInteractor = new crea::creawxVTKRenderWindowInteractor(this,-1);
     mInteractor->UseCaptureMouseOn();  
  
@@ -92,7 +91,7 @@ namespace creaImageIO
   //=====================================================================
 
   //================================================================
-  void WxViewer::SetImageVector(std::vector<ImagePointerHolder*>& pointers)
+   void WxViewer::SetImageVector(std::vector<boost::shared_ptr<ImagePointerHolder> >& pointers)
   {
        wxMutexLocker lock(mMutex);
        GimmickDebugMessage(6,"WxViewer::SetImageVector"<<std::endl);
@@ -114,7 +113,8 @@ namespace creaImageIO
        {
                if (mCurrent<imagePointers.size()) 
                {
-                       ImagePointerHolder* iph=imagePointers[mCurrent];
+                       boost::shared_ptr<ImagePointerHolder> iph = imagePointers[mCurrent];
+                       //ImagePointerHolder* iph= imagePointers[mCurrent];
                        vtkImageData* currIm=iph->Get();
                        ShowImage(currIm);
                        if ( currIm != mLastImageShown ) 
@@ -127,7 +127,8 @@ namespace creaImageIO
                else
                {
                        mCurrent = 0;
-                       ImagePointerHolder* iph=imagePointers[mCurrent];
+                       //ImagePointerHolder* iph=imagePointers[mCurrent];
+                       boost::shared_ptr<ImagePointerHolder> iph = imagePointers[mCurrent];
                        vtkImageData* currIm=iph->Get();
                        ShowImage(currIm);
                        if ( currIm != mLastImageShown ) 
@@ -144,22 +145,34 @@ namespace creaImageIO
   //=====================================================================
   void WxViewer::ShowImage(vtkImageData* im)
   {
- 
     GimmickDebugMessage(6,"WxViewer::ShowImage"
                        <<std::endl);
     if (im==0) return;
 
     mViewer->SetInput(im);
-       
+
     mViewer->SetSlice( 0 );
-    
+
     int x1,x2,y1,y2,z1,z2;
     double spx,spy,spz;
     im->Update();
-    
+
+//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);
-    
+    //im->GetExtent (x1,x2,y1,y2,z1,z2);  // JPR
+    im->GetWholeExtent (x1,x2,y1,y2,z1,z2); 
+/*       
+std::cout << "in WxViewer::ShowImage GetWholeExtent ext =";
+       std::cout << "   [x1]=" << x1;
+       std::cout << "   [x2]=" << x2;
+       std::cout << "   [y1]=" << y1;
+       std::cout << "   [y2]=" << y2;
+       std::cout << "   [z1]=" << z1;
+       std::cout << "   [z2]=" << z2;
+std::cout << std::endl; 
+*/   
     if ((x1!=mx1) ||
        (x2!=mx2) ||
        (y1!=my1) ||
@@ -180,27 +193,23 @@ namespace creaImageIO
        mspx = spx;
        mspy = spy;
        mspz = spz;
-       
+
        double *range = im->GetScalarRange();
-        mViewer->SetColorWindow(range[1] - range[0]);
-        mViewer->SetColorLevel(0.5 * (range[1] + range[0]));
+       mViewer->SetColorWindow(range[1] - range[0]);
+       mViewer->SetColorLevel(0.5 * (range[1] + range[0]));
 
-        mViewer->GetRenderer()->ResetCamera();
+       mViewer->GetRenderer()->ResetCamera();
        double bounds[6];
 
+       mViewer->GetRenderer()->ComputeVisiblePropBounds(bounds);
 
-        mViewer->GetRenderer()->ComputeVisiblePropBounds(bounds);
-
-         
-        mViewer->GetRenderer()->ResetCameraClippingRange(bounds);
-
-         
-         }
-
+       mViewer->GetRenderer()->ResetCameraClippingRange(bounds);
+       mViewer->GetRenderer()->SetBackground(0.1,0.1,0.2);  
+      }
   } 
   //================================================================
   
-   //================================================================
+  //================================================================
   bool WxViewer::RefreshIfNecessary()
   {
     if (mNeedRefresh)