X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2FmarParameters.cpp;h=b201515ddea4f6c5f988fa77c01057016077d368;hb=06b778a59d0c5109cf7626c76d2ee21e033f8c28;hp=51a529ca968edcdf6009ecaaee2df7e5355687b2;hpb=7cdd257ac8ad23e435cfbcd768805ccd40acdad3;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/kernel/marParameters.cpp b/lib/maracasVisuLib/src/kernel/marParameters.cpp
index 51a529c..b201515 100644
--- a/lib/maracasVisuLib/src/kernel/marParameters.cpp
+++ b/lib/maracasVisuLib/src/kernel/marParameters.cpp
@@ -1,10 +1,35 @@
+/*# ---------------------------------------------------------------------
+#
+# 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:   wxMaracas
  Module:    $RCSfile: marParameters.cpp,v $
  Language:  C++
- Date:      $Date: 2010/04/20 14:42:44 $
- Version:   $Revision: 1.3 $
+ Date:      $Date: 2012/11/15 14:16:12 $
+ Version:   $Revision: 1.4 $
  
   Copyright: (c) 2002, 2003
   License:
@@ -303,8 +328,10 @@ bool marParameters::save( wxString& nw )
 	
 //EEDxx2.4 DEBuG
 //	wxLogDebug("Saving parameters to file " + nw);
-	
-    if( os==NULL ) 
+
+//EED2016-12-22	
+//    if( os==NULL ) 
+    if( os.is_open()==false ) 
 	{
 		wxString errorMsg;
 		errorMsg= _T("Error : Cannot open file ")+nw+_T(" to save parameters");
@@ -335,7 +362,10 @@ bool marParameters::load( wxString& nr )
 	
 //EEDxx2.4 DEBuG
 //	wxLogDebug("Laoding parameters from file " + nr);
-    if( is==NULL ) 
+
+//EED 2016-12-22
+//    if( is==NULL ) 
+    if( is.is_open()==false ) 
 	{
 		wxString errorMsg;
 		errorMsg= _T("Error : Cannot open file ")+nr+_T(" to load parameters");