addition of file

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

diff --git a/bbtk/src/bbmaracasvisuShowNPoints.h b/bbtk/src/bbmaracasvisuShowNPoints.h
index d95977ea09ce092390e129f2afbe7ec97dc9a094..c890f13066389ef4fcaf16b8cee25f1da2b6d9cf 100644 (file)
--- a/bbtk/src/bbmaracasvisuShowNPoints.h
+++ b/bbtk/src/bbmaracasvisuShowNPoints.h
@@ -5,6 +5,7 @@
 
 
 #include "vtkActor.h"
+#include "vtkSphereSource.h"
 #include "vtkImageData.h"
 #include "vtkRenderer.h"
 #include "vtkTextActor3D.h"
@@ -26,7 +27,9 @@ namespace bbcreaMaracasVisu
          void OnEraseLastPoint(wxCommandEvent &event);   
          void OnDeleteAllPoints(wxCommandEvent &event);   
          void OnSavePoints(wxCommandEvent &event);   
-         void OnLoadPoints(wxCommandEvent &event);   
+         void OnLoadPoints(wxCommandEvent &event);
+
+         void UpdatePoints(wxCommandEvent &event);
          
          void SetPoint(std::vector<int> ppoint);
          void SetColour(std::vector<double> colour);
@@ -40,32 +43,37 @@ namespace bbcreaMaracasVisu
          std::vector<std::string> GetLstLabels();
 
   private:
-         
-         void                  AddPoint(int x, int y, int z, std::string label);
-         std::string   CleanSpaces(std::string ss);
-         int                   GetNearestPoint();
-         void                  ErasePoint(int id);
-         void                  SetOutputBox();
-         
-         ShowNPoints                                   *mbbShowNPoints;
-         vtkRenderer                                   *renderer;
-         std::vector<int>                              lstPointsX;
-         std::vector<int>                              lstPointsY;
-         std::vector<int>                              lstPointsZ;
-         std::vector<std::string>              lstLabels;
-         std::vector<vtkProp3D*>               lstActorsSphere;
-         std::vector<vtkTextActor3D*>  lstActorsText;
-
-         std::vector<int>                              mpoint;
-         vtkImageData                                  *mimage;
-         std::vector<double>                   mcolour;
-         double                                                mopacity;
-         double                                                mradio;
-         wxTextCtrl                                    *textCtrl;
-         wxStaticText                                  *txtNrPoints;
-  };
 
+         void                  AddPoint(int x, int y, int z, std::string label);
+         std::string           CleanSpaces(std::string ss);
+         int                   GetNearestPoint();
+         void                  ErasePoint(int id);
+         void                  SetOutputBox();
+
+         ShowNPoints                   *mbbShowNPoints;
+         vtkRenderer                   *renderer;
+         std::vector<int>              lstPointsX;
+         std::vector<int>              lstPointsY;
+         std::vector<int>              lstPointsZ;
+         std::vector<std::string>      lstLabels;
+         std::vector<vtkActor*>        lstActorsSphere;//NTU changed from prop3D to Actor
+         std::vector<vtkTextActor3D*>  lstActorsText;
 
+         //NTU: For updating points
+
+         std::vector<vtkSphereSource*> lstSourceSphere;
+
+         std::vector<int>      mpoint;
+         vtkImageData          *mimage;
+         std::vector<double>   mcolour;
+         double                mopacity;
+         double                mradio;
+         wxStaticText          *askPointLabel;
+         wxTextCtrl            *textCtrl;
+         wxStaticText          *txtNrPoints;
+         wxSlider              *sdrOpacity;
+         wxSlider              *sdrRadio;
+  };
 
 class /*BBTK_EXPORT*/ ShowNPoints
  : 
@@ -113,4 +121,3 @@ BBTK_END_DESCRIBE_BLACK_BOX(ShowNPoints);
 
 #endif // __bbcreaMaracasVisuShowNPoints_h_INCLUDED__
 #endif // _USE_WXWIDGETS_
-