X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuShowNPoints.h;h=f047ae4314b69ccb6a4193b77a79bd2dcb3b33c5;hb=d0c09a70008646305df0937f47fd7d5930636a67;hp=a203d1f9d03353c46ab7362c13ab1dd95351ecec;hpb=3f50fcd2bb43091e837ac26a9c175674a3fd32ee;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuShowNPoints.h b/bbtk/src/bbmaracasvisuShowNPoints.h
index a203d1f..f047ae4 100644
--- 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"
@@ -21,12 +22,16 @@ namespace bbcreaMaracasVisu
 	  WidgetShowNPoints( wxWindow *parent,  ShowNPoints *box);
 	  ~WidgetShowNPoints(); 
 	  void OnAddPoint(wxCommandEvent &event);   
+	  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 OnLoadPoints(wxCommandEvent &event);
+	  void UpdatePoints(wxCommandEvent &event);
+	  
+	  void RefreshPoint(int id);
 	  
 	  void SetPoint(std::vector<int> ppoint);
 	  void SetColour(std::vector<double> colour);
@@ -39,32 +44,40 @@ namespace bbcreaMaracasVisu
 	  std::vector<int> GetLstPointsZ();
 	  std::vector<std::string> GetLstLabels();
 
-  private:
-	  
-	  std::string	CleanSpaces(std::string ss);
-	  int			GetNearestPoint();
-	  void			ErasePoint(int id);
-	  void			SetOutputBox();
+	  void                  AddPoint(int x, int y, int z, std::string label);
 	  
-	  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;
+  private:
 
-	  std::vector<int>				mpoint;
-	  vtkImageData					*mimage;
-	  std::vector<double>			mcolour;
-	  double						mopacity;
-	  double						mradio;
-	  wxTextCtrl					*textCtrl;
-	  wxStaticText					*txtNrPoints;
-  };
+	  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
  : 
@@ -77,6 +90,7 @@ class /*BBTK_EXPORT*/ ShowNPoints
   BBTK_DECLARE_INPUT(Colour, std::vector<double> );
   BBTK_DECLARE_INPUT(Opacity, double );
   BBTK_DECLARE_INPUT(Radio, double );
+  BBTK_DECLARE_INPUT(Type, int );
   BBTK_DECLARE_OUTPUT( lstPointsX, std::vector<int> );
   BBTK_DECLARE_OUTPUT( lstPointsY, std::vector<int> );
   BBTK_DECLARE_OUTPUT( lstPointsZ, std::vector<int> );
@@ -88,7 +102,6 @@ class /*BBTK_EXPORT*/ ShowNPoints
 
 private:
 	WidgetShowNPoints *mwxwidget; 
-
 };
 
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(ShowNPoints,bbtk::WxBlackBox);
@@ -102,6 +115,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ShowNPoints,bbtk::WxBlackBox);
   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_INPUT(ShowNPoints,Type,"Type of the widget. 0(default): N-points, 1:Just one point",int,"");
   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> ,"");
@@ -112,4 +126,3 @@ BBTK_END_DESCRIBE_BLACK_BOX(ShowNPoints);
 
 #endif // __bbcreaMaracasVisuShowNPoints_h_INCLUDED__
 #endif // _USE_WXWIDGETS_
-