*** empty log message ***

diff --git a/bbtk/src/bbcreaMaracasVisuPlaneDirection.cxx b/bbtk/src/bbcreaMaracasVisuPlaneDirection.cxx
index 4c5a9a83eab24e56e90c54ff064b798a03c7605f..7dc928a90d3d5645885ece19078557cb9ad7414f 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuPlaneDirection.cxx
+++ b/bbtk/src/bbcreaMaracasVisuPlaneDirection.cxx
@@ -2,7 +2,7 @@
 #include "bbcreaMaracasVisuPackage.h"
 namespace bbcreaMaracasVisu
 {
-
+ 
 BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,PlaneDirection)
 BBTK_BLACK_BOX_IMPLEMENTATION(PlaneDirection,bbtk::WxBlackBox);
 void PlaneDirection::Process()

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.cpp
index 2e713ca96afeec856b9a8630b6317e47470a51b9..63d9b5c860d8444b025df47c0de85ab32810d053 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.cpp
@@ -13,7 +13,7 @@ creaContoursFactory::~creaContoursFactory()
 
 manualContourBaseControler* creaContoursFactory::getContourControler(int typeContour)
 {
-       manualContourBaseControler *manContourControl;
+       manualContourBaseControler *manContourControl = NULL;
        //spline
        if (typeContour==1)
        {
@@ -61,15 +61,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 +118,22 @@ 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 +181,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 +235,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 +330,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 +387,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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.h
index b5ab354a2b471b75b73c5e78bcaeb350c4295cc7..68f0a2938ac5c65e6bb0d083f84667a6551df0e1 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/creaContoursFactory.h
@@ -20,6 +20,9 @@
 #include "manualContourModelRotationTool.h"
 #include "manualViewRotationTool.h"
 #include "manualContourModelPolygon.h"
+#include "manualView3DContour.h"
+#include "manualContour3V3DControler.h"
+
 
 class creaMaracasVisu_EXPORT creaContoursFactory
 {

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContour3V3DControler.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContour3V3DControler.cpp
index 8c31ea1e4f14e899ae3b89fb0089f90e67801c30..8150aedba42ea850e527b46fa80f44cf49e4ecc0 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContour3V3DControler.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContour3V3DControler.cpp
@@ -7,6 +7,7 @@
 
 manualContour3V3DControler::manualContour3V3DControler()
 {
+       _manualcontour3Vcontroler=NULL;
 }
 // ----------------------------------------------------------------------------
 manualContour3V3DControler::~manualContour3V3DControler()
@@ -39,7 +40,10 @@ void manualContour3V3DControler::InsertPoint(int x, int y, int z ) // virtual
 void manualContour3V3DControler::AddPoint( int x, int y, int z )
 {
        manualContour3DControler::AddPoint(  x,  y,  z );
-       _manualcontour3Vcontroler->AddPoint_Others();
+       if (_manualcontour3Vcontroler!=NULL)
+       {
+               _manualcontour3Vcontroler->AddPoint_Others();
+       }
 }
 // ----------------------------------------------------------------------------
 void manualContour3V3DControler::DeleteActualMousePoint(int x, int y)
@@ -55,7 +59,10 @@ void manualContour3V3DControler::MouseMove( int x, int y )
        if ((this->GetState()!=7) && (ss!=1)){
                manualContour3DControler::MouseMove( x , y );
                int id = GetManualViewBaseContour()->GetIdPoint ( x , y , GetZ() );
-               _manualcontour3Vcontroler->MouseMove_Others(id);
+               if (_manualcontour3Vcontroler!=NULL)
+               {
+                       _manualcontour3Vcontroler->MouseMove_Others(id);
+               }
        }
 }
 // ----------------------------------------------------------------------------

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp
index d5925e7b2359f85c17ed17b93425f73987d0d8fd..a2e67a0d9cac1cbd0fb686de2cb4396bb7e9f5a5 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualContourBaseControler.cpp
@@ -156,6 +156,7 @@ bool manualContourBaseControler::OnMouseMove()
 // ----------------------------------------------------------------------------
 bool manualContourBaseControler::OnLeftButtonDown()
 {
+       printf("EED %p manualContourBaseControler::OnLeftButtonDown \n",this);
        SetKeyBoardMoving( false );
        if ( _vtkInteractorStyleBaseView!=NULL )
        {
@@ -171,6 +172,7 @@ bool manualContourBaseControler::OnLeftButtonDown()
 // ----------------------------------------------------------------------------
 bool manualContourBaseControler::OnLeftButtonUp()
 {
+       printf("EED %p manualContourBaseControler::OnLeftButtonUp \n",this);
        if ( _vtkInteractorStyleBaseView!=NULL )
        {
                int X,Y;
@@ -184,6 +186,7 @@ bool manualContourBaseControler::OnLeftButtonUp()
 // ----------------------------------------------------------------------------
 bool manualContourBaseControler::OnLeftDClick()
 {
+       printf("EED %p manualContourBaseControler::OnLeftDClick \n",this);
        if ( _vtkInteractorStyleBaseView!=NULL )
        {
                int X,Y;
@@ -217,6 +220,7 @@ bool manualContourBaseControler::OnMiddleButtonUp()
 // ----------------------------------------------------------------------------
 bool manualContourBaseControler::OnRightButtonDown()
 {
+       printf("EED %p manualContourBaseControler::OnRightButtonDown \n",this);
        if( _vtkInteractorStyleBaseView!= NULL )
        {
                int X,Y;
@@ -234,6 +238,7 @@ bool manualContourBaseControler::OnRightButtonDown()
 // ----------------------------------------------------------------------------
 bool manualContourBaseControler::OnRightButtonUp()
 {
+       printf("EED %p manualContourBaseControler::OnRightButtonUp \n",this);
        return true;
 }
 // ----------------------------------------------------------------------------

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
index 73904c377e64241392224d6c7c0185e09a7e57f5..7acce9bf9c86823e3d93ff47083ff36e49ff20d7 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.cxx
@@ -135,7 +135,7 @@ void wxVtkBaseView::TransFromCoordScreenToWorld(double &X, double &Y, double &Z,
 // EEDx5
        //JCP 13/05/2009
        vtkInteractorStyleBaseView* interactorstyle = (vtkInteractorStyleBaseView*)this->GetInteractorStyleBaseView();
-       wxVtk2DBaseView* baseview = (wxVtk2DBaseView*)interactorstyle->GetWxVtk2DBaseView();
+    wxVtk2DBaseView* baseview = (wxVtk2DBaseView*)interactorstyle->GetWxVtk2DBaseView();
 
        double fP[3];
        fP[0] = X;