#3323 Bug with ToolBar (in wxFrame an not in wxPanel) in MacOs

[creaImageIO.git] / src / creaImageIOWxGimmickReaderDialog.cpp

diff --git a/src/creaImageIOWxGimmickReaderDialog.cpp b/src/creaImageIOWxGimmickReaderDialog.cpp
index 4823d40bf665627e8743053dd0dc17850e6ef0c6..f7af7d0a589d99594fb3da7499bd26a58ee52b34 100644 (file)
--- a/src/creaImageIOWxGimmickReaderDialog.cpp
+++ b/src/creaImageIOWxGimmickReaderDialog.cpp
@@ -1,3 +1,31 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------
+*/
+
+
 #include <creaImageIOWxGimmickReaderDialog.h>
 #include <creaImageIOSystem.h>
 #include <creaImageIOGimmick.h>
@@ -7,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,
@@ -18,7 +46,7 @@ namespace creaImageIO
                                               int max_dim,
                                               int output_dim,  // never used ?!? // JPR
                                               int threads)
- :   wxDialog( parent, 
+ :   wxDialog( parent,
                  id, 
                  title,
                  pos,
@@ -31,7 +59,7 @@ namespace creaImageIO
                  wxCAPTION  
               ),
  //   mGimmick(0),
-     mView(0)
+     mView(NULL)
   {
     GimmickDebugMessage(1,"WxGimmickReaderDialog::WxGimmickReaderDialog"
                        <<std::endl);
@@ -39,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,
@@ -50,30 +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 ) );
+      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(); 
   }
 
@@ -90,7 +112,6 @@ namespace creaImageIO
       {
                mGimmick->Finalize();
       }
-
   }
 
   ///Callback method on a selection