X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuShowNPoints.h;h=fd2d8487b73a7ee68a42e40256d52e57d3099aa4;hb=262993876bc653f4da132e6531bec2b5ab951faa;hp=8a2feec1f234fa1eb6c3f44fd86144b4dbad06e2;hpb=2fcae0362dddfd613ec085c6b48da49e721d0021;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuShowNPoints.h b/bbtk/src/bbmaracasvisuShowNPoints.h
index 8a2feec..fd2d848 100644
--- a/bbtk/src/bbmaracasvisuShowNPoints.h
+++ b/bbtk/src/bbmaracasvisuShowNPoints.h
@@ -5,8 +5,10 @@
 
 
 #include "vtkActor.h"
+#include "vtkSphereSource.h"
 #include "vtkImageData.h"
 #include "vtkRenderer.h"
+#include "vtkTextActor3D.h"
 
 namespace bbcreaMaracasVisu
 {
@@ -20,10 +22,16 @@ namespace bbcreaMaracasVisu
 	  WidgetShowNPoints( wxWindow *parent,  ShowNPoints *box);
 	  ~WidgetShowNPoints(); 
 	  void OnAddPoint(wxCommandEvent &event);   
-	  void ErasePoint(int id);
+	  void OnSetPoint(wxCommandEvent& event);
+	  void OnRenamePoint(wxCommandEvent& event);
 	  void OnErasePoint(wxCommandEvent& event);
 	  void OnEraseLastPoint(wxCommandEvent &event);   
 	  void OnDeleteAllPoints(wxCommandEvent &event);   
+	  void OnSavePoints(wxCommandEvent &event);   
+	  void OnLoadPoints(wxCommandEvent &event);
+	  void UpdatePoints(wxCommandEvent &event);
+	  
+	  void RefreshPoint(int id);
 	  
 	  void SetPoint(std::vector<int> ppoint);
 	  void SetColour(std::vector<double> colour);
@@ -34,25 +42,41 @@ namespace bbcreaMaracasVisu
 	  std::vector<int> GetLstPointsX();
 	  std::vector<int> GetLstPointsY();
 	  std::vector<int> GetLstPointsZ();
+	  std::vector<std::string> GetLstLabels();
 
   private:
-	ShowNPoints				*mbbShowNPoints;
-	vtkRenderer				*renderer;
-	std::vector<int>		lstPointsX;
-	std::vector<int>		lstPointsY;
-	std::vector<int>		lstPointsZ;
-	std::vector<vtkProp3D*>	lstActorsSphere;
-	std::vector<vtkProp3D*>	lstActorsText;
-
-	std::vector<int>		mpoint;
-	vtkImageData			*mimage;
-	std::vector<double>		mcolour;
-	double					mopacity;
-	double					mradio;
-	wxTextCtrl				*textCtrl;
-  };
 
+	  void                  AddPoint(int x, int y, int z, std::string label);
+	  std::string           CleanSpaces(std::string ss);
+	  int                   GetNearestPoint();
+	  int					IdInsidePoint();
+	  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
  : 
@@ -68,6 +92,7 @@ class /*BBTK_EXPORT*/ ShowNPoints
   BBTK_DECLARE_OUTPUT( lstPointsX, std::vector<int> );
   BBTK_DECLARE_OUTPUT( lstPointsY, std::vector<int> );
   BBTK_DECLARE_OUTPUT( lstPointsZ, std::vector<int> );
+  BBTK_DECLARE_OUTPUT( lstLabels,  std::vector<std::string> );
   BBTK_PROCESS(Process);
   void Process();
   BBTK_CREATE_WIDGET(CreateWidget);
@@ -79,23 +104,23 @@ private:
 };
 
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(ShowNPoints,bbtk::WxBlackBox);
-BBTK_NAME("ShowNPoints");
-BBTK_AUTHOR("Eduardo DAVILA");
-BBTK_DESCRIPTION("widget that shows N moints in 3D (vtkActors)");
-BBTK_CATEGORY("widgetVtk");
-BBTK_INPUT(ShowNPoints,In,"One Point",std::vector<int>,"");
-BBTK_INPUT(ShowNPoints,Renderer,"Renderer",vtkRenderer*,"");
-BBTK_INPUT(ShowNPoints,Image,"vktkImageData",vtkImageData*,"");
-BBTK_INPUT(ShowNPoints,Colour,"Colour of the actor",std::vector<double>,"colour");
-BBTK_INPUT(ShowNPoints,Opacity,"Opacity of the actor",double,"");
-BBTK_INPUT(ShowNPoints,Radio,"Radio of the spheres",double,"");
-BBTK_OUTPUT(ShowNPoints , lstPointsX , " list of points X ", std::vector<int> ,"");
-BBTK_OUTPUT(ShowNPoints , lstPointsY , " list of points Y ", std::vector<int> ,"");
-BBTK_OUTPUT(ShowNPoints , lstPointsZ , " list of points Z ", std::vector<int> ,"");
+  BBTK_NAME("ShowNPoints");
+  BBTK_AUTHOR("Eduardo DAVILA");
+  BBTK_DESCRIPTION("widget that shows N moints in 3D (vtkActors)");
+  BBTK_CATEGORY("widgetVtk");
+  BBTK_INPUT(ShowNPoints,In,"One Point",std::vector<int>,"");
+  BBTK_INPUT(ShowNPoints,Renderer,"Renderer",vtkRenderer*,"");
+  BBTK_INPUT(ShowNPoints,Image,"vktkImageData",vtkImageData*,"");
+  BBTK_INPUT(ShowNPoints,Colour,"Colour of the actor",std::vector<double>,"colour");
+  BBTK_INPUT(ShowNPoints,Opacity,"Opacity of the actor",double,"");
+  BBTK_INPUT(ShowNPoints,Radio,"Radio of the spheres",double,"");
+  BBTK_OUTPUT(ShowNPoints , lstPointsX , " list of points X ", std::vector<int> ,"");
+  BBTK_OUTPUT(ShowNPoints , lstPointsY , " list of points Y ", std::vector<int> ,"");
+  BBTK_OUTPUT(ShowNPoints , lstPointsZ , " list of points Z ", std::vector<int> ,"");
+  BBTK_OUTPUT(ShowNPoints , lstLabels , " list of labels ", std::vector<std::string> ,"");
 BBTK_END_DESCRIBE_BLACK_BOX(ShowNPoints);
 }
 // EO namespace bbcreaMaracasVisu
 
 #endif // __bbcreaMaracasVisuShowNPoints_h_INCLUDED__
 #endif // _USE_WXWIDGETS_
-