]> Creatis software - creaMaracasVisu.git/blobdiff - bbtk/src/bbmaracasvisuShowNPoints.cxx
addition of file
[creaMaracasVisu.git] / bbtk / src / bbmaracasvisuShowNPoints.cxx
index ca5a850d93111118d8ac661efabff5074466d41f..d9e198e2b7202d10aba21e65f544d44a259514b1 100644 (file)
@@ -5,46 +5,76 @@
 #include "vtkSphereSource.h"
 #include "vtkPolyDataMapper.h"
 #include "vtkRenderWindow.h"
+#include "vtkTextActor3D.h"
 
 namespace bbcreaMaracasVisu
 {
 
-
 //----------------------------------------------------------------------
-       WidgetShowNPoints::WidgetShowNPoints(wxWindow *parent,  bbcreaMaracasVisu::ShowNPoints *box)
+  WidgetShowNPoints::WidgetShowNPoints(wxWindow *parent,  bbcreaMaracasVisu::ShowNPoints *box)
     : wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL)
   {
-    mbbShowNPoints                             = box;
-    this->renderer                             = NULL;
-       wxPanel *panel                          = this;
-    wxSizer *sizer                             = NULL;
-       
+    mbbShowNPoints                     = box;
+    this->renderer                     = NULL;
+    wxPanel    *panel                  = this;
+    wxSizer *sizer                     = NULL;
 
        // Widget interface
+       askPointLabel                           = new wxStaticText(panel, -1, _T("Point label :")); // JPR
+       textCtrl                                        = new wxTextCtrl(panel, -1);
        wxButton *btnAddPoint           = new wxButton( panel, -1, _T("Add Point"));
-       wxButton *btnEraseLstPoint  = new wxButton( panel, -1, _T("Erase Last point"));
+       wxButton *btnRenamePoint        = new wxButton( panel, -1, _T("Rename point"));
+       wxButton *btnEraseLastPoint     = new wxButton( panel, -1, _T("Erase Last point"));
+       wxButton *btnErasePoint         = new wxButton( panel, -1, _T("Erase point"));
        wxButton *btnDeleteAllPoints= new wxButton( panel, -1, _T("Delete all points"));
+       wxButton *btnSavePoints         = new wxButton( panel, -1, _T("Save points"));
+       wxButton *btnLoadPoints         = new wxButton( panel, -1, _T("Load points"));
+       txtNrPoints                                     = new wxStaticText(panel,-1, _T(" "));
 
+       //NTU: Sliders for opacity and radio change
 
-       wxFlexGridSizer *sizer1 = new wxFlexGridSizer(1); 
-//    sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
+       wxStaticText* txOpacity = new wxStaticText(this, -1, wxString(_T("  Points Opacity  ")));
+       sdrOpacity = new wxSlider(this, -1, 0, 0, 100, wxDefaultPosition, wxDefaultSize, wxSL_LABELS);
 
-    Connect(btnAddPoint->GetId()               , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnAddPoint);
-    Connect(btnEraseLstPoint->GetId()  , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnErasePoint);
-    Connect(btnDeleteAllPoints->GetId()        , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnDeleteAllPoints);
+       wxStaticText* txRadio = new wxStaticText(this, -1, wxString(_T("  Points Radio  ")));
+       sdrRadio = new wxSlider(this, -1, 0, 1, 50, wxDefaultPosition, wxDefaultSize, wxSL_LABELS);
 
-    sizer1->Add(btnAddPoint);
-    sizer1->Add(btnEraseLstPoint);
-    sizer1->Add(btnDeleteAllPoints);
+       wxFlexGridSizer *sizer1 = new wxFlexGridSizer(1);
+//    sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
 
-       sizer = sizer1;
-       panel   ->      SetSizer(sizer);
-    panel      ->      SetAutoLayout(true);
-    panel      ->      Layout();  
-       
+         Connect(btnAddPoint->GetId()           , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnAddPoint);
+         Connect(btnRenamePoint->GetId()        , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnRenamePoint);
+         Connect(btnEraseLastPoint->GetId() , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnEraseLastPoint);
+         Connect(btnErasePoint->GetId()         , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnErasePoint);
+         Connect(btnDeleteAllPoints->GetId(), wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnDeleteAllPoints);
+         Connect(btnSavePoints->GetId()         , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnSavePoints);
+         Connect(btnLoadPoints->GetId()         , wxEVT_COMMAND_BUTTON_CLICKED  , (wxObjectEventFunction) &WidgetShowNPoints::OnLoadPoints);
+
+         //NTU: Slider events
+         Connect(sdrOpacity->GetId()   , wxEVT_COMMAND_SLIDER_UPDATED  , (wxObjectEventFunction) &WidgetShowNPoints::UpdatePoints);
+         Connect(sdrRadio->GetId()     , wxEVT_COMMAND_SLIDER_UPDATED  , (wxObjectEventFunction) &WidgetShowNPoints::UpdatePoints);
+
+         sizer1->Add(askPointLabel); // JPR
+         sizer1->Add(textCtrl);
+         sizer1->Add(btnAddPoint);
+         sizer1->Add(btnRenamePoint);
+         sizer1->Add(btnErasePoint);
+         sizer1->Add(btnEraseLastPoint);
+         sizer1->Add(btnDeleteAllPoints);
+         sizer1->Add(txtNrPoints);
+         sizer1->Add(txOpacity);
+         sizer1->Add(sdrOpacity,1,wxGROW );
+         sizer1->Add(txRadio);
+         sizer1->Add(sdrRadio,1,wxGROW );
+         sizer1->Add(btnSavePoints);
+         sizer1->Add(btnLoadPoints);
+
+         sizer = sizer1;
+         panel ->SetSizer(sizer);
+         panel ->SetAutoLayout(true);
+         panel ->Layout();
 }
 
