X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualContour%2FcreaContoursFactory.cpp;h=c502c56df4126f0f989d63fa18b03f58f8c4f04b;hb=05c4abbebf824bbbbaaab135acf6c888662dff69;hp=2e713ca96afeec856b9a8630b6317e47470a51b9;hpb=8a17eefc009210d0bdd36de71e48c4804724bee8;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.cpp
index 2e713ca..c502c56 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.cpp
@@ -1,5 +1,52 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 #include "creaContoursFactory.h"
 
+#include "manualContourControler.h"
+#include "manualCircleControler.h"
+#include "manualContourModelCircle.h"
+#include "manualViewCircle.h"
+#include "manualLineControler.h"
+#include "manualContourModelLine.h"
+#include "manualViewLine.h"
+#include "manualRoiControler.h"
+#include "manualViewRoi.h"
+#include "manualContourModelRoi.h"
+#include "manualViewBullEye.h"
+#include "manualContourModelBullEye.h"
+#include "manualViewPoints.h"
+#include "manualRotationToolControler.h"
+#include "manualContourModelRotationTool.h"
+#include "manualViewRotationTool.h"
+#include "manualContourModelPolygon.h"
+#include "manualView3DContour.h"
+#include "manualContour3DControler.h"
+#include "manualContour3V3DControler.h"
+
+
 creaContoursFactory::creaContoursFactory()
 {
 
@@ -13,7 +60,7 @@ creaContoursFactory::~creaContoursFactory()
 
 manualContourBaseControler* creaContoursFactory::getContourControler(int typeContour)
 {
-	manualContourBaseControler *manContourControl;
+	manualContourBaseControler *manContourControl = NULL;
 	//spline
 	if (typeContour==1)
 	{
@@ -61,15 +108,22 @@ manualContourBaseControler* creaContoursFactory::getContourControler(int typeCon
 	{
 		manContourControl	= new manualContourControler();
 	}
-	return manContourControl;
 
-	
+
+	//JPReyes 13/04/2010
+	//Spline 3D
+	if(typeContour==12)
+	{
+		manContourControl = new manualContour3V3DControler();
+	}
+
+	return manContourControl;
 
 }
 
 manualContourBaseControler* creaContoursFactory::getContourControler(std::string typeContour)
 {
-	manualContourBaseControler *manContourControl;
+	manualContourBaseControler *manContourControl = NULL;
 	if (typeContour.compare("spline")==0)
 	{
 			manContourControl = getContourControler(1);
@@ -110,13 +164,19 @@ manualContourBaseControler* creaContoursFactory::getContourControler(std::string
 		manContourControl	=  getContourControler(10);
 	}
 
+	//JPReyes 13/04/2010
+	//Spline 3D
+	if(typeContour.compare("spline3D")==0)
+	{
+		manContourControl = getContourControler(12);
+	}
 	return manContourControl;
 }
 
 manualViewBaseContour* creaContoursFactory::getCountourView (int typeContour)
 {
 	
-	manualViewBaseContour *manViewerContour;
+	manualViewBaseContour *manViewerContour = NULL;
 	//spline
 	if (typeContour==1)
 	{
@@ -164,13 +224,20 @@ manualViewBaseContour* creaContoursFactory::getCountourView (int typeContour)
 	{
 		manViewerContour	= new manualViewContour();
 	}
+
+	//JPReyes 13/04/2010
+	//Spline 3D
+	if(typeContour==12)
+	{
+		manViewerContour	= new manualView3DContour();
+	}
 	return manViewerContour;
 }
 
 manualViewBaseContour* creaContoursFactory::getCountourView (std::string typeContour)
 {
 
-	manualViewBaseContour *manViewerContour;
+	manualViewBaseContour *manViewerContour = NULL;
 
 	if (typeContour.compare("spline")==0)
 	{
@@ -211,6 +278,14 @@ manualViewBaseContour* creaContoursFactory::getCountourView (std::string typeCon
 	{
 		manViewerContour = getCountourView(10);
 	}
+
+	//JPReyes 13/04/2010
+	//Spline 3D
+	if (typeContour.compare("spline3D")==0)
+	{
+		manViewerContour = getCountourView(12);
+	}
+
 	return manViewerContour;
 
 }
@@ -298,6 +373,14 @@ manualBaseModel* creaContoursFactory::getContourModel(int typeContour)
 		manModelContour = new manualContourModelPolygon();
 	}
 
+	
+	//JPReyes 13/04/2010
+	//Spline 3D
+	if(typeContour==12)
+	{
+		manModelContour = new manualContourModel();
+	}
+
 	return manModelContour;
 }
 
@@ -347,5 +430,13 @@ manualBaseModel* creaContoursFactory::getContourModel(std::string typeContour)
 		manModelContour = getContourModel(10);
 	}
 
+	
+	//JPReyes 13/04/2010
+	//Spline 3D
+	if (typeContour.compare("spline3D")==0)
+	{
+		manModelContour = getContourModel(12);
+	}
+
 	return manModelContour;
-}
\ No newline at end of file
+}