Getting ready for interactive initialization.

[cpPlugins.git] / lib / cpPlugins / Interface / Plugins.cxx

diff --git a/lib/cpPlugins/Interface/Plugins.cxx b/lib/cpPlugins/Interface/Plugins.cxx
index 45f555968db206262808d8890de0bb8641591195..0e6921262eede919b7a53c4002fa9bff06a7dda6 100644 (file)
--- a/lib/cpPlugins/Interface/Plugins.cxx
+++ b/lib/cpPlugins/Interface/Plugins.cxx
@@ -271,10 +271,10 @@ ReadImage( TImage::Pointer& image, bool exec_qt )
 
   if( ret == "" )
   {
-    bool execute = true;
+    TProcessObject::DialogResult dret = TProcessObject::DialogResult_NoModal;
     if( exec_qt )
-      execute = this->m_ImageReader->ExecConfigurationDialog( this->m_Widget );
-    if( execute )
+      dret = this->m_ImageReader->ExecConfigurationDialog( this->m_Widget );
+    if( dret != TProcessObject::DialogResult_Cancel )
     {
       this->BlockWidget( );
       ret = this->m_ImageReader->Update( );
@@ -319,7 +319,9 @@ ReadDicomSeries( TImage::Pointer& image )
 
   if( ret == "" )
   {
-    if( this->m_DicomSeriesReader->ExecConfigurationDialog( this->m_Widget ) )
+    TProcessObject::DialogResult dret =
+      this->m_DicomSeriesReader->ExecConfigurationDialog( this->m_Widget );
+    if( dret != TProcessObject::DialogResult_Cancel )
     {
       this->BlockWidget( );
       ret = this->m_DicomSeriesReader->Update( );
@@ -365,10 +367,10 @@ ReadMesh( TMesh::Pointer& mesh, bool exec_qt )
 
   if( ret == "" )
   {
-    bool execute = true;
+    TProcessObject::DialogResult dret = TProcessObject::DialogResult_NoModal;
     if( exec_qt )
-      execute = this->m_MeshReader->ExecConfigurationDialog( this->m_Widget );
-    if( execute )
+      dret = this->m_MeshReader->ExecConfigurationDialog( this->m_Widget );
+    if( dret != TProcessObject::DialogResult_Cancel )
     {
       this->BlockWidget( );
       ret = this->m_MeshReader->Update( );
@@ -412,10 +414,10 @@ WriteImage( TImage* image, bool exec_qt )
 
   if( ret == "" )
   {
-    bool execute = true;
+    TProcessObject::DialogResult dret = TProcessObject::DialogResult_NoModal;
     if( exec_qt )
-      execute = this->m_ImageWriter->ExecConfigurationDialog( this->m_Widget );
-    if( execute )
+      dret = this->m_ImageWriter->ExecConfigurationDialog( this->m_Widget );
+    if( dret != TProcessObject::DialogResult_Cancel )
     {
       this->m_ImageWriter->SetInput( "Input", image );
       this->BlockWidget( );
@@ -453,10 +455,10 @@ WriteMesh( TMesh* mesh, bool exec_qt )
 
   if( ret == "" )
   {
-    bool execute = true;
+    TProcessObject::DialogResult dret = TProcessObject::DialogResult_NoModal;
     if( exec_qt )
-      execute = this->m_MeshWriter->ExecConfigurationDialog( this->m_Widget );
-    if( execute )
+      dret = this->m_MeshWriter->ExecConfigurationDialog( this->m_Widget );
+    if( dret != TProcessObject::DialogResult_Cancel )
     {
       this->m_MeshWriter->SetInput( "Input", mesh );
       this->BlockWidget( );