BUG MacOs

[creaMaracasVisu.git] / bbtk / src / bbmaracasvisuShowNPoints.cxx

diff --git a/bbtk/src/bbmaracasvisuShowNPoints.cxx b/bbtk/src/bbmaracasvisuShowNPoints.cxx
index 7b47d87d179eff11d7f9312c0b382b09be6302b1..ccd3092010052435c663fe7927bd6435bdb9a0cb 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"));    
 }
 
 
@@ -185,21 +182,23 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ShowNPoints,bbtk::WxBlackBox);
 
 void ShowNPoints::Process()
 {
-       mwxwidget->SetPoint( bbGetInputIn() );   
-       mwxwidget->SetImage( bbGetInputImage() );   
-       mwxwidget->SetColour( bbGetInputColour() );   
-       mwxwidget->SetOpacity( bbGetInputOpacity() );   
-       mwxwidget->SetRadio( bbGetInputRadio() );   
+       if (mwxwidget!=NULL){
+               mwxwidget->SetPoint( bbGetInputIn() );   
+               mwxwidget->SetImage( bbGetInputImage() );   
+               mwxwidget->SetColour( bbGetInputColour() );   
+               mwxwidget->SetOpacity( bbGetInputOpacity() );   
+               mwxwidget->SetRadio( bbGetInputRadio() );   
 
-       bbSetOutputlstPointsX( mwxwidget->GetLstPointsX() );
-       bbSetOutputlstPointsY( mwxwidget->GetLstPointsY() );
-       bbSetOutputlstPointsZ( mwxwidget->GetLstPointsZ() );
+               bbSetOutputlstPointsX( mwxwidget->GetLstPointsX() );
+               bbSetOutputlstPointsY( mwxwidget->GetLstPointsY() );
+               bbSetOutputlstPointsZ( mwxwidget->GetLstPointsZ() );
+       } // mwxwidget
 }
 
 
-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)
@@ -213,6 +212,7 @@ void ShowNPoints::CreateWidget()
 
 void ShowNPoints::bbUserConstructor()
 {
+       mwxwidget = NULL;
        std::vector<double> colour;
        colour.push_back(1.0);
        colour.push_back(0.0);
@@ -224,7 +224,7 @@ void ShowNPoints::bbUserConstructor()
 }
 
 
-void ShowNPoints::bbUserCopyConstructor()
+void ShowNPoints::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
 {
 }