X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FPlugins%2FIO%2FImageWriter.cxx;h=a06f2d21062b9781d0b58d9b34b16ceb08261b8b;hb=1b600247da314fe62d007ca8a0ce24d0006931f4;hp=63080e27adcece1d9622fbfec2390c659a78d910;hpb=0bb74f9a32de4ce1559973ebf72fda495aa2c587;p=cpPlugins.git

diff --git a/lib/cpPlugins/Plugins/IO/ImageWriter.cxx b/lib/cpPlugins/Plugins/IO/ImageWriter.cxx
index 63080e2..a06f2d2 100644
--- a/lib/cpPlugins/Plugins/IO/ImageWriter.cxx
+++ b/lib/cpPlugins/Plugins/IO/ImageWriter.cxx
@@ -3,42 +3,45 @@
 
 #include <itkImageFileWriter.h>
 
-#ifdef cpPlugins_Interface_QT4
-#include <QFileDialog>
-#endif // cpPlugins_Interface_QT4
-
-// -------------------------------------------------------------------------
-bool cpPlugins::IO::ImageWriter::
-ExecConfigurationDialog( QWidget* parent )
-{
-  bool r = false;
-
-#ifdef cpPlugins_Interface_QT4
-
-  std::string name = this->m_Parameters->GetString( "FileName" );
-  if( name == "" )
-    name = "save.mhd";
-
-  // Show dialog and check if it was accepted
-  QString qname =
-    QFileDialog::getSaveFileName(
-      parent,
-      QFileDialog::tr( "Save File" ),
-      QFileDialog::tr( name.c_str( ) ),
-      QFileDialog::tr( "Image files (*.bmp *.png *.jpg *.jpeg *.dcm *.mhd *.nhdr *.nrrd *.tiff);;Any file (*)")
-      );
-  name = qname.toStdString( );
-  if( name != "" )
-  {
-    this->m_Parameters->SetString( "FileName", name );
-    r = true;
-
-  } // fi
-
-#endif // cpPlugins_Interface_QT4
-
-  return( r );
-}
+/* TODO
+   #ifdef cpPlugins_Interface_QT4
+   #include <QFileDialog>
+   #endif // cpPlugins_Interface_QT4
+
+   // -------------------------------------------------------------------------
+   cpPlugins::IO::ImageWriter::
+   DialogResult cpPlugins::IO::ImageWriter::
+   ExecConfigurationDialog( QWidget* parent )
+   {
+   DialogResult r = Self::DialogResult_Cancel;
+
+   #ifdef cpPlugins_Interface_QT4
+
+   std::string name = this->m_Parameters->GetString( "FileName" );
+   if( name == "" )
+   name = "save.mhd";
+
+   // Show dialog and check if it was accepted
+   QString qname =
+   QFileDialog::getSaveFileName(
+   parent,
+   QFileDialog::tr( "Save File" ),
+   QFileDialog::tr( name.c_str( ) ),
+   QFileDialog::tr( "Image files (*.bmp *.png *.jpg *.jpeg *.dcm *.mhd *.nhdr *.nrrd *.tiff);;Any file (*)")
+   );
+   name = qname.toStdString( );
+   if( name != "" )
+   {
+   this->m_Parameters->SetString( "FileName", name );
+   r = Self::DialogResult_NoModal;
+
+   } // fi
+
+   #endif // cpPlugins_Interface_QT4
+
+   return( r );
+   }
+*/
 
 // -------------------------------------------------------------------------
 cpPlugins::IO::ImageWriter::
@@ -46,8 +49,7 @@ ImageWriter( )
   : Superclass( )
 {
   this->_AddInput( "Input" );
-
-  this->m_Parameters->ConfigureAsString( "FileName", "" );
+  this->m_Parameters->ConfigureAsSaveFileName( "FileName" );
 }
 
 // -------------------------------------------------------------------------
@@ -75,8 +77,7 @@ template< unsigned int D >
 std::string cpPlugins::IO::ImageWriter::
 _GD0_Image( )
 {
-  cpPlugins::Interface::Image* image =
-    this->GetInput< cpPlugins::Interface::Image >( "Input" );
+  auto image = this->GetInputData< cpPlugins::Interface::Image >( "Input" );
   if( image == NULL )
     return( "ImageWriter: No input image." );
 
@@ -93,8 +94,7 @@ template< unsigned int D >
 std::string cpPlugins::IO::ImageWriter::
 _GD0_VectorImage( )
 {
-  cpPlugins::Interface::Image* image =
-    this->GetInput< cpPlugins::Interface::Image >( "Input" );
+  auto image = this->GetInputData< cpPlugins::Interface::Image >( "Input" );
   if( image == NULL )
     return( "ImageWriter: No input image." );
 
@@ -112,7 +112,7 @@ std::string cpPlugins::IO::ImageWriter::
 _RealGD( itk::DataObject* image )
 {
   // Get filename
-  std::string fname = this->m_Parameters->GetString( "FileName" );
+  std::string fname = this->m_Parameters->GetSaveFileName( "FileName" );
 
   typedef itk::ImageFileWriter< I > _W;
   _W* writer = this->_CreateITK< _W >( );