- new version

- flip

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 075d0916e000ddeb8c5be8b0553862ef6128b311..852b0d72dda377ba295345069d1fcc302c06b677 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ PROJECT(creaImageIO)
 # The project version
 SET(PROJECT_MAJOR_VERSION 0)
 SET(PROJECT_MINOR_VERSION 2)
-SET(PROJECT_BUILD_VERSION 5)
+SET(PROJECT_BUILD_VERSION 6)
 SET(CREA_VERBOSE_CMAKE TRUE)
 
 # JPR 4 mars 2011

diff --git a/src/creaImageIODicomImageReader.cpp b/src/creaImageIODicomImageReader.cpp
index 0d6a753bd38e2707021bae841391728d0bba4c2e..bfc40893df5f4ca9aabbe46fb31d504661e49e60 100644 (file)
--- a/src/creaImageIODicomImageReader.cpp
+++ b/src/creaImageIODicomImageReader.cpp
@@ -20,7 +20,10 @@ namespace creaImageIO
   DicomImageReader::DicomImageReader()
   {
     mReader = vtkGdcmReader::New();
-//EED  mReader->SetFlipY(false);
+         
+//EED 21 mars 2012  FLIP probleme  ..PLOP..
+       mReader->SetFlipY(false);
+         
     SetName ( "Dicom" );
 
   };

diff --git a/src/creaImageIOImageReader.cpp b/src/creaImageIOImageReader.cpp
index d93b186c839253fbac7aa11f29e30260c2de2e75..6f590003db37b01006c1c87e3901d07e3ce6ef1f 100644 (file)
--- a/src/creaImageIOImageReader.cpp
+++ b/src/creaImageIOImageReader.cpp
@@ -31,8 +31,9 @@ namespace creaImageIO
   {
     //    std::cout << "#### ImageReader::ImageReader()"<<std::endl;
     if (mUnreadableImage!=0) return;
-       
-    Register( boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkPNGReader::New(), "PNG", ".png")));
+
+
+       Register( boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkPNGReader::New() , "PNG", ".png")));
     Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkTIFFReader::New(), "JPEG", ".jpeg")));
     Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkJPEGReader::New())));
     Register(boost::shared_ptr<AbstractImageReader>(new VtkImageReader(vtkBMPReader::New())));

diff --git a/src/creaImageIOVtkImageReader.cpp b/src/creaImageIOVtkImageReader.cpp
index 4c70cbd64a4d35c4655070cbcf2005fe0de02306..89dc1834aebe146e0694b839f93cf3e6a0d9dfae 100644 (file)
--- a/src/creaImageIOVtkImageReader.cpp
+++ b/src/creaImageIOVtkImageReader.cpp
@@ -10,6 +10,10 @@ namespace creaImageIO{
                                       const std::string& extensions)
     : mReader(r), mExtensions(extensions)
   {
+         
+       //EED 21 mars 2012  FLIP probleme  ..PLOP..
+       mReader->FileLowerLeftOn();
+         
     if (name.size() == 0) 
       {
                  const char *test =mReader->GetDescriptiveName();

diff --git a/src/creaImageIOWxViewer.cpp b/src/creaImageIOWxViewer.cpp
index 065c686194d953556a6b220e08150187370a0505..ab134906524c0a02e6c9e9009c1982526ff5757c 100644 (file)
--- a/src/creaImageIOWxViewer.cpp
+++ b/src/creaImageIOWxViewer.cpp
@@ -232,6 +232,15 @@ std::cout << std::endl;
        mViewer->SetColorLevel(0.5 * (range[1] + range[0]));
 
        mViewer->GetRenderer()->ResetCamera();
+                 
+       //EED 21 mars 2012  FLIP problem  ..PLOP..
+       vtkCamera *camera =mViewer->GetRenderer()->GetActiveCamera();             
+       camera->SetViewUp               (       0               ,       -1              ,       0       );
+       camera->SetPosition             ((x1+x2)/2      , (y1+y2)/2     , -10000);
+       camera->SetFocalPoint   ((x1+x2)/2      , (y1+y2)/2     ,       0       );
+       camera->SetParallelScale( (x2-x1)/3.0 );
+                 
+                 
        double bounds[6];
 
        mViewer->GetRenderer()->ComputeVisiblePropBounds(bounds);