]> Creatis software - creaMaracasVisu.git/commitdiff
.
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Mon, 18 May 2009 15:59:22 +0000 (15:59 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Mon, 18 May 2009 15:59:22 +0000 (15:59 +0000)
43 files changed:
bbtk/src/bbcreaMaracasVisuIRMViewer.cxx
bbtk/src/bbcreaMaracasVisuIRMViewer.h
bbtk/src/bbcreaMaracasVisuSTL.cxx
bbtk/src/bbcreaMaracasVisuSTL.h
bbtk/src/bbcreaMaracasVisuSliceImage.cxx
bbtk/src/bbcreaMaracasVisuSliceImage.h
bbtk/src/bbmaracasvisuAxeVolume.cxx
bbtk/src/bbmaracasvisuAxeVolume.h
bbtk/src/bbmaracasvisuColorBar.cxx
bbtk/src/bbmaracasvisuColorBar.h
bbtk/src/bbmaracasvisuContourCrown.cxx
bbtk/src/bbmaracasvisuContourCrown.h
bbtk/src/bbmaracasvisuContourStatistics.cxx
bbtk/src/bbmaracasvisuContourStatistics.h
bbtk/src/bbmaracasvisuContourToControlPoints.cxx
bbtk/src/bbmaracasvisuContourToControlPoints.h
bbtk/src/bbmaracasvisuContourVOI.cxx
bbtk/src/bbmaracasvisuContourVOI.h
bbtk/src/bbmaracasvisuDrawAxe3D.cxx
bbtk/src/bbmaracasvisuDrawAxe3D.h
bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
bbtk/src/bbmaracasvisuDrawAxisTree3D.h
bbtk/src/bbmaracasvisuHistogramView.cxx
bbtk/src/bbmaracasvisuHistogramView.h
bbtk/src/bbmaracasvisuImageActor.cxx
bbtk/src/bbmaracasvisuImageActor.h
bbtk/src/bbmaracasvisuImageChangeInformation.cxx
bbtk/src/bbmaracasvisuImageChangeInformation.h
bbtk/src/bbmaracasvisuPlotterView.cxx
bbtk/src/bbmaracasvisuPlotterView.h
bbtk/src/bbmaracasvisuShowNPoints.cxx
bbtk/src/bbmaracasvisuShowNPoints.h
bbtk/src/bbmaracasvisuSliderMinMax.cxx
bbtk/src/bbmaracasvisuSliderMinMax.h
bbtk/src/bbmaracasvisuTransferFunctionView.cxx
bbtk/src/bbmaracasvisuTransferFunctionView.h
bbtk/src/bbmaracasvisuViewerMPR.cxx
bbtk/src/bbmaracasvisuViewerMPR.h
bbtk/src/bbmaracasvisuViewerNV.h
install/CMakeLists.txt
lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx
lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.h
lib/maracasVisuLib/src/interface/wxWindows/Contour/contoursIntersection.h

index 20e41fb65f4785998b9dec23c5a4d6611eaad45d..b64a85f8ae8ee5ab3cdacc68be31ea98039d2034 100644 (file)
@@ -49,29 +49,32 @@ void IRMViewer::CreateWidget(wxWindow* parent)
        bbSetOutputWidget(irmview);
   
 }
-void IRMViewer::bbUserConstructor()
-{
-  
-    bbSetInputIn0(NULL);
-       bbSetInputIn1(NULL);
-       bbSetInputIn2(NULL);
-       bbSetInputIn3(NULL);
-       bbSetInputIn4(NULL);
-       bbSetOutputWidget(NULL);
-  
-}
-void IRMViewer::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-  
-}
-void IRMViewer::bbUserDestructor()
-{
-  
-}
+
+       //-----------------------------------------------------------------     
+       void IRMViewer::bbUserSetDefaultValues()
+       {
+               bbSetInputIn0(NULL);
+               bbSetInputIn1(NULL);
+               bbSetInputIn2(NULL);
+               bbSetInputIn3(NULL);
+               bbSetInputIn4(NULL);
+               bbSetOutputWidget(NULL);
+       }
+       
+       //-----------------------------------------------------------------     
+       void IRMViewer::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void IRMViewer::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       
+       
+
 }
 // EO namespace bbcreaMaracasVisu
 
index 12f7563c0f031c46d970be8e4c18284177ddaf32..18833794ce742d421cda05a12d3fb53c14c8d134 100644 (file)
@@ -17,14 +17,6 @@ class bbcreaMaracasVisu_EXPORT IRMViewer
    public bbtk::WxBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(IRMViewer,bbtk::WxBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
   //BBTK_DECLARE_INPUT(In,vtkImageData*);
   BBTK_DECLARE_INPUT(Renderer,vtkRenderer*);
   BBTK_DECLARE_INPUT(In0,vtkProp3D*);  
index 8217e9aa8a395252ebf6a276d51d0bfaf5a4418b..425b86889f836b7b392d2d6f57558f9c4babb5ba 100644 (file)
@@ -31,24 +31,26 @@ void STL::CreateWidget(wxWindow* parent)
    //Process(); 
   
 }
