]> Creatis software - creaImageIO.git/commitdiff
- new version
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Wed, 30 May 2012 17:21:37 +0000 (17:21 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Wed, 30 May 2012 17:21:37 +0000 (17:21 +0000)
- flip

CMakeLists.txt
src/creaImageIODicomImageReader.cpp
src/creaImageIOImageReader.cpp
src/creaImageIOVtkImageReader.cpp
src/creaImageIOWxViewer.cpp

index 075d091..852b0d7 100644 (file)
@@ -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
index 0d6a753..bfc4089 100644 (file)
@@ -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" );
 
   };
index d93b186..6f59000 100644 (file)
@@ -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())));
index 4c70cbd..89dc183 100644 (file)
@@ -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();
index 065c686..ab13490 100644 (file)
@@ -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);