X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2Finclude%2FmarExperiment.cpp;h=2bb2f177b80ab2cdf5baed5a369372ba73a3ef06;hb=38e6a09417baf9a03ad75a3c6e74d7a638756cbc;hp=9653fd6f8c01a943ff9ed000fbec4f7ab75dd330;hpb=a4ee3758aa0477f677fb981e2c4d6e29995e8db8;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/kernel/include/marExperiment.cpp b/lib/maracasVisuLib/src/kernel/include/marExperiment.cpp
index 9653fd6..2bb2f17 100644
--- a/lib/maracasVisuLib/src/kernel/include/marExperiment.cpp
+++ b/lib/maracasVisuLib/src/kernel/include/marExperiment.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: marExperiment.cpp,v $
   Language:  C++
-  Date:      $Date: 2009/05/14 13:55:07 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2012/11/15 14:15:31 $
+  Version:   $Revision: 1.3 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -217,7 +242,7 @@ void marExperiment::prepareQuantification( )
 // ----------------------------------------------------------------------------
 void marExperiment::backQuant( )
 {
-//Cette méthode n'existe plus: dommage 
+//Cette m�thode n'existe plus: dommage 
 //    if ( _axes[0]->getQuantOn() )
   {
     _axes[0]->setFinishQuant( _axes[0]->getFinishQuant() - 1);
@@ -324,8 +349,8 @@ bool marExperiment::load(  std::ifstream& is )
 // ----------------------------------------------------------------------------
 void marExperiment::DeleteAxis( unsigned int index )
 {
-	/* Very naughty bug, when doing a - 1, where a is uint result is still
-	uint, imaging when a=0 :) need to cast to int*/
+	/* Very naughty bug, when doing a - 1, where a is uint32_t result is still
+	uint32_t, imaging when a=0 :) need to cast to int*/
   
   int axesize=_axes.size( )-1;
   index=index+1;
@@ -347,7 +372,7 @@ void marExperiment::DeleteAxis( unsigned int index )
   _axes.erase(_axes.begin() + index);
 */
 
-// PS ->   // PS : traitement identique à la methode std::vector::erase(iterator)
+// PS ->   // PS : traitement identique � la methode std::vector::erase(iterator)
 /*
   if(_axes[ 0 ]) 
 	  _axes[ 0 ]->Delete( );