-void STL::bbUserConstructor()
-{
-  
-    bbSetInputIn(NULL);     
-  
-}
-void STL::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-  
-}
-void STL::bbUserDestructor()
-{
-  
-}
+
+       //-----------------------------------------------------------------     
+       void STL::bbUserSetDefaultValues()
+       {
+               bbSetInputIn(NULL);     
+       }
+       
+       //-----------------------------------------------------------------     
+       void STL::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void STL::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       
+       
 }
 // EO namespace bbcreaMaracasVisu
 
index 15739286119c9b99a05761b18e44f1a6e463d91d..fd59bb5d6928fc9b7da0d59946d39a4f7b0e17e2 100644 (file)
@@ -16,14 +16,6 @@ class bbcreaMaracasVisu_EXPORT STL
    public bbtk::WxBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(STL,bbtk::WxBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
   BBTK_DECLARE_INPUT(In,vtkImageData*);  
   BBTK_PROCESS(Process);
   void Process();
index 363252e612f574770901ba629a10ce5d344c696c..95991aa50276ce5b314047e016faf4b4c091522a 100644 (file)
@@ -25,21 +25,27 @@ void SliceImage::Process()
 }
        
        
+       //-----------------------------------------------------------------     
+       void SliceImage::bbUserSetDefaultValues()
+       {
+               bbSetInputIn(NULL);
+               bbSetInputZ(0);
+               imageReslice=NULL;
+       }
+       
+       //-----------------------------------------------------------------     
+       void SliceImage::bbUserInitializeProcessing()
+       {
+               imageReslice = vtkImageReslice::New();
+       }
+       
+       //-----------------------------------------------------------------     
+       void SliceImage::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
        
-void SliceImage::bbUserConstructor()
-{
-       bbSetInputIn(NULL);
-       bbSetInputZ(0);
-       imageReslice = vtkImageReslice::New();
-}
-       
-void SliceImage::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-}
-       
-void SliceImage::bbUserDestructor()
-{  
-}
        
 }
 // EO namespace bbcreaMaracasVisu
index 0b30b209165032626905a6d0ba81eb5f78a1f4b4..c22e5d83c581a5411a2060ca73dc0b45187e05e4 100644 (file)
@@ -15,14 +15,6 @@ class bbcreaMaracasVisu_EXPORT SliceImage
    public bbtk::AtomicBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(SliceImage,bbtk::AtomicBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
   BBTK_DECLARE_INPUT(In,vtkImageData*);
   BBTK_DECLARE_INPUT(Z, double );
   BBTK_DECLARE_OUTPUT(Out,vtkImageData*);
index dc82eda1f760a9b98a5cc2bb6c77cecbd8627bd7..dfadc27204c3ab7640d317eb5904f473280b323b 100644 (file)
@@ -87,20 +87,24 @@ void AxeVolume::Process()
 }
 
 
-
-
-void AxeVolume::bbUserConstructor()
-{
-       mimage = NULL;
-}
-void AxeVolume::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-
-}
-void AxeVolume::bbUserDestructor()
-{
-
-}
+       //-----------------------------------------------------------------     
+       void AxeVolume::bbUserSetDefaultValues()
+       {
+               mimage=NULL;
+       }
+       
+       //-----------------------------------------------------------------     
+       void AxeVolume::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void AxeVolume::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       
 }
 // EO namespace bbcreaMaracasVisu
 
index 50486798db2a506213abd033a81e2228d173190e..d1a8a43dd3a80516276b426840b7bc09e7fcdc89 100644 (file)
@@ -13,14 +13,6 @@ class /*BBTK_EXPORT*/ AxeVolume
    public bbtk::AtomicBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(AxeVolume,bbtk::AtomicBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
   BBTK_DECLARE_INPUT( In , vtkImageData * );
   BBTK_DECLARE_INPUT( lstPointX , std::vector<double> );
   BBTK_DECLARE_INPUT( lstPointY , std::vector<double> );
index 1a2c08778633d9473e5f4cb733ce78f2fa13b86a..e8e614287e646cc11aaf95220a01ea40b8bc3fbb 100644 (file)
@@ -43,7 +43,7 @@ void ColorBar::CreateWidget(wxWindow* parent)
 }
 
 //--------------------------------------------------
-void ColorBar::bbUserConstructor()
+void ColorBar::bbUserSetDefaultValues()
 {
                mwxwidget = NULL;
                bbSetInputOrientation(1);
@@ -52,17 +52,19 @@ void ColorBar::bbUserConstructor()
                bbSetInputInMax(1);
                bbSetInputInMin(1);     
 }
