#3218 creaImageIO Feature New Normal - vtk8itk4wx3-mingw64

[creaImageIO.git] / src / creaImageIOWxGimmickView.cpp

diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp
index 5e706e78976149f4574def0c1ceb9469d0950b8a..ffb6174f8543e05ecc6df88adbfef72cf1e86527 100644 (file)
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@ -138,7 +138,7 @@ namespace creaImageIO
       mProgressDialog(NULL),
       mConstructed(false)
   {
-       mViewer=NULL;
+       mViewer = NULL;
     GimmickDebugMessage(1,"WxGimmickView::WxGimmickView" <<std::endl);
     // Sets the current directory to the home dir
     mCurrentDirectory =  std2wx(gimmick->GetHomeDirectory());
@@ -230,6 +230,8 @@ namespace creaImageIO
     GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView" <<std::endl);
        delete mIcon;
        delete mViewer;
+       mIcon   = NULL;
+       mViewer = NULL;
     //if(mListener->IsAlive())   {        mListener->Delete();    }
   }
   //======================================================================
@@ -356,12 +358,11 @@ namespace creaImageIO
 
        std::string asking;
        std::string dim;
-       bool bsingle = isSingle(files.front());
+       bool bsingle = isSingle( files.front() );
        int i_dim_out;
        mGimmick->GetSetting(SETTINGS_OUTPUT_ASK, asking);
        mGimmick->GetSetting(SETTINGS_OUTPUT_DIM, dim);
 
-
        if (asking == "true")
        {
                // display the output dialog box
@@ -424,6 +425,7 @@ namespace creaImageIO
        }
        // Now we read and create the waiting output (vtkImageData * or OutGimmickData *)
        readImages(outG, sort_files, Oattr, i_dim_out, zspacing);
+
   }
 
 
@@ -802,9 +804,11 @@ namespace creaImageIO
 #else
   void WxGimmickView::UpdateWindowUI(long flags)
   {
-         if(mViewer)
+         if(mViewer!=NULL)
      {
-        mViewer->RefreshIfNecessary();
+// EED 2018-08-23
+// GL Conflict because window is not showing the fist time
+//EED        mViewer->RefreshIfNecessary();
      }
   }
 #endif