Compilation with bbtk 0.9.1

diff --git a/bbtk/src/bbmaracasvisuAxeVolume.cxx b/bbtk/src/bbmaracasvisuAxeVolume.cxx
index be808e7320f44f0a02c7e36a1e18739169f0449f..dc82eda1f760a9b98a5cc2bb6c77cecbd8627bd7 100644 (file)
--- 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 7a573e2cb94a022233eea02f04db92d2866aaad0..50486798db2a506213abd033a81e2228d173190e 100644 (file)
--- 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 7b39dd827b109b305021d27567f900ac00c74d68..5bea9635d122dbabafc27913579266ff3165c102 100644 (file)
--- 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()"<<std::endl);
-               mwxwidget = new pColorBar( bbGetWxParent() ,bbGetInputInW(), bbGetInputInH(), bbGetInputOrientation()==1); 
+               mwxwidget = new pColorBar( parent ,bbGetInputInW(), bbGetInputInH(), bbGetInputOrientation()==1); 
                mwxwidget -> 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 e1568d4ae95bf6925cc14d8d0bc321b4a40545a1..dbc9658b0d0cd95f6ad436fe0447cc9423bc12bd 100644 (file)
--- 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 fde8bf672c12f57ee308b65ed9f9a3fe56967384..1e670e781d76d19fa9ba6f200d796a8793d8760a 100644 (file)
--- 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()"<<std::endl);
   
@@ -54,7 +54,7 @@ void ContourCrown::CreateWidget()
       wxMessageDialog(NULL,  bbtk::std2wx("(ContourCrown) Input 'In' is not set"),  bbtk::std2wx(bbGetFullName()) ).ShowModal();
     }
 
-       mwxwidget = new wxMaracasCoutourTool( bbGetWxParent(), bbGetInputwxVtkBaseView(), bbGetInputIn() );
+       mwxwidget = new wxMaracasCoutourTool( parent, bbGetInputwxVtkBaseView(), bbGetInputIn() );
        mwxwidget->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 9dbf038fd3e6bfd7f34bc69ebd47846949aab13c..272415339a01acff706166541cd9511790966656 100644 (file)
--- 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 722802e124feeb1a8f4f9f2885b475e7370fbd94..31219232012a1e5d5b15b13fa67640de5a1ab29c 100644 (file)
--- 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 af0e98fe786b7d21362aeadd9042d76ccfb5773f..90d6d7af67f05455e889a551f218e762e4528167 100644 (file)
--- 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 f17182d16d420bdd1632d27555f1bbb20887d16c..8fc411d68f7b0f0c4f33b73f85455b9d9884e48f 100644 (file)
--- 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 55f4b34cdf53788e61e4a5dc6dbf7271397699b5..de3904c6f0503e3898a7058bd029bc90181c44f8 100644 (file)
--- 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 72650fda227145a67d38e48af4db5fdea488e578..2c2929680588edb62af4fdf7ac1a9c3030bdc078 100644 (file)
--- 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()"<<std::endl);
   
@@ -122,7 +122,7 @@ void ContourVOI::CreateWidget()
       wxMessageDialog(NULL,  bbtk::std2wx("(ContourVOI) Input 'In' is not set"),  bbtk::std2wx(bbGetFullName()) ).ShowModal();
     }
 
-       wxWidgetVOI *mwxwidget = new wxWidgetVOI( bbGetWxParent(), bbGetInputwxVtkBaseView(), bbGetInputIn() );
+       wxWidgetVOI *mwxwidget = new wxWidgetVOI( parent, bbGetInputwxVtkBaseView(), bbGetInputIn() );
 
        bbSetOutputWidget(mwxwidget);
        bbtkDebugDecTab("Core",9);
@@ -134,7 +134,7 @@ void ContourVOI::bbUserConstructor()
 }
 
 //------------------------------------------------------
-void ContourVOI::bbUserCopyConstructor()
+void ContourVOI::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
 {
 }
 