-
-//--------------------------------------------------
-void ColorBar::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-}
-
-//--------------------------------------------------
-void ColorBar::bbUserDestructor()
-{
-}
-
+       
+       //-----------------------------------------------------------------     
+       void ColorBar::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void ColorBar::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       
 
 }
 // EO namespace bbcreaMaracasVisu
index dbc9658b0d0cd95f6ad436fe0447cc9423bc12bd..5adb258894e15a858cfb4fb5a8720ad8fd1700ff 100644 (file)
@@ -15,14 +15,6 @@ class /*BBTK_EXPORT*/ ColorBar
    public bbtk::WxBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(ColorBar,bbtk::WxBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
     BBTK_DECLARE_INPUT(Orientation, int );
        BBTK_DECLARE_INPUT(InW, int );
        BBTK_DECLARE_INPUT(InH, int );
index 9ece377e0f442d1730da75d86843ec727284c283..1c9e0ea1da1a3eea577c05274a3dacdf39dab6f3 100644 (file)
@@ -67,7 +67,7 @@ void ContourCrown::CreateWidget(wxWindow* parent)
 }
 
 //-----------------------------------------------------------
-void ContourCrown::bbUserConstructor()
+void ContourCrown::bbUserSetDefaultValues()
 {
        mwxwidget = NULL;
        bbSetInputIn(NULL);
@@ -79,15 +79,18 @@ void ContourCrown::bbUserConstructor()
 //--------------------------------------------------
 }
 
-//-----------------------------------------------------------
-void ContourCrown::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-}
-
-//-----------------------------------------------------------
-void ContourCrown::bbUserDestructor()
-{
-}
+       //-----------------------------------------------------------------     
+       void ContourCrown::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void ContourCrown::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       
 
 }
 // EO namespace bbcreaMaracasVisu
index 272415339a01acff706166541cd9511790966656..74e3725ffb3cf6bf7ae91875886df7fd58796b3e 100644 (file)
@@ -15,14 +15,6 @@ class /*BBTK_EXPORT*/ ContourCrown
    public bbtk::WxBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(ContourCrown,bbtk::WxBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
     BBTK_DECLARE_INPUT(In, vtkImageData*);
     BBTK_DECLARE_INPUT(wxVtkBaseView, wxVtkBaseView*);
 //JSTG 26-02-08 -------------------------------------------------------
index 31219232012a1e5d5b15b13fa67640de5a1ab29c..bcf7c9c3d786a49a38bdce6e0f8b9d92aa367a96 100644 (file)
@@ -55,20 +55,24 @@ void ContourStatistics::Process()
 }
 
 //------------------------------------------------------------
-void ContourStatistics::bbUserConstructor()
+void ContourStatistics::bbUserSetDefaultValues()
 {
       bbSetInputLstValue(NULL);
 }
 
-//------------------------------------------------------------
-void ContourStatistics::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-}
-
-//------------------------------------------------------------
-void ContourStatistics::bbUserDestructor()
-{
-}
+       
+       //-----------------------------------------------------------------     
+       void ContourStatistics::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void ContourStatistics::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       
 
 }
 // EO namespace bbcreaMaracasVisu
index 90d6d7af67f05455e889a551f218e762e4528167..6466f2c0edbe71c796c104689b176db80c7611a0 100644 (file)
@@ -11,14 +11,6 @@ class /*BBTK_EXPORT*/ ContourStatistics
    public bbtk::AtomicBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(ContourStatistics,bbtk::AtomicBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
        BBTK_DECLARE_INPUT(LstValue,std::vector<double>*);
        BBTK_DECLARE_INPUT(LstValuePosX,std::vector<double>*);
        BBTK_DECLARE_INPUT(LstValuePosY,std::vector<double>*);
index e75ffee08c1b4ff0c4a09a3efc6749ec60d51bda..fabcee39a1fa987b90ee9b1649aebb0555d18cd3 100644 (file)
@@ -113,8 +113,10 @@ void ContourToControlPoints::Process()
                bbSetOutputControlPointZ( &OutContourZ );
                bbSetOutputImagePropg( _imagedata );
 }
+       
+       
 //------------------------------------------------------------
