From: guigues Date: Tue, 13 Jan 2009 15:37:54 +0000 (+0000) Subject: Compilation with bbtk 0.9.1 X-Git-Tag: EED.02Oct2009~137 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=de5cb63cdc23317a114c77f7b6184126d7988508;p=creaMaracasVisu.git Compilation with bbtk 0.9.1 --- diff --git a/bbtk/src/bbmaracasvisuAxeVolume.cxx b/bbtk/src/bbmaracasvisuAxeVolume.cxx index be808e7..dc82eda 100644 --- a/bbtk/src/bbmaracasvisuAxeVolume.cxx +++ b/bbtk/src/bbmaracasvisuAxeVolume.cxx @@ -93,7 +93,7 @@ void AxeVolume::bbUserConstructor() { mimage = NULL; } -void AxeVolume::bbUserCopyConstructor() +void AxeVolume::bbUserCopyConstructor(bbtk::BlackBox::Pointer) { } diff --git a/bbtk/src/bbmaracasvisuAxeVolume.h b/bbtk/src/bbmaracasvisuAxeVolume.h index 7a573e2..5048679 100644 --- a/bbtk/src/bbmaracasvisuAxeVolume.h +++ b/bbtk/src/bbmaracasvisuAxeVolume.h @@ -17,7 +17,7 @@ class /*BBTK_EXPORT*/ AxeVolume /// User callback called in the box contructor virtual void bbUserConstructor(); /// User callback called in the box copy constructor -virtual void bbUserCopyConstructor(); +virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); /// User callback called in the box destructor virtual void bbUserDestructor(); //================================================================== diff --git a/bbtk/src/bbmaracasvisuColorBar.cxx b/bbtk/src/bbmaracasvisuColorBar.cxx index 7b39dd8..5bea963 100644 --- a/bbtk/src/bbmaracasvisuColorBar.cxx +++ b/bbtk/src/bbmaracasvisuColorBar.cxx @@ -12,12 +12,12 @@ void ColorBar::Process() } //-------------------------------------------------- -void ColorBar::CreateWidget() +void ColorBar::CreateWidget(wxWindow* parent) { // bbSetOutputWidget( new wxStaticText ( bbGetWxParent() , -1 , _T("") ) ); // Process(); bbtkDebugMessageInc("Core",9,"ColorBar::CreateWidget()"< setActiveStateTo( true ); mwxwidget -> setRepresentedValues(bbGetInputInMin(), bbGetInputInMax()); mwxwidget -> setDeviceEndMargin(10); @@ -53,7 +53,7 @@ void ColorBar::bbUserConstructor() } //-------------------------------------------------- -void ColorBar::bbUserCopyConstructor() +void ColorBar::bbUserCopyConstructor(bbtk::BlackBox::Pointer) { } diff --git a/bbtk/src/bbmaracasvisuColorBar.h b/bbtk/src/bbmaracasvisuColorBar.h index e1568d4..dbc9658 100644 --- a/bbtk/src/bbmaracasvisuColorBar.h +++ b/bbtk/src/bbmaracasvisuColorBar.h @@ -19,7 +19,7 @@ class /*BBTK_EXPORT*/ ColorBar /// User callback called in the box contructor virtual void bbUserConstructor(); /// User callback called in the box copy constructor -virtual void bbUserCopyConstructor(); +virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); /// User callback called in the box destructor virtual void bbUserDestructor(); //================================================================== @@ -35,7 +35,7 @@ virtual void bbUserDestructor(); BBTK_PROCESS(Process); void Process(); BBTK_CREATE_WIDGET(CreateWidget); - void CreateWidget(); + void CreateWidget(wxWindow*); private: pColorBar *mwxwidget; diff --git a/bbtk/src/bbmaracasvisuContourCrown.cxx b/bbtk/src/bbmaracasvisuContourCrown.cxx index fde8bf6..1e670e7 100644 --- a/bbtk/src/bbmaracasvisuContourCrown.cxx +++ b/bbtk/src/bbmaracasvisuContourCrown.cxx @@ -41,7 +41,7 @@ void ContourCrown::Process() } //----------------------------------------------------------- -void ContourCrown::CreateWidget() +void ContourCrown::CreateWidget(wxWindow* parent) { bbtkDebugMessageInc("Core",9,"ContourCrown::CreateWidget()"<ConfigureVTK(); bbSetOutputImageValueResult( mwxwidget->GetVtkImageValueResult() ); @@ -76,7 +76,7 @@ void ContourCrown::bbUserConstructor() } //----------------------------------------------------------- -void ContourCrown::bbUserCopyConstructor() +void ContourCrown::bbUserCopyConstructor(bbtk::BlackBox::Pointer) { } diff --git a/bbtk/src/bbmaracasvisuContourCrown.h b/bbtk/src/bbmaracasvisuContourCrown.h index 9dbf038..2724153 100644 --- a/bbtk/src/bbmaracasvisuContourCrown.h +++ b/bbtk/src/bbmaracasvisuContourCrown.h @@ -19,7 +19,7 @@ class /*BBTK_EXPORT*/ ContourCrown /// User callback called in the box contructor virtual void bbUserConstructor(); /// User callback called in the box copy constructor -virtual void bbUserCopyConstructor(); +virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); /// User callback called in the box destructor virtual void bbUserDestructor(); //================================================================== @@ -45,7 +45,7 @@ virtual void bbUserDestructor(); BBTK_PROCESS(Process); void Process(); BBTK_CREATE_WIDGET(CreateWidget); - void CreateWidget(); + void CreateWidget(wxWindow*); private: wxMaracasCoutourTool *mwxwidget; diff --git a/bbtk/src/bbmaracasvisuContourStatistics.cxx b/bbtk/src/bbmaracasvisuContourStatistics.cxx index 722802e..3121923 100644 --- a/bbtk/src/bbmaracasvisuContourStatistics.cxx +++ b/bbtk/src/bbmaracasvisuContourStatistics.cxx @@ -61,7 +61,7 @@ void ContourStatistics::bbUserConstructor() } //------------------------------------------------------------ -void ContourStatistics::bbUserCopyConstructor() +void ContourStatistics::bbUserCopyConstructor(bbtk::BlackBox::Pointer) { } diff --git a/bbtk/src/bbmaracasvisuContourStatistics.h b/bbtk/src/bbmaracasvisuContourStatistics.h index af0e98f..90d6d7a 100644 --- a/bbtk/src/bbmaracasvisuContourStatistics.h +++ b/bbtk/src/bbmaracasvisuContourStatistics.h @@ -15,7 +15,7 @@ class /*BBTK_EXPORT*/ ContourStatistics /// User callback called in the box contructor virtual void bbUserConstructor(); /// User callback called in the box copy constructor -virtual void bbUserCopyConstructor(); +virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); /// User callback called in the box destructor virtual void bbUserDestructor(); //================================================================== diff --git a/bbtk/src/bbmaracasvisuContourToControlPoints.cxx b/bbtk/src/bbmaracasvisuContourToControlPoints.cxx index f17182d..8fc411d 100644 --- a/bbtk/src/bbmaracasvisuContourToControlPoints.cxx +++ b/bbtk/src/bbmaracasvisuContourToControlPoints.cxx @@ -135,7 +135,7 @@ void ContourToControlPoints::bbUserConstructor() //bool inic = false; // JPRx } //------------------------------------------------------------ -void ContourToControlPoints::bbUserCopyConstructor() +void ContourToControlPoints::bbUserCopyConstructor(bbtk::BlackBox::Pointer) { } //------------------------------------------------------------ diff --git a/bbtk/src/bbmaracasvisuContourToControlPoints.h b/bbtk/src/bbmaracasvisuContourToControlPoints.h index 55f4b34..de3904c 100644 --- a/bbtk/src/bbmaracasvisuContourToControlPoints.h +++ b/bbtk/src/bbmaracasvisuContourToControlPoints.h @@ -23,7 +23,7 @@ class /*BBTK_EXPORT*/ ContourToControlPoints /// User callback called in the box contructor virtual void bbUserConstructor(); /// User callback called in the box copy constructor -virtual void bbUserCopyConstructor(); +virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); /// User callback called in the box destructor virtual void bbUserDestructor(); //================================================================== diff --git a/bbtk/src/bbmaracasvisuContourVOI.cxx b/bbtk/src/bbmaracasvisuContourVOI.cxx index 72650fd..2c29296 100644 --- a/bbtk/src/bbmaracasvisuContourVOI.cxx +++ b/bbtk/src/bbmaracasvisuContourVOI.cxx @@ -109,7 +109,7 @@ void ContourVOI::Process() } //------------------------------------------------------ -void ContourVOI::CreateWidget() +void ContourVOI::CreateWidget(wxWindow* parent) { bbtkDebugMessageInc("Core",9,"ContourVOI::CreateWidget()"<AddLayer(new pPlotterScaleX()); mwxwidget->AddLayer(new pPlotterScaleY()); pGraphicalFunction *pGF = mwxwidget->getFunctionForVectors( &(bbGetInputInX()), &(bbGetInputInY()) ); // taking address of temporary ! JPRx @@ -36,7 +36,7 @@ void PlotterView::bbUserConstructor() } //--------------------------------------------------- -void PlotterView::bbUserCopyConstructor() +void PlotterView::bbUserCopyConstructor(bbtk::BlackBox::Pointer) { } diff --git a/bbtk/src/bbmaracasvisuPlotterView.h b/bbtk/src/bbmaracasvisuPlotterView.h index 804adc5..ff4657b 100644 --- a/bbtk/src/bbmaracasvisuPlotterView.h +++ b/bbtk/src/bbmaracasvisuPlotterView.h @@ -17,7 +17,7 @@ class /*BBTK_EXPORT*/ PlotterView /// User callback called in the box contructor virtual void bbUserConstructor(); /// User callback called in the box copy constructor -virtual void bbUserCopyConstructor(); +virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); /// User callback called in the box destructor virtual void bbUserDestructor(); //================================================================== @@ -26,7 +26,7 @@ virtual void bbUserDestructor(); BBTK_PROCESS(Process); void Process(); BBTK_CREATE_WIDGET(CreateWidget); - void CreateWidget(); + void CreateWidget(wxWindow*); private: pPlotterWindow *mwxwidget; diff --git a/bbtk/src/bbmaracasvisuShowNPoints.cxx b/bbtk/src/bbmaracasvisuShowNPoints.cxx index 7b47d87..c741e5e 100644 --- a/bbtk/src/bbmaracasvisuShowNPoints.cxx +++ b/bbtk/src/bbmaracasvisuShowNPoints.cxx @@ -134,8 +134,7 @@ void WidgetShowNPoints::OnAddPoint (wxCommandEvent& event) renderer->GetRenderWindow()->Render(); //--BBTK - mbbShowNPoints->bbSetModifiedStatus(); - mbbShowNPoints->bbSignalOutputModification("Point"); + mbbShowNPoints->bbSignalOutputModification(std::string("Point")); } } @@ -152,8 +151,7 @@ void WidgetShowNPoints::OnErasePoint(wxCommandEvent& event) lstPointsZ.erase( lstPointsZ.begin()+id ); renderer->GetRenderWindow()->Render(); //--BBTK - mbbShowNPoints->bbSetModifiedStatus(); - mbbShowNPoints->bbSignalOutputModification("Point"); + mbbShowNPoints->bbSignalOutputModification(std::string("Point")); } } @@ -172,8 +170,7 @@ void WidgetShowNPoints::OnDeleteAllPoints(wxCommandEvent& event) lstPointsZ.clear(); renderer->GetRenderWindow()->Render(); //--BBTK - mbbShowNPoints->bbSetModifiedStatus(); - mbbShowNPoints->bbSignalOutputModification("Point"); + mbbShowNPoints->bbSignalOutputModification(std::string("Point")); } @@ -197,9 +194,9 @@ void ShowNPoints::Process() } -void ShowNPoints::CreateWidget() +void ShowNPoints::CreateWidget(wxWindow* parent) { - mwxwidget = new WidgetShowNPoints( bbGetWxParent() , bbGetInputRenderer(), this); + mwxwidget = new WidgetShowNPoints( parent , bbGetInputRenderer(), this); mwxwidget->SetPoint( bbGetInputIn() ); if (bbGetInputImage()==NULL) @@ -224,7 +221,7 @@ void ShowNPoints::bbUserConstructor() } -void ShowNPoints::bbUserCopyConstructor() +void ShowNPoints::bbUserCopyConstructor(bbtk::BlackBox::Pointer) { } diff --git a/bbtk/src/bbmaracasvisuShowNPoints.h b/bbtk/src/bbmaracasvisuShowNPoints.h index 814466f..7aac0bb 100644 --- a/bbtk/src/bbmaracasvisuShowNPoints.h +++ b/bbtk/src/bbmaracasvisuShowNPoints.h @@ -57,7 +57,7 @@ class /*BBTK_EXPORT*/ ShowNPoints /// User callback called in the box contructor virtual void bbUserConstructor(); /// User callback called in the box copy constructor -virtual void bbUserCopyConstructor(); +virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); /// User callback called in the box destructor virtual void bbUserDestructor(); //================================================================== @@ -73,7 +73,7 @@ virtual void bbUserDestructor(); BBTK_PROCESS(Process); void Process(); BBTK_CREATE_WIDGET(CreateWidget); - void CreateWidget(); + void CreateWidget(wxWindow*); private: WidgetShowNPoints *mwxwidget; diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.cxx b/bbtk/src/bbmaracasvisuSliderMinMax.cxx index a8020e4..b3b5caa 100644 --- a/bbtk/src/bbmaracasvisuSliderMinMax.cxx +++ b/bbtk/src/bbmaracasvisuSliderMinMax.cxx @@ -43,20 +43,20 @@ namespace bbcreaMaracasVisu { printf ("EED wxWidgetSliderMinMax :: onActualChange_Bar \n"); mbbtkSliderMinMax->bbSetOutputOutActual(modBarRange->GetActual()); - mbbtkSliderMinMax->bbSignalOutputModification("OutActual"); + mbbtkSliderMinMax->bbSignalOutputModification(std::string("OutActual")); } void wxWidgetSliderMinMax :: onStartChange_Bar(wxCommandEvent& event) { printf ("EED wxWidgetSliderMinMax :: onStartChange_Bar \n"); mbbtkSliderMinMax->bbSetOutputOutStart(modBarRange->GetStart()); - mbbtkSliderMinMax->bbSignalOutputModification("OutStart"); + mbbtkSliderMinMax->bbSignalOutputModification(std::string("OutStart")); } void wxWidgetSliderMinMax :: onEndChange_Bar(wxCommandEvent& event) { printf ("EED wxWidgetSliderMinMax :: onEndChange_Bar \n"); mbbtkSliderMinMax->bbSetOutputOutEnd(modBarRange->GetEnd()); - mbbtkSliderMinMax->bbSignalOutputModification("OutEnd"); + mbbtkSliderMinMax->bbSignalOutputModification(std::string("OutEnd")); } void wxWidgetSliderMinMax :: onSelectionEnd(wxCommandEvent& event) { @@ -84,12 +84,12 @@ void SliderMinMax::Process() } //------------------------------------------------------ -void SliderMinMax::CreateWidget() +void SliderMinMax::CreateWidget(wxWindow* parent) { bbtkDebugMessageInc("Core",9,"SliderMinMax::CreateWidget()"< SetOrientation( bbGetInputOrientation()==1 ); mwxwidget -> setActiveStateTo(true); mwxwidget -> setVisibleLabels( bbGetInputShowLabels()==1 ); @@ -126,7 +126,7 @@ void SliderMinMax::bbUserConstructor() } //------------------------------------------------------ -void SliderMinMax::bbUserCopyConstructor() +void SliderMinMax::bbUserCopyConstructor(bbtk::BlackBox::Pointer) { } diff --git a/bbtk/src/bbmaracasvisuSliderMinMax.h b/bbtk/src/bbmaracasvisuSliderMinMax.h index f22ce2f..7c7ce86 100644 --- a/bbtk/src/bbmaracasvisuSliderMinMax.h +++ b/bbtk/src/bbmaracasvisuSliderMinMax.h @@ -61,7 +61,7 @@ class /*BBTK_EXPORT*/ SliderMinMax /// User callback called in the box contructor virtual void bbUserConstructor(); /// User callback called in the box copy constructor -virtual void bbUserCopyConstructor(); +virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer); /// User callback called in the box destructor virtual void bbUserDestructor(); //================================================================== @@ -80,7 +80,7 @@ virtual void bbUserDestructor(); BBTK_PROCESS(Process); void Process(); BBTK_CREATE_WIDGET(CreateWidget); - void CreateWidget(); + void CreateWidget(wxWindow*); private: mBarRange* mwxwidget; diff --git a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx index 5e5856d..f99c631 100644 --- a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx +++ b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx @@ -12,10 +12,10 @@ void TransferFunctionView::Process() } //----------------------------------------------------- -void TransferFunctionView::CreateWidget() +void TransferFunctionView::CreateWidget(wxWindow* parent) { bbtkDebugMessageInc("Core",9,"TransferFunctionView::CreateWxWindow()"<GetVtkMPRBaseData()->GetY()); point.push_back((int)wxwidget->GetVtkMPRBaseData()->GetZ()); mbbViewerMPR->bbSetOutputPoint( GetPoint() ); - mbbViewerMPR->bbSetModifiedStatus(); - mbbViewerMPR->bbSignalOutputModification("Point"); + mbbViewerMPR->bbSignalOutputModification(std::string("Point")); wxwidget->RefreshView(); } } @@ -115,12 +114,12 @@ void ViewerMPR::Process() bbSetOutputRenderer( mwxwidgetmpr->GetRenderer() ); } -void ViewerMPR::CreateWidget() +void ViewerMPR::CreateWidget(wxWindow* parent) { bbtkDebugMessageInc("Core",9,"ViewerMPR::CreateWidget() " <bbSetModifiedStatus(); - mbbViewerNV->bbSignalOutputModification("Point"); + mbbViewerNV->bbSignalOutputModification(std::string("Point")); } @@ -41,8 +40,7 @@ void bbwxMaracas_N_ViewersWidget::OnRefreshView(wxCommandEvent & event) void bbwxMaracas_N_ViewersWidget::OnDClickLeft(wxCommandEvent & event) { wxMaracas_N_ViewersWidget::OnDClickLeft(event); - mbbViewerNV->bbSetModifiedStatus(); - mbbViewerNV->bbSignalOutputModification("Point"); + mbbViewerNV->bbSignalOutputModification(std::string("Point")); } //------------------------------------------------------------- @@ -83,10 +81,10 @@ void ViewerNV::Process() } //------------------------------------------------------------- -void ViewerNV::CreateWidget() +void ViewerNV::CreateWidget(wxWindow* parent) { bbtkDebugMessageInc("Core",9,"ViewerNV::CreateWidget()"<