*** empty log message ***

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

diff --git a/bbtk/src/bbmaracasvisuShowNPoints.h b/bbtk/src/bbmaracasvisuShowNPoints.h
index a203d1f9d03353c46ab7362c13ab1dd95351ecec..231e0905acb912179dfaef2810ba76548c8e4c04 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);
@@ -41,6 +44,7 @@ namespace bbcreaMaracasVisu
 
   private:
          
+         void                  AddPoint(int x, int y, int z, std::string label);
          std::string   CleanSpaces(std::string ss);
          int                   GetNearestPoint();
          void                  ErasePoint(int id);
@@ -52,9 +56,13 @@ namespace bbcreaMaracasVisu
          std::vector<int>                              lstPointsY;
          std::vector<int>                              lstPointsZ;
          std::vector<std::string>              lstLabels;
-         std::vector<vtkProp3D*>               lstActorsSphere;
+         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;
@@ -62,6 +70,8 @@ namespace bbcreaMaracasVisu
          double                                                mradio;
          wxTextCtrl                                    *textCtrl;
          wxStaticText                                  *txtNrPoints;
+         wxSlider                                              *sdrOpacity;
+         wxSlider                                              *sdrRadio;
   };