X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbCreaContournDimensions.h;h=86e8e23fd09cc9a2321386fb94ae43657ddb78e2;hb=3daae2bd6af3744f72c316b8155131ff1ca8f617;hp=5cb3ab5d2cc0ece28fffab99d3cff74f98976011;hpb=2732d50f5ca35b222d5bd2cc9ca20e9829a17933;p=creaContours.git

diff --git a/bbtk/src/bbCreaContournDimensions.h b/bbtk/src/bbCreaContournDimensions.h
index 5cb3ab5..86e8e23 100644
--- a/bbtk/src/bbCreaContournDimensions.h
+++ b/bbtk/src/bbCreaContournDimensions.h
@@ -4,27 +4,17 @@
 #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>
 
-namespace bbCreaContour
+namespace bbcreaContours
 {
 
 class /*BBTK_EXPORT*/ nDimensions
@@ -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,8 +40,9 @@ virtual void bbUserDestructor();
   BBTK_DECLARE_OUTPUT(SizeContour,std::vector <int>);
 
 private:
-	wxContourMainFrame* frame;
-	wxContourEventHandler * eventHandler;
+	//wxContourMainFrame* frame;
+	vtkImageData* currentimg;
+	//wxContourEventHandler * eventHandler;
 
 };
 
@@ -68,7 +53,7 @@ BBTK_DESCRIPTION("With a given image, the box shows the ndimension application")
 BBTK_CATEGORY("__CategoryBlackBox__");
 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_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*,"");