-void ContourToControlPoints::bbUserConstructor()
+void ContourToControlPoints::bbUserSetDefaultValues()
 {
                bbSetInputSampling(5.0);
                bbSetInputSlice(0);
@@ -125,23 +127,42 @@ void ContourToControlPoints::bbUserConstructor()
                bbSetInputOption(1);
                bbSetInputLoadContour(0);
 
+               _contprop       = NULL;
+               _propgdata      = NULL;
+               _imagedata      = NULL;
+               _ext2D          = NULL;
+       
+               _fd = NULL;
+               pos = 0;
+}
+
+       
+       //-----------------------------------------------------------------     
+       void ContourToControlPoints::bbUserInitializeProcessing()
+       {
                _contprop       = new ContourPropagation();
                _propgdata      = new PropContour();
                _imagedata      = vtkImageData::New();
                _ext2D          = new ExtractControlPoints2D();
-               _fd = NULL;
-               pos = 0;
-               //it = NULL;  // JPRx
-               //bool inic = false; // JPRx
-}
-//------------------------------------------------------------
-void ContourToControlPoints::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-}
-//------------------------------------------------------------
-void ContourToControlPoints::bbUserDestructor()
-{
-}
+       }
+       
+       //-----------------------------------------------------------------     
+       void ContourToControlPoints::bbUserFinalizeProcessing()
+       {
+               if (_contprop!=NULL) delete _contprop;
+               if (_propgdata!=NULL) delete _propgdata;
+               if (_imagedata!=NULL) _imagedata->Delete();
+               if (_ext2D!=NULL) delete _ext2D;
+
+               _contprop       = NULL;
+               _propgdata      = NULL;
+               _imagedata      = NULL;
+               _ext2D          = NULL;
+       }
+       
+       //-----------------------------------------------------------------     
+
+       
 
 }
 // EO namespace bbcreaMaracasVisu
index de3904c6f0503e3898a7058bd029bc90181c44f8..3a9d443f187add56303dcc3acdd95ba9c8ffdfbc 100644 (file)
@@ -18,15 +18,6 @@ class /*BBTK_EXPORT*/ ContourToControlPoints
 {
        //BBTK_USER_BLACK_BOX_INTERFACE(ContourToControlPoints,bbtk::AtomicBlackBox);
        BBTK_BLACK_BOX_INTERFACE(ContourToControlPoints,bbtk::AtomicBlackBox);
-
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
   BBTK_DECLARE_INPUT(In,double);
                BBTK_DECLARE_INPUT(Sampling, double);
                BBTK_DECLARE_INPUT(Slice,int);
index dfdfb8d4953955ed507f295c55b399a2cb421d4c..dfb620215e184217e8afe8316abda565e10ecfb4 100644 (file)
@@ -198,7 +198,7 @@ void ContourVOI::CreateWidget(wxWindow*  parent)
 }
 
 //------------------------------------------------------
-void ContourVOI::bbUserConstructor()
+void ContourVOI::bbUserSetDefaultValues()
 {
 
        _img = NULL;
@@ -214,20 +214,18 @@ void ContourVOI::bbUserConstructor()
 
 }
 
-//------------------------------------------------------
-void ContourVOI::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-       _img = NULL;
-       _base = NULL;
-       _extract =NULL;
-
-}
-
-//------------------------------------------------------
-void ContourVOI::bbUserDestructor()
-{
-}
-
+       //-----------------------------------------------------------------     
+       void ContourVOI::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void ContourVOI::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       
 
 }
 // EO namespace bbcreaMaracasVisu
index edc2ebc7ef10dc3c4ba5a45b58e20b1fb92e73f6..5395fbe354e3c8372e6319a4be4ae9d503bd1083 100644 (file)
@@ -65,14 +65,6 @@ class /*BBTK_EXPORT*/ ContourVOI
    public bbtk::WxBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(ContourVOI,bbtk::WxBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
   BBTK_DECLARE_INPUT(Title,std::string);
     BBTK_DECLARE_INPUT(In, vtkImageData*);
     BBTK_DECLARE_INPUT(wxVtkBaseView, wxVtkBaseView*);
index 5a0a17d3a69fbbf9a4a631d72d2b8c644c65358b..14db3707048d91771fe441748d9161dcca544684 100644 (file)
@@ -4,7 +4,6 @@
 
 #include "vtkImageData.h"
 #include "vtkActor.h"
-#include "vtkPolyDataMapper.h"
 #include "vtkPoints.h"
 #include "vtkCellArray.h"
 #include "vtkProperty.h"
@@ -39,7 +38,7 @@ void DrawAxe3D::Process()
 
                for( i = 0; i < vectx.size( ); i++) {   
                        //multiplicar ver parametros spacing, en maracas cuando se toca la imagen y se ve dycom
-                       //hay parámetro dycom, vtkImagedata valor spacing y esos datos hay que multiplicar al polydata
+                       //hay par·metro dycom, vtkImagedata valor spacing y esos datos hay que multiplicar al polydata
                        allPoints->InsertNextPoint( vectx[i]*spc[0],  vecty[i]*spc[1], vectz[i]*spc[2] );
                        allTopology->InsertCellPoint( i );
                } // rof
@@ -67,16 +66,13 @@ void DrawAxe3D::Process()
 
 }
 
