X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk_creaVtk_PKG%2Fbbs%2Fboxes%2FPlaneVectorVisu_Widget.bbs;h=d9f33658a75d0f7721d1327094d804884d3edbc2;hb=3582c0f9b8380fde739856aa6a188da3262cf03b;hp=b22e2a958ac27e0ef9b8fc4fc0e1bc44d7be1dcc;hpb=8bfff910147ed9b3e76f839f63abee27da8860b5;p=creaVtk.git

diff --git a/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbs b/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbs
index b22e2a9..d9f3365 100644
--- a/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbs
+++ b/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbs
@@ -1,6 +1,10 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
+<<<<<<< HEAD
 # - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbs
+=======
+# - /tmpEED/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbs
+>>>>>>> master
 # ----------------------------------
 
 include std
@@ -34,6 +38,11 @@ new vtk:UpdateRender Box13
   set Box13.BoxProcessMode "Reactive"
 
 new std:SharedMemory Box15
+<<<<<<< HEAD
+=======
+
+new std:MagicBox Box11
+>>>>>>> master
 
 
 connect Box03.Out Box00.In
@@ -52,11 +61,16 @@ connect Box05.Out Box13.Renderer
 connect Box15.Out Box00.BoxExecute
 connect Box06.boxChange Box15.In1
 connect Box15.Out Box13.BoxExecute
+<<<<<<< HEAD
 connect Box01.BoxChange Box15.In2
+=======
+connect Box11.Out Box15.In2
+>>>>>>> master
 
 # Complex input ports
 input vtkImageData Box04.In " "
 input renderer Box05.In " "
+input boxexecute Box11.BoxExecute " "
 
 # Complex output ports
 output Widget Box06.widget " "