diff --git a/bbtk/src/bbmaracasvisuContourVOI.h b/bbtk/src/bbmaracasvisuContourVOI.h
index 7c5ad734e2216641a478c842edf7926a554d1cf3..76d61c171de40a8b8f584bf18db5c4f552255ac5 100644 (file)
--- a/bbtk/src/bbmaracasvisuContourVOI.h
+++ b/bbtk/src/bbmaracasvisuContourVOI.h
@@ -57,7 +57,7 @@ class /*BBTK_EXPORT*/ ContourVOI
 /// 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();
 //==================================================================
@@ -69,7 +69,7 @@ virtual void bbUserDestructor();
   BBTK_PROCESS(Process);
   void Process();
   BBTK_CREATE_WIDGET(CreateWidget);
-  void CreateWidget();
+  void CreateWidget(wxWindow*);
 
 };
 

diff --git a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
index 61c3ade4fa0a0607c11780d931eccec525ac42da..821576a8304f2cf4b97b34dc5c704ed20f562354 100644 (file)
--- a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
+++ b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
@@ -83,7 +83,7 @@ void DrawAxe3D::bbUserConstructor()
     bbSetInputColour(colour);
 }
 
-void DrawAxe3D::bbUserCopyConstructor()
+void DrawAxe3D::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
 {
 }
 void DrawAxe3D::bbUserDestructor()

diff --git a/bbtk/src/bbmaracasvisuDrawAxe3D.h b/bbtk/src/bbmaracasvisuDrawAxe3D.h
index aca4d451b96876ebabee6e841b849984ffcc702d..a71e0a7cf51ee03615d5348e4bc2c81331cf64d1 100644 (file)
--- a/bbtk/src/bbmaracasvisuDrawAxe3D.h
+++ b/bbtk/src/bbmaracasvisuDrawAxe3D.h
@@ -20,7 +20,7 @@ class /*BBTK_EXPORT*/ DrawAxe3D
 /// 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/bbmaracasvisuDrawAxisTree3D.cxx b/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
index fbd94b1e77708c0481b24b765aae3ff061c79dc1..a950029aee343ed62933091fb5963c1d99fee8bf 100644 (file)
--- a/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
+++ b/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
@@ -146,7 +146,7 @@ void DrawAxisTree3D::bbUserConstructor()
 
 }
 
-void DrawAxisTree3D::bbUserCopyConstructor()
+void DrawAxisTree3D::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
 {  
 }
 

diff --git a/bbtk/src/bbmaracasvisuDrawAxisTree3D.h b/bbtk/src/bbmaracasvisuDrawAxisTree3D.h
index 7913a94d34fba027c235ff46286840d9981c0ecd..4553148bc008744335f04329025365bd5c3785f5 100644 (file)
--- a/bbtk/src/bbmaracasvisuDrawAxisTree3D.h
+++ b/bbtk/src/bbmaracasvisuDrawAxisTree3D.h
@@ -27,7 +27,7 @@ class /*BBTK_EXPORT*/ DrawAxisTree3D
 /// 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/bbmaracasvisuHistogramView.cxx b/bbtk/src/bbmaracasvisuHistogramView.cxx
index 27078bbbd7a3dbaddca05e193f7f46a6f99c8205..10546534fa2e2a1feba7936132cd168477636dfd 100644 (file)
--- a/bbtk/src/bbmaracasvisuHistogramView.cxx
+++ b/bbtk/src/bbmaracasvisuHistogramView.cxx
@@ -15,10 +15,10 @@ void HistogramView::Process()
 }
 
 //------------------------------------------------
-void HistogramView::CreateWidget()
+void HistogramView::CreateWidget(wxWindow* parent)
 {
        bbtkDebugMessageInc("Core",9,"HistogramViewWindow::CreateWidget()"<<std::endl);
-       Histogram *wxwidget = new Histogram( bbGetWxParent() , -1, wxPoint(0,0), wxSize(400,400),wxNO_BORDER ,bbGetInputIn());
+       Histogram *wxwidget = new Histogram( parent , -1, wxPoint(0,0), wxSize(400,400),wxNO_BORDER ,bbGetInputIn());
     bbtkDebugDecTab("Core",9);
        bbSetOutputWidget( wxwidget );
 }
