X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuShowNPoints.h;h=46ab8b9f3a58c659e675dbf4c8aaf68554250a7f;hb=4df00b156385a2dd881c35fd7561ef9eb0885ee0;hp=d32401cd5122a690ded9742a1a3968b7dd10269c;hpb=9697c343d164e830207af2a1ca6cd0899c862c51;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuShowNPoints.h b/bbtk/src/bbmaracasvisuShowNPoints.h
index d32401c..46ab8b9 100644
--- a/bbtk/src/bbmaracasvisuShowNPoints.h
+++ b/bbtk/src/bbmaracasvisuShowNPoints.h
@@ -17,34 +17,42 @@ namespace bbcreaMaracasVisu
   class WidgetShowNPoints : public wxPanel
   {
   public:
-	WidgetShowNPoints( wxWindow *parent,  ShowNPoints *box);
-    ~WidgetShowNPoints(); 
-	void OnAddPoint(wxCommandEvent &event);   
-	void OnErasePoint(wxCommandEvent &event);   
-	void OnDeleteAllPoints(wxCommandEvent &event);   
-	void SetPoint(std::vector<int> ppoint);
-	void SetColour(std::vector<double> colour);
-	void SetOpacity(double opacity);
-	void SetRadio(double radio);
-	void SetImage(vtkImageData *image);
-	void SetRenderer(vtkRenderer *renderer);
-	std::vector<int> GetLstPointsX();
-	std::vector<int> GetLstPointsY();
-	std::vector<int> GetLstPointsZ();
+	  WidgetShowNPoints( wxWindow *parent,  ShowNPoints *box);
+	  ~WidgetShowNPoints(); 
+	  void OnAddPoint(wxCommandEvent &event);   
+	  void ErasePoint(int id);
+	  void OnErasePoint(wxCommandEvent& event);
+	  void OnEraseLastPoint(wxCommandEvent &event);   
+	  void OnDeleteAllPoints(wxCommandEvent &event);   
+	  
+	  void SetOutputBox();
+	  void SetPoint(std::vector<int> ppoint);
+	  void SetColour(std::vector<double> colour);
+	  void SetOpacity(double opacity);
+	  void SetRadio(double radio);
+	  void SetImage(vtkImageData *image);
+	  void SetRenderer(vtkRenderer *renderer);
+	  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<vtkActor*>	lstActors;
+	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<vtkProp3D*>	 lstActorsText;
 
 	std::vector<int>		mpoint;
 	vtkImageData			*mimage;
 	std::vector<double>		mcolour;
 	double					mopacity;
 	double					mradio;
+	wxTextCtrl				*textCtrl;
   };
 
 
@@ -63,6 +71,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);
@@ -74,19 +83,20 @@ 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