X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxGimmickReaderDialog.cpp;h=5bf968b2f1f8beeeeac9a5e878a0ff9d59cecd4d;hb=b124b45664473a3ad32c1c8cf680cc3355e4dbd2;hp=e2362d9afa7350f82eeb871972531a14b0a62360;hpb=3a22e19184c369b130d4caa992a8e98e50c7a0ee;p=creaImageIO.git

diff --git a/src/creaImageIOWxGimmickReaderDialog.cpp b/src/creaImageIOWxGimmickReaderDialog.cpp
index e2362d9..5bf968b 100644
--- 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,23 @@ 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);
-    mCancelButton = (wxButton*)FindWindowById(GetEscapeId(),      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,13 +111,8 @@ namespace creaImageIO
       {
 		mGimmick->Finalize();
       }
-   deleteMessage();
   }
 
-void   	WxGimmickReaderDialog::deleteMessage()
-	{
-		deleteGimmickDebugMessage();
-	};
   ///Callback method on a selection
   void WxGimmickReaderDialog::OnValid(bool t)
   {