X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2Finclude%2FmarAxis.h;h=28ae98091aff0a5c18512fabf48bd6ef1daef8f8;hb=542063db4a06b1a74587bcab7d5c450ebdd53272;hp=61064749ed68ab1a77fc892a76711b91ef093d91;hpb=66588eac91068d9b7f9d45bffc5e09c27511eaac;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/kernel/include/marAxis.h b/lib/maracasVisuLib/src/kernel/include/marAxis.h
index 6106474..28ae980 100644
--- a/lib/maracasVisuLib/src/kernel/include/marAxis.h
+++ b/lib/maracasVisuLib/src/kernel/include/marAxis.h
@@ -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: marAxis.h,v $
   Language:  C++
-  Date:      $Date: 2010/04/20 16:11:41 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2012/11/15 14:15:31 $
+  Version:   $Revision: 1.4 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -106,17 +131,17 @@ public:
   void calculateSignal( kVolume* vol );
     
 
-  int getActualQuant( )				{ return _actualQuant;			}
+  int getActualQuant( )						{ return _actualQuant;				}
 
-  float getSignal( uint32_t slice )		{ return( _signal[ slice ] );		};
+  float getSignal( uint slice )				{ return( _signal[ slice ] );		};
 
-  double* getSplinePoint( uint32_t i )		{ return ( _points[ i ] );		};
+  double* getSplinePoint( uint i )			{ return ( _points[ i ] );			};
 
-  int getHealthySlice( )			{ return( _healthySlice );		};
-  int getHealthySliceStart( )			{ return( _healthySliceStart );		};
-  int getHealthySliceEnd( )			{ return( _healthySliceEnd );		};
+  int getHealthySlice( )					{ return( _healthySlice );			};
+  int getHealthySliceStart( )				{ return( _healthySliceStart );		};
+  int getHealthySliceEnd( )					{ return( _healthySliceEnd );		};
 
-  void setActualQuant(int act)			{ _actualQuant=act;			};
+  void setActualQuant(int act)				{ _actualQuant=act;					};
 
   void setHealthySlice( int hsS, int hs, int hsE );
 
@@ -156,14 +181,12 @@ public:
   vtkImageData* getSliceImage( int i ) { return(_quantificationImages[ i ]);  };
 */
 
-
-  bool if3DcontourExist(int i); 
-  void Save3Dcontour(FILE *ff,int i);
-  void SaveExisting3DContours(FILE *ff);
-
+  bool              if3DcontourExist(int i);
+  void				Save3Dcontour(FILE *ff,int i);
+  void				SaveExisting3DContours(FILE *ff);
 	
   marContour*		getContour(		int i , kVolume* vol );		// DATA-MODEL-2D  
-  kVolume*		getSlice(		int i , kVolume* vol );		// DATA-MODEL-Voxel XxYx1
+  kVolume*			getSlice(		int i , kVolume* vol );		// DATA-MODEL-Voxel XxYx1
   vtkProbeFilter*	get3DSlice(		int i , kVolume* vol );		// VISUALISATION-VTK 3D
   vtkPoints*		get3Dcontour(	int i , kVolume* vol );		// VISUALISATION-VTK 3D
   vtkImageData*		getSliceImage(	int i , kVolume* vol );		// VISUALISATION-VTK 2D