X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbCreaContournDimensions.h;h=2f6a427c5cbbb0a9d3d7dde1189cc628aa1cd5d8;hb=fb42dbcd2fdf92b96397f90ac6b2794026c6d5cc;hp=b0e103df14761c2476f0ab1e9a09ca8dca4b7804;hpb=c80a486f463943ea0ce295ebca58fc10e956c38c;p=creaContours.git

diff --git a/bbtk/src/bbCreaContournDimensions.h b/bbtk/src/bbCreaContournDimensions.h
index b0e103d..2f6a427 100644
--- a/bbtk/src/bbCreaContournDimensions.h
+++ b/bbtk/src/bbCreaContournDimensions.h
@@ -4,22 +4,12 @@
 #include "bbtkWxBlackBox.h"
 
 #include "wxContourMainFrame.h"
-#include "OutlineModelManager.h"
-#include "wxContourEventHandler.h"
-#include "wxContourMainPanel.h"
+
 #include <map>
 #include "vtkImageData.h"
-#include "OutlineModelBuilder.h"
-#include "ContourThing.h"
-#include "AxeThing.h"
-#include "ImageSourceThing.h"
-#include "ImageSectionThing.h"
-#include "SomeEnvironment.h"
-#include "ReaderEnvironment.h"
 
 #include "wx/artprov.h"
 #include <wx/filedlg.h>
-#include "interfMainPanel.h"
 
 #include <vtkImageData.h>
 #include <vtkMetaImageReader.h>
@@ -32,21 +22,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*);
@@ -56,27 +40,26 @@ virtual void bbUserDestructor();
   BBTK_DECLARE_OUTPUT(SizeContour,std::vector <int>);
 
 private:
-	wxContourMainFrame* frame;
-	wxContourEventHandler * eventHandler;
-
+	//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,"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);
 }
@@ -84,4 +67,3 @@ BBTK_END_DESCRIBE_BLACK_BOX(nDimensions);
 
 #endif // __bbCreaContournDimensions_h_INCLUDED__
 #endif // _USE_WXWIDGETS_
-