@@ -29,7 +29,7 @@ void HistogramView::bbUserConstructor()
 }
 
 //------------------------------------------------
-void HistogramView::bbUserCopyConstructor()
+void HistogramView::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
 {
 }
 

diff --git a/bbtk/src/bbmaracasvisuHistogramView.h b/bbtk/src/bbmaracasvisuHistogramView.h
index 22b8afa5195ec845b75b5122b5b4cc703722c25a..761446a13c77f2c81ac32da47333bb341536cd2e 100644 (file)
--- a/bbtk/src/bbmaracasvisuHistogramView.h
+++ b/bbtk/src/bbmaracasvisuHistogramView.h
@@ -17,7 +17,7 @@ class /*BBTK_EXPORT*/ HistogramView
 /// 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();
 //==================================================================
@@ -25,7 +25,7 @@ virtual void bbUserDestructor();
   BBTK_PROCESS(Process);
   void Process();
   BBTK_CREATE_WIDGET(CreateWidget);
-  void CreateWidget();
+  void CreateWidget(wxWindow*);
 };
 
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(HistogramView,bbtk::WxBlackBox);

diff --git a/bbtk/src/bbmaracasvisuImageChangeInformation.cxx b/bbtk/src/bbmaracasvisuImageChangeInformation.cxx
index feeece21f58d732d99c10d09f1211bd533cc0f8d..02e2ef9336386e215371642d7abd534a22adc3ba 100644 (file)
--- a/bbtk/src/bbmaracasvisuImageChangeInformation.cxx
+++ b/bbtk/src/bbmaracasvisuImageChangeInformation.cxx
@@ -23,7 +23,7 @@ void ImageChangeInformation::bbUserConstructor()
 {
   mchange=NULL;
 }
-void ImageChangeInformation::bbUserCopyConstructor()
+void ImageChangeInformation::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
 {
 
 }

diff --git a/bbtk/src/bbmaracasvisuImageChangeInformation.h b/bbtk/src/bbmaracasvisuImageChangeInformation.h
index 3a7d037e103688ae4c2d3af0e8bdaed8b33ee802..e3afb81b0b15d80b3208c3b3e3f6b3d299824a1e 100644 (file)
--- a/bbtk/src/bbmaracasvisuImageChangeInformation.h
+++ b/bbtk/src/bbmaracasvisuImageChangeInformation.h
@@ -18,7 +18,7 @@ class /*BBTK_EXPORT*/ ImageChangeInformation
 /// 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/bbmaracasvisuPlotterView.cxx b/bbtk/src/bbmaracasvisuPlotterView.cxx
index 4c60cf3d1af541e62652c4fcde7ce579a9795186..b760826ae1b330f8022d94cb0c3892236a37645a 100644 (file)
--- a/bbtk/src/bbmaracasvisuPlotterView.cxx
+++ b/bbtk/src/bbmaracasvisuPlotterView.cxx
@@ -17,10 +17,10 @@ void PlotterView::Process()
 }
 
 //---------------------------------------------------
