From 800f29fd7e4cc70d8706b3075454e63f0b1a5717 Mon Sep 17 00:00:00 2001 From: guigues Date: Fri, 21 Nov 2008 15:12:21 +0000 Subject: [PATCH] Changed bbtk package name to comply to coding style --- CMakeLists.txt | 2 +- bbtk/CMakeLists.txt | 6 +++--- bbtk/src/bbmaracasvisuColorBar.cxx | 8 ++++---- bbtk/src/bbmaracasvisuColorBar.h | 15 ++++++--------- bbtk/src/bbmaracasvisuContourCrown.cxx | 8 ++++---- bbtk/src/bbmaracasvisuContourCrown.h | 10 +++++----- bbtk/src/bbmaracasvisuContourStatistics.cxx | 8 ++++---- bbtk/src/bbmaracasvisuContourStatistics.h | 10 +++++----- bbtk/src/bbmaracasvisuContourToControlPoints.cxx | 8 ++++---- bbtk/src/bbmaracasvisuContourToControlPoints.h | 10 +++++----- bbtk/src/bbmaracasvisuContourVOI.cxx | 8 ++++---- bbtk/src/bbmaracasvisuContourVOI.h | 10 +++++----- bbtk/src/bbmaracasvisuHistogramView.cxx | 8 ++++---- bbtk/src/bbmaracasvisuHistogramView.h | 10 +++++----- bbtk/src/bbmaracasvisuImageChangeInformation.cxx | 8 ++++---- bbtk/src/bbmaracasvisuImageChangeInformation.h | 10 +++++----- bbtk/src/bbmaracasvisuPlotterView.cxx | 8 ++++---- bbtk/src/bbmaracasvisuPlotterView.h | 10 +++++----- bbtk/src/bbmaracasvisuSliderMinMax.cxx | 8 ++++---- bbtk/src/bbmaracasvisuSliderMinMax.h | 10 +++++----- bbtk/src/bbmaracasvisuTransferFunctionView.cxx | 8 ++++---- bbtk/src/bbmaracasvisuTransferFunctionView.h | 10 +++++----- bbtk/src/bbmaracasvisuViewerMPR.cxx | 8 ++++---- bbtk/src/bbmaracasvisuViewerMPR.h | 10 +++++----- bbtk/src/bbmaracasvisuViewerNV.cxx | 8 ++++---- bbtk/src/bbmaracasvisuViewerNV.h | 10 +++++----- lib/maracasVisuLib/CMakeLists.txt | 2 +- 27 files changed, 114 insertions(+), 117 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 615047e..eb83e11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VER CMAKE_POLICY(SET CMP0005 NEW) ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4) -PROJECT(creaMaracasVisu) +PROJECT(CreaMaracasVisu) SET(PROJECT_MAJOR_VERSION 1) SET(PROJECT_MINOR_VERSION 0) diff --git a/bbtk/CMakeLists.txt b/bbtk/CMakeLists.txt index d475b03..0ccc6db 100644 --- a/bbtk/CMakeLists.txt +++ b/bbtk/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_MFC_FLAG 2) #=========================================================================== # THE NAME OF THE BBTK PACKAGE -SET(BBTK_PACKAGE_NAME maracasvisu) +SET(BBTK_PACKAGE_NAME creaMaracasVisu) #=========================================================================== @@ -27,7 +27,7 @@ SET(${BBTK_PACKAGE_NAME}_AUTHOR "eduardo.davila [at] creatis.insa-lyon.fr") #=========================================================================== # PACKAGE DESCRIPTION -SET(${BBTK_PACKAGE_NAME}_DESCRIPTION "Maracas library") +SET(${BBTK_PACKAGE_NAME}_DESCRIPTION "Maracas library. LG : what does it provide ?") #=========================================================================== #=========================================================================== @@ -357,7 +357,7 @@ SET(${BBTK_PACKAGE_NAME}_LIBS # LIST HERE THE ADDITIONAL LIBS TO LINK AGAINST # EXCEPT : the same libs than for INCLUDE_DIRS ### ${MYSQL_LIBRARIES} - maracasVisuLib + creaMaracasVisu ### ILPDModel.lib ### ILPDInterface ### ILPDcontrolerInterface diff --git a/bbtk/src/bbmaracasvisuColorBar.cxx b/bbtk/src/bbmaracasvisuColorBar.cxx index 7e57f4d..7b39dd8 100644 --- a/bbtk/src/bbmaracasvisuColorBar.cxx +++ b/bbtk/src/bbmaracasvisuColorBar.cxx @@ -1,9 +1,9 @@ #include "bbmaracasvisuColorBar.h" -#include "bbmaracasvisuPackage.h" -namespace bbmaracasvisu +#include "bbcreaMaracasVisuPackage.h" +namespace bbcreaMaracasVisu { -BBTK_ADD_BLACK_BOX_TO_PACKAGE(maracasvisu,ColorBar) +BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ColorBar) BBTK_BLACK_BOX_IMPLEMENTATION(ColorBar,bbtk::WxBlackBox); //-------------------------------------------------- @@ -64,6 +64,6 @@ void ColorBar::bbUserDestructor() } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu diff --git a/bbtk/src/bbmaracasvisuColorBar.h b/bbtk/src/bbmaracasvisuColorBar.h index f1a92bf..e1568d4 100644 --- a/bbtk/src/bbmaracasvisuColorBar.h +++ b/bbtk/src/bbmaracasvisuColorBar.h @@ -1,14 +1,13 @@ #ifdef _USE_WXWIDGETS_ -#ifndef __bbmaracasvisuColorBar_h_INCLUDED__ -#define __bbmaracasvisuColorBar_h_INCLUDED__ +#ifndef __bbcreaMaracasVisuColorBar_h_INCLUDED__ +#define __bbcreaMaracasVisuColorBar_h_INCLUDED__ #include "bbtkWxBlackBox.h" -#include "bbmaracasvisuColorBar.h" -#include "bbmaracasvisuPackage.h" +#include "bbcreaMaracasVisuPackage.h" #include "pColorBar.h" -namespace bbmaracasvisu +namespace bbcreaMaracasVisu { class /*BBTK_EXPORT*/ ColorBar @@ -47,8 +46,6 @@ BBTK_NAME("ColorBar"); BBTK_AUTHOR("eduardo.davila [at] creatis.insa-lyon.fr"); BBTK_DESCRIPTION("Degrade Color Bar Window"); //BBTK_CATEGORY("__CategoryBlackBox__"); - BBTK_AUTHOR("eduardo.davila [at] creatis.insa-lyon.fr"); - BBTK_DESCRIPTION("Degrade Color Bar Window"); BBTK_INPUT(ColorBar,Orientation,"Orientation ", int,""); BBTK_INPUT(ColorBar,InW,"Width ", int,""); BBTK_INPUT(ColorBar,InH,"Height ", int,""); @@ -60,8 +57,8 @@ BBTK_DESCRIPTION("Degrade Color Bar Window"); BBTK_INPUT(ColorBar,Values, "Values ",std::vector,""); BBTK_END_DESCRIBE_BLACK_BOX(ColorBar); } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu -#endif // __bbmaracasvisuColorBar_h_INCLUDED__ +#endif // __bbcreaMaracasVisuColorBar_h_INCLUDED__ #endif // _USE_WXWIDGETS_ diff --git a/bbtk/src/bbmaracasvisuContourCrown.cxx b/bbtk/src/bbmaracasvisuContourCrown.cxx index e9a2a47..fde8bf6 100644 --- a/bbtk/src/bbmaracasvisuContourCrown.cxx +++ b/bbtk/src/bbmaracasvisuContourCrown.cxx @@ -1,12 +1,12 @@ #include "bbmaracasvisuContourCrown.h" -#include "bbmaracasvisuPackage.h" +#include "bbcreaMaracasVisuPackage.h" #include -namespace bbmaracasvisu +namespace bbcreaMaracasVisu { -BBTK_ADD_BLACK_BOX_TO_PACKAGE(maracasvisu,ContourCrown) +BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ContourCrown) BBTK_BLACK_BOX_IMPLEMENTATION(ContourCrown,bbtk::WxBlackBox); //----------------------------------------------------------- @@ -86,6 +86,6 @@ void ContourCrown::bbUserDestructor() } } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu diff --git a/bbtk/src/bbmaracasvisuContourCrown.h b/bbtk/src/bbmaracasvisuContourCrown.h index 7ef6ba5..9dbf038 100644 --- a/bbtk/src/bbmaracasvisuContourCrown.h +++ b/bbtk/src/bbmaracasvisuContourCrown.h @@ -1,13 +1,13 @@ #ifdef _USE_WXWIDGETS_ -#ifndef __bbmaracasvisuContourCrown_h_INCLUDED__ -#define __bbmaracasvisuContourCrown_h_INCLUDED__ +#ifndef __bbcreaMaracasVisuContourCrown_h_INCLUDED__ +#define __bbcreaMaracasVisuContourCrown_h_INCLUDED__ #include "bbtkWxBlackBox.h" #include #include "Contour/ContourCrownWidget.h" -namespace bbmaracasvisu +namespace bbcreaMaracasVisu { class /*BBTK_EXPORT*/ ContourCrown @@ -87,8 +87,8 @@ BBTK_DESCRIPTION("Contour crown tool"); BBTK_OUTPUT(ContourCrown,ImageMaskResult, "vtkImagedata with the mask" , vtkImageData *,"" ); BBTK_END_DESCRIBE_BLACK_BOX(ContourCrown); } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu -#endif // __bbmaracasvisuContourCrown_h_INCLUDED__ +#endif // __bbcreaMaracasVisuContourCrown_h_INCLUDED__ #endif // _USE_WXWIDGETS_ diff --git a/bbtk/src/bbmaracasvisuContourStatistics.cxx b/bbtk/src/bbmaracasvisuContourStatistics.cxx index ac7526b..722802e 100644 --- a/bbtk/src/bbmaracasvisuContourStatistics.cxx +++ b/bbtk/src/bbmaracasvisuContourStatistics.cxx @@ -1,10 +1,10 @@ #include "bbmaracasvisuContourStatistics.h" -#include "bbmaracasvisuPackage.h" +#include "bbcreaMaracasVisuPackage.h" #include -namespace bbmaracasvisu +namespace bbcreaMaracasVisu { -BBTK_ADD_BLACK_BOX_TO_PACKAGE(maracasvisu,ContourStatistics) +BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ContourStatistics) BBTK_BLACK_BOX_IMPLEMENTATION(ContourStatistics,bbtk::AtomicBlackBox); //------------------------------------------------------------ @@ -71,6 +71,6 @@ void ContourStatistics::bbUserDestructor() } } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu diff --git a/bbtk/src/bbmaracasvisuContourStatistics.h b/bbtk/src/bbmaracasvisuContourStatistics.h index 150632e..af0e98f 100644 --- a/bbtk/src/bbmaracasvisuContourStatistics.h +++ b/bbtk/src/bbmaracasvisuContourStatistics.h @@ -1,9 +1,9 @@ -#ifndef __bbmaracasvisuContourStatistics_h_INCLUDED__ -#define __bbmaracasvisuContourStatistics_h_INCLUDED__ +#ifndef __bbcreaMaracasVisuContourStatistics_h_INCLUDED__ +#define __bbcreaMaracasVisuContourStatistics_h_INCLUDED__ #include "bbtkAtomicBlackBox.h" #include "iostream" -namespace bbmaracasvisu +namespace bbcreaMaracasVisu { class /*BBTK_EXPORT*/ ContourStatistics @@ -48,7 +48,7 @@ BBTK_CATEGORY("math"); BBTK_OUTPUT(ContourStatistics,nPoints,"Number of values",int,""); BBTK_END_DESCRIBE_BLACK_BOX(ContourStatistics); } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu -#endif // __bbmaracasvisuContourStatistics_h_INCLUDED__ +#endif // __bbcreaMaracasVisuContourStatistics_h_INCLUDED__ diff --git a/bbtk/src/bbmaracasvisuContourToControlPoints.cxx b/bbtk/src/bbmaracasvisuContourToControlPoints.cxx index 02db285..f17182d 100644 --- a/bbtk/src/bbmaracasvisuContourToControlPoints.cxx +++ b/bbtk/src/bbmaracasvisuContourToControlPoints.cxx @@ -2,11 +2,11 @@ #ifdef _USE_ITK_ #include "bbmaracasvisuContourToControlPoints.h" -#include "bbmaracasvisuPackage.h" -namespace bbmaracasvisu +#include "bbcreaMaracasVisuPackage.h" +namespace bbcreaMaracasVisu { -BBTK_ADD_BLACK_BOX_TO_PACKAGE(maracasvisu,ContourToControlPoints) +BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ContourToControlPoints) //BBTK_USER_BLACK_BOX_IMPLEMENTATION(ContourToControlPoints,bbtk::AtomicBlackBox); BBTK_BLACK_BOX_IMPLEMENTATION(ContourToControlPoints,bbtk::AtomicBlackBox); @@ -144,7 +144,7 @@ void ContourToControlPoints::bbUserDestructor() } } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu #endif //_USE_ITK_ #endif //_USE_VTK_ diff --git a/bbtk/src/bbmaracasvisuContourToControlPoints.h b/bbtk/src/bbmaracasvisuContourToControlPoints.h index 48553fa..55f4b34 100644 --- a/bbtk/src/bbmaracasvisuContourToControlPoints.h +++ b/bbtk/src/bbmaracasvisuContourToControlPoints.h @@ -1,5 +1,5 @@ -#ifndef __bbmaracasvisuContourToControlPoints_h_INCLUDED__ -#define __bbmaracasvisuContourToControlPoints_h_INCLUDED__ +#ifndef __bbcreaMaracasVisuContourToControlPoints_h_INCLUDED__ +#define __bbcreaMaracasVisuContourToControlPoints_h_INCLUDED__ #include "bbtkAtomicBlackBox.h" #include "iostream" @@ -9,7 +9,7 @@ #include "vtkImageData.h" -namespace bbmaracasvisu +namespace bbcreaMaracasVisu { class /*BBTK_EXPORT*/ ContourToControlPoints @@ -92,7 +92,7 @@ BBTK_CATEGORY("filter"); BBTK_OUTPUT(ContourToControlPoints,ImagePropg,"vtkImageData of the propagation image-3D",vtkImageData*,""); BBTK_END_DESCRIBE_BLACK_BOX(ContourToControlPoints); } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu -#endif // __bbmaracasvisuContourToControlPoints_h_INCLUDED__ +#endif // __bbcreaMaracasVisuContourToControlPoints_h_INCLUDED__ diff --git a/bbtk/src/bbmaracasvisuContourVOI.cxx b/bbtk/src/bbmaracasvisuContourVOI.cxx index 61911be..72650fd 100644 --- a/bbtk/src/bbmaracasvisuContourVOI.cxx +++ b/bbtk/src/bbmaracasvisuContourVOI.cxx @@ -2,8 +2,8 @@ //HOLA!!! #include "bbmaracasvisuContourVOI.h" -#include "bbmaracasvisuPackage.h" -namespace bbmaracasvisu +#include "bbcreaMaracasVisuPackage.h" +namespace bbcreaMaracasVisu { //-------------------------------------------------------------------------- @@ -87,7 +87,7 @@ ContourVOIWidget* wxWidgetVOI::GetContourVOIWidget() //------------------------------------------------------ -BBTK_ADD_BLACK_BOX_TO_PACKAGE(maracasvisu,ContourVOI) +BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ContourVOI) BBTK_BLACK_BOX_IMPLEMENTATION(ContourVOI,bbtk::WxBlackBox); //------------------------------------------------------ @@ -145,6 +145,6 @@ void ContourVOI::bbUserDestructor() } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu diff --git a/bbtk/src/bbmaracasvisuContourVOI.h b/bbtk/src/bbmaracasvisuContourVOI.h index 4f55e46..7c5ad73 100644 --- a/bbtk/src/bbmaracasvisuContourVOI.h +++ b/bbtk/src/bbmaracasvisuContourVOI.h @@ -1,8 +1,8 @@ #ifdef _USE_WXWIDGETS_ -#ifndef __bbmaracasvisuContourVOI_h_INCLUDED__ -#define __bbmaracasvisuContourVOI_h_INCLUDED__ +#ifndef __bbcreaMaracasVisuContourVOI_h_INCLUDED__ +#define __bbcreaMaracasVisuContourVOI_h_INCLUDED__ #include "bbtkWxBlackBox.h" @@ -10,7 +10,7 @@ #include "Contour/ContourVOIWidget.h" -namespace bbmaracasvisu +namespace bbcreaMaracasVisu { @@ -85,8 +85,8 @@ BBTK_DESCRIPTION("define VOI widget"); BBTK_OUTPUT(ContourVOI,Size, "Size" , std::string,""); BBTK_END_DESCRIBE_BLACK_BOX(ContourVOI); } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu -#endif // __bbmaracasvisuContourVOI_h_INCLUDED__ +#endif // __bbcreaMaracasVisuContourVOI_h_INCLUDED__ #endif // _USE_WXWIDGETS_ diff --git a/bbtk/src/bbmaracasvisuHistogramView.cxx b/bbtk/src/bbmaracasvisuHistogramView.cxx index 7eab151..27078bb 100644 --- a/bbtk/src/bbmaracasvisuHistogramView.cxx +++ b/bbtk/src/bbmaracasvisuHistogramView.cxx @@ -1,12 +1,12 @@ #include "bbmaracasvisuHistogramView.h" -#include "bbmaracasvisuPackage.h" +#include "bbcreaMaracasVisuPackage.h" #include "Histogram.h" -namespace bbmaracasvisu +namespace bbcreaMaracasVisu { -BBTK_ADD_BLACK_BOX_TO_PACKAGE(maracasvisu,HistogramView) +BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,HistogramView) BBTK_BLACK_BOX_IMPLEMENTATION(HistogramView,bbtk::WxBlackBox); //------------------------------------------------ @@ -39,6 +39,6 @@ void HistogramView::bbUserDestructor() } } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu diff --git a/bbtk/src/bbmaracasvisuHistogramView.h b/bbtk/src/bbmaracasvisuHistogramView.h index 90774e1..22b8afa 100644 --- a/bbtk/src/bbmaracasvisuHistogramView.h +++ b/bbtk/src/bbmaracasvisuHistogramView.h @@ -1,11 +1,11 @@ #ifdef _USE_WXWIDGETS_ -#ifndef __bbmaracasvisuHistogramView_h_INCLUDED__ -#define __bbmaracasvisuHistogramView_h_INCLUDED__ +#ifndef __bbcreaMaracasVisuHistogramView_h_INCLUDED__ +#define __bbcreaMaracasVisuHistogramView_h_INCLUDED__ #include "bbtkWxBlackBox.h" #include "vtkImageData.h" -namespace bbmaracasvisu +namespace bbcreaMaracasVisu { class /*BBTK_EXPORT*/ HistogramView @@ -36,8 +36,8 @@ BBTK_CATEGORY("viewer"); BBTK_INPUT(HistogramView,In,"Input image",vtkImageData*,""); BBTK_END_DESCRIBE_BLACK_BOX(HistogramView); } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu -#endif // __bbmaracasvisuHistogramView_h_INCLUDED__ +#endif // __bbcreaMaracasVisuHistogramView_h_INCLUDED__ #endif // _USE_WXWIDGETS_ diff --git a/bbtk/src/bbmaracasvisuImageChangeInformation.cxx b/bbtk/src/bbmaracasvisuImageChangeInformation.cxx index 6d944d3..feeece2 100644 --- a/bbtk/src/bbmaracasvisuImageChangeInformation.cxx +++ b/bbtk/src/bbmaracasvisuImageChangeInformation.cxx @@ -1,10 +1,10 @@ #include "bbmaracasvisuImageChangeInformation.h" -#include "bbmaracasvisuPackage.h" -namespace bbmaracasvisu +#include "bbcreaMaracasVisuPackage.h" +namespace bbcreaMaracasVisu { -BBTK_ADD_BLACK_BOX_TO_PACKAGE(maracasvisu,ImageChangeInformation) +BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ImageChangeInformation) BBTK_BLACK_BOX_IMPLEMENTATION(ImageChangeInformation,bbtk::AtomicBlackBox); void ImageChangeInformation::Process() { @@ -36,6 +36,6 @@ void ImageChangeInformation::bbUserDestructor() } } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu diff --git a/bbtk/src/bbmaracasvisuImageChangeInformation.h b/bbtk/src/bbmaracasvisuImageChangeInformation.h index e9751eb..3a7d037 100644 --- a/bbtk/src/bbmaracasvisuImageChangeInformation.h +++ b/bbtk/src/bbmaracasvisuImageChangeInformation.h @@ -1,12 +1,12 @@ -#ifndef __bbmaracasvisuImageChangeInformation_h_INCLUDED__ -#define __bbmaracasvisuImageChangeInformation_h_INCLUDED__ +#ifndef __bbcreaMaracasVisuImageChangeInformation_h_INCLUDED__ +#define __bbcreaMaracasVisuImageChangeInformation_h_INCLUDED__ #include "bbtkAtomicBlackBox.h" #include "iostream" #include "vtkImageData.h" #include "vtkImageChangeInformation.h" -namespace bbmaracasvisu +namespace bbcreaMaracasVisu { class /*BBTK_EXPORT*/ ImageChangeInformation @@ -41,7 +41,7 @@ BBTK_DESCRIPTION("vtkImageData change information. Translate extern to 0,0,0"); BBTK_OUTPUT(ImageChangeInformation,Out,"Output image",vtkImageData*,""); BBTK_END_DESCRIBE_BLACK_BOX(ImageChangeInformation); } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu -#endif // __bbmaracasvisuImageChangeInformation_h_INCLUDED__ +#endif // __bbcreaMaracasVisuImageChangeInformation_h_INCLUDED__ diff --git a/bbtk/src/bbmaracasvisuPlotterView.cxx b/bbtk/src/bbmaracasvisuPlotterView.cxx index 39e76a3..4c60cf3 100644 --- a/bbtk/src/bbmaracasvisuPlotterView.cxx +++ b/bbtk/src/bbmaracasvisuPlotterView.cxx @@ -1,14 +1,14 @@ #include "bbmaracasvisuPlotterView.h" -#include "bbmaracasvisuPackage.h" +#include "bbcreaMaracasVisuPackage.h" #include "pPlotterScaleX.h" #include "pPlotterScaleY.h" -namespace bbmaracasvisu +namespace bbcreaMaracasVisu { -BBTK_ADD_BLACK_BOX_TO_PACKAGE(maracasvisu,PlotterView) +BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,PlotterView) BBTK_BLACK_BOX_IMPLEMENTATION(PlotterView,bbtk::WxBlackBox); //--------------------------------------------------- @@ -46,6 +46,6 @@ void PlotterView::bbUserDestructor() } } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu diff --git a/bbtk/src/bbmaracasvisuPlotterView.h b/bbtk/src/bbmaracasvisuPlotterView.h index ede9e0c..804adc5 100644 --- a/bbtk/src/bbmaracasvisuPlotterView.h +++ b/bbtk/src/bbmaracasvisuPlotterView.h @@ -1,11 +1,11 @@ #ifdef _USE_WXWIDGETS_ -#ifndef __bbmaracasvisuPlotterView_h_INCLUDED__ -#define __bbmaracasvisuPlotterView_h_INCLUDED__ +#ifndef __bbcreaMaracasVisuPlotterView_h_INCLUDED__ +#define __bbcreaMaracasVisuPlotterView_h_INCLUDED__ #include "bbtkWxBlackBox.h" #include "pPlotterWindow.h" -namespace bbmaracasvisu +namespace bbcreaMaracasVisu { class /*BBTK_EXPORT*/ PlotterView @@ -42,8 +42,8 @@ BBTK_CATEGORY("viewer"); BBTK_INPUT(PlotterView,InY,"y vector",std::vector,""); BBTK_END_DESCRIBE_BLACK_BOX(PlotterView); } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu -#endif // __bbmaracasvisuPlotterView_h_INCLUDED__ +#endif // __bbcreaMaracasVisuPlotterView_h_INCLUDED__ #endif // _USE_WXWIDGETS_ diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.cxx b/bbtk/src/bbmaracasvisuSliderMinMax.cxx index cb3755a..de16146 100644 --- a/bbtk/src/bbmaracasvisuSliderMinMax.cxx +++ b/bbtk/src/bbmaracasvisuSliderMinMax.cxx @@ -1,8 +1,8 @@ #include "bbmaracasvisuSliderMinMax.h" -#include "bbmaracasvisuPackage.h" +#include "bbcreaMaracasVisuPackage.h" -namespace bbmaracasvisu +namespace bbcreaMaracasVisu { //------------------------------------------------------------------------------------------------------------------------------------ @@ -66,7 +66,7 @@ namespace bbmaracasvisu //-------------------------------------------------------------------------- -BBTK_ADD_BLACK_BOX_TO_PACKAGE(maracasvisu,SliderMinMax) +BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,SliderMinMax) BBTK_BLACK_BOX_IMPLEMENTATION(SliderMinMax,bbtk::WxBlackBox); //------------------------------------------------------ @@ -130,6 +130,6 @@ void SliderMinMax::bbUserDestructor() } } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.h b/bbtk/src/bbmaracasvisuSliderMinMax.h index 14c9835..f22ce2f 100644 --- a/bbtk/src/bbmaracasvisuSliderMinMax.h +++ b/bbtk/src/bbmaracasvisuSliderMinMax.h @@ -1,11 +1,11 @@ #ifdef _USE_WXWIDGETS_ -#ifndef __bbmaracasvisuSliderMinMax_h_INCLUDED__ -#define __bbmaracasvisuSliderMinMax_h_INCLUDED__ +#ifndef __bbcreaMaracasVisuSliderMinMax_h_INCLUDED__ +#define __bbcreaMaracasVisuSliderMinMax_h_INCLUDED__ #include "bbtkWxBlackBox.h" #include "mBarRange.h" -namespace bbmaracasvisu +namespace bbcreaMaracasVisu { @@ -105,8 +105,8 @@ BBTK_DESCRIPTION("Slider min max"); BBTK_OUTPUT(SliderMinMax,OutActual,"Actual value output",int,""); BBTK_END_DESCRIBE_BLACK_BOX(SliderMinMax); } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu -#endif // __bbmaracasvisuSliderMinMax_h_INCLUDED__ +#endif // __bbcreaMaracasVisuSliderMinMax_h_INCLUDED__ #endif // _USE_WXWIDGETS_ diff --git a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx index cfa8f01..5e5856d 100644 --- a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx +++ b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx @@ -1,9 +1,9 @@ #include "bbmaracasvisuTransferFunctionView.h" -#include "bbmaracasvisuPackage.h" -namespace bbmaracasvisu +#include "bbcreaMaracasVisuPackage.h" +namespace bbcreaMaracasVisu { -BBTK_ADD_BLACK_BOX_TO_PACKAGE(maracasvisu,TransferFunctionView) +BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,TransferFunctionView) BBTK_BLACK_BOX_IMPLEMENTATION(TransferFunctionView,bbtk::WxBlackBox); //----------------------------------------------------- @@ -36,6 +36,6 @@ void TransferFunctionView::bbUserDestructor() } } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu diff --git a/bbtk/src/bbmaracasvisuTransferFunctionView.h b/bbtk/src/bbmaracasvisuTransferFunctionView.h index 0bd81ae..65824eb 100644 --- a/bbtk/src/bbmaracasvisuTransferFunctionView.h +++ b/bbtk/src/bbmaracasvisuTransferFunctionView.h @@ -1,12 +1,12 @@ #ifdef _USE_WXWIDGETS_ -#ifndef __bbmaracasvisuTransferFunctionView_h_INCLUDED__ -#define __bbmaracasvisuTransferFunctionView_h_INCLUDED__ +#ifndef __bbcreaMaracasVisuTransferFunctionView_h_INCLUDED__ +#define __bbcreaMaracasVisuTransferFunctionView_h_INCLUDED__ #include "bbtkWxBlackBox.h" #include "vtkImageData.h" #include "HistogramWidget.h" -namespace bbmaracasvisu +namespace bbcreaMaracasVisu { class /*BBTK_EXPORT*/ TransferFunctionView @@ -40,8 +40,8 @@ BBTK_DESCRIPTION("Transfer Function Window"); BBTK_INPUT(TransferFunctionView,In,"Input image",vtkImageData*,""); BBTK_END_DESCRIBE_BLACK_BOX(TransferFunctionView); } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu -#endif // __bbmaracasvisuTransferFunctionView_h_INCLUDED__ +#endif // __bbcreaMaracasVisuTransferFunctionView_h_INCLUDED__ #endif // _USE_WXWIDGETS_ diff --git a/bbtk/src/bbmaracasvisuViewerMPR.cxx b/bbtk/src/bbmaracasvisuViewerMPR.cxx index 2ba4227..893932d 100644 --- a/bbtk/src/bbmaracasvisuViewerMPR.cxx +++ b/bbtk/src/bbmaracasvisuViewerMPR.cxx @@ -1,7 +1,7 @@ #include "bbmaracasvisuViewerMPR.h" -#include "bbmaracasvisuPackage.h" -namespace bbmaracasvisu +#include "bbcreaMaracasVisuPackage.h" +namespace bbcreaMaracasVisu { //-------------------------------------------------------------------------- @@ -106,7 +106,7 @@ END_EVENT_TABLE( ); -BBTK_ADD_BLACK_BOX_TO_PACKAGE(maracasvisu,ViewerMPR) +BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ViewerMPR) BBTK_BLACK_BOX_IMPLEMENTATION(ViewerMPR,bbtk::WxBlackBox); void ViewerMPR::Process() { @@ -137,6 +137,6 @@ void ViewerMPR::bbUserDestructor() } } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu diff --git a/bbtk/src/bbmaracasvisuViewerMPR.h b/bbtk/src/bbmaracasvisuViewerMPR.h index 8f004ea..878a9a6 100644 --- a/bbtk/src/bbmaracasvisuViewerMPR.h +++ b/bbtk/src/bbmaracasvisuViewerMPR.h @@ -1,13 +1,13 @@ #ifdef _USE_WXWIDGETS_ -#ifndef __bbmaracasvisuViewerMPR_h_INCLUDED__ -#define __bbmaracasvisuViewerMPR_h_INCLUDED__ +#ifndef __bbcreaMaracasVisuViewerMPR_h_INCLUDED__ +#define __bbcreaMaracasVisuViewerMPR_h_INCLUDED__ #include "bbtkWxBlackBox.h" #include "wxMaracasMPR.h" #include "vtkImageData.h" #include "vtkRenderer.h" -namespace bbmaracasvisu +namespace bbcreaMaracasVisu { @@ -86,8 +86,8 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ViewerMPR,bbtk::WxBlackBox); BBTK_END_DESCRIBE_BLACK_BOX(ViewerMPR); } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu -#endif // __bbmaracasvisuViewerMPR_h_INCLUDED__ +#endif // __bbcreaMaracasVisuViewerMPR_h_INCLUDED__ #endif // _USE_WXWIDGETS_ diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx index b89d78b..e50eed4 100644 --- a/bbtk/src/bbmaracasvisuViewerNV.cxx +++ b/bbtk/src/bbmaracasvisuViewerNV.cxx @@ -1,9 +1,9 @@ #include "bbmaracasvisuViewerNV.h" -#include "bbmaracasvisuPackage.h" -namespace bbmaracasvisu +#include "bbcreaMaracasVisuPackage.h" +namespace bbcreaMaracasVisu { -BBTK_ADD_BLACK_BOX_TO_PACKAGE(maracasvisu,ViewerNV) +BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ViewerNV) BBTK_BLACK_BOX_IMPLEMENTATION(ViewerNV,bbtk::WxBlackBox); //------------------------------------------------------------- void ViewerNV::Process() @@ -76,6 +76,6 @@ void ViewerNV::bbUserDestructor() } } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu diff --git a/bbtk/src/bbmaracasvisuViewerNV.h b/bbtk/src/bbmaracasvisuViewerNV.h index c1bd831..53c0ad5 100644 --- a/bbtk/src/bbmaracasvisuViewerNV.h +++ b/bbtk/src/bbmaracasvisuViewerNV.h @@ -1,6 +1,6 @@ #ifdef _USE_WXWIDGETS_ -#ifndef __bbmaracasvisuViewerNV_h_INCLUDED__ -#define __bbmaracasvisuViewerNV_h_INCLUDED__ +#ifndef __bbcreaMaracasVisuViewerNV_h_INCLUDED__ +#define __bbcreaMaracasVisuViewerNV_h_INCLUDED__ #include "bbtkWxBlackBox.h" @@ -12,7 +12,7 @@ #include "widgets/wxMaracas_ViewerWidget.h" #include "widgets/wxMaracas_N_ViewersWidget.h" -namespace bbmaracasvisu +namespace bbcreaMaracasVisu { class /*BBTK_EXPORT*/ ViewerNV @@ -69,8 +69,8 @@ BBTK_DESCRIPTION("Viewer : N view configuration 2D and 3D"); BBTK_OUTPUT(ViewerNV,Point,"Axis point",std::vector,""); BBTK_END_DESCRIBE_BLACK_BOX(ViewerNV); } -// EO namespace bbmaracasvisu +// EO namespace bbcreaMaracasVisu -#endif // __bbmaracasvisuViewerNV_h_INCLUDED__ +#endif // __bbcreaMaracasVisuViewerNV_h_INCLUDED__ #endif // _USE_WXWIDGETS_ diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt index e8e313f..0fb02b1 100644 --- a/lib/maracasVisuLib/CMakeLists.txt +++ b/lib/maracasVisuLib/CMakeLists.txt @@ -1,6 +1,6 @@ #---------------------------------------------------------------------------- # SET THE NAME OF YOUR LIBRARY -SET ( LIBRARY_NAME maracasVisuLib ) +SET ( LIBRARY_NAME creaMaracasVisu ) #---------------------------------------------------------------------------- #---------------------------------------------------------------------------- -- 2.45.1