-void DrawAxe3D::bbUserConstructor()
+void DrawAxe3D::bbUserSetDefaultValues()
 {
        firsttime                                                       = true;
-       mallData                                                        = vtkPolyData::New( );
-       vtkPolyDataMapper* polydatamapper       = vtkPolyDataMapper::New();
-       mvtkactor                                                       = vtkActor::New();
-       polydatamapper->SetInput(mallData);
-       mvtkactor->SetMapper(polydatamapper);
-       bbSetOutputOut(mvtkactor);
-
+       mallData                                                        = NULL;
+       polydatamapper                                          = NULL;
+       mvtkactor                                                       = NULL;
+       
     std::vector<double> colour;
     colour.push_back(1.0);
     colour.push_back(0.0);
@@ -84,12 +80,47 @@ void DrawAxe3D::bbUserConstructor()
     bbSetInputColour(colour);
 }
 
-void DrawAxe3D::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-}
-void DrawAxe3D::bbUserDestructor()
-{
-}
+
+       
+       //-----------------------------------------------------------------     
+       void DrawAxe3D::bbUserInitializeProcessing()
+       {
+               mallData                = vtkPolyData::New( );
+               polydatamapper  = vtkPolyDataMapper::New();
+               mvtkactor               = vtkActor::New();
+               
+               polydatamapper->SetInput(mallData);
+               mvtkactor->SetMapper(polydatamapper);
+               bbSetOutputOut(mvtkactor);
+       }
+       
+       //-----------------------------------------------------------------     
+       void DrawAxe3D::bbUserFinalizeProcessing()
+       {
+               if (mallData!=NULL)
+               {
+                       mallData->Delete();
+                       mallData=NULL;
+               }         
+               
+               if (polydatamapper!=NULL)
+               {
+                       polydatamapper->Delete();
+                       polydatamapper=NULL;
+               }         
+               
+               if (mvtkactor!=NULL)
+               {
+                       mvtkactor->Delete();
+                       mvtkactor=NULL;
+               }         
+               
+       }
+       
+       //-----------------------------------------------------------------     
+       
+       
+
 
 }
 
index 6058c470195d320a1bac00ad8983f72765b3c3f5..a96ad4fb24928cda456fda4bcc13e177c7ce2c8f 100644 (file)
@@ -6,6 +6,7 @@
 
 #include "vtkRenderer.h"
 #include "vtkPolyData.h"
+#include "vtkPolyDataMapper.h"
 #include "vtkLinearTransform.h"
 
 namespace bbcreaMaracasVisu
@@ -16,14 +17,6 @@ class /*BBTK_EXPORT*/ DrawAxe3D
    public bbtk::AtomicBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(DrawAxe3D,bbtk::AtomicBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
   BBTK_DECLARE_INPUT(Renderer,vtkRenderer*);
   BBTK_DECLARE_INPUT(lstPointX,std::vector<double>);
   BBTK_DECLARE_INPUT(lstPointY,std::vector<double>);
@@ -37,9 +30,10 @@ virtual void bbUserDestructor();
   void Process();
 
   private:
-    bool                       firsttime;
-    vtkPolyData                *mallData;
-       vtkActor                *mvtkactor;
+    bool                               firsttime;
+    vtkPolyData                        *mallData;
+       vtkActor                        *mvtkactor;
+       vtkPolyDataMapper       *polydatamapper;
 };
 
 
index 9af83d5eaab9a88e2b0cf40d3f9f6df3bf555de5..a283fe858eee0b0646e9bcae16ae1afbc97b41fd 100644 (file)
@@ -40,7 +40,7 @@ void DrawAxisTree3D::DrawOneAxis(int iGeneral,int numPoints, int iAxis)
                for (i=iGeneral;i<size;i++)
                {
                        //multiplicar ver parametros spacing, en maracas cuando se toca la imagen y se ve dycom
-                       //hay parámetro dycom, vtkImagedata valor spacing y esos datos hay que multiplicar al polydata
+                       //hay par·metro dycom, vtkImagedata valor spacing y esos datos hay que multiplicar al polydata
                        allPoints->InsertNextPoint( bbGetInputlstPointX()[i]*spc[0],  
                                                                                bbGetInputlstPointY()[i]*spc[1], 
                                                                                bbGetInputlstPointZ()[i]*spc[2] );
@@ -114,7 +114,7 @@ void DrawAxisTree3D::Process()
 
 }
 
-void DrawAxisTree3D::bbUserConstructor()
+void DrawAxisTree3D::bbUserSetDefaultValues()
 { 
         bbSetInputiAxis(0);
      std::vector<double> colour;
@@ -148,13 +148,18 @@ void DrawAxisTree3D::bbUserConstructor()
 
 }
 
-void DrawAxisTree3D::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{  
-}
-
-void DrawAxisTree3D::bbUserDestructor()
-{  
-}
+       
+       //-----------------------------------------------------------------     
+       void DrawAxisTree3D::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void DrawAxisTree3D::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
 
 }
 // EO namespace bbcreaMaracasVisu
