From: Eduardo DAVILA Date: Wed, 8 Aug 2018 09:05:37 +0000 (+0200) Subject: 3223 creaVtk Feature New Normal - vtk8itk4wx3-mingw64 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f0b9ff5192075ba6a5bffdb0c0180e22df4f7351;p=creaVtk.git 3223 creaVtk Feature New Normal - vtk8itk4wx3-mingw64 --- diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu.bbs b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu.bbs index 461c370..37abe99 100644 --- a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu.bbs +++ b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu.bbs @@ -63,19 +63,11 @@ new vtk:StructuredPointsReader Box31 new vtk:ProbeFilter Box32 set Box32.BoxProcessMode "Reactive" -<<<<<<< HEAD -new creaVtk:TensorsVisu_Widget Box33 - -new wx:LayoutTab Box36 - -new creaVtk:TensorsVisu_Widget Box37 -======= new creaVtk:TensorsVisu_Wideget Box33 new wx:LayoutTab Box36 new creaVtk:TensorsVisu_Wideget Box37 ->>>>>>> master new vtk:MaskPoint Box38 diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbg b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbg index 782c5da..cf3f075 100644 --- a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbg +++ b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbg @@ -1,10 +1,6 @@ # ---------------------------------- # - 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 @@ -52,24 +48,15 @@ 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 @@ -80,31 +67,12 @@ 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 -30.256714:33.584173:-900.000000 -PORT -In2:"/creaVtk/Vectors.vtk" -FIN_BOX -BOX -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 @@ -117,7 +85,6 @@ ISEXEC:FALSE 2.558822:36.323063:-900.000000 PORT In2:"/creaVtk/Vectors.vtk" ->>>>>>> master FIN_BOX CONNECTIONS:9 CONNECTION @@ -142,16 +109,9 @@ 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 diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbs b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbs index 5998d48..03a4658 100644 --- a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbs +++ b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbs @@ -1,10 +1,6 @@ # ---------------------------------- # - 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 @@ -23,11 +19,7 @@ description "Description ??" category "" new vtk:MaskPoint Box01 -<<<<<<< HEAD - set Box01.Ratio "30" -======= set Box01.Ratio "1" ->>>>>>> master new creaVtk:VectorsVisu Box02 set Box02.Active "true" @@ -49,17 +41,10 @@ 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 @@ -76,15 +61,9 @@ 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 diff --git a/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg b/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg index 74b8602..aca1f16 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg +++ b/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg @@ -1,10 +1,6 @@ # ---------------------------------- # - 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 @@ -32,14 +28,6 @@ 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 @@ -50,7 +38,6 @@ creaVtk:VectorsVisu:Box00 ISEXEC:FALSE -4.465574:-69.418679:-900.000000 41.109426:-79.418679:-900.000000 ->>>>>>> master FIN_BOX BOX creaVtk:PlaneWidget:Box01 @@ -100,9 +87,6 @@ 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 @@ -110,7 +94,6 @@ ISEXEC:FALSE -70.729953:39.494646:-900.000000 FIN_BOX CONNECTIONS:22 ->>>>>>> master CONNECTION Box03:Out:Box00:In NumberOfControlPoints:0 @@ -172,13 +155,9 @@ 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 diff --git a/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbs b/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbs index d9f3365..05e401e 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbs +++ b/bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbs @@ -1,10 +1,6 @@ # ---------------------------------- # - 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 @@ -38,11 +34,8 @@ new vtk:UpdateRender Box13 set Box13.BoxProcessMode "Reactive" new std:SharedMemory Box15 -<<<<<<< HEAD -======= new std:MagicBox Box11 ->>>>>>> master connect Box03.Out Box00.In @@ -61,11 +54,7 @@ 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 " "