2392 creaMaracasVisu Feature New Normal InsertPoint in showNPoints 2014-06-13 11:13

[creaMaracasVisu.git] / bbtk / src / bbmaracasvisuShowNPoints.h

diff --git a/bbtk/src/bbmaracasvisuShowNPoints.h b/bbtk/src/bbmaracasvisuShowNPoints.h
index fd2d8487b73a7ee68a42e40256d52e57d3099aa4..5879aed318617f9c7d64f80c02d0bddc2c859a11 100644 (file)
--- a/bbtk/src/bbmaracasvisuShowNPoints.h
+++ b/bbtk/src/bbmaracasvisuShowNPoints.h
@@ -1,8 +1,33 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #ifdef _USE_WXWIDGETS_
 #ifndef __bbcreaMaracasVisuShowNPoints_h_INCLUDED__
 #define __bbcreaMaracasVisuShowNPoints_h_INCLUDED__
 #include "bbtkWxBlackBox.h"
-
+#include <cmath>
 
 #include "vtkActor.h"
 #include "vtkSphereSource.h"
@@ -22,6 +47,7 @@ namespace bbcreaMaracasVisu
          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);
@@ -44,9 +70,12 @@ namespace bbcreaMaracasVisu
          std::vector<int> GetLstPointsZ();
          std::vector<std::string> GetLstLabels();
 
+         void AddPoint(int x, int y, int z, std::string label);
+               void InsertPoint(int x, int y, int z, std::string label);//CFT
+               double Distance(double dX0, double dY0, double dZ0, double dX1, double dY1, double dZ1);//CFT
+
   private:
 
-         void                  AddPoint(int x, int y, int z, std::string label);
          std::string           CleanSpaces(std::string ss);
          int                   GetNearestPoint();
          int                                   IdInsidePoint();
@@ -76,6 +105,7 @@ namespace bbcreaMaracasVisu
          wxStaticText          *txtNrPoints;
          wxSlider              *sdrOpacity;
          wxSlider              *sdrRadio;
+
   };
 
 class /*BBTK_EXPORT*/ ShowNPoints
@@ -89,6 +119,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> );
@@ -100,7 +131,6 @@ class /*BBTK_EXPORT*/ ShowNPoints
 
 private:
        WidgetShowNPoints *mwxwidget; 
-
 };
 
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(ShowNPoints,bbtk::WxBlackBox);
@@ -112,8 +142,9 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ShowNPoints,bbtk::WxBlackBox);
   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_INPUT(ShowNPoints,Opacity,"Opacity of the actor 0..1 (default 1)",double,"");
+  BBTK_INPUT(ShowNPoints,Radio,"Radio of the spheres 1..50 (default 10)",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> ,"");