X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins%2FPlugins%2FIO%2FImageReader.cxx;h=17744fa4e38a48c5a1007c54800476b785a1f02d;hb=83e946f1e96c001dde06a2785473d08468e28b2e;hp=fc747eb7348f910d36a04f936a10a9f8ee43fce4;hpb=0bb74f9a32de4ce1559973ebf72fda495aa2c587;p=cpPlugins.git diff --git a/lib/cpPlugins/Plugins/IO/ImageReader.cxx b/lib/cpPlugins/Plugins/IO/ImageReader.cxx index fc747eb..17744fa 100644 --- a/lib/cpPlugins/Plugins/IO/ImageReader.cxx +++ b/lib/cpPlugins/Plugins/IO/ImageReader.cxx @@ -9,10 +9,11 @@ #endif // cpPlugins_Interface_QT4 // ------------------------------------------------------------------------- -bool cpPlugins::IO::ImageReader:: +cpPlugins::IO::ImageReader:: +DialogResult cpPlugins::IO::ImageReader:: ExecConfigurationDialog( QWidget* parent ) { - bool r = false; + DialogResult r = Self::DialogResult_Cancel; #ifdef cpPlugins_Interface_QT4 @@ -40,7 +41,7 @@ ExecConfigurationDialog( QWidget* parent ) "FileNames", qIt->toStdString( ) ); this->m_Parameters->SetBool( "VectorType", false ); - r = true; + r = Self::DialogResult_NoModal; } // fi @@ -57,7 +58,8 @@ ImageReader( ) this->_MakeOutput< cpPlugins::Interface::Image >( "Output" ); this->m_Parameters->ConfigureAsStringList( "FileNames" ); - this->m_Parameters->ConfigureAsBool( "VectorType", false ); + this->m_Parameters->ConfigureAsBool( "VectorType" ); + this->m_Parameters->SetBool( "VectorType", false ); } // ------------------------------------------------------------------------- @@ -105,7 +107,7 @@ _GenerateData( ) r = "ImageReader: Could not CreateImageIO for \"" + names[ 0 ] + "\""; } else - r = "No image files given"; + r = "ImageReader: No image files given"; return( r ); }