*** empty log message ***

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3bb70922fab4df1d333572a0a7733422ecc018f..c7cfe9ce95de0b5471b1326181dbc9850965d356 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,13 +1,4 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
-#MARK_AS_ADVANCED( FORCE CMAKE_BACKWARDS_COMPATIBILITY )
-
-# for CMake 2.6 corrected behaviour (see "cmake --help-policy CMP0003")
-IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
-  CMAKE_POLICY(SET CMP0003 NEW)
-  CMAKE_POLICY(SET CMP0005 NEW)
-ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4)
-
-
 
 PROJECT(creaImageIO)
 

diff --git a/src/creaImageIOImageReader.cpp b/src/creaImageIOImageReader.cpp
index d4eed5a75c9ddbf098d6c6580ac09dedc1dd28f3..2d34c6638153225f747cd4db12ae5f5eaa3408ad 100644 (file)
--- a/src/creaImageIOImageReader.cpp
+++ b/src/creaImageIOImageReader.cpp
@@ -354,7 +354,7 @@ namespace creaImageIO
     // 
     mUnreadableImage = vtkImageData::New();
     int dim[3];
-    dim[0] = dim[1] = 32; 
+    dim[0] = dim[1] = 128; 
     dim[2] = 1; 
     mUnreadableImage->SetDimensions ( dim );
     mUnreadableImage->SetScalarTypeToUnsignedChar();

diff --git a/src/creaImageIOWxGimmick.cpp b/src/creaImageIOWxGimmick.cpp
index 4aba5f617256721424967c22c7f085cecaf66960..ef0439de64ce04901a63d815706b86e6975152b0 100644 (file)
--- a/src/creaImageIOWxGimmick.cpp
+++ b/src/creaImageIOWxGimmick.cpp
@@ -2035,13 +2035,17 @@ namespace creaImageIO
   void WxGimmick::ShowImage(vtkImageData* im)
   {
     //  wxBusyCursor busy;
+    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; 
@@ -2069,6 +2073,26 @@ namespace creaImageIO
        mspy = spy;
        mspz = spz;
        
+       double *range = im->GetScalarRange();
+        mViewer->SetColorWindow(range[1] - range[0]);
+        mViewer->SetColorLevel(0.5 * (range[1] + range[0]));
+
+        mViewer->GetRenderer()->ResetCamera();
+       double bounds[6];
+
+
+        mViewer->GetRenderer()->ComputeVisiblePropBounds(bounds);
+
+        /*
+       std::cout <<"bounds : "<<bounds[0]<<","
+<<bounds[1]<<","
+<<bounds[2]<<","
+<<bounds[3]<<","
+<<bounds[4]<<","
+                 <<bounds[5]<<std::endl;
+        */
+        mViewer->GetRenderer()->ResetCameraClippingRange(bounds);
+       /*
        vtkCamera *camera = mViewer->GetRenderer()->GetActiveCamera();
        
        camera->SetViewUp ( spx*0, -spy*1, spz*0);
@@ -2079,10 +2103,9 @@ namespace creaImageIO
        camera->SetParallelScale(  spx*(x2-x1)/2.0 );
        
        camera->Roll ( 180 );
+       */
       }
     
-    mViewer->SetInput( im );
-    mViewer->SetSlice( 0 );
     mInteractor->Render();
   } 
   //================================================================