-
 //------------------------------------------------------------------------
 WidgetShowNPoints::~WidgetShowNPoints()
 {
@@ -52,7 +82,9 @@ WidgetShowNPoints::~WidgetShowNPoints()
 
 void WidgetShowNPoints::SetRadio(double radio)
 {
-       mradio=radio;
+       this->mradio=radio;
+       //NTU: For Slider
+       sdrRadio->SetValue(this->mradio);
 }
 
 //------------------------------------------------------------------------
@@ -73,8 +105,11 @@ std::vector<int> WidgetShowNPoints::GetLstPointsZ()
        return lstPointsZ;
 }
 
-
-
+//------------------------------------------------------------------------
+       std::vector<std::string> WidgetShowNPoints::GetLstLabels()
+{
+       return lstLabels;
+}
 
 //------------------------------------------------------------------------
 void WidgetShowNPoints::SetPoint(std::vector<int> ppoint)
@@ -92,6 +127,8 @@ void WidgetShowNPoints::SetColour(std::vector<double> colour)
 void WidgetShowNPoints::SetOpacity(double opacity)
 {
        this->mopacity=opacity;
+       //NTU: For Slider
+       sdrOpacity->SetValue(this->mopacity/100.0);
 }
 
 //------------------------------------------------------------------------
@@ -106,133 +143,346 @@ void  WidgetShowNPoints::SetRenderer(vtkRenderer *renderer)
        this->renderer  = renderer;
 }
 
+//------------------------------------------------------------------------
 
+std::string WidgetShowNPoints::CleanSpaces(std::string ss)
+{
+       int i;
+       while( (i=ss.find(32))>=0 )
+       {
+               ss.replace(i,1,"_");
+       }
+       return ss;
+}
 
 //------------------------------------------------------------------------