index 4553148bc008744335f04329025365bd5c3785f5..34caf18988c274949c3707505ff3c0c0e2a1455f 100644 (file)
@@ -23,14 +23,6 @@ class /*BBTK_EXPORT*/ DrawAxisTree3D
    public bbtk::AtomicBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(DrawAxisTree3D,bbtk::AtomicBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
   BBTK_DECLARE_INPUT(Renderer ,vtkRenderer*);
   BBTK_DECLARE_INPUT(lstIndexs,std::vector<int>);
   BBTK_DECLARE_INPUT(lstPointX,std::vector<double>);
index 35b832c91f953abf02b351136593f3d3d53666a4..bd1e1f5413cf467fc228649d7379514c4fb5fb2a 100644 (file)
@@ -35,21 +35,22 @@ void HistogramView::CreateWidget(wxWindow* parent)
 //     bbSetOutputWidget( wxpanel );
 }
 
-//------------------------------------------------
-void HistogramView::bbUserConstructor()
-{
-
-}
-
-//------------------------------------------------
-void HistogramView::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-}
-
-//------------------------------------------------
-void HistogramView::bbUserDestructor()
-{
-}
+       //-----------------------------------------------------------------     
+       void HistogramView::bbUserSetDefaultValues()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void HistogramView::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void HistogramView::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
 
 }
 // EO namespace bbcreaMaracasVisu
index 28faf0eb1cca5866d28534e2ab6d1516318b537e..554f62ea800a1d68708d9d4c1d9e45bad7d003f2 100644 (file)
@@ -15,14 +15,6 @@ class /*BBTK_EXPORT*/ HistogramView
    public bbtk::WxBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(HistogramView,bbtk::WxBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
        BBTK_DECLARE_INPUT(In, vtkImageData *);
   BBTK_PROCESS(Process);
   void Process();
index 166901c2a7dd663602194a87ad967caac8d3582b..50931410e70ff254a6e9e9b2b97e5b59bfe07f64 100644 (file)
@@ -28,7 +28,7 @@ void ImageActor::Process()
                        bbGetInputRenderer()->AddActor( imageactor );
        }
 }
-void ImageActor::bbUserConstructor()
+void ImageActor::bbUserSetDefaultValues()
 {
     firsttime = true;
     imageactor = NULL;
@@ -38,16 +38,19 @@ void ImageActor::bbUserConstructor()
     bbSetInputRenderer(NULL);
   
 }
-void ImageActor::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-
-  
-}
-void ImageActor::bbUserDestructor()
-{
 
-  
-}
+       
+       //-----------------------------------------------------------------     
+       void ImageActor::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void ImageActor::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
 }
 // EO namespace bbcreaMaracasVisu
 
index e952673c029e84ab248f6d639e1267bd7bb0823d..054a80fd4835f9194e74c0db2b09088c030e253a 100644 (file)
@@ -20,14 +20,6 @@ class bbcreaMaracasVisu_EXPORT ImageActor
    public bbtk::AtomicBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(ImageActor,bbtk::AtomicBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
   BBTK_DECLARE_INPUT(In,vtkImageData*);
   BBTK_DECLARE_INPUT(Transform,vtkLinearTransform*);
   BBTK_DECLARE_INPUT(Renderer,vtkRenderer*);
index 11b365d03767811ffa4c77e824dac93a97621aa7..ce368cc999663effa404d2b3d070be162d38ade4 100644 (file)
@@ -25,24 +25,29 @@ void ImageChangeInformation::Process()
 
   
 }
-void ImageChangeInformation::bbUserConstructor()
+void ImageChangeInformation::bbUserSetDefaultValues()
 {
   mchange = NULL;
    bbSetOutputOut( NULL);
    bbSetInputIn(NULL);
 }
-void ImageChangeInformation::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
+
+void ImageChangeInformation::bbUserInitializeProcessing()
 {
-       mchange = NULL;
+       
 }
-void ImageChangeInformation::bbUserDestructor()
+       
+void ImageChangeInformation::bbUserFinalizeProcessing()
 {
        if (mchange!=NULL)
        {
                mchange->Delete();
        }
 }
+       
 
+       
+       
 }
 // EO namespace bbcreaMaracasVisu
 
index e3afb81b0b15d80b3208c3b3e3f6b3d299824a1e..be986bde72ee20a523de2449e942a8052865f448 100644 (file)
@@ -14,14 +14,6 @@ class /*BBTK_EXPORT*/ ImageChangeInformation
    public bbtk::AtomicBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(ImageChangeInformation,bbtk::AtomicBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
   BBTK_DECLARE_INPUT(In,vtkImageData*);
   BBTK_DECLARE_OUTPUT(Out,vtkImageData*);
   BBTK_PROCESS(Process);
index 51f36eba9a6e543f0b1921a6226b8faa307d56c1..98a59d0840e1fe799482370196c48daf4a65660d 100644 (file)
@@ -37,20 +37,22 @@ void PlotterView::CreateWidget(wxWindow* parent)
 }
 
 //---------------------------------------------------
