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

diff --git a/bbtk/src/bbmaracasvisuShowNPoints.h b/bbtk/src/bbmaracasvisuShowNPoints.h
index 8a2feec..46ab8b9 100644
--- a/bbtk/src/bbmaracasvisuShowNPoints.h
+++ b/bbtk/src/bbmaracasvisuShowNPoints.h
@@ -25,6 +25,7 @@ namespace bbcreaMaracasVisu
 	  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);
@@ -34,15 +35,17 @@ 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;
+	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;
@@ -68,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);
@@ -79,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