addition of file

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

diff --git a/bbtk/src/bbmaracasvisuShowNPoints.cxx b/bbtk/src/bbmaracasvisuShowNPoints.cxx
index dd99af86d3307564fef36a03cee7d874ac5f445f..d9e198e2b7202d10aba21e65f544d44a259514b1 100644 (file)
--- a/bbtk/src/bbmaracasvisuShowNPoints.cxx
+++ b/bbtk/src/bbmaracasvisuShowNPoints.cxx
@@ -20,16 +20,16 @@ namespace bbcreaMaracasVisu
     wxSizer *sizer                     = NULL;
 
        // Widget interface
-       askPointLabel                   = new wxStaticText(panel, -1, _T("Point label :")); // JPR
-       textCtrl                        = new wxTextCtrl(panel, -1);
+       askPointLabel                           = new wxStaticText(panel, -1, _T("Point label :")); // JPR
+       textCtrl                                        = new wxTextCtrl(panel, -1);
        wxButton *btnAddPoint           = new wxButton( panel, -1, _T("Add 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 *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(" "));
+       txtNrPoints                                     = new wxStaticText(panel,-1, _T(" "));
 
        //NTU: Sliders for opacity and radio change
 
@@ -63,9 +63,9 @@ namespace bbcreaMaracasVisu
          sizer1->Add(btnDeleteAllPoints);
          sizer1->Add(txtNrPoints);
          sizer1->Add(txOpacity);
-         sizer1->Add(sdrOpacity);
+         sizer1->Add(sdrOpacity,1,wxGROW );
          sizer1->Add(txRadio);
-         sizer1->Add(sdrRadio);
+         sizer1->Add(sdrRadio,1,wxGROW );
          sizer1->Add(btnSavePoints);
          sizer1->Add(btnLoadPoints);
 
@@ -128,7 +128,7 @@ void WidgetShowNPoints::SetOpacity(double opacity)
 {
        this->mopacity=opacity;
        //NTU: For Slider
-       sdrOpacity->SetValue(this->mopacity*100.0);
+       sdrOpacity->SetValue(this->mopacity/100.0);
 }
 
 //------------------------------------------------------------------------
@@ -276,7 +276,7 @@ void WidgetShowNPoints::OnAddPoint (wxCommandEvent& event)
                                        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());
+                                       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
@@ -318,7 +318,7 @@ void WidgetShowNPoints::OnAddPoint (wxCommandEvent& event)
                                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
+                                       fscanf(ff,"%d%d%d%f%s",&x,&y,&z,&value,chartmp );  // x,y,z,value,label
                                        AddPoint(x,y,z, chartmp );
                                }
                                fclose(ff);
@@ -454,7 +454,8 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ShowNPoints,bbtk::WxBlackBox);
 
 void ShowNPoints::Process()
 {
-       if (mwxwidget!=NULL){
+       if (mwxwidget!=NULL)
+       {
                mwxwidget->SetRenderer( bbGetInputRenderer() );
                mwxwidget->SetPoint( bbGetInputIn() );
                mwxwidget->SetImage( bbGetInputImage() );
@@ -472,14 +473,7 @@ void ShowNPoints::Process()
 void ShowNPoints::CreateWidget(wxWindow* parent)
 {
        mwxwidget = new WidgetShowNPoints( parent, this);
-       mwxwidget->SetPoint( bbGetInputIn() );
-
-       if (bbGetInputImage()==NULL)
-       {
-               printf("Missing Image  (ShowNPoints) \n");
-       }
-
-   bbSetOutputWidget( mwxwidget );
+        bbSetOutputWidget( mwxwidget );
 }
 
 void ShowNPoints::bbUserSetDefaultValues()