From: eduardo.davila@creatis.insa-lyon.fr Date: Thu, 7 Nov 2024 16:12:52 +0000 (+0100) Subject: #3567 WithEventPropagation wxVtkBaseView_Info Box X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=4e22d514517194f5c398e2e4985348549834c324;p=creaMaracasVisu.git #3567 WithEventPropagation wxVtkBaseView_Info Box --- diff --git a/bbtk/src/bbcreaMaracasVisuwxVtkBaseView_Info.cxx b/bbtk/src/bbcreaMaracasVisuwxVtkBaseView_Info.cxx index 50e9f72..a9e32f1 100644 --- a/bbtk/src/bbcreaMaracasVisuwxVtkBaseView_Info.cxx +++ b/bbtk/src/bbcreaMaracasVisuwxVtkBaseView_Info.cxx @@ -205,7 +205,6 @@ bool InteractorwxVtkBaseView::OnRightButtonUp() return true; } - bool InteractorwxVtkBaseView::OnLeftDClick() { if (_box!=NULL) @@ -214,7 +213,7 @@ bool InteractorwxVtkBaseView::OnLeftDClick() { _box->SetwxVtkBaseViewOutputs( _wxvtkbaseview ); _box->bbSignalOutputModification(); - return false; + return _box->bbGetInputWithEventPropagation(); } // if _vtkbaseview } // if _box return true; @@ -369,9 +368,10 @@ void wxVtkBaseView_Info::bbUserSetDefaultValues() bbSetOutputDirection(2); bbSetOutputInterpolation(true); bbSetOutputvtkRenderer(NULL); - interactorwxvtkbaseview=NULL; - interactorwxvtkbaseview2=NULL; - interactorwxvtkbaseview3=NULL; + bbSetInputWithEventPropagation(false); + interactorwxvtkbaseview = NULL; + interactorwxvtkbaseview2 = NULL; + interactorwxvtkbaseview3 = NULL; bbSetOutputInteractorwxVtkBaseView_model( interactorwxvtkbaseview ); bbSetOutputInteractorwxVtkBaseView_model1( interactorwxvtkbaseview1 ); bbSetOutputInteractorwxVtkBaseView_model2( interactorwxvtkbaseview2 ); @@ -388,7 +388,6 @@ void wxVtkBaseView_Info::bbUserInitializeProcessing() // but this is where you should allocate the internal/output pointers // if any -// bbSetInputWithEventPropagation(false); bbSetOutputInteractorwxVtkBaseView_model(NULL); bbSetOutputInteractorwxVtkBaseView_model1(NULL); bbSetOutputInteractorwxVtkBaseView_model2(NULL); diff --git a/bbtk/src/bbcreaMaracasVisuwxVtkBaseView_Info.h b/bbtk/src/bbcreaMaracasVisuwxVtkBaseView_Info.h index 7c760c2..fa860fb 100644 --- a/bbtk/src/bbcreaMaracasVisuwxVtkBaseView_Info.h +++ b/bbtk/src/bbcreaMaracasVisuwxVtkBaseView_Info.h @@ -45,7 +45,7 @@ class bbcreaMaracasVisu_EXPORT wxVtkBaseView_Info BBTK_DECLARE_INPUT(wxVtkBaseView2,wxVtkBaseView*); BBTK_DECLARE_INPUT(wxVtkBaseView3,wxVtkBaseView*); BBTK_DECLARE_INPUT(InteractionType,int); -// BBTK_DECLARE_INPUT(WithEventPropagation,bool); + BBTK_DECLARE_INPUT(WithEventPropagation,bool); BBTK_DECLARE_OUTPUT(vtkRenderer,vtkRenderer*); BBTK_DECLARE_OUTPUT(Direction,int); @@ -88,7 +88,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(wxVtkBaseView_Info,bbtk::AtomicBlackBox); BBTK_INPUT(wxVtkBaseView_Info,wxVtkBaseView2,"Used in case of InteractionType!=0",wxVtkBaseView*,""); BBTK_INPUT(wxVtkBaseView_Info,wxVtkBaseView3,"Used in case of InteractionType!=0",wxVtkBaseView*,""); BBTK_INPUT(wxVtkBaseView_Info,InteractionType,"(default 0) 0:Nothing 1:LeftButtonDown 2:LeftButtonUp 3:MouseMove 4:RightButtonDown 5:RightButtonUp 6:LeftDClick 7:RightDClick 8:DragLeft 9:DragRight 10:MiddleButtonDown 11:MiddleButtonUp 12:DragMiddle ",int,""); -// BBTK_INPUT(wxVtkBaseView_Info,WithEventPropagation,"(default false) (In MouseMove envet) false:No Event propagation true:With event propagation",bool,""); + BBTK_INPUT(wxVtkBaseView_Info,WithEventPropagation,"(default false) (In LeftDClick envet) false:No Event propagation true:With event propagation",bool,""); BBTK_OUTPUT(wxVtkBaseView_Info,Direction,"Direction -1=3D 0=YZ 1=XZ 2=XY(default)",int,""); BBTK_OUTPUT(wxVtkBaseView_Info,vtkRenderer,"vtkRenderer default=NULL",vtkRenderer*,"");