X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk_creaVtk_PKG%2Fbbs%2Fappli%2FexampleVectorsVisu.bbg;h=782c5da71647cc3cfde42e613e5636d3958e26f3;hb=3582c0f9b8380fde739856aa6a188da3262cf03b;hp=6fd4c3ba49b8acd963f01157912a1931eb52fd1c;hpb=0fe587457cf4d6eda506990f92a35796ad6ef7cc;p=creaVtk.git

diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbg b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbg
index 6fd4c3b..782c5da 100644
--- a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbg
+++ b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbg
@@ -1,6 +1,10 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
+<<<<<<< HEAD
 # - /tmpEED/creaTools2/ci/bin/../share/bbtk/bbs/creaVtk/appli/exampleVectorsVisu.bbg
+=======
+# - /tmpEED/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbg
+>>>>>>> master
 # ----------------------------------
 
 APP_START
@@ -48,15 +52,24 @@ BOX
 wx:LayoutSplit:Box05
 ISEXEC:TRUE
 20.586047:-67.968368:-900.000000
+<<<<<<< HEAD
 57.261047:-77.968368:-900.000000
+=======
+59.666047:-77.968368:-900.000000
+>>>>>>> master
 PORT
 Proportion:"10"
 FIN_BOX
 BOX
 wx:FileSelector:Box06
 ISEXEC:FALSE
+<<<<<<< HEAD
 -79.676950:57.942181:-900.000000
 -42.301950:47.942181:-900.000000
+=======
+-82.100831:48.785297:-900.000000
+-44.725831:38.785297:-900.000000
+>>>>>>> master
 FIN_BOX
 BOX
 vtk:LoadHola:Box07
@@ -67,12 +80,18 @@ FIN_BOX
 BOX
 vtk:StructuredPointsReader:Box08
 ISEXEC:FALSE
+<<<<<<< HEAD
 -65.776361:20.644357:-900.000000
 -17.076361:10.644357:-900.000000
+=======
+-77.679349:22.958827:-900.000000
+-28.979349:12.958827:-900.000000
+>>>>>>> master
 PORT
 In:"/home/davila/Creatis/creaVtk/data/Vectors.vtk"
 FIN_BOX
 BOX
+<<<<<<< HEAD
 std:ConcatStrings:Box09
 ISEXEC:FALSE
 -9.468286:43.584173:-900.000000
@@ -85,6 +104,20 @@ std:Configuration:Box10
 ISEXEC:FALSE
 8.566544:63.723067:-900.000000
 47.991544:53.723067:-900.000000
+=======
+std:Configuration:Box09
+ISEXEC:FALSE
+-32.049096:69.753914:-900.000000
+7.375904:59.753914:-900.000000
+FIN_BOX
+BOX
+std:ConcatStrings:Box10
+ISEXEC:FALSE
+-37.166178:46.323063:-900.000000
+2.558822:36.323063:-900.000000
+PORT
+In2:"/creaVtk/Vectors.vtk"
+>>>>>>> master
 FIN_BOX
 CONNECTIONS:9
 CONNECTION
@@ -109,9 +142,16 @@ CONNECTION
 Box08:Out:Box01:In
 NumberOfControlPoints:0
 CONNECTION
+<<<<<<< HEAD
 Box10:DataPath:Box09:In1
 NumberOfControlPoints:0
 CONNECTION
 Box09:Out:Box08:In
+=======
+Box09:DataPath:Box10:In1
+NumberOfControlPoints:0
+CONNECTION
+Box10:Out:Box08:In
+>>>>>>> master
 NumberOfControlPoints:0
 APP_END