X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=bbtk%2Fsrc%2FbbmaracasvisuViewerNV.h;h=f2ae6d5a10aea6846cf7e793636195b7273f2271;hb=4db61566d2cc017bccbbca36f713aa24faecc9f6;hp=c3de8c25257ae924b58aefce9b9d10a855c0fe59;hpb=f3147db6a86be513dbb14c7d43b9312e96770558;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuViewerNV.h b/bbtk/src/bbmaracasvisuViewerNV.h
index c3de8c2..f2ae6d5 100644
--- a/bbtk/src/bbmaracasvisuViewerNV.h
+++ b/bbtk/src/bbmaracasvisuViewerNV.h
@@ -21,7 +21,7 @@ namespace bbcreaMaracasVisu
   class bbwxMaracas_N_ViewersWidget : public wxMaracas_N_ViewersWidget
   {
 	public:
-		bbwxMaracas_N_ViewersWidget(ViewerNV* box,wxWindow *parent, vtkImageData* imagedata, std::vector<int> *nTypeView);
+		bbwxMaracas_N_ViewersWidget(ViewerNV* box,wxWindow *parent, vtkImageData* imagedata=NULL, std::vector<int> *nTypeView=NULL);
 		~bbwxMaracas_N_ViewersWidget();
 	    
 		//if the MPR had generated the refresh event
@@ -47,7 +47,7 @@ class /*BBTK_EXPORT*/ ViewerNV
 /// User callback called in the box contructor
 virtual void bbUserConstructor();
 /// User callback called in the box copy constructor
-virtual void bbUserCopyConstructor();
+virtual void bbUserCopyConstructor(bbtk::BlackBox::Pointer p);
 /// User callback called in the box destructor
 virtual void bbUserDestructor();
 //==================================================================
@@ -66,11 +66,16 @@ virtual void bbUserDestructor();
   BBTK_PROCESS(Process);
   void Process();
   BBTK_CREATE_WIDGET(CreateWidget);
-  void CreateWidget();
+  void CreateWidget(wxWindow* parent);
 
-private:
-	wxMaracas_N_ViewersWidget	*mwxwidget;
+private:	
+	bool	enter;
 	std::vector<int>			point;
+	vtkImageData* currentimg;
+	std::vector<int>  currenttype;
+	wxMaracas_N_ViewersWidget	*mwxwidget;
+
+	bool compareVectors(std::vector<int> type,std::vector<int> currenttype);
 };
 
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(ViewerNV,bbtk::WxBlackBox);
@@ -80,7 +85,7 @@ BBTK_DESCRIPTION("Viewer : N view configuration 2D and 3D");
   BBTK_CATEGORY("viewer");
   BBTK_INPUT(ViewerNV,Title,"Title prepended to the text",std::string,"");
 	BBTK_INPUT(ViewerNV,In,"Input image",vtkImageData*,"");
-	BBTK_INPUT(ViewerNV,nTypeView,"vector of viewer types (default 5 0 1 3 ): -1=Z_2DwithOutAxis 0=Z_2D 1=X_2D 2=Y_2D 3=Plane 4=Sphere 5=3D ",std::vector<int>,"");
+	BBTK_INPUT(ViewerNV,nTypeView,"vector of viewer types (default 5 0 1 3 ): -1=Z_2DwithOutAxis 0=Z_2D 1=X_2D 2=Y_2D 3=Plane 4=Sphere 5=3D 6=3Dplane",std::vector<int>,"");
 	BBTK_OUTPUT(ViewerNV,wxVtkBaseView1,"wxVtkBaseView 1",wxVtkBaseView  *,"");
 	BBTK_OUTPUT(ViewerNV,wxVtkBaseView2,"wxVtkBaseView 2",wxVtkBaseView  *,"");
 	BBTK_OUTPUT(ViewerNV,wxVtkBaseView3,"wxVtkBaseView 3",wxVtkBaseView  *,"");