Clean code

[creaImageIO.git] / src / creaImageIOWxGimmickReaderDialog.cpp

diff --git a/src/creaImageIOWxGimmickReaderDialog.cpp b/src/creaImageIOWxGimmickReaderDialog.cpp
index 1dff6b3fd0246dd09fa8e90d14a8012aec7dca2a..3af978666b7d69615c5faf91c29cf2711c71a95a 100644 (file)
--- a/src/creaImageIOWxGimmickReaderDialog.cpp
+++ b/src/creaImageIOWxGimmickReaderDialog.cpp
@@ -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);
-      mView->Initialize();
+       mView->Initialize();
           // Connect the AddProgress callback
       mView->ConnectValidationObserver( boost::bind( &WxGimmickReaderDialog::OnValid , this, _1 ) );
+    } catch (crea::Exception e) {
+               printf("EED WxGimmickReaderDialog::WxGimmickReaderDialog catch 1\n");
+        e.Print();
+               printf("EED WxGimmickReaderDialog::WxGimmickReaderDialog catch 2\n");
+        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);
     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