From 738e5bef4c52a1f25013e598a008a81f20fc6f63 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Mon, 18 May 2009 15:59:22 +0000 Subject: [PATCH] . --- bbtk/src/bbcreaMaracasVisuIRMViewer.cxx | 49 ++++++++------- bbtk/src/bbcreaMaracasVisuIRMViewer.h | 8 --- bbtk/src/bbcreaMaracasVisuSTL.cxx | 38 +++++------ bbtk/src/bbcreaMaracasVisuSTL.h | 8 --- bbtk/src/bbcreaMaracasVisuSliceImage.cxx | 34 +++++----- bbtk/src/bbcreaMaracasVisuSliceImage.h | 8 --- bbtk/src/bbmaracasvisuAxeVolume.cxx | 32 +++++----- bbtk/src/bbmaracasvisuAxeVolume.h | 8 --- bbtk/src/bbmaracasvisuColorBar.cxx | 26 ++++---- bbtk/src/bbmaracasvisuColorBar.h | 8 --- bbtk/src/bbmaracasvisuContourCrown.cxx | 23 ++++--- bbtk/src/bbmaracasvisuContourCrown.h | 8 --- bbtk/src/bbmaracasvisuContourStatistics.cxx | 24 ++++--- bbtk/src/bbmaracasvisuContourStatistics.h | 8 --- .../bbmaracasvisuContourToControlPoints.cxx | 49 ++++++++++----- .../src/bbmaracasvisuContourToControlPoints.h | 9 --- bbtk/src/bbmaracasvisuContourVOI.cxx | 28 ++++----- bbtk/src/bbmaracasvisuContourVOI.h | 8 --- bbtk/src/bbmaracasvisuDrawAxe3D.cxx | 63 ++++++++++++++----- bbtk/src/bbmaracasvisuDrawAxe3D.h | 16 ++--- bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx | 23 ++++--- bbtk/src/bbmaracasvisuDrawAxisTree3D.h | 8 --- bbtk/src/bbmaracasvisuHistogramView.cxx | 31 ++++----- bbtk/src/bbmaracasvisuHistogramView.h | 8 --- bbtk/src/bbmaracasvisuImageActor.cxx | 23 ++++--- bbtk/src/bbmaracasvisuImageActor.h | 8 --- .../bbmaracasvisuImageChangeInformation.cxx | 13 ++-- .../src/bbmaracasvisuImageChangeInformation.h | 8 --- bbtk/src/bbmaracasvisuPlotterView.cxx | 24 +++---- bbtk/src/bbmaracasvisuPlotterView.h | 8 --- bbtk/src/bbmaracasvisuShowNPoints.cxx | 23 ++++--- bbtk/src/bbmaracasvisuShowNPoints.h | 8 --- bbtk/src/bbmaracasvisuSliderMinMax.cxx | 23 ++++--- bbtk/src/bbmaracasvisuSliderMinMax.h | 8 --- .../src/bbmaracasvisuTransferFunctionView.cxx | 23 ++++--- bbtk/src/bbmaracasvisuTransferFunctionView.h | 8 --- bbtk/src/bbmaracasvisuViewerMPR.cxx | 24 ++++--- bbtk/src/bbmaracasvisuViewerMPR.h | 8 --- bbtk/src/bbmaracasvisuViewerNV.h | 8 --- install/CMakeLists.txt | 5 +- .../wxWindows/Contour/ContourVOIWidget.cxx | 1 + .../wxWindows/Contour/ContourVOIWidget.h | 5 +- .../wxWindows/Contour/contoursIntersection.h | 1 - 43 files changed, 351 insertions(+), 403 deletions(-) diff --git a/bbtk/src/bbcreaMaracasVisuIRMViewer.cxx b/bbtk/src/bbcreaMaracasVisuIRMViewer.cxx index 20e41fb..b64a85f 100644 --- a/bbtk/src/bbcreaMaracasVisuIRMViewer.cxx +++ b/bbtk/src/bbcreaMaracasVisuIRMViewer.cxx @@ -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 diff --git a/bbtk/src/bbcreaMaracasVisuIRMViewer.h b/bbtk/src/bbcreaMaracasVisuIRMViewer.h index 12f7563..1883379 100644 --- a/bbtk/src/bbcreaMaracasVisuIRMViewer.h +++ b/bbtk/src/bbcreaMaracasVisuIRMViewer.h @@ -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*); diff --git a/bbtk/src/bbcreaMaracasVisuSTL.cxx b/bbtk/src/bbcreaMaracasVisuSTL.cxx index 8217e9a..425b868 100644 --- a/bbtk/src/bbcreaMaracasVisuSTL.cxx +++ b/bbtk/src/bbcreaMaracasVisuSTL.cxx @@ -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 diff --git a/bbtk/src/bbcreaMaracasVisuSTL.h b/bbtk/src/bbcreaMaracasVisuSTL.h index 1573928..fd59bb5 100644 --- a/bbtk/src/bbcreaMaracasVisuSTL.h +++ b/bbtk/src/bbcreaMaracasVisuSTL.h @@ -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(); diff --git a/bbtk/src/bbcreaMaracasVisuSliceImage.cxx b/bbtk/src/bbcreaMaracasVisuSliceImage.cxx index 363252e..95991aa 100644 --- a/bbtk/src/bbcreaMaracasVisuSliceImage.cxx +++ b/bbtk/src/bbcreaMaracasVisuSliceImage.cxx @@ -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 diff --git a/bbtk/src/bbcreaMaracasVisuSliceImage.h b/bbtk/src/bbcreaMaracasVisuSliceImage.h index 0b30b20..c22e5d8 100644 --- a/bbtk/src/bbcreaMaracasVisuSliceImage.h +++ b/bbtk/src/bbcreaMaracasVisuSliceImage.h @@ -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*); diff --git a/bbtk/src/bbmaracasvisuAxeVolume.cxx b/bbtk/src/bbmaracasvisuAxeVolume.cxx index dc82eda..dfadc27 100644 --- a/bbtk/src/bbmaracasvisuAxeVolume.cxx +++ b/bbtk/src/bbmaracasvisuAxeVolume.cxx @@ -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 diff --git a/bbtk/src/bbmaracasvisuAxeVolume.h b/bbtk/src/bbmaracasvisuAxeVolume.h index 5048679..d1a8a43 100644 --- a/bbtk/src/bbmaracasvisuAxeVolume.h +++ b/bbtk/src/bbmaracasvisuAxeVolume.h @@ -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 ); BBTK_DECLARE_INPUT( lstPointY , std::vector ); diff --git a/bbtk/src/bbmaracasvisuColorBar.cxx b/bbtk/src/bbmaracasvisuColorBar.cxx index 1a2c087..e8e6142 100644 --- a/bbtk/src/bbmaracasvisuColorBar.cxx +++ b/bbtk/src/bbmaracasvisuColorBar.cxx @@ -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 diff --git a/bbtk/src/bbmaracasvisuColorBar.h b/bbtk/src/bbmaracasvisuColorBar.h index dbc9658..5adb258 100644 --- a/bbtk/src/bbmaracasvisuColorBar.h +++ b/bbtk/src/bbmaracasvisuColorBar.h @@ -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 ); diff --git a/bbtk/src/bbmaracasvisuContourCrown.cxx b/bbtk/src/bbmaracasvisuContourCrown.cxx index 9ece377..1c9e0ea 100644 --- a/bbtk/src/bbmaracasvisuContourCrown.cxx +++ b/bbtk/src/bbmaracasvisuContourCrown.cxx @@ -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 diff --git a/bbtk/src/bbmaracasvisuContourCrown.h b/bbtk/src/bbmaracasvisuContourCrown.h index 2724153..74e3725 100644 --- a/bbtk/src/bbmaracasvisuContourCrown.h +++ b/bbtk/src/bbmaracasvisuContourCrown.h @@ -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 ------------------------------------------------------- diff --git a/bbtk/src/bbmaracasvisuContourStatistics.cxx b/bbtk/src/bbmaracasvisuContourStatistics.cxx index 3121923..bcf7c9c 100644 --- a/bbtk/src/bbmaracasvisuContourStatistics.cxx +++ b/bbtk/src/bbmaracasvisuContourStatistics.cxx @@ -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 diff --git a/bbtk/src/bbmaracasvisuContourStatistics.h b/bbtk/src/bbmaracasvisuContourStatistics.h index 90d6d7a..6466f2c 100644 --- a/bbtk/src/bbmaracasvisuContourStatistics.h +++ b/bbtk/src/bbmaracasvisuContourStatistics.h @@ -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*); BBTK_DECLARE_INPUT(LstValuePosX,std::vector*); BBTK_DECLARE_INPUT(LstValuePosY,std::vector*); diff --git a/bbtk/src/bbmaracasvisuContourToControlPoints.cxx b/bbtk/src/bbmaracasvisuContourToControlPoints.cxx index e75ffee..fabcee3 100644 --- a/bbtk/src/bbmaracasvisuContourToControlPoints.cxx +++ b/bbtk/src/bbmaracasvisuContourToControlPoints.cxx @@ -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 diff --git a/bbtk/src/bbmaracasvisuContourToControlPoints.h b/bbtk/src/bbmaracasvisuContourToControlPoints.h index de3904c..3a9d443 100644 --- a/bbtk/src/bbmaracasvisuContourToControlPoints.h +++ b/bbtk/src/bbmaracasvisuContourToControlPoints.h @@ -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); diff --git a/bbtk/src/bbmaracasvisuContourVOI.cxx b/bbtk/src/bbmaracasvisuContourVOI.cxx index dfdfb8d..dfb6202 100644 --- a/bbtk/src/bbmaracasvisuContourVOI.cxx +++ b/bbtk/src/bbmaracasvisuContourVOI.cxx @@ -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 diff --git a/bbtk/src/bbmaracasvisuContourVOI.h b/bbtk/src/bbmaracasvisuContourVOI.h index edc2ebc..5395fbe 100644 --- a/bbtk/src/bbmaracasvisuContourVOI.h +++ b/bbtk/src/bbmaracasvisuContourVOI.h @@ -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*); diff --git a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx index 5a0a17d..14db370 100644 --- a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx +++ b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx @@ -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 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; + } + + } + + //----------------------------------------------------------------- + + + } diff --git a/bbtk/src/bbmaracasvisuDrawAxe3D.h b/bbtk/src/bbmaracasvisuDrawAxe3D.h index 6058c47..a96ad4f 100644 --- a/bbtk/src/bbmaracasvisuDrawAxe3D.h +++ b/bbtk/src/bbmaracasvisuDrawAxe3D.h @@ -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); BBTK_DECLARE_INPUT(lstPointY,std::vector); @@ -37,9 +30,10 @@ virtual void bbUserDestructor(); void Process(); private: - bool firsttime; - vtkPolyData *mallData; - vtkActor *mvtkactor; + bool firsttime; + vtkPolyData *mallData; + vtkActor *mvtkactor; + vtkPolyDataMapper *polydatamapper; }; diff --git a/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx b/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx index 9af83d5..a283fe8 100644 --- a/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx +++ b/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx @@ -40,7 +40,7 @@ void DrawAxisTree3D::DrawOneAxis(int iGeneral,int numPoints, int iAxis) for (i=iGeneral;iInsertNextPoint( 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 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 diff --git a/bbtk/src/bbmaracasvisuDrawAxisTree3D.h b/bbtk/src/bbmaracasvisuDrawAxisTree3D.h index 4553148..34caf18 100644 --- a/bbtk/src/bbmaracasvisuDrawAxisTree3D.h +++ b/bbtk/src/bbmaracasvisuDrawAxisTree3D.h @@ -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); BBTK_DECLARE_INPUT(lstPointX,std::vector); diff --git a/bbtk/src/bbmaracasvisuHistogramView.cxx b/bbtk/src/bbmaracasvisuHistogramView.cxx index 35b832c..bd1e1f5 100644 --- a/bbtk/src/bbmaracasvisuHistogramView.cxx +++ b/bbtk/src/bbmaracasvisuHistogramView.cxx @@ -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 diff --git a/bbtk/src/bbmaracasvisuHistogramView.h b/bbtk/src/bbmaracasvisuHistogramView.h index 28faf0e..554f62e 100644 --- a/bbtk/src/bbmaracasvisuHistogramView.h +++ b/bbtk/src/bbmaracasvisuHistogramView.h @@ -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(); diff --git a/bbtk/src/bbmaracasvisuImageActor.cxx b/bbtk/src/bbmaracasvisuImageActor.cxx index 166901c..5093141 100644 --- a/bbtk/src/bbmaracasvisuImageActor.cxx +++ b/bbtk/src/bbmaracasvisuImageActor.cxx @@ -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 diff --git a/bbtk/src/bbmaracasvisuImageActor.h b/bbtk/src/bbmaracasvisuImageActor.h index e952673..054a80f 100644 --- a/bbtk/src/bbmaracasvisuImageActor.h +++ b/bbtk/src/bbmaracasvisuImageActor.h @@ -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*); diff --git a/bbtk/src/bbmaracasvisuImageChangeInformation.cxx b/bbtk/src/bbmaracasvisuImageChangeInformation.cxx index 11b365d..ce368cc 100644 --- a/bbtk/src/bbmaracasvisuImageChangeInformation.cxx +++ b/bbtk/src/bbmaracasvisuImageChangeInformation.cxx @@ -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 diff --git a/bbtk/src/bbmaracasvisuImageChangeInformation.h b/bbtk/src/bbmaracasvisuImageChangeInformation.h index e3afb81..be986bd 100644 --- a/bbtk/src/bbmaracasvisuImageChangeInformation.h +++ b/bbtk/src/bbmaracasvisuImageChangeInformation.h @@ -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); diff --git a/bbtk/src/bbmaracasvisuPlotterView.cxx b/bbtk/src/bbmaracasvisuPlotterView.cxx index 51f36eb..98a59d0 100644 --- a/bbtk/src/bbmaracasvisuPlotterView.cxx +++ b/bbtk/src/bbmaracasvisuPlotterView.cxx @@ -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 diff --git a/bbtk/src/bbmaracasvisuPlotterView.h b/bbtk/src/bbmaracasvisuPlotterView.h index ff4657b..d3d0dfe 100644 --- a/bbtk/src/bbmaracasvisuPlotterView.h +++ b/bbtk/src/bbmaracasvisuPlotterView.h @@ -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 ); BBTK_DECLARE_INPUT(InY, std::vector ); BBTK_PROCESS(Process); diff --git a/bbtk/src/bbmaracasvisuShowNPoints.cxx b/bbtk/src/bbmaracasvisuShowNPoints.cxx index ccd3092..573627f 100644 --- a/bbtk/src/bbmaracasvisuShowNPoints.cxx +++ b/bbtk/src/bbmaracasvisuShowNPoints.cxx @@ -210,7 +210,7 @@ void ShowNPoints::CreateWidget(wxWindow* parent) Process(); } -void ShowNPoints::bbUserConstructor() +void ShowNPoints::bbUserSetDefaultValues() { mwxwidget = NULL; std::vector 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 diff --git a/bbtk/src/bbmaracasvisuShowNPoints.h b/bbtk/src/bbmaracasvisuShowNPoints.h index 7aac0bb..2aeacdf 100644 --- a/bbtk/src/bbmaracasvisuShowNPoints.h +++ b/bbtk/src/bbmaracasvisuShowNPoints.h @@ -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 ); BBTK_DECLARE_INPUT(Renderer, vtkRenderer* ); BBTK_DECLARE_INPUT(Image, vtkImageData* ); diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.cxx b/bbtk/src/bbmaracasvisuSliderMinMax.cxx index a3cc988..ce4ea2f 100644 --- a/bbtk/src/bbmaracasvisuSliderMinMax.cxx +++ b/bbtk/src/bbmaracasvisuSliderMinMax.cxx @@ -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 diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.h b/bbtk/src/bbmaracasvisuSliderMinMax.h index 7c7ce86..d62496a 100644 --- a/bbtk/src/bbmaracasvisuSliderMinMax.h +++ b/bbtk/src/bbmaracasvisuSliderMinMax.h @@ -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); diff --git a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx index 35e7ad2..0693ec1 100644 --- a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx +++ b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx @@ -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 diff --git a/bbtk/src/bbmaracasvisuTransferFunctionView.h b/bbtk/src/bbmaracasvisuTransferFunctionView.h index abb9864..e9c3b08 100644 --- a/bbtk/src/bbmaracasvisuTransferFunctionView.h +++ b/bbtk/src/bbmaracasvisuTransferFunctionView.h @@ -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(); diff --git a/bbtk/src/bbmaracasvisuViewerMPR.cxx b/bbtk/src/bbmaracasvisuViewerMPR.cxx index 4b4e994..f0acd3a 100644 --- a/bbtk/src/bbmaracasvisuViewerMPR.cxx +++ b/bbtk/src/bbmaracasvisuViewerMPR.cxx @@ -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 diff --git a/bbtk/src/bbmaracasvisuViewerMPR.h b/bbtk/src/bbmaracasvisuViewerMPR.h index b8d143c..882fa43 100644 --- a/bbtk/src/bbmaracasvisuViewerMPR.h +++ b/bbtk/src/bbmaracasvisuViewerMPR.h @@ -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 *); diff --git a/bbtk/src/bbmaracasvisuViewerNV.h b/bbtk/src/bbmaracasvisuViewerNV.h index f2ae6d5..4222d32 100644 --- a/bbtk/src/bbmaracasvisuViewerNV.h +++ b/bbtk/src/bbmaracasvisuViewerNV.h @@ -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 ); diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt index a33f82b..a794453 100644 --- a/install/CMakeLists.txt +++ b/install/CMakeLists.txt @@ -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} diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx index 2f4f890..f13867d 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.cxx @@ -1,6 +1,7 @@ #include "ContourVOIWidget.h" +#include "manualContourModelRoi.h" #include #include diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.h index abd49ac..2cf1153 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.h @@ -3,7 +3,10 @@ #define __ContourVOIWidget_h_INCLUDED_H__ -#include + +#include +#include +#include "wxVtkBaseView.h" #include "mBarRange.h" #include "marTypes.h" diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/contoursIntersection.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/contoursIntersection.h index 3096880..213e385 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/contoursIntersection.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/contoursIntersection.h @@ -1,7 +1,6 @@ #ifndef __contoursIntersection_h_INCLUDED__ #define __contoursIntersection_h_INCLUDED__ -#include "manualContour.h" #include "vectorFunctions.h" class contoursIntersection -- 2.46.2