X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbmaracasvisuShowNPoints.h;h=cfeee438b6ccb5a8ab7d1dcbb35ac57c6f8f7411;hb=4b2a99534d79424c7892e09160a1488604741064;hp=df37ddb87ffbffe476e4d402f5ec57325ccfae9b;hpb=3ffc04fea9ffbe065dd0141b2d213353e874b284;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuShowNPoints.h b/bbtk/src/bbmaracasvisuShowNPoints.h
index df37ddb..cfeee43 100644
--- a/bbtk/src/bbmaracasvisuShowNPoints.h
+++ b/bbtk/src/bbmaracasvisuShowNPoints.h
@@ -27,123 +27,37 @@
 #ifndef __bbcreaMaracasVisuShowNPoints_h_INCLUDED__
 #define __bbcreaMaracasVisuShowNPoints_h_INCLUDED__
 #include "bbtkWxBlackBox.h"
-#include <cmath>
 
-#include "vtkActor.h"
-#include "vtkSphereSource.h"
+
 #include "vtkImageData.h"
-#include "vtkRenderer.h"
-#include "vtkTextActor3D.h"
+
+#include "WidgetShowNPoints.h"
 
 namespace bbcreaMaracasVisu
 {
 
-  class ModelShowNPoints
-  {
-	public:
-	  ModelShowNPoints();
-	  ~ModelShowNPoints(); 
-	  std::vector<int> 			GetLstPointsX();
-	  std::vector<int> 			GetLstPointsY();
-	  std::vector<int> 			GetLstPointsZ();
-	  void 						GetIdPoint(int id, int *x, int *y, int *z);
-	  std::string 				GetIdLabel(int id);
-	  std::vector<std::string> 	GetLstLabels();
-	  void 						AddPoint(int x, int y, int z, std::string label);
-	  double 					Distance(double dX0, double dY0, double dZ0, double dX1, double dY1, double dZ1);
-	  int 						InsertPoint(int x, int y, int z, std::string label);
-	  void						SavePoints(std::string filename);
-	  int						ReadPoints(std::string filename);
-	  int 						GetNearestPoint();
-
-	  int 						GetLstPointsSize();
-	  void 						SetPointId_mReferencePoint(int id);
-	  int 						IdInsidePoint();
-
-	  void 						SetReferencePoint(std::vector<int> ppoint);
-	  std::vector<int> 			GetReferencePoint();
-	  void 						SetImage(vtkImageData *image);
-	  std::string 				CleanSpaces(std::string ss);
-	  vtkImageData*				GetImage();
-	  void 						SetRadio(double radio);
-	  double					GetRadio();
-	  int 						RenamePoint(std::string label);
-	  void 						ErasePoint(int id);
-
-	private:
-	  std::vector<int>              lstPointsX;
-	  std::vector<int>              lstPointsY;
-	  std::vector<int>              lstPointsZ;
-	  std::vector<std::string>      lstLabels;
-	  std::vector<int>      		mReferencePoint;
-	  double                		mradio;
-	  vtkImageData          		*mimage;
-
-  };
-
-
-  class ShowNPoints;
-
-  //--------------------------------------------------------------------------
-  class WidgetShowNPoints : public wxPanel
-  {
-  public:
-	  WidgetShowNPoints( wxWindow *parent,  ShowNPoints *box);
-	  ~WidgetShowNPoints(); 
-	  void OnAddPoint(wxCommandEvent &event);   
-	  void OnInsertPoint (wxCommandEvent& event);//CFT
-	  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 SetColour(std::vector<double> colour);
-	  void SetOpacity(double opacity);
-	  void SetRadio(double radio);
-	  void SetImage(vtkImageData *image);
-	  void SetRenderer(vtkRenderer *renderer);
-	  void SetReferencePoint(std::vector<int> point);
-
-	  void AddPoint(int x, int y, int z, std::string label);
-	  void InsertPoint(int x, int y, int z, std::string label);//CFT
-
-	  ModelShowNPoints* GetModelShowNPoints();
-	  void RefreshPoints();
-	  void AddVtkPoint();
-	  void SetInitLstPoints( std::vector<int> initLstPointsX,  std::vector<int> initLstPointsY, std::vector<int> initLstPointsZ, std::vector<std::string> initLstLabels );
-
-
-  private:
-	  void                  		ErasePoint(int id);
-	  void                  		SetOutputBox();
-
-	  ShowNPoints                   *mbbShowNPoints;
-	  vtkRenderer                   *renderer;
-
-	  std::vector<vtkActor*>        lstActorsSphere;//NTU changed from prop3D to Actor
-	  std::vector<vtkTextActor3D*>  lstActorsText;
-
-	  //NTU: For updating points
-
-	  std::vector<vtkSphereSource*> lstSourceSphere;
-
-	  std::vector<double>   		mcolour;
-	  double                		mopacity;
-	  wxStaticText          		*askPointLabel;
-	  wxTextCtrl            		*textCtrl;
-	  wxStaticText          		*txtNrPoints;
-	  wxSlider              		*sdrOpacity;
-	  wxSlider              		*sdrRadio;
-
-	  ModelShowNPoints				*mmodelShowNPoints;
-		
-  };
+
+//--------------------------------------------------------------------------
+//--------------------------------------------------------------------------
+//--------------------------------------------------------------------------
+//--------------------------------------------------------------------------
+//--------------------------------------------------------------------------
+
+class ShowNPoints;
+
+class WidgetShowNPointsBox : public WidgetShowNPoints
+{
+public:
+	WidgetShowNPointsBox( wxWindow *parent,  ShowNPoints *box, int type);
+	~WidgetShowNPointsBox(); 
+	void UpdatePoints(wxCommandEvent &event);
+private:
+	void						SetOutputBox();
+	ShowNPoints					*mbbShowNPoints;
+};
+
+
+
 
 class /*BBTK_EXPORT*/ ShowNPoints
  : 
@@ -166,14 +80,14 @@ class /*BBTK_EXPORT*/ ShowNPoints
   BBTK_DECLARE_OUTPUT( lstPointsY, std::vector<int> );
   BBTK_DECLARE_OUTPUT( lstPointsZ, std::vector<int> );
   BBTK_DECLARE_OUTPUT( lstLabels,  std::vector<std::string> );
+  BBTK_DECLARE_OUTPUT( WidgetShowNPoints,  WidgetShowNPoints*);
   BBTK_PROCESS(Process);
   void Process();
   BBTK_CREATE_WIDGET(CreateWidget);
   void CreateWidget(wxWindow*);
 
 private:
-	WidgetShowNPoints *mwxwidget; 
-	bool firsttime;
+	WidgetShowNPointsBox *mwxwidget; 
 };
 
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(ShowNPoints,bbtk::WxBlackBox);
@@ -192,12 +106,13 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ShowNPoints,bbtk::WxBlackBox);
   BBTK_INPUT(ShowNPoints,InitLstPointsY,"Initial lst of points Y",std::vector<int>,"");
   BBTK_INPUT(ShowNPoints,InitLstPointsZ,"Initial lst of points Z",std::vector<int>,"");
   BBTK_INPUT(ShowNPoints,InitLstLabels,"Initial lst of labels",std::vector<std::string>,"");
-  BBTK_INPUT(ShowNPoints,Type,"Type of the widget. 0(default): N-points, 1:Just one point",int,"");
+  BBTK_INPUT(ShowNPoints,Type,"Type of the widget. 0(default): N-points, 1:Just one point, 2:Add/DeleteAll points, 3:As 0 with out save/load option",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> ,"");
   BBTK_OUTPUT(ShowNPoints , lstLabels , " list of labels ", std::vector<std::string> ,"");
+  BBTK_OUTPUT(ShowNPoints , WidgetShowNPoints , " WidgetShowNPoints ", WidgetShowNPoints* ,"");
 
 BBTK_END_DESCRIBE_BLACK_BOX(ShowNPoints);
 }