-void PlotterView::bbUserConstructor()
+void PlotterView::bbUserSetDefaultValues()
 {
        mwxwidget = NULL;
 }
-
-//---------------------------------------------------
-void PlotterView::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-}
-
-//---------------------------------------------------
-void PlotterView::bbUserDestructor()
-{
-}
+       
+       //-----------------------------------------------------------------     
+       void PlotterView::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void PlotterView::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
 
 }
 // EO namespace bbcreaMaracasVisu
index ff4657bed9e81d0b90f640c6229202c960ad5015..d3d0dfe6e918137a790f0c9fade759141502e671 100644 (file)
@@ -13,14 +13,6 @@ class /*BBTK_EXPORT*/ PlotterView
    public bbtk::WxBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(PlotterView,bbtk::WxBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
        BBTK_DECLARE_INPUT(InX, std::vector<double> );
        BBTK_DECLARE_INPUT(InY, std::vector<double> );
   BBTK_PROCESS(Process);
index ccd3092010052435c663fe7927bd6435bdb9a0cb..573627f50a936f9ce2fdb3a49925162390746356 100644 (file)
@@ -210,7 +210,7 @@ void ShowNPoints::CreateWidget(wxWindow* parent)
    Process();  
 }
 
-void ShowNPoints::bbUserConstructor()
+void ShowNPoints::bbUserSetDefaultValues()
 {
        mwxwidget = NULL;
        std::vector<double> colour;
@@ -222,15 +222,18 @@ void ShowNPoints::bbUserConstructor()
        bbSetInputImage(NULL);
        bbSetInputRadio(0.5);
 }
-
-
-void ShowNPoints::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-}
-
-void ShowNPoints::bbUserDestructor()
-{
-}
+       
+       //-----------------------------------------------------------------     
+       void ShowNPoints::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void ShowNPoints::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
 
 }
 // EO namespace bbcreaMaracasVisu
index 7aac0bbdc94ac433d6c00aa534efc21aa09ec03e..2aeacdf18da50b061a842388a020598d9f831c0e 100644 (file)
@@ -53,14 +53,6 @@ class /*BBTK_EXPORT*/ ShowNPoints
    public bbtk::WxBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(ShowNPoints,bbtk::WxBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
   BBTK_DECLARE_INPUT(In, std::vector<int> );
   BBTK_DECLARE_INPUT(Renderer, vtkRenderer* );
   BBTK_DECLARE_INPUT(Image, vtkImageData* );
index a3cc988f5b03b408533fb8026868824a47b1b19f..ce4ea2f904c03b4708c0570b88947d299b1e15fe 100644 (file)
@@ -107,7 +107,7 @@ void SliderMinMax::CreateWidget(wxWindow* parent)
 }
 
 //------------------------------------------------------
-void SliderMinMax::bbUserConstructor()
+void SliderMinMax::bbUserSetDefaultValues()
 {
                mwxwidget = NULL;
                bbSetInputOrientation(1);
@@ -125,15 +125,18 @@ void SliderMinMax::bbUserConstructor()
                bbSetOutputOutActual(0);
 }
 
-//------------------------------------------------------
-void SliderMinMax::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-}
-
-//------------------------------------------------------
-void SliderMinMax::bbUserDestructor()
-{
-}
+               
+       //-----------------------------------------------------------------     
+       void SliderMinMax::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void SliderMinMax::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
 
 }
 // EO namespace bbcreaMaracasVisu
index 7c7ce86ca3ed8b5c051f32563518a4c896b4f889..d62496a813a07c758cdeaa2f76ad6ff919faee76 100644 (file)
@@ -57,14 +57,6 @@ class /*BBTK_EXPORT*/ SliderMinMax
    public bbtk::WxBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(SliderMinMax,bbtk::WxBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
        BBTK_DECLARE_INPUT(Orientation, int);
        BBTK_DECLARE_INPUT(InW, int);
        BBTK_DECLARE_INPUT(InH, int);
index 35e7ad2cd8a1ad29336b1531313ef77266c7a33f..0693ec168a23f3cd8970f2a52968e642e67bcca1 100644 (file)
@@ -21,20 +21,23 @@ void TransferFunctionView::CreateWidget(wxWindow* parent)
 }
 
 //-----------------------------------------------------
-void TransferFunctionView::bbUserConstructor()
+void TransferFunctionView::bbUserSetDefaultValues()
 {
        mwxwidget = NULL;
 }
 
-//-----------------------------------------------------
-void TransferFunctionView::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{
-}
-
-//-----------------------------------------------------
-void TransferFunctionView::bbUserDestructor()
-{
-}
+       
+       //-----------------------------------------------------------------     
+       void TransferFunctionView::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void TransferFunctionView::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
 
 }
 // EO namespace bbcreaMaracasVisu