-void WidgetShowNPoints::OnAddPoint (wxCommandEvent& event)
+void WidgetShowNPoints::AddPoint(int x, int y, int z, std::string label)
 {
-printf("EED %p WidgetShowNPoints::OnAddPoint 01\n", this);
-       if (this->renderer!=NULL){ 
-printf("EED %p WidgetShowNPoints::OnAddPoint 02\n", this);
-               if (mpoint.size()==3){
-printf("EED %p WidgetShowNPoints::OnAddPoint 03\n", this);
-                       lstPointsX.push_back( mpoint[0] );
-                       lstPointsY.push_back( mpoint[1] );
-                       lstPointsZ.push_back( mpoint[2] );
-
-                       // Sphere
-                       vtkSphereSource *vtksphere              = vtkSphereSource::New();
-                       vtksphere->SetThetaResolution (20);
-                       vtksphere->SetPhiResolution (20);
-                       vtksphere->SetRadius( mradio  ); 
-                       vtkPolyDataMapper *sphereMapper = vtkPolyDataMapper::New();
-                       sphereMapper->SetInput( vtksphere->GetOutput() );
-                       vtkActor *sphereActor   = vtkActor::New();
-                       sphereActor->SetMapper(sphereMapper);
-                       sphereActor->SetOrigin(0, 0, 0);
-                       double spc[3];
-                       mimage->GetSpacing(spc);
-                       sphereActor->SetPosition( spc[0]*mpoint[0] , spc[1]*mpoint[1] , spc[2]*mpoint[2] );
-                       sphereActor->GetProperty()->SetColor( mcolour[0] , mcolour[1] , mcolour[2] );
-                       sphereActor->GetProperty()->SetOpacity( mopacity );
-
-                       lstActors.push_back(sphereActor);
-                       renderer->AddActor( sphereActor );
+       lstPointsX.push_back( x );
+       lstPointsY.push_back( y );
+       lstPointsZ.push_back( z );
+
+       std::string strLabel = CleanSpaces(  label );
+
+       lstLabels.push_back( strLabel );
+
+       // Sphere
+       vtkSphereSource *vtksphere              = vtkSphereSource::New();
+       vtksphere->SetThetaResolution (20);
+       vtksphere->SetPhiResolution (20);
+       vtksphere->SetRadius( mradio  );
+
+       //NTU: For updating points
+
+       lstSourceSphere.push_back(vtksphere);
+
+       vtkPolyDataMapper *sphereMapper = vtkPolyDataMapper::New();
+       sphereMapper->SetInput( vtksphere->GetOutput() );
+       vtkActor *sphereActor   = vtkActor::New();
+       sphereActor->SetMapper(sphereMapper);
+       sphereActor->SetOrigin(0, 0, 0);
+       double spc[3];
+       if(mimage==NULL){
+               wxMessageDialog dialog(this, _T("Image Not Set"),_T("Image Not Set"),wxICON_ERROR);
+               dialog.ShowModal();
+               return;
+       }
+       mimage->GetSpacing(spc);
+       sphereActor->SetPosition( spc[0]*x , spc[1]*y , spc[2]*z );
+       sphereActor->GetProperty()->SetColor( mcolour[0] , mcolour[1] , mcolour[2] );
+       sphereActor->GetProperty()->SetOpacity( mopacity );
+
+       lstActorsSphere.push_back(sphereActor);
+       if(renderer==NULL){
+               wxMessageDialog dialog(this, _T("Renderer Not Set"),_T("Renderer Not Set"),wxICON_ERROR);
+               dialog.ShowModal();             
+               return;
+       }
+       renderer->AddActor( sphereActor );
 
-                       renderer->GetRenderWindow()->Render();
+       // Actor
+       vtkTextActor3D *textActor = vtkTextActor3D::New();
+       textActor->SetPosition(  mradio+spc[0]*x , spc[1]*y , spc[2]*z );
+       textActor->SetInput( strLabel.c_str()  );
+       renderer->AddActor( textActor );
+       lstActorsText.push_back(textActor);
 
-                       //--BBTK
-//EED???                       mbbShowNPoints->bbSignalOutputModification(std::string("Point"));    
+       SetOutputBox();
+}
 
+//------------------------------------------------------------------------
+void WidgetShowNPoints::OnAddPoint (wxCommandEvent& event)
+{
+       if (this->renderer!=NULL){
+               if (mpoint.size()==3){
+                       AddPoint(mpoint[0],mpoint[1],mpoint[2], (const char*) ( textCtrl->GetValue().mb_str() ) );
                } else {//mpoint.size
-                       printf("creaMaracasVisu::ShowNPoints (not match point)");
+                       printf("creaMaracasVisu::ShowNPoints (not match point) \n");
                }
        } // renderer
 }
 
 //------------------------------------------------------------------------
-void WidgetShowNPoints::OnErasePoint(wxCommandEvent& event)
-{
-       int id = lstActors.size()-1;
-       if (this->renderer!=NULL){ 
-               if (id>=0){
-                       renderer->RemoveActor( lstActors[id] );
-                       lstActors.erase( lstActors.begin()+id );
-                       lstPointsX.erase( lstPointsX.begin()+id );
-                       lstPointsY.erase( lstPointsY.begin()+id );
-                       lstPointsZ.erase( lstPointsZ.begin()+id );
-                       renderer->GetRenderWindow()->Render();
+       void WidgetShowNPoints::SetOutputBox()
+       {
+               renderer->GetRenderWindow()->Render();
+               wxString strTmp;
+               strTmp.Printf(_T("Nbr of points: %d"), (int)(lstPointsX.size()) );
+               txtNrPoints->SetLabel(  strTmp );
+
                //--BBTK
-//EED???                       mbbShowNPoints->bbSignalOutputModification(std::string("Point"));    
-               } // if id
-       } // if renderer
-}
+               mbbShowNPoints->bbSetOutputlstPointsX( lstPointsX );
+               mbbShowNPoints->bbSetOutputlstPointsY( lstPointsY );
+               mbbShowNPoints->bbSetOutputlstPointsZ( lstPointsZ );
+               mbbShowNPoints->bbSetOutputlstLabels( lstLabels );
+               mbbShowNPoints->bbSignalOutputModification(std::string("lstPointsX"));
+               mbbShowNPoints->bbSignalOutputModification(std::string("lstPointsY"));
+               mbbShowNPoints->bbSignalOutputModification(std::string("lstPointsZ"));
+               mbbShowNPoints->bbSignalOutputModification(std::string("lstLabels"));
+       }
 
 //------------------------------------------------------------------------
-void WidgetShowNPoints::OnDeleteAllPoints(wxCommandEvent& event)
-{
-       int i,size=lstActors.size();
-       if (this->renderer!=NULL){ 
-               for (i=0;i<size;i++)
+       void WidgetShowNPoints::OnSavePoints(wxCommandEvent& event)
+       {
+               wxFileDialog* FD = new wxFileDialog( 0,
+                                            _T("Save points .."),
+                                            _T(""),
+                                            _T(""),
+                                            _T("(*.xls)|*.xls"),
+                                            wxSAVE | wxOVERWRITE_PROMPT,
+                                            wxDefaultPosition);
+               //EED
+
+               int result_FD = FD->ShowModal();
+
+               // This line is need it by windows //EED
+               FD->SetReturnCode( result_FD );
+
+               if (FD->GetReturnCode()==wxID_OK)
                {
-                       renderer->RemoveActor( lstActors[i] );
+                       FILE *ff;
+                       std::string filename= (const char*) ( FD->GetPath().mb_str() );
+                       ff = fopen( filename.c_str() , "w+" );
+                       if (ff!=NULL)
+                       {
+                               int i , size = (int) (lstActorsSphere.size());
+                               fprintf(ff,"NumberOfPoints %d \n",size);
+                               fprintf(ff," X\tY\tZ\tvalue\tLabel\n");
+                               int x, y, z;
+                               double value;
+                               for (i=0; i<size; i++)
+                               {
+                                       x=lstPointsX[i];
+                                       y=lstPointsY[i];
+                                       z=lstPointsZ[i];
+                                       value= mimage->GetScalarComponentAsDouble(x,y,z,0);
+                                       fprintf(ff,"%d\t%d\t%d\t%f\t%s\n", x , y , z , value  , lstLabels[i].c_str());
+                               } // for
+                               fclose(ff);
+                       } else {   // else ff
+                               printf("WidgetShowNPoints::OnSavePoints  ...Error... creating file");
+                       } //ff
+               }       // dialog box
+       }
+
+//------------------------------------------------------------------------
+       void WidgetShowNPoints::OnLoadPoints(wxCommandEvent& event)
+       {
+               wxFileDialog* FD = new wxFileDialog( 0,
+                                             _T("Load points .."),
+                                             _T(""),
+                                             _T(""),
+                                             _T("(*.xls)|*.xls"),
+                                             wxOPEN | wxFILE_MUST_EXIST,
+                                             wxDefaultPosition);
+               //EED
+
+               int result_FD = FD->ShowModal();
+
+               // This line is need it by windows //EED
+               FD->SetReturnCode( result_FD );
+
+               if (FD->GetReturnCode()==wxID_OK)
+               {
+                       FILE *ff;
+                       std::string filename= (const char*) ( FD->GetPath().mb_str() );
+                       ff = fopen( filename.c_str() , "r+" );
+                       if (ff!=NULL)
+                       {
+                               int i,size;
+                               char chartmp[256];
+                               fscanf(ff," %s %d",chartmp,&size);
+                               fscanf(ff," %s %s %s %s %s",chartmp, chartmp,chartmp,chartmp,chartmp );
+
+                               float value;
+                               int x,y,z;
+                               for (i=0; i<size; i++)
+                               {
+                                       fscanf(ff,"%d%d%d%f%s",&x,&y,&z,&value,chartmp );  // x,y,z,value,label
+                                       AddPoint(x,y,z, chartmp );
+                               }
+                               fclose(ff);
+                       } else {   // else ff
+                               printf("WidgetShowNPoints::OnLoadPoints  ...Error... reading file");
+                       } //ff
+               }       // dialog box
+
+
+       }
+
+//------------------------------------------------------------------------
+
+       int WidgetShowNPoints::GetNearestPoint()
+       {
+               int id=-1;
+               int i, size=(int)(lstActorsSphere.size());
+               double spc[3];
+
+               if(mimage ==NULL){                      
+                       wxMessageDialog* diag = new wxMessageDialog(this, _T("Image not set"), _T("Image Not Set"), wxICON_ERROR);
+                       diag->ShowModal();
+                       return -1;
+               }else{
+
+                       mimage->GetSpacing(spc);
+
+                       for ( i=0  ; i<size; i++ )
+                       {
+                               double rx =  spc[0]*(mpoint[0] - lstPointsX [i]);
+                               double ry =  spc[1]*(mpoint[1] - lstPointsY [i]);
+                               double rz =  spc[2]*(mpoint[2] - lstPointsZ [i]);
+                               if ( rx*rx + ry*ry + rz*rz <= mradio*mradio)
+                               {
+                                       id=i;
+                               }       // if
+                       } // for
+
+                       return id;
                }
-               lstActors.clear();
-               lstPointsX.clear();
-               lstPointsY.clear();
-               lstPointsZ.clear();
-               renderer->GetRenderWindow()->Render();
-               //--BBTK
-//EED???               mbbShowNPoints->bbSignalOutputModification(std::string("Point"));    
-       } // renderer
+       }
+
+//------------------------------------------------------------------------
+       void WidgetShowNPoints::OnRenamePoint(wxCommandEvent& event)
+       {
+               int id=GetNearestPoint();
+               if (id>=0)
+               {
+                       std::string strLabel = CleanSpaces(  (const char*) ( textCtrl->GetValue().mb_str() ) );
+                       lstLabels[id] = CleanSpaces( (const char*) (textCtrl->GetValue().mb_str()) ) ;
+                       lstActorsText[id]->SetInput(  lstLabels[id].c_str() );
+                       SetOutputBox();
+               }
+       }
+
+//------------------------------------------------------------------------
+       void WidgetShowNPoints::ErasePoint(int id)
+       {
+               if (this->renderer!=NULL){
+                       if (id>=0){
+                               renderer->RemoveActor( lstActorsSphere[id] );
+                               renderer->RemoveActor( lstActorsText[id] );
+                                lstActorsSphere[id]->Delete();
+                                lstActorsText[id]->Delete();
+                                lstSourceSphere[id]->Delete();
+                               lstActorsSphere.erase( lstActorsSphere.begin()+id );
+                               lstActorsText.erase( lstActorsText.begin()+id );
+                               lstSourceSphere.erase( lstSourceSphere.begin()+id );
+
+                               lstPointsX.erase( lstPointsX.begin()+id );
+                               lstPointsY.erase( lstPointsY.begin()+id );
+                               lstPointsZ.erase( lstPointsZ.begin()+id );
+                               lstLabels.erase( lstLabels.begin()+id );
+
+                               SetOutputBox();
+
+                       } // if id
+               } // if renderer
+       }
+
+//------------------------------------------------------------------------
+       void WidgetShowNPoints::OnErasePoint(wxCommandEvent& event)
+       {
+               ErasePoint( GetNearestPoint() );
+       }
+
+//------------------------------------------------------------------------
+       void WidgetShowNPoints::OnEraseLastPoint(wxCommandEvent& event)
+       {
+               ErasePoint(lstActorsSphere.size()-1);
+       }
+
+//------------------------------------------------------------------------
+void WidgetShowNPoints::OnDeleteAllPoints(wxCommandEvent& event)
+{
+       int id,size=lstActorsSphere.size();
+       for (id=size-1;id>=0;id--)
+       {
+               ErasePoint(id);
+       }
 }
 
+//NTU: Method for updating points opacity and Radio
 
+//------------------------------------------------------------------------
+void WidgetShowNPoints::UpdatePoints(wxCommandEvent &event)
+{
+       //Difference in Radio for text placement
+       int difradio = sdrRadio->GetValue() - this->mradio;
+       
+       this->mopacity = sdrOpacity->GetValue()/100.0;
+       this->mradio = sdrRadio->GetValue();
+       
+       //NTU refresh the inputs
+       mbbShowNPoints->bbSetInputOpacity(this->mopacity);
+       mbbShowNPoints->bbSetInputRadio(this->mradio);
 
+       int size = (int) this->lstActorsSphere.size();
+       int i;
+       for(i = 0; i < size; i ++)
+       {
+               this->lstSourceSphere[i]->SetRadius(mradio);
+               this->lstActorsSphere[i]->GetProperty()->SetOpacity(mopacity);
+               this->lstActorsText[i]->SetPosition(this->lstActorsText[i]->GetPosition()[0]+difradio,this->lstActorsText[i]->GetPosition()[1], this->lstActorsText[i]->GetPosition()[2]);
+       }
 
+       //NTU: For updating
+       SetOutputBox();
+}
 
 BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ShowNPoints)
 BBTK_BLACK_BOX_IMPLEMENTATION(ShowNPoints,bbtk::WxBlackBox);
 
 void ShowNPoints::Process()
 {
-printf("EED %p ShowNPoints::Process 01\n", this);
-       if (mwxwidget!=NULL){
-printf("EED %p ShowNPoints::Process 02\n", this);
-               mwxwidget->SetRenderer( bbGetInputRenderer() );   
-               mwxwidget->SetPoint( bbGetInputIn() );   
-               mwxwidget->SetImage( bbGetInputImage() );   
-               mwxwidget->SetColour( bbGetInputColour() );   
-               mwxwidget->SetOpacity( bbGetInputOpacity() );   
-               mwxwidget->SetRadio( bbGetInputRadio() );   
+       if (mwxwidget!=NULL)
+       {
+               mwxwidget->SetRenderer( bbGetInputRenderer() );
+               mwxwidget->SetPoint( bbGetInputIn() );
+               mwxwidget->SetImage( bbGetInputImage() );
+               mwxwidget->SetColour( bbGetInputColour() );
+               mwxwidget->SetOpacity( bbGetInputOpacity() );
+               mwxwidget->SetRadio( bbGetInputRadio() );
 
                bbSetOutputlstPointsX( mwxwidget->GetLstPointsX() );
                bbSetOutputlstPointsY( mwxwidget->GetLstPointsY() );
                bbSetOutputlstPointsZ( mwxwidget->GetLstPointsZ() );
+               bbSetOutputlstLabels( mwxwidget->GetLstLabels() );
        } // mwxwidget
 }
 
-
 void ShowNPoints::CreateWidget(wxWindow* parent)
 {
-       mwxwidget = new WidgetShowNPoints( parent ,  this);
-       mwxwidget->SetPoint( bbGetInputIn() );
-
-       if (bbGetInputImage()==NULL)
-       {
-               printf("Missing Image  (ShowNPoints) \n");
-       }
-
-   bbSetOutputWidget( mwxwidget ); 
+       mwxwidget = new WidgetShowNPoints( parent, this);
+        bbSetOutputWidget( mwxwidget );
 }
 
 void ShowNPoints::bbUserSetDefaultValues()
 {
        mwxwidget = NULL;
 
-       bbSetInputRadio(0.5);
+       bbSetInputRadio(1);
        bbSetInputOpacity(1);
-       
+
        std::vector<double> colour;
        colour.push_back(1.0);
        colour.push_back(0.0);
@@ -242,20 +492,18 @@ void ShowNPoints::bbUserSetDefaultValues()
        bbSetInputImage(NULL);
        bbSetInputRenderer(NULL);
 }
-       
-       //-----------------------------------------------------------------     
+
+//-----------------------------------------------------------------
        void ShowNPoints::bbUserInitializeProcessing()
        {
        }
-       
-       //-----------------------------------------------------------------     
+
+//-----------------------------------------------------------------
        void ShowNPoints::bbUserFinalizeProcessing()
        {
        }
-       
-       //-----------------------------------------------------------------     
+
+//-----------------------------------------------------------------
 
 }
 // EO namespace bbcreaMaracasVisu
-
-