-void PlotterView::CreateWidget()
+void PlotterView::CreateWidget(wxWindow* parent)
 {
     bbtkDebugMessageInc("Core",9,"PlotterView::CreateWxWindow()"<<std::endl);
-               mwxwidget = new pPlotterWindow(  bbGetWxParent() , -1,wxDefaultPosition,  wxDefaultSize,  0 );
+               mwxwidget = new pPlotterWindow( parent , -1,wxDefaultPosition,  wxDefaultSize,  0 );
                mwxwidget->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 804adc5c60a5d6368a98a5dbc5da2b9eadb7b302..ff4657bed9e81d0b90f640c6229202c960ad5015 100644 (file)
--- 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 7b47d87d179eff11d7f9312c0b382b09be6302b1..c741e5e625a6417fb11b22d2d361e221944ebf26 100644 (file)
--- 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 814466f92e3dac7339690d4c2bed37d0688fe488..7aac0bbdc94ac433d6c00aa534efc21aa09ec03e 100644 (file)
--- 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 a8020e41a0c4af6d47a28e1f1a14969f1f9edd68..b3b5caa79b7eb600bdae91399ea28726e9780288 100644 (file)
--- 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()"<<std::endl);
 
-               mwxwidget = new mBarRange( bbGetWxParent() ,bbGetInputInW(), bbGetInputInH()); 
+               mwxwidget = new mBarRange(parent ,bbGetInputInW(), bbGetInputInH()); 
                mwxwidget -> 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 f22ce2f16002b886353eb3222bdc6ebd0094b069..7c7ce86ca3ed8b5c051f32563518a4c896b4f889 100644 (file)
--- 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 5e5856d36076df3c874f00248bf0d389883faae8..f99c6310f50ef5b1c22b6dbb93fb91ad5337c0f4 100644 (file)
--- 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()"<<std::endl);
-       mwxwidget = new HistogramWidget(bbGetWxParent(), -1, wxPoint(0,0), wxSize(400,400),wxNO_BORDER ,bbGetInputIn(),1);
+       mwxwidget = new HistogramWidget(parent, -1, wxPoint(0,0), wxSize(400,400),wxNO_BORDER ,bbGetInputIn(),1);
     bbtkDebugDecTab("Core",9);
        bbSetOutputWidget( mwxwidget );
 }
@@ -26,7 +26,7 @@ void TransferFunctionView::bbUserConstructor()
 }
 
 //-----------------------------------------------------
-void TransferFunctionView::bbUserCopyConstructor()
+void TransferFunctionView::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
 {
 }
 

diff --git a/bbtk/src/bbmaracasvisuTransferFunctionView.h b/bbtk/src/bbmaracasvisuTransferFunctionView.h
index 65824eb01247f13a7880414bd6ed3f7902143569..abb9864134625994b6fff15543137e019a93048d 100644 (file)
--- a/bbtk/src/bbmaracasvisuTransferFunctionView.h
+++ b/bbtk/src/bbmaracasvisuTransferFunctionView.h
@@ -18,7 +18,7 @@ class /*BBTK_EXPORT*/ TransferFunctionView
 /// 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* parent);
 
   private:
        HistogramWidget *mwxwidget;

diff --git a/bbtk/src/bbmaracasvisuViewerMPR.cxx b/bbtk/src/bbmaracasvisuViewerMPR.cxx
index 893932dd2bf47345f719354fb15c97afcb96f212..bbb2adbe37f3367842e3341e623321ee846b0d80 100644 (file)
--- a/bbtk/src/bbmaracasvisuViewerMPR.cxx
+++ b/bbtk/src/bbmaracasvisuViewerMPR.cxx
@@ -83,8 +83,7 @@ END_EVENT_TABLE( );
                point.push_back((int)wxwidget->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() " <<std::endl);
        marImageData    *marimagedata = new marImageData(bbGetInputIn() );
        bbtkDebugDecTab("Core",9);
-       mwxwidgetmpr = new wxWidgetMPR(this , bbGetWxParent() ,marimagedata);
+       mwxwidgetmpr = new wxWidgetMPR(this , parent ,marimagedata);
        bbSetOutputWidget( mwxwidgetmpr );
 }
 
@@ -128,7 +127,7 @@ void ViewerMPR::bbUserConstructor()
 {
                bbSetInputIn(NULL);
 }
-void ViewerMPR::bbUserCopyConstructor()
+void ViewerMPR::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
 {
 
 }

