From: David Sarrut <david.sarrut@gmail.com>
Date: Mon, 26 Mar 2012 08:11:53 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.3.0~52^2~33
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=06cf3eb32f6aa7c31ebc1192d5dadd5385763fdb;hp=3fd15028ab81e6746d3af96695526d7d973a26c8;p=clitk.git

Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
---

diff --git a/common/vvImageWriter.cxx b/common/vvImageWriter.cxx
index 18123f6..c2d2a91 100644
--- a/common/vvImageWriter.cxx
+++ b/common/vvImageWriter.cxx
@@ -30,6 +30,7 @@ vvImageWriter::vvImageWriter()
   mOutputFilename = "";
   mLastError = "";
   mUseAnObserver = false;
+  mSaveTransform = false;
 }
 //------------------------------------------------------------------------------
 
diff --git a/common/vvImageWriter.h b/common/vvImageWriter.h
index 6281549..ae192b5 100644
--- a/common/vvImageWriter.h
+++ b/common/vvImageWriter.h
@@ -48,6 +48,9 @@ public:
     return mLastError;
   }
 
+  bool GetSaveTransform() { return mSaveTransform; }
+  void SetSaveTransform(bool b) { mSaveTransform = b; }
+
   //====================================================================
   // Main function
   void Update() {
@@ -66,6 +69,7 @@ protected:
 
   std::string mLastError;
   bool mUseAnObserver;
+  bool mSaveTransform;
 
   //====================================================================
   template<unsigned int VImageDimension>
diff --git a/common/vvImageWriter.txx b/common/vvImageWriter.txx
index 35192f0..0640f0c 100644
--- a/common/vvImageWriter.txx
+++ b/common/vvImageWriter.txx
@@ -19,8 +19,8 @@
 #define vvImageWriter_TXX
 
 #include <itkImageFileWriter.h>
+#include <itkChangeInformationImageFilter.h>
 #include "vvToITK.h"
-#include "clitkDD.h"
 
 //====================================================================
 template<unsigned int VImageDimension>
@@ -52,12 +52,50 @@ void vvImageWriter::UpdateWithDim(std::string OutputPixelType)
 template<class OutputPixelType, unsigned int VImageDimension>
 void vvImageWriter::UpdateWithDimAndOutputPixelType()
 {
-  //Create the writer
+  // The ITK image
   typedef itk::Image< OutputPixelType, VImageDimension > OutputImageType;
+  typename OutputImageType::ConstPointer itkimg = vvImageToITK<OutputImageType>(mImage);
+
+  //Create the writer
   typedef itk::ImageFileWriter<OutputImageType> WriterType;
   typename WriterType::Pointer writer = WriterType::New();
   writer->SetFileName(mOutputFilename);
-  writer->SetInput(vvImageToITK<OutputImageType>(mImage));
+
+  //Change information if it must transformation must be saved
+  typedef itk::ChangeInformationImageFilter<OutputImageType> ChangeInfoType;
+  typename ChangeInfoType::Pointer info = ChangeInfoType::New();
+  if(mSaveTransform) {
+    // Set pipeline
+    info->SetInput(itkimg);
+    writer->SetInput(info->GetOutput());
+
+    // Inverse vv matrix
+    itk::Matrix<double, 4, 4> trans;
+    for(int i=0; i<4; i++)
+      for(int j=0; j<4; j++)
+        trans[i][j] = mImage->GetTransform()->GetMatrix()->GetElement(i,j);
+    trans = trans.GetInverse();
+
+    // Direction
+    typename ChangeInfoType::DirectionType direction;
+    for(unsigned int i=0; i<VImageDimension; i++)
+      for(unsigned int j=0; j<VImageDimension; j++)
+        direction[i][j] = trans[i][j];
+    info->SetOutputDirection(direction);
+    info->ChangeDirectionOn();
+
+    // Origin
+    typename ChangeInfoType::PointType origin = itkimg->GetOrigin();
+    origin = direction * origin;
+    for(unsigned int i=0; i<VImageDimension; i++)
+      origin[i] += trans[i][3];
+    info->SetOutputOrigin(origin);
+    info->ChangeOriginOn();
+  }
+  else
+    writer->SetInput(itkimg);
+
+
   if (mUseAnObserver) {
     writer->AddObserver(itk::ProgressEvent(), mObserver);
   }
diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx
index 9dbd407..436a89f 100644
--- a/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@ -2297,6 +2297,27 @@ void vvMainWindow::SaveAs()
       vvImageWriter::Pointer writer = vvImageWriter::New();
       writer->SetOutputFileName(fileName.toStdString());
       writer->SetInput(mSlicerManagers[index]->GetImage());
+
+      // Check on transform and prompt user
+      writer->SetSaveTransform(false);
+      bool bId = true;
+      for(int i=0; i<4; i++)
+        for(int j=0; j<4; j++) {
+          double elt = mSlicerManagers[index]->GetImage()->GetTransform()->GetMatrix()->GetElement(i,j);
+          if(i==j && elt!=1.)
+            bId = false;
+          if(i!=j && elt!=0.)
+            bId = false;
+        }
+      if( !bId ) {
+        QString warning = "The image has an associated linear transform. Do you want to save it along?";
+        QMessageBox msgBox(QMessageBox::Warning, tr("Save transform"), warning, 0, this);
+        msgBox.addButton(tr("Yes"), QMessageBox::AcceptRole);
+        msgBox.addButton(tr("No"), QMessageBox::RejectRole);
+        if (msgBox.exec() == QMessageBox::AcceptRole)
+          writer->SetSaveTransform(true);
+      }
+
       writer->Update();
       QApplication::restoreOverrideCursor();
       if (writer->GetLastError().size()) {
@@ -2792,13 +2813,13 @@ void vvMainWindow::SaveScreenshot(QVTKWidget *widget)
 
       // FPS
       bool ok;
-      int fps = QInputDialog::getInt(this, tr("Number of frames per second"),
+      int fps = QInputDialog::getInteger(this, tr("Number of frames per second"),
                                      tr("FPS:"), 5, 0, 1000, 1, &ok);
       if(ok)
         gif->SetRate(fps);
 
       // Loops
-      int loops = QInputDialog::getInt(this, tr("Loops"),
+      int loops = QInputDialog::getInteger(this, tr("Loops"),
                                      tr("Number of loops (0 means infinite):"), 0, 0, 1000000000, 1, &ok);
       if(ok)
         gif->SetLoops(loops);
@@ -2810,7 +2831,7 @@ void vvMainWindow::SaveScreenshot(QVTKWidget *widget)
       vidwriter = mpg;
       mpg->SetQuality(2);
       bool ok;
-      int fps = QInputDialog::getInt(this, tr("Number of frames per second"),
+      int fps = QInputDialog::getInteger(this, tr("Number of frames per second"),
                                      tr("FPS:"), 5, 0, 1024, 1, &ok);
       if(!ok)
         fps = 5;
@@ -2823,7 +2844,7 @@ void vvMainWindow::SaveScreenshot(QVTKWidget *widget)
       vidwriter = mpg;
       mpg->SetQuality(2);
       bool ok;
-      int fps = QInputDialog::getInt(this, tr("Number of frames per second"),
+      int fps = QInputDialog::getInteger(this, tr("Number of frames per second"),
                                      tr("FPS:"), 5, 0, 1024, 1, &ok);
       if(!ok)
         fps = 5;