*** empty log message ***

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / manualContour / creaContoursFactory.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.cpp
index 2e713ca96afeec856b9a8630b6317e47470a51b9..551f76e79065b9bcb2109951b5f85d407283ac70 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.cpp
@@ -1,5 +1,27 @@
 #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 +35,7 @@ creaContoursFactory::~creaContoursFactory()
 
 manualContourBaseControler* creaContoursFactory::getContourControler(int typeContour)
 {
-       manualContourBaseControler *manContourControl;
+       manualContourBaseControler *manContourControl = NULL;
        //spline
        if (typeContour==1)
        {
@@ -61,15 +83,23 @@ manualContourBaseControler* creaContoursFactory::getContourControler(int typeCon
        {
                manContourControl       = new manualContourControler();
        }
-       return manContourControl;
 
-       
+
+       //JPReyes 13/04/2010
+       //Spline 3D
+       if(typeContour==12)
+       {
+               printf("JPReyes %p creaContoursFactory::getContourControler pasando por el Contour 12 \n",this);
+               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 +140,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 +200,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 +254,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 +349,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 +406,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