#3223 creaVtk Feature New Normal - vtk8itk4wx3-mingw64

[creaVtk.git] / bbtk_creaVtk_PKG / bbs / boxes / PlaneVectorVisu_Widget.bbg

diff --git a/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg b/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg
index 30c568c7a3450c128444ec2095bc7571d30edd0c..74b8602e57fc3eba79f7761af0341bef12e12c7d 100644 (file)
--- a/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg
+++ b/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg
@@ -1,6 +1,10 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
+<<<<<<< HEAD
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg
+=======
 # - /tmpEED/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg
+>>>>>>> master
 # ----------------------------------
 
 APP_START
@@ -28,6 +32,14 @@ COMPLEX_PORT
 renderer
 -52.117833:88.203991:-900.000000
 FIN_COMPLEX_PORT
+<<<<<<< HEAD
+BOXES:8
+BOX
+creaVtk:VectorsVisu:Box00
+ISEXEC:FALSE
+-2.817636:-56.941435:-900.000000
+34.807364:-66.941435:-900.000000
+=======
 COMPLEX_PORT
 boxexecute
 -104.232070:88.823851:-900.000000
@@ -38,36 +50,37 @@ creaVtk:VectorsVisu:Box00
 ISEXEC:FALSE
 -4.465574:-69.418679:-900.000000
 41.109426:-79.418679:-900.000000
+>>>>>>> master
 FIN_BOX
 BOX
 creaVtk:PlaneWidget:Box01
 ISEXEC:FALSE
 -66.409855:2.022991:-900.000000
--20.834855:-7.977009:-900.000000
+-27.884855:-7.977009:-900.000000
 FIN_BOX
 BOX
 vtk:ProbeFilter:Box03
 ISEXEC:FALSE
 -29.657798:-23.712064:-900.000000
-15.917202:-33.712064:-900.000000
+6.742202:-33.712064:-900.000000
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box04
 ISEXEC:FALSE
 31.994878:59.395975:-900.000000
-103.169878:49.395975:-900.000000
+84.169878:49.395975:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box05
 ISEXEC:FALSE
 -63.018802:49.434694:-900.000000
--17.443802:39.434694:-900.000000
+-26.943802:39.434694:-900.000000
 FIN_BOX
 BOX
 creaVtk:PlaneVectorViso_Interface:Box06
 ISEXEC:FALSE
 53.843860:42.438188:-900.000000
-125.018860:32.438188:-900.000000
+105.768860:32.438188:-900.000000
 PORT
 typeFormsStr:"Line Arrow"
 FIN_BOX
@@ -75,7 +88,7 @@ BOX
 vtk:UpdateRender:Box13
 ISEXEC:FALSE
 -129.325679:-71.617843:-900.000000
--83.750679:-81.617843:-900.000000
+-89.000679:-81.617843:-900.000000
 PORT
 Active:"true"
 PORT
@@ -85,8 +98,11 @@ BOX
 std:SharedMemory:Box15
 ISEXEC:FALSE
 -79.072661:-36.761184:-900.000000
--33.497661:-46.761184:-900.000000
+-37.897661:-46.761184:-900.000000
 FIN_BOX
+<<<<<<< HEAD
+CONNECTIONS:21
+=======
 BOX
 std:MagicBox:Box11
 ISEXEC:FALSE
@@ -94,6 +110,7 @@ ISEXEC:FALSE
 -70.729953:39.494646:-900.000000
 FIN_BOX
 CONNECTIONS:22
+>>>>>>> master
 CONNECTION
 Box03:Out:Box00:In
 NumberOfControlPoints:0
@@ -155,9 +172,13 @@ CONNECTION
 Box15:Out:Box13:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
+<<<<<<< HEAD
+Box01:BoxChange:Box15:In2
+=======
 boxexecute:boxexecute:Box11:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
 Box11:Out:Box15:In2
+>>>>>>> master
 NumberOfControlPoints:0
 APP_END