correction of infinity loop at starting

diff --git a/src2/creaImageIOGimmick.h b/src2/creaImageIOGimmick.h
index 13c2495ca645faf6ab1a7c2d766f1b4a0e0a11bb..0a880875e5280727c533608da706f958c901e203 100644 (file)
--- a/src2/creaImageIOGimmick.h
+++ b/src2/creaImageIOGimmick.h
@@ -6,12 +6,7 @@
 #include <creaImageIOSynchron.h>
 #include <creaImageIOSettings.h>
 
-#ifdef _RELWITHDEBINFO
-#include <crtdbg.h>
-#define DEBUG_NEW new(_NORMAL_BLOCK ,__FILE__, __LINE__)
-#else
-#define DEBUG_NEW new
-#endif
+
 
 #ifdef _DEBUG
 #include <crtdbg.h>

diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp
index e209d82e6232d5d0407373449cf3478622751d57..4cf4cb5be6f37bab2e910cdf4b509a49f8d8e104 100644 (file)
--- a/src2/creaImageIOGimmickView.cpp
+++ b/src2/creaImageIOGimmickView.cpp
@@ -334,7 +334,7 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
 std::cout <<"in GimmickView::ReadImagesNotThreaded GetWholeExtent ext =";
 for (int jjj=0;jjj<6;jjj++)
        std:cout << "   [" << jjj << "]=" << ext[jjj];
