#3223 creaVtk Feature New Normal - vtk8itk4wx3-mingw64

[creaVtk.git] / bbtk_creaVtk_PKG / bbs / appli / exampleVectorsVisu.bbs

diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbs b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbs
index 03a4658a0bc7b291a052017b0728dc0ab122d1e3..5998d4858ac81ac32b758e922ff9aee49d3a42b5 100644 (file)
--- a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbs
+++ b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbs
@@ -1,6 +1,10 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script
+<<<<<<< HEAD
+# - /tmpEED/creaTools2/ci/bin/../share/bbtk/bbs/creaVtk/appli/exampleVectorsVisu.bbs
+=======
 # - /tmpEED/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbs
+>>>>>>> master
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -19,7 +23,11 @@ description "Description ??"
 category "<VOID>"
 
 new vtk:MaskPoint Box01
+<<<<<<< HEAD
+  set Box01.Ratio "30"
+=======
   set Box01.Ratio "1"
+>>>>>>> master
 
 new creaVtk:VectorsVisu Box02
   set Box02.Active "true"
@@ -41,10 +49,17 @@ new vtk:LoadHola Box07
 new vtk:StructuredPointsReader Box08
   set Box08.In "/home/davila/Creatis/creaVtk/data/Vectors.vtk"
 
+<<<<<<< HEAD
+new std:ConcatStrings Box09
+  set Box09.In2 "/creaVtk/Vectors.vtk"
+
+new std:Configuration Box10
+=======
 new std:Configuration Box09
 
 new std:ConcatStrings Box10
   set Box10.In2 "/creaVtk/Vectors.vtk"
+>>>>>>> master
 
 
 connect Box01.Out Box02.In
@@ -61,9 +76,15 @@ connect Box07.Out Box03.In
 
 connect Box08.Out Box01.In
 
+<<<<<<< HEAD
+connect Box10.DataPath Box09.In1
+
+connect Box09.Out Box08.In
+=======
 connect Box09.DataPath Box10.In1
 
 connect Box10.Out Box08.In
+>>>>>>> master