X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Fkernel_ManagerContour_NDimensions%2FParserOsirix%2FOsirixParser.h;h=712bc1bdad64a5856c027aa7d9c479ef969b651d;hb=7ef64acb00d37e665e0bf019b9a7ede2495bf155;hp=2b19e444e6be1ed4df148c4c8673f290b09681aa;hpb=fc546c3fa6dc579e173688cb0d5460af7dd668bb;p=creaContours.git

diff --git a/lib/kernel_ManagerContour_NDimensions/ParserOsirix/OsirixParser.h b/lib/kernel_ManagerContour_NDimensions/ParserOsirix/OsirixParser.h
index 2b19e44..712bc1b 100644
--- a/lib/kernel_ManagerContour_NDimensions/ParserOsirix/OsirixParser.h
+++ b/lib/kernel_ManagerContour_NDimensions/ParserOsirix/OsirixParser.h
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 __OsirixParser__
 #define __OsirixParser__
 
@@ -59,6 +84,22 @@ public:
 
 	std::string getContoursFileName();
 
+	// Return ROI as lists of points
+	const std::map<int, vector< vector<double> > >& getContoursMapMM() {
+	  return contoursmapMM;
+	}
+	const std::map<int, vector< vector<double> > >& getContoursMapPX() {
+	  return contoursmapPX;
+	}
+
+	// Return ROI names
+	const std::map<int, std::string>& getContoursNameMM() {
+	  return contoursnameMM;
+	}
+	const std::map<int, std::string>& getContoursNamePX() {
+	  return contoursnamePX;
+	}
+
 private:
 
 	std::string schema;
@@ -66,6 +107,7 @@ private:
 	std::string errorline;	
 
 	int _imageindex;
+	std::string _roiname;
 
 	const char* OSIRIX_DICT;
 	const char* OSIRIX_KEY;
@@ -78,7 +120,8 @@ private:
 	const char* OSIRIX_POINT_MM;
 	const char* OSIRIX_POINT_PX;
 	const char* OSIRIX_STRING;		
-	
+	const char* OSIRIX_NAME;
+
 	const char* CREACONTOUR;
 	const char* CREACONTOUR_VERSION;
 	const char* CREACONTOUR_IMAGEDIMENSIONS;
@@ -101,6 +144,9 @@ private:
 	std::map<int, vectorXYZ> contoursmapMM;	
 	std::map<int, vectorXYZ> contoursmapPX;
 
+	std::map<int, std::string> contoursnameMM;
+	std::map<int, std::string> contoursnamePX;
+
 	void saveCreaContoursFormat();
 
 	void writeHeader(FILE* pFile);