index abb9864134625994b6fff15543137e019a93048d..e9c3b08148b4f0a08ba0eae7bec6b8de9edd7205 100644 (file)
@@ -14,14 +14,6 @@ class /*BBTK_EXPORT*/ TransferFunctionView
    public bbtk::WxBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(TransferFunctionView,bbtk::WxBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
        BBTK_DECLARE_INPUT(In, vtkImageData*);
   BBTK_PROCESS(Process);
   void Process();
index 4b4e994f38e3ee460e4e1aede39514eaae18eace..f0acd3ae904b0c50db6c8f74b3430577a338b0b1 100644 (file)
@@ -149,22 +149,26 @@ void ViewerMPR::CreateWidget(wxWindow* parent)
        bbSetOutputWidget( wxwidget );
 }
 
-void ViewerMPR::bbUserConstructor()
+void ViewerMPR::bbUserSetDefaultValues()
 {              
                _img = NULL;
                wxwidget = NULL;
                bbSetInputIn(NULL);
 }
-void ViewerMPR::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
-{      
-               wxwidget = NULL;
-               bbSetInputIn(NULL);
 
-}
-void ViewerMPR::bbUserDestructor()
-{
-
-}
+       
+       //-----------------------------------------------------------------     
+       void ViewerMPR::bbUserInitializeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       void ViewerMPR::bbUserFinalizeProcessing()
+       {
+       }
+       
+       //-----------------------------------------------------------------     
+       
 }
 // EO namespace bbcreaMaracasVisu
 
index b8d143c8b88515ba7562f698f23fc73f5afde212..882fa43962a9c386d13dcc24b48acec2455d3e0a 100644 (file)
@@ -57,14 +57,6 @@ class /*BBTK_EXPORT*/ ViewerMPR
    public bbtk::WxBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(ViewerMPR,bbtk::WxBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
   BBTK_DECLARE_INPUT(Title,std::string);
     BBTK_DECLARE_INPUT(In, vtkImageData *);
     BBTK_DECLARE_OUTPUT(Renderer,vtkRenderer *);
index f2ae6d5a10aea6846cf7e793636195b7273f2271..4222d32ec6116ec6d226f65facacc0c5ec6cc7c4 100644 (file)
@@ -43,14 +43,6 @@ class /*BBTK_EXPORT*/ ViewerNV
    public bbtk::WxBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(ViewerNV,bbtk::WxBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer p);
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
-//==================================================================
   BBTK_DECLARE_INPUT(Title,std::string);
       BBTK_DECLARE_INPUT(In, vtkImageData *);
          BBTK_DECLARE_INPUT(nTypeView, std::vector<int> );
index a33f82b246dd597d10446cc8f9f2137f4a340cc9..a79445337bd954bfa0512ffc86aa87d392b6815d 100644 (file)
@@ -24,15 +24,16 @@ SET(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_BUILD_VERSION})
 
 SET(DATA_DIR ${PROJECT_SOURCE_DIR}/data )
-FILE(GLOB DATA_FILES "${DATA_DIR}/*.*")
+FILE(GLOB DATA_FILES "${DATA_DIR}/*.png")
 FOREACH( iLST  ${DATA_FILES} )
    INSTALL( 
         FILES ${iLST}
         DESTINATION bin/data
    )
 ENDFOREACH(iLST)
+
 SET(DATA_DIR ${PROJECT_SOURCE_DIR}/data/Icons )
-FILE(GLOB DATA_FILES "${DATA_DIR}/*.*")
+FILE(GLOB DATA_FILES "${DATA_DIR}/*.xpm")
 FOREACH( iLST  ${DATA_FILES} )
    INSTALL( 
         FILES ${iLST}
index 2f4f89097776a3760c038cee2c4a83e9517958af..f13867d4793addeb0e41a945be5937bdc6d40c61 100644 (file)
@@ -1,6 +1,7 @@
 
 #include "ContourVOIWidget.h"
 
+#include "manualContourModelRoi.h"
 #include <vtkImageMapToColors.h>
 #include <vtkImageActor.h>
 
index abd49ac7be9168e837138298e636b0a65c140628..2cf11538f62a7d1e3bde955b14f3bfdc073b7c08 100644 (file)
@@ -3,7 +3,10 @@
 #define __ContourVOIWidget_h_INCLUDED_H__
 
 
-#include <manualContour.h>
+
+#include <manualRoiControler.h>
+#include <manualViewRoi.h>
+#include "wxVtkBaseView.h"
 #include "mBarRange.h"
 #include "marTypes.h"
   
index 3096880737d0d0690be6634ff1457b37acc17e6c..213e385cdbed544301618dbe0014cf481df11d32 100644 (file)
@@ -1,7 +1,6 @@
 #ifndef __contoursIntersection_h_INCLUDED__
 #define __contoursIntersection_h_INCLUDED__
 
-#include "manualContour.h"
 #include "vectorFunctions.h"
 
 class contoursIntersection