X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbCreaContournDimensions.h;h=a4f6178ca3c80634f28eb20597b230cbc3871872;hb=87eb16df886e4afe2d53ddf115de54cf8fe25665;hp=e224b9d91e29028330ca9d6e80fb39a1dc451970;hpb=6e3c929c883c405e0075fa8df10b12a935979367;p=creaContours.git

diff --git a/bbtk/src/bbCreaContournDimensions.h b/bbtk/src/bbCreaContournDimensions.h
index e224b9d..a4f6178 100644
--- a/bbtk/src/bbCreaContournDimensions.h
+++ b/bbtk/src/bbCreaContournDimensions.h
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 __bbCreaContournDimensions_h_INCLUDED__
 #define __bbCreaContournDimensions_h_INCLUDED__
@@ -22,21 +47,15 @@ class /*BBTK_EXPORT*/ nDimensions
    public bbtk::WxBlackBox
 {
   BBTK_BLACK_BOX_INTERFACE(nDimensions,bbtk::WxBlackBox);
-//==================================================================
-/// User callback called in the box contructor
-virtual void bbUserConstructor();
-/// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor();
-/// User callback called in the box destructor
-virtual void bbUserDestructor();
+
 //==================================================================
   BBTK_DECLARE_INPUT(WorkDir,std::string);
   BBTK_DECLARE_INPUT(In,vtkImageData*);
-  BBTK_DECLARE_INPUT(Get,int);
+  BBTK_DECLARE_INPUT(ContourType,int);
   BBTK_PROCESS(Process);
   void Process();
   BBTK_CREATE_WIDGET(CreateWidget);
-  void CreateWidget();
+  void CreateWidget(wxWindow*);
 
   BBTK_DECLARE_OUTPUT(Mask,vtkImageData*);
   BBTK_DECLARE_OUTPUT(Value,vtkImageData*);
@@ -46,27 +65,26 @@ virtual void bbUserDestructor();
   BBTK_DECLARE_OUTPUT(SizeContour,std::vector <int>);
 
 private:
-	wxContourMainFrame* frame;
+	//wxContourMainFrame* frame;
+	vtkImageData* currentimg;
 	//wxContourEventHandler * eventHandler;
-
 };
 
-BBTK_BEGIN_DESCRIBE_BLACK_BOX(nDimensions,bbtk::WxBlackBox);
+BBTK_BEGIN_DESCRIBE_BLACK_BOX(nDimensions, bbtk::WxBlackBox);
 BBTK_NAME("nDimensions");
 BBTK_AUTHOR("car-prie@uniandes.edu.co");
-BBTK_DESCRIPTION("With a given image, the box shows the ndimension application");
-BBTK_CATEGORY("__CategoryBlackBox__");
+BBTK_DESCRIPTION("With a given image, the box shows the nDimension application");
+BBTK_CATEGORY("contours");
 BBTK_INPUT(nDimensions,WorkDir,"Working data directory where config and data files are located",std::string,"");
 BBTK_INPUT(nDimensions,In,"Image to be shown",vtkImageData*,"");
-BBTK_INPUT(nDimensions,Get,"Set to 1 when data ready to be exported",int,"");
-
-BBTK_OUTPUT(nDimensions,Mask,"Mask of the contours",vtkImageData*,"");
-BBTK_OUTPUT(nDimensions,Value,"Value of the contours",vtkImageData*,"");
-BBTK_OUTPUT(nDimensions,X,"Vector of vectors that contains the X coordinates of each contour",double**,"");
-BBTK_OUTPUT(nDimensions,Y,"Vector of vectors that contains the Y coordinates of each contour",double**,"");
-BBTK_OUTPUT(nDimensions,Z,"Vector of vectors that contains the Z coordinates of each contour",double**,"");
-BBTK_OUTPUT(nDimensions,SizeContour,"Vector of vectors that contains the Z coordinates of each contour",std::vector <int>,"");
+BBTK_INPUT(nDimensions,ContourType,"(default 0) Contour type to be exported: ",int,"");
 
+BBTK_OUTPUT(nDimensions, Mask, "Mask of the contours",vtkImageData*,"");
+BBTK_OUTPUT(nDimensions, Value, "Value of the contours",vtkImageData*,"");
+BBTK_OUTPUT(nDimensions, X, "Array of arrays that contains the X coordinates of each contour", double**, "");
+BBTK_OUTPUT(nDimensions, Y, "Array of arrays that contains the Y coordinates of each contour", double**, "");
+BBTK_OUTPUT(nDimensions, Z, "Array of arrays that contains the Z coordinates of each contour", double**, "");
+BBTK_OUTPUT(nDimensions, SizeContour, "Vector that contains the coordinates of each contour", std::vector <int>, "");
 
 BBTK_END_DESCRIBE_BLACK_BOX(nDimensions);
 }
@@ -74,4 +92,3 @@ BBTK_END_DESCRIBE_BLACK_BOX(nDimensions);
 
 #endif // __bbCreaContournDimensions_h_INCLUDED__
 #endif // _USE_WXWIDGETS_
-