X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxGimmickReaderDialog.cpp;h=f7af7d0a589d99594fb3da7499bd26a58ee52b34;hb=d46e98ff2fdb2fa5adc19481d29b48bfbacbd34f;hp=1dff6b3fd0246dd09fa8e90d14a8012aec7dca2a;hpb=69b4e990347bac15882c7f45758b69cfebb5e62a;p=creaImageIO.git

diff --git a/src/creaImageIOWxGimmickReaderDialog.cpp b/src/creaImageIOWxGimmickReaderDialog.cpp
index 1dff6b3..f7af7d0 100644
--- a/src/creaImageIOWxGimmickReaderDialog.cpp
+++ b/src/creaImageIOWxGimmickReaderDialog.cpp
@@ -35,7 +35,7 @@
 namespace creaImageIO
 {
   // CTor
-  WxGimmickReaderDialog::WxGimmickReaderDialog(wxWindow *parent, 
+  WxGimmickReaderDialog::WxGimmickReaderDialog(wxWindow *parent,
 					       wxWindowID id,
 					       const std::string i_namedescp, 
 					       const std::string i_namedb,
@@ -46,7 +46,7 @@ namespace creaImageIO
 					       int max_dim,
 					       int output_dim,  // never used ?!? // JPR
 					       int threads)
- :   wxDialog( parent, 
+ :   wxDialog( parent,
 		  id, 
 		  title,
 		  pos,
@@ -59,7 +59,7 @@ namespace creaImageIO
 		  wxCAPTION  
 	       ),
  //   mGimmick(0),
-     mView(0)
+     mView(NULL)
   {
     GimmickDebugMessage(1,"WxGimmickReaderDialog::WxGimmickReaderDialog"
 			<<std::endl);
@@ -67,10 +67,10 @@ namespace creaImageIO
 
     try {
 
-	  mGimmick = boost::shared_ptr<Gimmick>(new Gimmick());
-      mGimmick->Initialize(i_namedescp,i_namedb);
+	 mGimmick = boost::shared_ptr<Gimmick>(new Gimmick());
+	 mGimmick->Initialize(i_namedescp,i_namedb);
 
-      mView = new WxGimmickView(mGimmick,
+     mView = new WxGimmickView(mGimmick,
 				this,
 				TVID,
 				wxDefaultPosition,
@@ -78,29 +78,24 @@ namespace creaImageIO
 				min_dim,
 				max_dim,
 				threads);
+      //EED 2021-12-17
       mView->Initialize();
 	   // Connect the AddProgress callback
       mView->ConnectValidationObserver( boost::bind( &WxGimmickReaderDialog::OnValid , this, _1 ) );
+    } catch (crea::Exception e) {
+        e.Print();
+        return;
     }
-    catch (crea::Exception e)
-    {
-      e.Print();
-      return;
-    }
-
     mtopsizer->Add( mView,1,wxGROW,0);
-
     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);
+	//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);
     mtopsizer->Add ( bsizer, 0, wxGROW );
+    SetSizer( mtopsizer );
 
-    SetSizer( mtopsizer );     
- 
     Layout(); 
   }
 
@@ -117,7 +112,6 @@ namespace creaImageIO
       {
 		mGimmick->Finalize();
       }
-
   }
 
   ///Callback method on a selection