X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOOutputModel.h;h=eb14eceecd21edc5f3b5eec7aca45b6458f1e14d;hb=c7482ec7d04a5e5987841932a6856ebd471cebdb;hp=ada72a358d9bf49c0fceecdba9dcbdff08d308fc;hpb=a16d21efe1eeb91888000310de90293c7d7b2fc3;p=creaImageIO.git

diff --git a/src/creaImageIOOutputModel.h b/src/creaImageIOOutputModel.h
index ada72a3..eb14ece 100644
--- a/src/creaImageIOOutputModel.h
+++ b/src/creaImageIOOutputModel.h
@@ -1,3 +1,30 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------
+*/
+
 #ifndef __creaImageIOoutputModel_h_INCLUDED__
 #define __creaImageIOoutputModel_h_INCLUDED__
 #if defined (USE_XERCES)
@@ -7,6 +34,8 @@
 #include <gdcmScanner.h>
 #endif
 
+#include <vector>
+#include <string>
 
 #define OUTPUTMODEL_TAG_i	""
 #define OUTPUTMODEL_TAG_0	"TAG_BEGIN"
@@ -16,11 +45,9 @@
 #define OUTPUTMODEL_TAG_4	"ANCHOR"
 #define OUTPUTMODEL_TAG(i)	OUTPUTMODEL_TAG_ ## i
 
-
-
-
 namespace creaImageIO
 {
+
 	class  OutputModel 
 	{
 	public:
@@ -30,16 +57,12 @@ namespace creaImageIO
 
 #if defined(USE_XERCES)
 		OutputModel(OutputModelParser *i_outparser);
-
-		
-
 	
 		// Test if we need to check the "dicom" tag if it exists on database
 		void setDB(const std::string i_db, const std::string i_table);
 
 		const std::string getTag();
 
-	
 	private:
 
 		OutputModelParser *m_outparser;
@@ -106,7 +129,9 @@ namespace creaImageIO
 		bool checkModel(std::map<std::string, std::string> i_model, const std::string i_val);
 #endif
 	};
-		 template <class T>
+	
+/*
+	 template <class T>
 	 class OutputSort
 	 {
 	 public :
@@ -120,10 +145,11 @@ namespace creaImageIO
 
 		 void sort (const std::map<std::string, T> i_values, std::vector<std::string> &o_sort)
 		 {
-			 for(T index = tags[OUTPUTMODEL_TAG(0)]; index <= tags[OUTPUTMODEL_TAG(1)]; index += tags[OUTPUTMODEL_TAG(2)])
+		        std::map<std::string, T>::const_iterator it_val; 
+			for(T index = tags[OUTPUTMODEL_TAG(0)]; index <= tags[OUTPUTMODEL_TAG(1)]; index += tags[OUTPUTMODEL_TAG(2)])
 			{
-				std::map<std::string, T>::const_iterator it_val = i_values.begin();
-				for(;it_val != values.end(); it_val++)
+				//std::map<std::string, T>::const_iterator it_val; 
+				for(it_val = i_values.begin();it_val != i_values.end(); it_val++)
 				{
 					if(it_val->second.c_str()  == index)
 					{
@@ -134,5 +160,7 @@ namespace creaImageIO
 			 }
 		 }
 	 };
+*/
+	
 } // namespace creaImageIO
-#endif //__creaImageIOoutputModel_h_INCLUDED__
\ No newline at end of file
+#endif //__creaImageIOoutputModel_h_INCLUDED__