#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 8ee23088f956e7e7bd2525facbfb506209a23267..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
@@ -19,7 +23,7 @@ COMPLEX_PORT
 boxchange
 -75.932205:-101.708611:-900.000000
 FIN_COMPLEX_PORT
-COMPLEXINPUTS:2
+COMPLEXINPUTS:3
 COMPLEX_PORT
 vtkImageData
 38.028121:89.676762:-900.000000
@@ -28,12 +32,25 @@ 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
+FIN_COMPLEX_PORT
+BOXES:9
+BOX
+creaVtk:VectorsVisu:Box00
+ISEXEC:FALSE
+-4.465574:-69.418679:-900.000000
+41.109426:-79.418679:-900.000000
+>>>>>>> master
 FIN_BOX
 BOX
 creaVtk:PlaneWidget:Box01
@@ -83,7 +100,17 @@ ISEXEC:FALSE
 -79.072661:-36.761184:-900.000000
 -37.897661:-46.761184:-900.000000
 FIN_BOX
+<<<<<<< HEAD
 CONNECTIONS:21
+=======
+BOX
+std:MagicBox:Box11
+ISEXEC:FALSE
+-116.304953:49.494646:-900.000000
+-70.729953:39.494646:-900.000000
+FIN_BOX
+CONNECTIONS:22
+>>>>>>> master
 CONNECTION
 Box03:Out:Box00:In
 NumberOfControlPoints:0
@@ -145,6 +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