X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwx%2Fsrc%2FbbwxFileSelector.cxx;h=4757485e021b57407f02fbbbf0b32b1fef04b41b;hb=b05f82ac827b39aceb736aaace5eb5cc3e914814;hp=53e3ee3a47bd8b40e31daa76189c3d1170807917;hpb=888f2592d143847b6598d947cd037162c4fb90c6;p=bbtk.git

diff --git a/packages/wx/src/bbwxFileSelector.cxx b/packages/wx/src/bbwxFileSelector.cxx
index 53e3ee3..4757485 100644
--- a/packages/wx/src/bbwxFileSelector.cxx
+++ b/packages/wx/src/bbwxFileSelector.cxx
@@ -1,20 +1,38 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
 /*=========================================================================
-                                                                                
   Program:   bbtk
   Module:    $RCSfile: bbwxFileSelector.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/02/15 12:47:18 $
-  Version:   $Revision: 1.1 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2012/11/16 08:52:14 $
+  Version:   $Revision: 1.8 $
 =========================================================================*/
+
 /**
  *  \file 
  *  \brief 
@@ -26,6 +44,7 @@
 
 #include "bbwxFileSelector.h"
 #include "bbwxPackage.h"
+#include "bbtkWx.h"
 
 #include <wx/filedlg.h>
 
@@ -34,11 +53,25 @@ namespace bbwx
 {
 
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(wx,FileSelector);
-  
-
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(FileSelector,bbtk::AtomicBlackBox);
-
-
+  BBTK_BLACK_BOX_IMPLEMENTATION(FileSelector,bbtk::AtomicBlackBox);
+
+
+	//-----------------------------------------------------------------	
+	void FileSelector::bbUserSetDefaultValues()
+	{
+		bbSetInputOpenSave("Open");
+	}
+	
+	//-----------------------------------------------------------------	
+	void FileSelector::bbUserInitializeProcessing()
+	{
+	}
+	
+	//-----------------------------------------------------------------	
+	void FileSelector::bbUserFinalizeProcessing()
+	{
+	}	
+	
   void FileSelector::Process() 
   { 
     bbtkDebugMessageInc("Core",9,"FileSelector::Process() ["
@@ -57,7 +90,7 @@ namespace bbwx
     std::string wc(bbGetInputWildcard());
     if (wc=="") 
       {
-	wc = "*.*";
+	wc = "*";  // Any file must be shown
       }
     
     
@@ -68,12 +101,17 @@ namespace bbwx
 					 bbtk::std2wx(wc),
 					 style,
 					 wxDefaultPosition);
+//EED
+
+    int result_FD = FD->ShowModal();
+
+	// This line is need it by windows //EED
+	FD->SetReturnCode( result_FD );
 
-    FD->ShowModal();
-    
     if (FD->GetReturnCode()==wxID_OK)
       {
 	bbSetOutputOut( bbtk::wx2std (FD->GetPath()) );
+	bbSignalOutputModification(std::string("Out"));
       }
     else
       { 
@@ -83,6 +121,7 @@ namespace bbwx
     bbtkDebugDecTab("Core",9); 
   }
   
+	
 
 
 }//namespace bbtk