From 75a36cc2a5936be131f570520d4cc2f74bd0c548 Mon Sep 17 00:00:00 2001 From: Frederic Cervenansky Date: Fri, 20 Nov 2009 13:50:50 +0000 Subject: [PATCH] correction of infinity loop at starting --- src2/creaImageIOGimmick.h | 7 +------ src2/creaImageIOGimmickView.cpp | 2 +- src2/creaImageIOWxGimmickFrame.cpp | 2 +- src2/creaImageIOWxGimmickPanel.cpp | 6 ++---- src2/creaImageIOWxGimmickPanel.h | 2 +- src2/creaImageIOWxGimmickReaderDialog.cpp | 22 +++++++++++++++------- src2/creaImageIOWxGimmickReaderDialog.h | 2 +- src2/creaImageIOWxGimmickView.cpp | 19 ++++++++----------- src2/creaImageIOWxGimmickView.h | 2 +- 9 files changed, 31 insertions(+), 33 deletions(-) diff --git a/src2/creaImageIOGimmick.h b/src2/creaImageIOGimmick.h index 13c2495..0a88087 100644 --- a/src2/creaImageIOGimmick.h +++ b/src2/creaImageIOGimmick.h @@ -6,12 +6,7 @@ #include #include -#ifdef _RELWITHDEBINFO -#include -#define DEBUG_NEW new(_NORMAL_BLOCK ,__FILE__, __LINE__) -#else -#define DEBUG_NEW new -#endif + #ifdef _DEBUG #include diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp index e209d82..4cf4cb5 100644 --- a/src2/creaImageIOGimmickView.cpp +++ b/src2/creaImageIOGimmickView.cpp @@ -334,7 +334,7 @@ void GimmickView::ReadImagesNotThreaded(std::vector& 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 bbdf226..f98963e 100644 --- a/src2/creaImageIOWxGimmickFrame.cpp +++ b/src2/creaImageIOWxGimmickFrame.cpp @@ -31,7 +31,7 @@ namespace creaImageIO try { - // mGimmick = new Gimmick(); +// mGimmick = boost::shared_ptr(new Gimmick()); mGimmick->Initialize(); int min_dim = GIMMICK_2D_IMAGE_SELECTION; diff --git a/src2/creaImageIOWxGimmickPanel.cpp b/src2/creaImageIOWxGimmickPanel.cpp index e317bcb..2cd7ad0 100644 --- 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(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 0a2bccf..040a859 100644 --- a/src2/creaImageIOWxGimmickPanel.h +++ b/src2/creaImageIOWxGimmickPanel.h @@ -68,7 +68,7 @@ namespace creaImageIO // DECLARE_EVENT_TABLE(); private : - boost::shared_ptr mGimmick; + boost::shared_ptr mGimmick; WxGimmickView* mView; ///The sendImage signal diff --git a/src2/creaImageIOWxGimmickReaderDialog.cpp b/src2/creaImageIOWxGimmickReaderDialog.cpp index c68efc1..bdf1f66 100644 --- 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(new Gimmick()); + mGimmick = boost::shared_ptr(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 904b6cd..1755be8 100644 --- a/src2/creaImageIOWxGimmickReaderDialog.h +++ b/src2/creaImageIOWxGimmickReaderDialog.h @@ -59,7 +59,7 @@ namespace creaImageIO private : - boost::shared_ptr mGimmick; + boost::shared_ptr mGimmick; WxGimmickView* mView; wxButton* mOkButton; diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index 3b9e041..625cb94 100644 --- 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" <IsAlive()) - { - mListener->Delete(); - } + //if(mListener->IsAlive()) { mListener->Delete(); } } //====================================================================== diff --git a/src2/creaImageIOWxGimmickView.h b/src2/creaImageIOWxGimmickView.h index b16fdd0..d0dfaff 100644 --- a/src2/creaImageIOWxGimmickView.h +++ b/src2/creaImageIOWxGimmickView.h @@ -140,7 +140,7 @@ namespace creaImageIO void CreateIconList(); boost::shared_ptr mGimmick; - + Listener* mListener; /// Callback for adding files -- 2.45.0