diff --git a/bbtk/src/bbmaracasvisuViewerMPR.h b/bbtk/src/bbmaracasvisuViewerMPR.h
index 878a9a645828338f85d9902f324e003c6038a8bc..796c3893f75f0004cae6a79269026e260349357f 100644 (file)
--- a/bbtk/src/bbmaracasvisuViewerMPR.h
+++ b/bbtk/src/bbmaracasvisuViewerMPR.h
@@ -57,7 +57,7 @@ class /*BBTK_EXPORT*/ ViewerMPR
 /// 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();
 //==================================================================
@@ -68,7 +68,7 @@ virtual void bbUserDestructor();
   BBTK_PROCESS(Process);
   void Process();
   BBTK_CREATE_WIDGET(CreateWidget);
-  void CreateWidget();
+  void CreateWidget(wxWindow* parent);
 
 private:
   wxWidgetMPR *mwxwidgetmpr;

diff --git a/bbtk/src/bbmaracasvisuViewerNV.cxx b/bbtk/src/bbmaracasvisuViewerNV.cxx
index 4530cae2927e28fafe2254d93c81cd52d8e0ab4d..e1c6bb5d75e49ce6969222a244a004756abd59ec 100644 (file)
--- a/bbtk/src/bbmaracasvisuViewerNV.cxx
+++ b/bbtk/src/bbmaracasvisuViewerNV.cxx
@@ -32,8 +32,7 @@ bbwxMaracas_N_ViewersWidget::~bbwxMaracas_N_ViewersWidget()
 void bbwxMaracas_N_ViewersWidget::OnRefreshView(wxCommandEvent & event)
 {
        wxMaracas_N_ViewersWidget::OnRefreshView(event);
-       mbbViewerNV->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()"<<std::endl);
-       mwxwidget = new bbwxMaracas_N_ViewersWidget( this,bbGetWxParent() , bbGetInputIn() , &(bbGetInputnTypeView())   );
+       mwxwidget = new bbwxMaracas_N_ViewersWidget( this, parent , bbGetInputIn() , &(bbGetInputnTypeView())   );
        bbtkDebugDecTab("Core",9);
     bbSetOutputWidget( mwxwidget );
 }
@@ -115,7 +113,7 @@ void ViewerNV::bbUserConstructor()
 }
 
 //-------------------------------------------------------------
-void ViewerNV::bbUserCopyConstructor()
+void ViewerNV::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
 {
 }
 

diff --git a/bbtk/src/bbmaracasvisuViewerNV.h b/bbtk/src/bbmaracasvisuViewerNV.h
index c3de8c25257ae924b58aefce9b9d10a855c0fe59..71d159c42e072954f19c9ce7eb2598cbd6b5be2b 100644 (file)
--- a/bbtk/src/bbmaracasvisuViewerNV.h
+++ b/bbtk/src/bbmaracasvisuViewerNV.h
@@ -47,7 +47,7 @@ class /*BBTK_EXPORT*/ ViewerNV
 /// 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 p);
 /// User callback called in the box destructor
 virtual void bbUserDestructor();
 //==================================================================
@@ -66,7 +66,7 @@ virtual void bbUserDestructor();
   BBTK_PROCESS(Process);
   void Process();
   BBTK_CREATE_WIDGET(CreateWidget);
-  void CreateWidget();
+  void CreateWidget(wxWindow* parent);
 
 private:
        wxMaracas_N_ViewersWidget       *mwxwidget;

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index e999a34cafd439a1e1857d3bff3ee8cf3b66c6d3..74f55e50d74a61e30e2c70deeb757bea8f375c60 100644 (file)
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -209,7 +209,8 @@ IF ( BUILD_${LIBRARY_NAME} )
 
 
   # MANAGE SHARED LIB
-  CREA_MANAGE_SHARED_LIBRARY(${LIBRARY_NAME})
+  CREA_DYNAMIC_LIBRARY_EXPORT ( ${LIBRARY_NAME})
+  #CREA_MANAGE_SHARED_LIBRARY(${LIBRARY_NAME})
 
   # CREATE THE TARGET
   ADD_LIBRARY(${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES} ${${LIBRARY_NAME}_HEADERS})