avoid warnings / fix typo / reindent

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

diff --git a/bbtk/src/bbmaracasvisuShowNPoints.cxx b/bbtk/src/bbmaracasvisuShowNPoints.cxx
index bd4ec4272aff02d3718599324a21cd8f685c3dd3..dd99af86d3307564fef36a03cee7d874ac5f445f 100644 (file)
--- a/bbtk/src/bbmaracasvisuShowNPoints.cxx
+++ b/bbtk/src/bbmaracasvisuShowNPoints.cxx
@@ -10,27 +10,26 @@
 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
-       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"));
+       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 *btnSavePoints                 = new wxButton( panel, -1, _T("Save points"));
-       wxButton *btnLoadPoints                 = new wxButton( panel, -1, _T("Load points"));
-       txtNrPoints                                             = new wxStaticText(panel,-1, _T(" "));
+       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
 
@@ -43,18 +42,19 @@ namespace bbcreaMaracasVisu
        wxFlexGridSizer *sizer1 = new wxFlexGridSizer(1);
 //    sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
 
-         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);
+         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);
+         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);
@@ -70,13 +70,11 @@ namespace bbcreaMaracasVisu
          sizer1->Add(btnLoadPoints);
 
          sizer = sizer1;
-         panel ->      SetSizer(sizer);
-         panel ->      SetAutoLayout(true);
-         panel ->      Layout();
-
+         panel ->SetSizer(sizer);
+         panel ->SetAutoLayout(true);
+         panel ->Layout();
 }
 
-
 //------------------------------------------------------------------------
 WidgetShowNPoints::~WidgetShowNPoints()
 {
@@ -113,9 +111,6 @@ std::vector<int> WidgetShowNPoints::GetLstPointsZ()
        return lstLabels;
 }
 
-
-
-
 //------------------------------------------------------------------------
 void WidgetShowNPoints::SetPoint(std::vector<int> ppoint)
 {
@@ -148,6 +143,7 @@ void  WidgetShowNPoints::SetRenderer(vtkRenderer *renderer)
        this->renderer  = renderer;
 }
 
+//------------------------------------------------------------------------
 
 std::string WidgetShowNPoints::CleanSpaces(std::string ss)
 {
@@ -212,7 +208,6 @@ void WidgetShowNPoints::AddPoint(int x, int y, int z, std::string label)
        lstActorsText.push_back(textActor);
 
        SetOutputBox();
-
 }
 
 //------------------------------------------------------------------------
@@ -227,8 +222,7 @@ void WidgetShowNPoints::OnAddPoint (wxCommandEvent& event)
        } // renderer
 }
 
-
-       //------------------------------------------------------------------------
+//------------------------------------------------------------------------
        void WidgetShowNPoints::SetOutputBox()
        {
                renderer->GetRenderWindow()->Render();
@@ -247,17 +241,16 @@ void WidgetShowNPoints::OnAddPoint (wxCommandEvent& event)
                mbbShowNPoints->bbSignalOutputModification(std::string("lstLabels"));
        }
 
-       //------------------------------------------------------------------------
+//------------------------------------------------------------------------
        void WidgetShowNPoints::OnSavePoints(wxCommandEvent& event)
        {
-
                wxFileDialog* FD = new wxFileDialog( 0,
-                                                                                       _T("Save points .."),
-                                                                                       _T(""),
-                                                                                       _T(""),
-                                                                                       _T("(*.xls)|*.xls"),
-                                                                                        wxSAVE | wxOVERWRITE_PROMPT,
-                                                                                       wxDefaultPosition);
+                                            _T("Save points .."),
+                                            _T(""),
+                                            _T(""),
+                                            _T("(*.xls)|*.xls"),
+                                            wxSAVE | wxOVERWRITE_PROMPT,
+                                            wxDefaultPosition);
                //EED
 
                int result_FD = FD->ShowModal();
@@ -290,19 +283,18 @@ void WidgetShowNPoints::OnAddPoint (wxCommandEvent& event)
                                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);
+                                             _T("Load points .."),
+                                             _T(""),
+                                             _T(""),
+                                             _T("(*.xls)|*.xls"),
+                                             wxOPEN | wxFILE_MUST_EXIST,
+                                             wxDefaultPosition);
                //EED
 
                int result_FD = FD->ShowModal();
@@ -338,6 +330,8 @@ void WidgetShowNPoints::OnAddPoint (wxCommandEvent& event)
 
        }
 
+//------------------------------------------------------------------------
+
        int WidgetShowNPoints::GetNearestPoint()
        {
                int id=-1;
@@ -367,7 +361,7 @@ void WidgetShowNPoints::OnAddPoint (wxCommandEvent& event)
                }
        }
 
-       //------------------------------------------------------------------------
+//------------------------------------------------------------------------
        void WidgetShowNPoints::OnRenamePoint(wxCommandEvent& event)
        {
                int id=GetNearestPoint();
@@ -380,7 +374,7 @@ void WidgetShowNPoints::OnAddPoint (wxCommandEvent& event)
                }
        }
 
-       //------------------------------------------------------------------------
+//------------------------------------------------------------------------
        void WidgetShowNPoints::ErasePoint(int id)
        {
                if (this->renderer!=NULL){
@@ -405,19 +399,18 @@ void WidgetShowNPoints::OnAddPoint (wxCommandEvent& event)
                } // if renderer
        }
 
-       //------------------------------------------------------------------------
+//------------------------------------------------------------------------
        void WidgetShowNPoints::OnErasePoint(wxCommandEvent& event)
        {
                ErasePoint( GetNearestPoint() );
        }
 
-       //------------------------------------------------------------------------
+//------------------------------------------------------------------------
        void WidgetShowNPoints::OnEraseLastPoint(wxCommandEvent& event)
        {
                ErasePoint(lstActorsSphere.size()-1);
        }
 
-
 //------------------------------------------------------------------------
 void WidgetShowNPoints::OnDeleteAllPoints(wxCommandEvent& event)
 {
@@ -426,7 +419,6 @@ void WidgetShowNPoints::OnDeleteAllPoints(wxCommandEvent& event)
        {
                ErasePoint(id);
        }
-
 }
 
 //NTU: Method for updating points opacity and Radio
@@ -457,8 +449,6 @@ void WidgetShowNPoints::UpdatePoints(wxCommandEvent &event)
        SetOutputBox();
 }
 
-
-
 BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaMaracasVisu,ShowNPoints)
 BBTK_BLACK_BOX_IMPLEMENTATION(ShowNPoints,bbtk::WxBlackBox);
 
@@ -479,10 +469,9 @@ void ShowNPoints::Process()
        } // mwxwidget
 }
 
-
 void ShowNPoints::CreateWidget(wxWindow* parent)
 {
-       mwxwidget = new WidgetShowNPoints( parent ,  this);
+       mwxwidget = new WidgetShowNPoints( parent, this);
        mwxwidget->SetPoint( bbGetInputIn() );
 
        if (bbGetInputImage()==NULL)
@@ -510,19 +499,17 @@ void ShowNPoints::bbUserSetDefaultValues()
        bbSetInputRenderer(NULL);
 }
 
-       //-----------------------------------------------------------------
+//-----------------------------------------------------------------
        void ShowNPoints::bbUserInitializeProcessing()
        {
        }
 
-       //-----------------------------------------------------------------
+//-----------------------------------------------------------------
        void ShowNPoints::bbUserFinalizeProcessing()
        {
        }
 
-       //-----------------------------------------------------------------
+//-----------------------------------------------------------------
 
 }
 // EO namespace bbcreaMaracasVisu
-
-