-std::cout << endl;
+std::cout << std::endl;
 
                        if(ext[5] == 0)
                        {

diff --git a/src2/creaImageIOWxGimmickFrame.cpp b/src2/creaImageIOWxGimmickFrame.cpp
index bbdf22668a9e51fde3fddfdc9f696506b11acaed..f98963e0fa55599f72f4fd4638bfb018df47f50e 100644 (file)
--- a/src2/creaImageIOWxGimmickFrame.cpp
+++ b/src2/creaImageIOWxGimmickFrame.cpp
@@ -31,7 +31,7 @@ namespace creaImageIO
     
     try {
       
-   //   mGimmick = new Gimmick();
+//             mGimmick = boost::shared_ptr<Gimmick>(new Gimmick());
       mGimmick->Initialize();
      
       int min_dim = GIMMICK_2D_IMAGE_SELECTION;

diff --git a/src2/creaImageIOWxGimmickPanel.cpp b/src2/creaImageIOWxGimmickPanel.cpp
index e317bcbe869f928734194b8de77a86be4399d83f..2cd7ad097e45976e3c00042ae4c18d17c12b8671 100644 (file)
--- a/src2/creaImageIOWxGimmickPanel.cpp
+++ b/src2/creaImageIOWxGimmickPanel.cpp
@@ -22,7 +22,7 @@ namespace creaImageIO
                  wxMINIMIZE_BOX | 
                  wxCAPTION  
               ),
-  //   mGimmick(0),
+     //mGimmick(0),
      mView(0)
   {
     GimmickDebugMessage(1,"WxGimmickPanel::WxGimmickPanel"
@@ -32,8 +32,7 @@ namespace creaImageIO
     try {
       
                mGimmick = boost::shared_ptr<Gimmick>(new Gimmick());
-          mGimmick->Initialize(i_namedescp,i_namedb);
-     
+               mGimmick->Initialize(i_namedescp,i_namedb);
       int min_dim = GIMMICK_2D_IMAGE_SELECTION;
          int max_dim = GIMMICK_3D_IMAGE_SELECTION;
       mView = new WxGimmickView(mGimmick,
@@ -72,7 +71,6 @@ namespace creaImageIO
     if (mGimmick) 
       {
        mGimmick->Finalize();
-//     delete mGimmick;
       }
   }
   

diff --git a/src2/creaImageIOWxGimmickPanel.h b/src2/creaImageIOWxGimmickPanel.h
index 0a2bccf27ff90fcfafebf39dd0154e629d87f9f9..040a859ac251d109959c1d6921c532bc128d2870 100644 (file)
--- a/src2/creaImageIOWxGimmickPanel.h
+++ b/src2/creaImageIOWxGimmickPanel.h
@@ -68,7 +68,7 @@ namespace creaImageIO
     //    DECLARE_EVENT_TABLE();
   private :
     
-         boost::shared_ptr<Gimmick>       mGimmick;
+       boost::shared_ptr<Gimmick>       mGimmick;
     WxGimmickView* mView;
 
        ///The sendImage signal

diff --git a/src2/creaImageIOWxGimmickReaderDialog.cpp b/src2/creaImageIOWxGimmickReaderDialog.cpp
index c68efc1ac7adca92d33ac01cc9e4a9819060e2ba..bdf1f6687c34e65ccc308f1042d2e6eb7a652c81 100644 (file)
--- a/src2/creaImageIOWxGimmickReaderDialog.cpp
+++ b/src2/creaImageIOWxGimmickReaderDialog.cpp
@@ -5,6 +5,10 @@
 #define new DEBUG_NEW
 #endif
 
+#ifdef _RELWITHDEBINFO
+#define new DEBUG_NEW
+#endif
+
 namespace creaImageIO
 {
   // CTor
@@ -31,7 +35,7 @@ namespace creaImageIO
                  wxMINIMIZE_BOX  | 
                  wxCAPTION  
               ),
-  //  mGimmick(0),
+ //   mGimmick(0),
      mView(0)
   {
     GimmickDebugMessage(1,"WxGimmickReaderDialog::WxGimmickReaderDialog"
@@ -40,7 +44,7 @@ namespace creaImageIO
 
     try {
 
-      mGimmick = boost::shared_ptr<Gimmick>(new Gimmick());
+         mGimmick = boost::shared_ptr<Gimmick>(new Gimmick());
       mGimmick->Initialize(i_namedescp,i_namedb);
 
       mView = new WxGimmickView(mGimmick,
@@ -64,15 +68,20 @@ namespace creaImageIO
 
     topsizer->Add( mView,1,wxGROW,0);
 
-    wxSizer* bsizer = CreateSeparatedButtonSizer(wxOK|wxCANCEL);
-    mOkButton     = (wxButton*)FindWindowById(GetAffirmativeId(), this);
+    wxSizer* bsizer = this->CreateSeparatedButtonSizer(wxOK|wxCANCEL);
+       /*mOkButton = new wxButton(this, wxID_OK, _T("OK"), wxPoint(170,50));
+       mCancelButton = new wxButton(this, wxID_CANCEL, _T("CANCEL"), wxPoint(210,50));
+       */      mOkButton = (wxButton*)FindWindowById(GetAffirmativeId(), this);
     mCancelButton = (wxButton*)FindWindowById(GetEscapeId(),      this);
 
     mOkButton->Enable(false);
 
-    topsizer->Add ( bsizer, 0, wxGROW );
+topsizer->Add(mOkButton, 0, wxGROW);
+topsizer->Add(mCancelButton, 0, wxGROW);
+   topsizer->Add ( bsizer, 0, wxGROW );
 
     SetSizer( topsizer );     
+ 
     Layout(); 
   }
 
@@ -87,8 +96,7 @@ namespace creaImageIO
       }
     if (mGimmick) 
       {
-       mGimmick->Finalize();
-       //delete mGimmick;
+               mGimmick->Finalize();
       }
   }
 

diff --git a/src2/creaImageIOWxGimmickReaderDialog.h b/src2/creaImageIOWxGimmickReaderDialog.h
index 904b6cdf5d727e2edabe17804b0fc9e0fcfca8af..1755be8e8e97bbb872a0d20537769ea7acaba8f3 100644 (file)
--- a/src2/creaImageIOWxGimmickReaderDialog.h
+++ b/src2/creaImageIOWxGimmickReaderDialog.h
@@ -59,7 +59,7 @@ namespace creaImageIO
 
   private :
 
-    boost::shared_ptr<Gimmick>      mGimmick;
+    boost::shared_ptr<Gimmick>   mGimmick;
     WxGimmickView* mView;
 
     wxButton* mOkButton;

diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp
index 3b9e04187c78ed2b8435c7370c886b5fd0d34fda..625cb94afc1b8c0d8af85221641e1bafe3cf7c4c 100644 (file)
--- a/src2/creaImageIOWxGimmickView.cpp
+++ b/src2/creaImageIOWxGimmickView.cpp
@@ -108,8 +108,8 @@ namespace creaImageIO
     mCurrentDirectory =  std2wx(gimmick->GetHomeDirectory());
 
      // Connect the AddProgress callback
-    gimmick->ConnectAddProgressObserver
-      ( boost::bind( &WxGimmickView::OnAddProgress , this, _1 ) );
+    gimmick->ConnectAddProgressObserver 
+     ( boost::bind( &WxGimmickView::OnAddProgress , this, _1 ) );
 
     // Create the list of icons (mIcon)
     CreateIconList();
@@ -179,11 +179,11 @@ namespace creaImageIO
     SetSizer( sizer );     
     SetAutoLayout(true);
     Layout();
-    mListener=new Listener();
-    mListener->ConnectObserver(boost::bind( &WxGimmickView::OnDriveMount, this, _1 ) );
-    mListener->Create();
-    mListener->Run();
-    mListener->Pause();
+    //mListener=new Listener();
+    //mListener->ConnectObserver(boost::bind( &WxGimmickView::OnDriveMount, this, _1 ) );
+    //mListener->Create();
+   // mListener->Run();
+   // mListener->Pause();
 
     mConstructed = true;
   }
@@ -198,10 +198,7 @@ namespace creaImageIO
     GimmickDebugMessage(1,"WxGimmickView::~WxGimmickView"
                        <<std::endl);
        delete mIcon;
-    if(mListener->IsAlive())
-    {
-        mListener->Delete();
-    }
+    //if(mListener->IsAlive())   {        mListener->Delete();    }
   }
   //======================================================================
   

diff --git a/src2/creaImageIOWxGimmickView.h b/src2/creaImageIOWxGimmickView.h
index b16fdd03f5f6c59bd6dc123fa6887dad61d43f9e..d0dfaff14cef09dc63358e25ab53b44a2da1f2e8 100644 (file)
--- a/src2/creaImageIOWxGimmickView.h
+++ b/src2/creaImageIOWxGimmickView.h
@@ -140,7 +140,7 @@ namespace creaImageIO
     void CreateIconList();
     
     boost::shared_ptr<Gimmick> mGimmick;
-       
+               
        Listener* mListener;
 
     /// Callback for adding files