]> Creatis software - creaVtk.git/commitdiff
Merge branch 'master' into vtk8itk4wx3-mingw64
authorEduardo DAVILA <davila@ei-ed-606.creatis.insa-lyon.fr>
Fri, 28 Dec 2018 10:37:21 +0000 (11:37 +0100)
committerEduardo DAVILA <davila@ei-ed-606.creatis.insa-lyon.fr>
Fri, 28 Dec 2018 10:37:21 +0000 (11:37 +0100)
77 files changed:
bbtk_creaVtk_PKG/bbs/appli/ExampleTransformVector.bbg [new file with mode: 0644]
bbtk_creaVtk_PKG/bbs/appli/ExampleTransformVector.bbs [new file with mode: 0644]
bbtk_creaVtk_PKG/bbs/appli/examplePlaneWidget_StreamLineVisu_Widget.bbg [new file with mode: 0644]
bbtk_creaVtk_PKG/bbs/appli/examplePlaneWidget_StreamLineVisu_Widget.bbs [new file with mode: 0644]
bbtk_creaVtk_PKG/bbs/appli/exampleProbeFilter.bbg
bbtk_creaVtk_PKG/bbs/appli/exampleProbeFilter.bbs
bbtk_creaVtk_PKG/bbs/appli/exampleReadMHDPlane.bbg [new file with mode: 0644]
bbtk_creaVtk_PKG/bbs/appli/exampleReadMHDPlane.bbs [new file with mode: 0644]
bbtk_creaVtk_PKG/bbs/appli/exampleScalarsBarActor_ScalarsToColors.bbg [new file with mode: 0644]
bbtk_creaVtk_PKG/bbs/appli/exampleScalarsBarActor_ScalarsToColors.bbs [new file with mode: 0644]
bbtk_creaVtk_PKG/bbs/appli/exampleSlab-Widget-01.bbg [new file with mode: 0644]
bbtk_creaVtk_PKG/bbs/appli/exampleSlab-Widget-01.bbs [new file with mode: 0644]
bbtk_creaVtk_PKG/bbs/appli/exampleStreamLineScalarSegmentation.bbg
bbtk_creaVtk_PKG/bbs/appli/exampleStreamLineScalarSegmentation.bbs
bbtk_creaVtk_PKG/bbs/appli/exampleTensorsExploration_Widget.bbg [new file with mode: 0644]
bbtk_creaVtk_PKG/bbs/appli/exampleTensorsExploration_Widget.bbs [new file with mode: 0644]
bbtk_creaVtk_PKG/bbs/appli/exampleVectorsExploration_Widget.bbg [new file with mode: 0644]
bbtk_creaVtk_PKG/bbs/appli/exampleVectorsExploration_Widget.bbs [new file with mode: 0644]
bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu.bbg
bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu2.bbg
bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu2.bbs
bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensors_manualread_Widget.bbg [new file with mode: 0644]
bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensors_manualread_Widget.bbs [new file with mode: 0644]
bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu.bbg
bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu_Widget.bbg [new file with mode: 0644]
bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu_Widget.bbs [new file with mode: 0644]
bbtk_creaVtk_PKG/bbs/boxes/PlaneVectorVisu_Widget.bbg
bbtk_creaVtk_PKG/bbs/boxes/PlaneWidget_StreamLineVisu_Widget.bbg
bbtk_creaVtk_PKG/bbs/boxes/PlaneWidget_StreamLineVisu_Widget.bbs
bbtk_creaVtk_PKG/bbs/boxes/StreamLineExploration_Widget.bbg [moved from bbtk_creaVtk_PKG/bbs/boxes/StreamlineExploration_Wideget.bbg with 84% similarity]
bbtk_creaVtk_PKG/bbs/boxes/StreamLineExploration_Widget.bbs [moved from bbtk_creaVtk_PKG/bbs/boxes/StreamlineExploration_Wideget.bbs with 71% similarity]
bbtk_creaVtk_PKG/bbs/boxes/TensorsExploration_Widget.bbg [moved from bbtk_creaVtk_PKG/bbs/boxes/TensorsExploration_Wideget.bbg with 86% similarity]
bbtk_creaVtk_PKG/bbs/boxes/TensorsExploration_Widget.bbs [moved from bbtk_creaVtk_PKG/bbs/boxes/TensorsExploration_Wideget.bbs with 74% similarity]
bbtk_creaVtk_PKG/bbs/boxes/TensorsVisu_Widget.bbg [moved from bbtk_creaVtk_PKG/bbs/boxes/TensorsVisu_Wideget.bbg with 86% similarity]
bbtk_creaVtk_PKG/bbs/boxes/TensorsVisu_Widget.bbs [moved from bbtk_creaVtk_PKG/bbs/boxes/TensorsVisu_Wideget.bbs with 75% similarity]
bbtk_creaVtk_PKG/bbs/boxes/VectorsExploration_Widget.bbg [moved from bbtk_creaVtk_PKG/bbs/boxes/VectorsExploration_Wideget.bbg with 86% similarity]
bbtk_creaVtk_PKG/bbs/boxes/VectorsExploration_Widget.bbs [moved from bbtk_creaVtk_PKG/bbs/boxes/VectorsExploration_Wideget.bbs with 75% similarity]
bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Widget.bbg [moved from bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Wideget.bbg with 89% similarity]
bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Widget.bbs [moved from bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Wideget.bbs with 80% similarity]
bbtk_creaVtk_PKG/data/Tensors.vtk [moved from data/Tensors.vtk with 100% similarity]
bbtk_creaVtk_PKG/data/Vectors.vtk [moved from data/Vectors.vtk with 100% similarity]
bbtk_creaVtk_PKG/src/bbcreaVtkActor.cxx
bbtk_creaVtk_PKG/src/bbcreaVtkGenerateArrowSource.h
bbtk_creaVtk_PKG/src/bbcreaVtkImageAccumulate.cxx
bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousDilate3D.cxx
bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousDilate3D.h
bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousErode3D.cxx
bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousErode3D.h
bbtk_creaVtk_PKG/src/bbcreaVtkImageCutByAxis.cxx
bbtk_creaVtk_PKG/src/bbcreaVtkImageExtractComponents.cxx
bbtk_creaVtk_PKG/src/bbcreaVtkImageSlab.cxx
bbtk_creaVtk_PKG/src/bbcreaVtkImageSlab.h
bbtk_creaVtk_PKG/src/bbcreaVtkMeshCutByAxis.cxx
bbtk_creaVtk_PKG/src/bbcreaVtkReadMHDPlane.cxx
bbtk_creaVtk_PKG/src/bbcreaVtkStreamLineNumeration.cxx
bbtk_creaVtk_PKG/src/bbcreaVtkTensorsVisu.cxx
bbtk_creaVtk_PKG/src/bbcreaVtkUnMosaicVectorVtkImageData.h
bbtk_creaVtk_PKG/src/bbcreaVtkVectorsExtraction.cxx
bbtk_creaVtk_PKG/src/bbcreaVtkVectorsExtraction.h
bbtk_creaVtk_PKG/src/bbcreaVtkVectorsVisu.cxx
bbtk_creaVtk_PKG/src/bbcreaVtkXMLImageDataWriter.cxx [new file with mode: 0644]
bbtk_creaVtk_PKG/src/bbcreaVtkXMLImageDataWriter.h [new file with mode: 0644]
data/CMakeLists.txt
lib/creaVtk/creaVtkPlaneWidget.cpp
lib/creaVtk/creaVtkStreamLine.cpp
lib/creaVtk/creaVtkStreamLineScalarSeg.cpp
lib/creaVtk/creaVtkStreamTracer.cpp
lib/creaVtk/creaVtkUnMosaicVectorVtkImageData.cpp
lib/creaVtk/cutImageSegmentation.cpp
lib/creaVtk/vtkImageDataStrucPoints.cpp
lib/creaVtk/vtkStreamLineCreateColorInfo.cpp
lib/creaVtk/vtkTensorsVisu.cpp
lib/creaVtk/vtkTensorsVisu.h
lib/creaVtk/vtkVectorsTensorsVisuBase.cpp
lib/creaVtk/vtkVectorsTensorsVisuBase.h
lib/creaVtk/vtkVectorsVisu.cpp
lib/creaVtk/vtkVectorsVisu.h

diff --git a/bbtk_creaVtk_PKG/bbs/appli/ExampleTransformVector.bbg b/bbtk_creaVtk_PKG/bbs/appli/ExampleTransformVector.bbg
new file mode 100644 (file)
index 0000000..aedd47d
--- /dev/null
@@ -0,0 +1,79 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBG BlackBox Diagram file
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/ExampleTransformVector.bbg
+# ----------------------------------
+
+APP_START
+CATEGORY:<VOID>
+DESCRIPTION:Description ??
+AUTHOR:Author ??
+COMPLEXBOX:FALSE
+COMPLEXINPUTS:0
+BOXES:6
+BOX
+creaVtk:TransformVector:Box00
+ISEXEC:FALSE
+-10.219737:10.520318:-900.000000
+31.830263:0.520318:-900.000000
+PORT
+InX:"0 10 20 30 40"
+PORT
+InY:"0 0 0 0 0"
+PORT
+InZ:"0 0 0 0 0"
+FIN_BOX
+BOX
+vtk:Transform:Box01
+ISEXEC:FALSE
+3.907547:36.670822:-900.000000
+39.482547:26.670822:-900.000000
+PORT
+RotateWXYZ:"45 0 0 1"
+FIN_BOX
+BOX
+wx:OutputText:Box02
+ISEXEC:FALSE
+-32.763275:-20.740055:-900.000000
+4.011725:-30.740055:-900.000000
+FIN_BOX
+BOX
+wx:OutputText:Box03
+ISEXEC:FALSE
+8.577941:-39.514940:-900.000000
+45.352941:-49.514940:-900.000000
+FIN_BOX
+BOX
+wx:OutputText:Box04
+ISEXEC:FALSE
+60.578368:-42.821325:-900.000000
+97.353368:-52.821325:-900.000000
+FIN_BOX
+BOX
+wx:LayoutLine:Box05
+ISEXEC:TRUE
+-7.514513:-74.543965:-900.000000
+50.045487:-84.543965:-900.000000
+FIN_BOX
+CONNECTIONS:7
+CONNECTION
+Box01:Out:Box00:Transform
+NumberOfControlPoints:0
+CONNECTION
+Box00:OutX:Box02:In
+NumberOfControlPoints:0
+CONNECTION
+Box02:Widget:Box05:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box03:Widget:Box05:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box04:Widget:Box05:Widget3
+NumberOfControlPoints:0
+CONNECTION
+Box00:OutY:Box03:In
+NumberOfControlPoints:0
+CONNECTION
+Box00:OutZ:Box04:In
+NumberOfControlPoints:0
+APP_END
diff --git a/bbtk_creaVtk_PKG/bbs/appli/ExampleTransformVector.bbs b/bbtk_creaVtk_PKG/bbs/appli/ExampleTransformVector.bbs
new file mode 100644 (file)
index 0000000..75474cc
--- /dev/null
@@ -0,0 +1,53 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBS BlackBox Script
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/ExampleTransformVector.bbs
+# ----------------------------------
+
+# BBTK GEditor Script
+# ----------------------
+
+include std
+include itkvtk
+include creaVtk
+include vtk
+include wx
+
+author "Author ??"
+description "Description ??"
+category "<VOID>"
+
+new creaVtk:TransformVector Box00
+  set Box00.InX "0 10 20 30 40"
+  set Box00.InY "0 0 0 0 0"
+  set Box00.InZ "0 0 0 0 0"
+
+new vtk:Transform Box01
+  set Box01.RotateWXYZ "45 0 0 1"
+
+new wx:OutputText Box02
+
+new wx:OutputText Box03
+
+new wx:OutputText Box04
+
+new wx:LayoutLine Box05
+
+
+connect Box01.Out Box00.Transform
+
+connect Box00.OutX Box02.In
+
+connect Box02.Widget Box05.Widget1
+
+connect Box03.Widget Box05.Widget2
+
+connect Box04.Widget Box05.Widget3
+
+connect Box00.OutY Box03.In
+
+connect Box00.OutZ Box04.In
+
+
+
+# Complex input ports
+exec Box05
diff --git a/bbtk_creaVtk_PKG/bbs/appli/examplePlaneWidget_StreamLineVisu_Widget.bbg b/bbtk_creaVtk_PKG/bbs/appli/examplePlaneWidget_StreamLineVisu_Widget.bbg
new file mode 100644 (file)
index 0000000..300a792
--- /dev/null
@@ -0,0 +1,72 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBG BlackBox Diagram file
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/examplePlaneWidget_StreamLineVisu_Widget.bbg
+# ----------------------------------
+
+APP_START
+CATEGORY:<VOID>
+DESCRIPTION:Description ??
+AUTHOR:Author ??
+COMPLEXBOX:FALSE
+COMPLEXINPUTS:0
+BOXES:6
+BOX
+creaVtk:PlaneWidget_StreamLineVisu_Widget:Box00
+ISEXEC:FALSE
+-54.555361:-10.520318:-900.000000
+7.319639:-20.520318:-900.000000
+FIN_BOX
+BOX
+wx:LayoutSplit:Box03
+ISEXEC:TRUE
+-15.780476:-44.485915:-900.000000
+23.299524:-54.485915:-900.000000
+PORT
+Orientation:"H"
+FIN_BOX
+BOX
+vtk:StructuredPointsReader:Box04
+ISEXEC:FALSE
+-49.746073:24.948182:-900.000000
+-1.046073:14.948182:-900.000000
+FIN_BOX
+BOX
+std:Configuration:Box05
+ISEXEC:FALSE
+-40.878949:69.434096:-900.000000
+-1.453949:59.434096:-900.000000
+FIN_BOX
+BOX
+std:ConcatStrings:Box06
+ISEXEC:FALSE
+-45.688237:44.786495:-900.000000
+-5.963237:34.786495:-900.000000
+PORT
+In2:"/creaVtk/Vectors.vtk"
+FIN_BOX
+BOX
+wxvtk:Viewer3D:Box07
+ISEXEC:FALSE
+41.329819:27.052245:-900.000000
+105.049819:17.052245:-900.000000
+FIN_BOX
+CONNECTIONS:6
+CONNECTION
+Box00:Widget:Box03:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box04:Out:Box00:In
+NumberOfControlPoints:0
+CONNECTION
+Box05:DataPath:Box06:In1
+NumberOfControlPoints:0
+CONNECTION
+Box06:Out:Box04:In
+NumberOfControlPoints:0
+CONNECTION
+Box07:Widget:Box03:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box07:Renderer:Box00:Renderer
+NumberOfControlPoints:0
+APP_END
diff --git a/bbtk_creaVtk_PKG/bbs/appli/examplePlaneWidget_StreamLineVisu_Widget.bbs b/bbtk_creaVtk_PKG/bbs/appli/examplePlaneWidget_StreamLineVisu_Widget.bbs
new file mode 100644 (file)
index 0000000..a17a9f9
--- /dev/null
@@ -0,0 +1,51 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBS BlackBox Script
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/examplePlaneWidget_StreamLineVisu_Widget.bbs
+# ----------------------------------
+
+# BBTK GEditor Script
+# ----------------------
+
+include std
+include itkvtk
+include creaVtk
+include wx
+include vtk
+include std
+include wxvtk
+
+author "Author ??"
+description "Description ??"
+category "<VOID>"
+
+new creaVtk:PlaneWidget_StreamLineVisu_Widget Box00
+
+new wx:LayoutSplit Box03
+  set Box03.Orientation "H"
+
+new vtk:StructuredPointsReader Box04
+
+new std:Configuration Box05
+
+new std:ConcatStrings Box06
+  set Box06.In2 "/creaVtk/Vectors.vtk"
+
+new wxvtk:Viewer3D Box07
+
+
+connect Box00.Widget Box03.Widget1
+
+connect Box04.Out Box00.In
+
+connect Box05.DataPath Box06.In1
+
+connect Box06.Out Box04.In
+
+connect Box07.Widget Box03.Widget2
+
+connect Box07.Renderer Box00.Renderer
+
+
+
+# Complex input ports
+exec Box03
index 5201ac582ea9522c6627d8caa9f59aae09778deb..54079e340ff0d29a44848fe2f8a2263c400b3ac4 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleProbeFilter.bbg
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleProbeFilter.bbg
 # ----------------------------------
 
 APP_START
@@ -9,24 +9,24 @@ DESCRIPTION:Description ??
 AUTHOR:Author ??
 COMPLEXBOX:FALSE
 COMPLEXINPUTS:0
-BOXES:12
+BOXES:14
 BOX
 creaVtk:PlaneWidget:Box00
 ISEXEC:FALSE
 -76.705485:79.270049:-900.000000
--31.130485:69.270049:-900.000000
+-38.180485:69.270049:-900.000000
 FIN_BOX
 BOX
 vtk:ProbeFilter:Box02
 ISEXEC:FALSE
 -43.835869:45.416427:-900.000000
-1.739131:35.416427:-900.000000
+-7.435869:35.416427:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ViewerNV:Box03
 ISEXEC:FALSE
 100.754389:107.101567:-900.000000
-161.394389:97.101567:-900.000000
+164.474389:97.101567:-900.000000
 PORT
 nTypeView:"5"
 FIN_BOX
@@ -34,7 +34,7 @@ BOX
 wx:LayoutSplit:Box05
 ISEXEC:TRUE
 97.322929:-128.251406:-900.000000
-142.897929:-138.251406:-900.000000
+136.402929:-138.251406:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -42,13 +42,13 @@ BOX
 vtk:LoadHola:Box09
 ISEXEC:FALSE
 142.671975:134.967207:-900.000000
-188.246975:124.967207:-900.000000
+178.221975:124.967207:-900.000000
 FIN_BOX
 BOX
 vtk:StructuredPointsReader:Box10
 ISEXEC:FALSE
 77.497560:159.524340:-900.000000
-148.672560:149.524340:-900.000000
+126.197560:149.524340:-900.000000
 PORT
 In:"/home/davila/Creatis/creaVtk/data/Vectors.vtk"
 FIN_BOX
@@ -56,7 +56,7 @@ BOX
 creaVtk:VectorsVisu:Box12
 ISEXEC:FALSE
 -27.687849:-11.740630:-900.000000
-17.887151:-21.740630:-900.000000
+9.937151:-21.740630:-900.000000
 PORT
 Active:"true"
 PORT
@@ -66,7 +66,7 @@ BOX
 vtk:UpdateRender:Box22
 ISEXEC:FALSE
 165.995379:-60.051937:-900.000000
-211.570379:-70.051937:-900.000000
+206.320379:-70.051937:-900.000000
 PORT
 Active:"true"
 FIN_BOX
@@ -74,13 +74,13 @@ BOX
 creaVtk:PlaneWidget_Interface:Box24
 ISEXEC:FALSE
 -47.463465:136.171302:-900.000000
-23.711535:126.171302:-900.000000
+0.761535:126.171302:-900.000000
 FIN_BOX
 BOX
 creaVtk:VectorsVisu_Interface:Box14
 ISEXEC:FALSE
 -16.543876:28.960560:-900.000000
-54.631124:18.960560:-900.000000
+30.781124:18.960560:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box15
@@ -92,11 +92,25 @@ BOX
 std:MultipleInputs:Box16
 ISEXEC:FALSE
 -70.786709:7.815093:-900.000000
--25.211709:-2.184907:-900.000000
+-31.086709:-2.184907:-900.000000
 PORT
 BoxProcessMode:"Reactive"
 FIN_BOX
-CONNECTIONS:22
+BOX
+std:Configuration:Box17
+ISEXEC:FALSE
+92.222261:199.620337:-900.000000
+131.647261:189.620337:-900.000000
+FIN_BOX
+BOX
+std:ConcatStrings:Box18
+ISEXEC:FALSE
+92.611384:176.078367:-900.000000
+132.336384:166.078367:-900.000000
+PORT
+In2:"/creaVtk/Vectors.vtk"
+FIN_BOX
+CONNECTIONS:24
 CONNECTION
 Box03:Widget:Box05:Widget2
 NumberOfControlPoints:0
@@ -163,4 +177,10 @@ NumberOfControlPoints:0
 CONNECTION
 Box16:BoxChange:Box12:BoxExecute
 NumberOfControlPoints:0
+CONNECTION
+Box18:Out:Box10:In
+NumberOfControlPoints:0
+CONNECTION
+Box17:DataPath:Box18:In1
+NumberOfControlPoints:0
 APP_END
index 3b80981ed514ecefa0ed241b6decfb546e540880..7c5d8b49862129b26430ce5fa282ab8eb157fedf 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script
-# - /home/davila/Creatis/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleProbeFilter.bbs
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleProbeFilter.bbs
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -18,37 +18,42 @@ author "Author ??"
 description "Description ??"
 category "<VOID>"
 
-new PlaneWidget Box00
+new creaVtk:PlaneWidget Box00
 
-new ProbeFilter Box02
+new vtk:ProbeFilter Box02
 
-new ViewerNV Box03
+new creaMaracasVisu:ViewerNV Box03
   set Box03.nTypeView "5"
 
-new LayoutSplit Box05
+new wx:LayoutSplit Box05
   set Box05.Orientation "H"
 
-new LoadHola Box09
+new vtk:LoadHola Box09
 
-new StructuredPointsReader Box10
+new vtk:StructuredPointsReader Box10
   set Box10.In "/home/davila/Creatis/creaVtk/data/Vectors.vtk"
 
-new VectorsVisu Box12
+new creaVtk:VectorsVisu Box12
   set Box12.Active "true"
   set Box12.ScaleFactor "10"
 
-new UpdateRender Box22
+new vtk:UpdateRender Box22
   set Box22.Active "true"
 
-new PlaneWidget_Interface Box24
+new creaVtk:PlaneWidget_Interface Box24
 
-new VectorsVisu_Interface Box14
+new creaVtk:VectorsVisu_Interface Box14
 
-new LayoutLine Box15
+new wx:LayoutLine Box15
 
-new MultipleInputs Box16
+new std:MultipleInputs Box16
   set Box16.BoxProcessMode "Reactive"
 
+new std:Configuration Box17
+
+new std:ConcatStrings Box18
+  set Box18.In2 "/creaVtk/Vectors.vtk"
+
 
 connect Box03.Widget Box05.Widget2
 
@@ -94,6 +99,10 @@ connect Box14.boxChange Box16.In2
 
 connect Box16.BoxChange Box12.BoxExecute
 
+connect Box18.Out Box10.In
+
+connect Box17.DataPath Box18.In1
+
 
 
 # Complex input ports
diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleReadMHDPlane.bbg b/bbtk_creaVtk_PKG/bbs/appli/exampleReadMHDPlane.bbg
new file mode 100644 (file)
index 0000000..10e8dfc
--- /dev/null
@@ -0,0 +1,81 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBG BlackBox Diagram file
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleReadMHDPlane.bbg
+# ----------------------------------
+
+APP_START
+CATEGORY:<VOID>
+DESCRIPTION:Description ??
+AUTHOR:Author ??
+COMPLEXBOX:FALSE
+COMPLEXINPUTS:0
+BOXES:6
+BOX
+creaMaracasVisu:ViewerNV:Box00
+ISEXEC:FALSE
+-8.566544:0.601161:-900.000000
+55.153456:-9.398839:-900.000000
+PORT
+nTypeView:"0"
+FIN_BOX
+BOX
+wx:LayoutSplit:Box01
+ISEXEC:TRUE
+-32.913565:-26.150504:-900.000000
+6.166435:-36.150504:-900.000000
+PORT
+Proportion:"90"
+FIN_BOX
+BOX
+wx:Slider:Box02
+ISEXEC:FALSE
+-66.879162:48.994622:-900.000000
+-15.479162:38.994622:-900.000000
+PORT
+Max:"100"
+PORT
+ReactiveOnTrack:"true"
+FIN_BOX
+BOX
+creaVtk:ReadMHDPlane:Box03
+ISEXEC:FALSE
+14.878735:35.468499:-900.000000
+56.228735:25.468499:-900.000000
+FIN_BOX
+BOX
+std:Configuration:Box04
+ISEXEC:FALSE
+13.676413:79.052673:-900.000000
+53.101413:69.052673:-900.000000
+FIN_BOX
+BOX
+std:ConcatStrings:Box05
+ISEXEC:FALSE
+17.884540:64.023647:-900.000000
+57.609540:54.023647:-900.000000
+PORT
+In2:"/vtk/hola.mhd"
+FIN_BOX
+CONNECTIONS:7
+CONNECTION
+Box02:Out:Box03:Slice
+NumberOfControlPoints:0
+CONNECTION
+Box04:DataPath:Box05:In1
+NumberOfControlPoints:0
+CONNECTION
+Box05:Out:Box03:FileName
+NumberOfControlPoints:0
+CONNECTION
+Box03:Out:Box00:In
+NumberOfControlPoints:0
+CONNECTION
+Box02:BoxChange:Box00:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box02:Widget:Box01:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box00:Widget:Box01:Widget1
+NumberOfControlPoints:0
+APP_END
diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleReadMHDPlane.bbs b/bbtk_creaVtk_PKG/bbs/appli/exampleReadMHDPlane.bbs
new file mode 100644 (file)
index 0000000..ad2f2f2
--- /dev/null
@@ -0,0 +1,55 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBS BlackBox Script
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleReadMHDPlane.bbs
+# ----------------------------------
+
+# BBTK GEditor Script
+# ----------------------
+
+include std
+include itkvtk
+include creaMaracasVisu
+include wx
+include creaVtk
+include std
+
+author "Author ??"
+description "Description ??"
+category "<VOID>"
+
+new creaMaracasVisu:ViewerNV Box00
+  set Box00.nTypeView "0"
+
+new wx:LayoutSplit Box01
+  set Box01.Proportion "90"
+
+new wx:Slider Box02
+  set Box02.Max "100"
+  set Box02.ReactiveOnTrack "true"
+
+new creaVtk:ReadMHDPlane Box03
+
+new std:Configuration Box04
+
+new std:ConcatStrings Box05
+  set Box05.In2 "/vtk/hola.mhd"
+
+
+connect Box02.Out Box03.Slice
+
+connect Box04.DataPath Box05.In1
+
+connect Box05.Out Box03.FileName
+
+connect Box03.Out Box00.In
+
+connect Box02.BoxChange Box00.BoxExecute
+
+connect Box02.Widget Box01.Widget2
+
+connect Box00.Widget Box01.Widget1
+
+
+
+# Complex input ports
+exec Box01
diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleScalarsBarActor_ScalarsToColors.bbg b/bbtk_creaVtk_PKG/bbs/appli/exampleScalarsBarActor_ScalarsToColors.bbg
new file mode 100644 (file)
index 0000000..1ef5815
--- /dev/null
@@ -0,0 +1,79 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBG BlackBox Diagram file
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleScalarsBarActor_ScalarsToColors.bbg
+# ----------------------------------
+
+APP_START
+CATEGORY:<VOID>
+DESCRIPTION:Description ??
+AUTHOR:Author ??
+COMPLEXBOX:FALSE
+COMPLEXINPUTS:0
+BOXES:7
+BOX
+creaMaracasVisu:ViewerNV:Box08
+ISEXEC:FALSE
+-15.472539:38.268312:-900.000000
+48.247461:28.268312:-900.000000
+FIN_BOX
+BOX
+wx:LayoutLine:Box11
+ISEXEC:FALSE
+-24.882195:-44.560996:-900.000000
+32.677805:-54.560996:-900.000000
+FIN_BOX
+BOX
+wx:LayoutLine:Box12
+ISEXEC:FALSE
+-96.127109:-41.150430:-900.000000
+-38.567109:-51.150430:-900.000000
+FIN_BOX
+BOX
+wx:LayoutSplit:Box14
+ISEXEC:TRUE
+-68.058386:-81.387986:-900.000000
+-28.978386:-91.387986:-900.000000
+PORT
+Orientation:"H"
+FIN_BOX
+BOX
+creaVtk:ScalarBarActor:Box16
+ISEXEC:FALSE
+-72.813427:0.996827:-900.000000
+-31.988427:-9.003173:-900.000000
+FIN_BOX
+BOX
+vtk:LoadHola:Box17
+ISEXEC:FALSE
+-11.470404:66.518676:-900.000000
+24.079596:56.518676:-900.000000
+FIN_BOX
+BOX
+creaVtk:ScalarsToColors:Box18
+ISEXEC:FALSE
+-74.307159:39.659436:-900.000000
+-32.782159:29.659436:-900.000000
+FIN_BOX
+CONNECTIONS:7
+CONNECTION
+Box08:Widget:Box11:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box12:Widget:Box14:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box11:Widget:Box14:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box17:Out:Box08:In
+NumberOfControlPoints:0
+CONNECTION
+Box08:Renderer1:Box16:Renderer
+NumberOfControlPoints:0
+CONNECTION
+Box18:LookupTable:Box16:LookupTable
+NumberOfControlPoints:0
+CONNECTION
+Box16:BoxChange:Box12:BoxExecute
+NumberOfControlPoints:0
+APP_END
diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleScalarsBarActor_ScalarsToColors.bbs b/bbtk_creaVtk_PKG/bbs/appli/exampleScalarsBarActor_ScalarsToColors.bbs
new file mode 100644 (file)
index 0000000..1bf1fa4
--- /dev/null
@@ -0,0 +1,53 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBS BlackBox Script
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleScalarsBarActor_ScalarsToColors.bbs
+# ----------------------------------
+
+# BBTK GEditor Script
+# ----------------------
+
+include std
+include itkvtk
+include creaMaracasVisu
+include wx
+include creaVtk
+include vtk
+
+author "Author ??"
+description "Description ??"
+category "<VOID>"
+
+new creaMaracasVisu:ViewerNV Box08
+
+new wx:LayoutLine Box11
+
+new wx:LayoutLine Box12
+
+new wx:LayoutSplit Box14
+  set Box14.Orientation "H"
+
+new creaVtk:ScalarBarActor Box16
+
+new vtk:LoadHola Box17
+
+new creaVtk:ScalarsToColors Box18
+
+
+connect Box08.Widget Box11.Widget1
+
+connect Box12.Widget Box14.Widget1
+
+connect Box11.Widget Box14.Widget2
+
+connect Box17.Out Box08.In
+
+connect Box08.Renderer1 Box16.Renderer
+
+connect Box18.LookupTable Box16.LookupTable
+
+connect Box16.BoxChange Box12.BoxExecute
+
+
+
+# Complex input ports
+exec Box14
diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleSlab-Widget-01.bbg b/bbtk_creaVtk_PKG/bbs/appli/exampleSlab-Widget-01.bbg
new file mode 100644 (file)
index 0000000..d6aaac5
--- /dev/null
@@ -0,0 +1,127 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBG BlackBox Diagram file
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleSlab-Widget-01.bbg
+# ----------------------------------
+
+APP_START
+CATEGORY:<VOID>
+DESCRIPTION:Description ??
+AUTHOR:Author ??
+COMPLEXBOX:FALSE
+COMPLEXINPUTS:0
+BOXES:10
+BOX
+creaVtk:Slab-Widget-01:Box01
+ISEXEC:FALSE
+-34.489424:13.362700:-900.000000
+6.760576:3.362700:-900.000000
+FIN_BOX
+BOX
+std:FilesFromDirectory:Box02
+ISEXEC:FALSE
+-36.840080:44.404203:-900.000000
+7.034920:34.404203:-900.000000
+FIN_BOX
+BOX
+std:Configuration:Box03
+ISEXEC:FALSE
+-23.672903:80.263749:-900.000000
+15.752097:70.263749:-900.000000
+FIN_BOX
+BOX
+std:ConcatStrings:Box04
+ISEXEC:FALSE
+-27.314889:63.454587:-900.000000
+12.410111:53.454587:-900.000000
+PORT
+In10:"/gdcmvtk/dicom01"
+FIN_BOX
+BOX
+creaMaracasVisu:ViewerNV:Box05
+ISEXEC:FALSE
+-18.350002:-19.470613:-900.000000
+17.524998:-29.470613:-900.000000
+FIN_BOX
+BOX
+wx:LayoutSplit:Box06
+ISEXEC:TRUE
+-36.559928:-67.656878:-900.000000
+0.115072:-77.656878:-900.000000
+PORT
+Orientation:"H"
+FIN_BOX
+BOX
+wx:LayoutTab:Box07
+ISEXEC:FALSE
+-4.342367:-42.162982:-900.000000
+31.907633:-52.162982:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:ViewerNV:Box08
+ISEXEC:FALSE
+49.275957:-18.801149:-900.000000
+85.150957:-28.801149:-900.000000
+FIN_BOX
+BOX
+wx:Slider:Box09
+ISEXEC:FALSE
+34.879012:44.964509:-900.000000
+86.279012:34.964509:-900.000000
+PORT
+Max:"100"
+PORT
+ReactiveOnTrack:"true"
+FIN_BOX
+BOX
+wx:LayoutLine:Box10
+ISEXEC:FALSE
+-70.738557:-23.392751:-900.000000
+-13.178557:-33.392751:-900.000000
+FIN_BOX
+CONNECTIONS:15
+CONNECTION
+Box03:DataPath:Box04:In1
+NumberOfControlPoints:0
+CONNECTION
+Box04:Out:Box02:In
+NumberOfControlPoints:0
+CONNECTION
+Box02:Out:Box01:LstFileNames
+NumberOfControlPoints:0
+CONNECTION
+Box01:ImageSlab2D:Box05:In
+NumberOfControlPoints:0
+CONNECTION
+Box05:Widget:Box07:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box08:Widget:Box07:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box01:Image3D:Box08:In
+NumberOfControlPoints:0
+CONNECTION
+Box07:Widget:Box06:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box01:boxChange:Box05:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box01:boxChange:Box08:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box09:Out:Box01:Slice_In
+NumberOfControlPoints:0
+CONNECTION
+Box09:BoxChange:Box01:boxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box01:widget:Box10:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box09:Widget:Box10:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box10:Widget:Box06:Widget1
+NumberOfControlPoints:0
+APP_END
diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleSlab-Widget-01.bbs b/bbtk_creaVtk_PKG/bbs/appli/exampleSlab-Widget-01.bbs
new file mode 100644 (file)
index 0000000..dcaf1d4
--- /dev/null
@@ -0,0 +1,78 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBS BlackBox Script
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleSlab-Widget-01.bbs
+# ----------------------------------
+
+# BBTK GEditor Script
+# ----------------------
+
+include std
+include itkvtk
+include creaVtk
+include std
+include creaMaracasVisu
+include wx
+
+author "Author ??"
+description "Description ??"
+category "<VOID>"
+
+new creaVtk:Slab-Widget-01 Box01
+
+new std:FilesFromDirectory Box02
+
+new std:Configuration Box03
+
+new std:ConcatStrings Box04
+  set Box04.In10 "/gdcmvtk/dicom01"
+
+new creaMaracasVisu:ViewerNV Box05
+
+new wx:LayoutSplit Box06
+  set Box06.Orientation "H"
+
+new wx:LayoutTab Box07
+
+new creaMaracasVisu:ViewerNV Box08
+
+new wx:Slider Box09
+  set Box09.Max "100"
+  set Box09.ReactiveOnTrack "true"
+
+new wx:LayoutLine Box10
+
+
+connect Box03.DataPath Box04.In1
+
+connect Box04.Out Box02.In
+
+connect Box02.Out Box01.LstFileNames
+
+connect Box01.ImageSlab2D Box05.In
+
+connect Box05.Widget Box07.Widget1
+
+connect Box08.Widget Box07.Widget2
+
+connect Box01.Image3D Box08.In
+
+connect Box07.Widget Box06.Widget2
+
+connect Box01.boxChange Box05.BoxExecute
+
+connect Box01.boxChange Box08.BoxExecute
+
+connect Box09.Out Box01.Slice_In
+
+connect Box09.BoxChange Box01.boxExecute
+
+connect Box01.widget Box10.Widget2
+
+connect Box09.Widget Box10.Widget1
+
+connect Box10.Widget Box06.Widget1
+
+
+
+# Complex input ports
+exec Box06
index 6c43b6a11634c30c567d63f01117e9a9d2d77d4e..cedf7a115898b20b834e3edfd7fe3c8ae5e6bdc6 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleStreamLineScalarSegmentation.bbg
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleStreamLineScalarSegmentation.bbg
 # ----------------------------------
 
 APP_START
@@ -14,7 +14,7 @@ BOX
 vtk:PolyDataReader:Box01
 ISEXEC:FALSE
 -88.546051:6.171672:-900.000000
--42.971051:-3.828328:-900.000000
+-46.546051:-3.828328:-900.000000
 PORT
 In:"/home/davila/Borrame/FIB/example01/V1_IM_fibers.vtk"
 FIN_BOX
@@ -22,25 +22,25 @@ BOX
 creaMaracasVisu:ViewerNV:Box02
 ISEXEC:FALSE
 17.274671:53.788961:-900.000000
-77.914671:43.788961:-900.000000
+80.994671:43.788961:-900.000000
 FIN_BOX
 BOX
 vtk:LoadHola:Box03
 ISEXEC:FALSE
 -92.289200:111.539584:-900.000000
--46.714200:101.539584:-900.000000
+-56.739200:101.539584:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box08
 ISEXEC:FALSE
 137.278039:-199.459007:-900.000000
-194.838039:-209.459007:-900.000000
+173.528039:-209.459007:-900.000000
 FIN_BOX
 BOX
 wx:LayoutSplit:Box09
 ISEXEC:TRUE
 100.030854:-227.815281:-900.000000
-145.605854:-237.815281:-900.000000
+136.705854:-237.815281:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -48,19 +48,19 @@ BOX
 wx:FileSelector:Box14
 ISEXEC:FALSE
 -8.045537:111.400732:-900.000000
-37.529463:101.400732:-900.000000
+29.329463:101.400732:-900.000000
 FIN_BOX
 BOX
 creaImageIO:ImagesChooserDialogBox:Box15
 ISEXEC:FALSE
 44.418152:133.616105:-900.000000
-115.593152:123.616105:-900.000000
+95.893152:123.616105:-900.000000
 FIN_BOX
 BOX
 vtk:UnMosaic:Box16
 ISEXEC:FALSE
 59.016557:113.304403:-900.000000
-104.591557:103.304403:-900.000000
+94.841557:103.304403:-900.000000
 PORT
 NbImagesInMosaic:"10"
 PORT
@@ -70,7 +70,7 @@ BOX
 creaMaracasVisu:ImageChangeInformation:Box17
 ISEXEC:FALSE
 73.555765:95.217887:-900.000000
-144.730765:85.217887:-900.000000
+125.080765:85.217887:-900.000000
 PORT
 NewSpacing:"2.65626 2.65625 6.25"
 FIN_BOX
@@ -78,35 +78,35 @@ BOX
 toolsbbtk:SaveMHD-Button:Box18
 ISEXEC:FALSE
 203.504265:-47.784362:-900.000000
-249.079265:-57.784362:-900.000000
+246.029265:-57.784362:-900.000000
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box20
 ISEXEC:FALSE
 30.936680:79.756254:-900.000000
-102.111680:69.756254:-900.000000
+83.111680:69.756254:-900.000000
 FIN_BOX
 BOX
 vtk:MetaImageReader:Box21
 ISEXEC:FALSE
 -7.094553:96.485348:-900.000000
-38.480447:86.485348:-900.000000
+37.580447:86.485348:-900.000000
 PORT
 In:"/home/davila/Borrame/FIB/example01/V1_IM_b_0_dir_1.mhd"
 FIN_BOX
 BOX
 creaVtk:StreamLine_Visu_Widget:Box26
 ISEXEC:FALSE
-22.700614:-93.328771:-900.000000
-93.875614:-103.328771:-900.000000
+10.631846:-112.824473:-900.000000
+60.306846:-122.824473:-900.000000
 PORT
 Title:"Segmented Stream Line"
 FIN_BOX
 BOX
 creaVtk:StreamLine_Visu_Widget:Box27
 ISEXEC:FALSE
--108.718370:-94.326200:-900.000000
--37.543370:-104.326200:-900.000000
+-107.480548:-100.515312:-900.000000
+-57.805548:-110.515312:-900.000000
 PORT
 Title:"Complete Stream Line"
 FIN_BOX
@@ -114,7 +114,7 @@ BOX
 wx:LayoutLine:Box29
 ISEXEC:FALSE
 -9.970267:-146.347569:-900.000000
-47.589733:-156.347569:-900.000000
+26.604733:-156.347569:-900.000000
 PORT
 Orientation:"V"
 FIN_BOX
@@ -122,19 +122,19 @@ BOX
 creaVtk:StreamLineColorInfo:Box32
 ISEXEC:FALSE
 -99.959608:-16.963324:-900.000000
--28.784608:-26.963324:-900.000000
+-54.234608:-26.963324:-900.000000
 FIN_BOX
 BOX
 creaVtk:StreamLineNumeration:Box33
 ISEXEC:FALSE
--19.206371:-40.822235:-900.000000
-51.968629:-50.822235:-900.000000
+-9.922704:-40.822235:-900.000000
+38.352296:-50.822235:-900.000000
 FIN_BOX
 BOX
 creaVtk:StreamLineSegmentationByScalar:Box34
 ISEXEC:FALSE
--25.171099:-59.634068:-900.000000
-46.003901:-69.634068:-900.000000
+-13.046067:-63.656991:-900.000000
+45.753933:-73.656991:-900.000000
 PORT
 ScalarArrayName:"creaNumeration"
 FIN_BOX
@@ -147,8 +147,8 @@ FIN_BOX
 BOX
 creaMaracasVisu:SliderMinMax:Box37
 ISEXEC:FALSE
--8.653391:-11.457421:-900.000000
-45.826609:-21.457421:-900.000000
+-1.620310:-9.769481:-900.000000
+52.859690:-19.769481:-900.000000
 PORT
 InMax:"1000"
 PORT
@@ -162,7 +162,7 @@ BOX
 vtk:UpdateRender:Box38
 ISEXEC:FALSE
 -58.618472:-74.417405:-900.000000
--13.043472:-84.417405:-900.000000
+-18.293472:-84.417405:-900.000000
 PORT
 Active:"true"
 FIN_BOX
index 5f52976b63d038e4602e988747e171778f1a2ad6..63717d069c3c584a1d7225a4348cf578d9515af7 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script
-# - /home/davila/Creatis/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleStreamLineScalarSegmentation.bbs
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleStreamLineScalarSegmentation.bbs
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -19,61 +19,61 @@ author "Author ??"
 description "Description ??"
 category "<VOID>"
 
-new PolyDataReader Box01
+new vtk:PolyDataReader Box01
   set Box01.In "/home/davila/Borrame/FIB/example01/V1_IM_fibers.vtk"
 
-new ViewerNV Box02
+new creaMaracasVisu:ViewerNV Box02
 
-new LoadHola Box03
+new vtk:LoadHola Box03
 
-new LayoutTab Box08
+new wx:LayoutTab Box08
 
-new LayoutSplit Box09
+new wx:LayoutSplit Box09
   set Box09.Orientation "H"
 
-new FileSelector Box14
+new wx:FileSelector Box14
 
-new ImagesChooserDialogBox Box15
+new creaImageIO:ImagesChooserDialogBox Box15
 
-new UnMosaic Box16
+new vtk:UnMosaic Box16
   set Box16.NbImagesInMosaic "10"
   set Box16.NbImagesPerRow "4"
 
-new ImageChangeInformation Box17
+new creaMaracasVisu:ImageChangeInformation Box17
   set Box17.NewSpacing "2.65626 2.65625 6.25"
 
-new SaveMHD-Button Box18
+new toolsbbtk:SaveMHD-Button Box18
 
-new vtkImageDataPointerRelay Box20
+new vtk:vtkImageDataPointerRelay Box20
 
-new MetaImageReader Box21
+new vtk:MetaImageReader Box21
   set Box21.In "/home/davila/Borrame/FIB/example01/V1_IM_b_0_dir_1.mhd"
 
-new StreamLine_Visu_Widget Box26
+new creaVtk:StreamLine_Visu_Widget Box26
   set Box26.Title "Segmented Stream Line"
 
-new StreamLine_Visu_Widget Box27
+new creaVtk:StreamLine_Visu_Widget Box27
   set Box27.Title "Complete Stream Line"
 
-new LayoutLine Box29
+new wx:LayoutLine Box29
   set Box29.Orientation "V"
 
-new StreamLineColorInfo Box32
+new creaVtk:StreamLineColorInfo Box32
 
-new StreamLineNumeration Box33
+new creaVtk:StreamLineNumeration Box33
 
-new StreamLineSegmentationByScalar Box34
+new creaVtk:StreamLineSegmentationByScalar Box34
   set Box34.ScalarArrayName "creaNumeration"
 
-new LayoutLine Box35
+new wx:LayoutLine Box35
 
-new SliderMinMax Box37
+new creaMaracasVisu:SliderMinMax Box37
   set Box37.InMax "1000"
   set Box37.InMin "0"
   set Box37.ShowActual "false"
   set Box37.WinTitle "Threshold"
 
-new UpdateRender Box38
+new vtk:UpdateRender Box38
   set Box38.Active "true"
 
 
@@ -130,5 +130,4 @@ connect Box02.Renderer1 Box38.Renderer
 
 
 # Complex input ports
-message    
 exec Box09
diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleTensorsExploration_Widget.bbg b/bbtk_creaVtk_PKG/bbs/appli/exampleTensorsExploration_Widget.bbg
new file mode 100644 (file)
index 0000000..f25b939
--- /dev/null
@@ -0,0 +1,81 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBG BlackBox Diagram file
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleTensorsExploration_Widget.bbg
+# ----------------------------------
+
+APP_START
+CATEGORY:<VOID>
+DESCRIPTION:Description ??
+AUTHOR:Author ??
+COMPLEXBOX:FALSE
+COMPLEXINPUTS:0
+BOXES:7
+BOX
+creaVtk:TensorsExploration_Widget:Box00
+ISEXEC:FALSE
+-52.851722:9.416788:-900.000000
+-0.951722:-0.583212:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:ViewerNV:Box01
+ISEXEC:FALSE
+-10.240757:46.377680:-900.000000
+53.479243:36.377680:-900.000000
+FIN_BOX
+BOX
+vtk:LoadHola:Box02
+ISEXEC:FALSE
+2.236487:81.455215:-900.000000
+37.786487:71.455215:-900.000000
+FIN_BOX
+BOX
+wx:LayoutSplit:Box03
+ISEXEC:TRUE
+-25.778457:-26.367006:-900.000000
+13.301543:-36.367006:-900.000000
+PORT
+Orientation:"H"
+FIN_BOX
+BOX
+std:Configuration:Box04
+ISEXEC:FALSE
+-89.341774:75.334303:-900.000000
+-49.916774:65.334303:-900.000000
+FIN_BOX
+BOX
+std:ConcatStrings:Box05
+ISEXEC:FALSE
+-84.162541:52.027753:-900.000000
+-44.437541:42.027753:-900.000000
+PORT
+In2:"/creaVtk/Tensors.vtk"
+FIN_BOX
+BOX
+vtk:StructuredPointsReader:Box06
+ISEXEC:FALSE
+-90.754293:32.017079:-900.000000
+-42.054293:22.017079:-900.000000
+FIN_BOX
+CONNECTIONS:7
+CONNECTION
+Box01:Renderer1:Box00:vtkRenderer
+NumberOfControlPoints:0
+CONNECTION
+Box02:Out:Box01:In
+NumberOfControlPoints:0
+CONNECTION
+Box01:Widget:Box03:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box04:DataPath:Box05:In1
+NumberOfControlPoints:0
+CONNECTION
+Box05:Out:Box06:In
+NumberOfControlPoints:0
+CONNECTION
+Box06:Out:Box00:vtkImageData_tensors
+NumberOfControlPoints:0
+CONNECTION
+Box00:widget:Box03:Widget1
+NumberOfControlPoints:0
+APP_END
diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleTensorsExploration_Widget.bbs b/bbtk_creaVtk_PKG/bbs/appli/exampleTensorsExploration_Widget.bbs
new file mode 100644 (file)
index 0000000..cc2c672
--- /dev/null
@@ -0,0 +1,55 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBS BlackBox Script
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleTensorsExploration_Widget.bbs
+# ----------------------------------
+
+# BBTK GEditor Script
+# ----------------------
+
+include std
+include itkvtk
+include creaVtk
+include creaMaracasVisu
+include vtk
+include wx
+include std
+
+author "Author ??"
+description "Description ??"
+category "<VOID>"
+
+new creaVtk:TensorsExploration_Widget Box00
+
+new creaMaracasVisu:ViewerNV Box01
+
+new vtk:LoadHola Box02
+
+new wx:LayoutSplit Box03
+  set Box03.Orientation "H"
+
+new std:Configuration Box04
+
+new std:ConcatStrings Box05
+  set Box05.In2 "/creaVtk/Tensors.vtk"
+
+new vtk:StructuredPointsReader Box06
+
+
+connect Box01.Renderer1 Box00.vtkRenderer
+
+connect Box02.Out Box01.In
+
+connect Box01.Widget Box03.Widget2
+
+connect Box04.DataPath Box05.In1
+
+connect Box05.Out Box06.In
+
+connect Box06.Out Box00.vtkImageData_tensors
+
+connect Box00.widget Box03.Widget1
+
+
+
+# Complex input ports
+exec Box03
diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsExploration_Widget.bbg b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsExploration_Widget.bbg
new file mode 100644 (file)
index 0000000..7b82938
--- /dev/null
@@ -0,0 +1,81 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBG BlackBox Diagram file
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsExploration_Widget.bbg
+# ----------------------------------
+
+APP_START
+CATEGORY:<VOID>
+DESCRIPTION:Description ??
+AUTHOR:Author ??
+COMPLEXBOX:FALSE
+COMPLEXINPUTS:0
+BOXES:7
+BOX
+creaVtk:VectorsExploration_Widget:Box05
+ISEXEC:FALSE
+-44.335624:-18.635991:-900.000000
+7.914376:-28.635991:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:ViewerNV:Box06
+ISEXEC:FALSE
+23.896150:19.838313:-900.000000
+87.616150:9.838313:-900.000000
+FIN_BOX
+BOX
+vtk:LoadHola:Box07
+ISEXEC:FALSE
+25.399053:55.607393:-900.000000
+60.949053:45.607393:-900.000000
+FIN_BOX
+BOX
+std:ConcatStrings:Box08
+ISEXEC:FALSE
+-62.370455:29.757470:-900.000000
+-22.645455:19.757470:-900.000000
+PORT
+In2:"/creaVtk/Vectors.vtk"
+FIN_BOX
+BOX
+std:Configuration:Box09
+ISEXEC:FALSE
+-44.035044:51.399266:-900.000000
+-4.610044:41.399266:-900.000000
+FIN_BOX
+BOX
+vtk:StructuredPointsReader:Box10
+ISEXEC:FALSE
+-62.069874:10.820898:-900.000000
+-13.369874:0.820898:-900.000000
+FIN_BOX
+BOX
+wx:LayoutSplit:Box11
+ISEXEC:TRUE
+-8.566544:-57.410876:-900.000000
+30.513456:-67.410876:-900.000000
+PORT
+Orientation:"H"
+FIN_BOX
+CONNECTIONS:7
+CONNECTION
+Box06:Renderer1:Box05:vtkRenderer
+NumberOfControlPoints:0
+CONNECTION
+Box07:Out:Box06:In
+NumberOfControlPoints:0
+CONNECTION
+Box09:DataPath:Box08:In1
+NumberOfControlPoints:0
+CONNECTION
+Box08:Out:Box10:In
+NumberOfControlPoints:0
+CONNECTION
+Box10:Out:Box05:vtkImageData_vectors
+NumberOfControlPoints:0
+CONNECTION
+Box05:widget:Box11:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box06:Widget:Box11:Widget2
+NumberOfControlPoints:0
+APP_END
diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsExploration_Widget.bbs b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsExploration_Widget.bbs
new file mode 100644 (file)
index 0000000..c999230
--- /dev/null
@@ -0,0 +1,55 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBS BlackBox Script
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsExploration_Widget.bbs
+# ----------------------------------
+
+# BBTK GEditor Script
+# ----------------------
+
+include std
+include itkvtk
+include creaVtk
+include creaMaracasVisu
+include vtk
+include std
+include wx
+
+author "Author ??"
+description "Description ??"
+category "<VOID>"
+
+new creaVtk:VectorsExploration_Widget Box05
+
+new creaMaracasVisu:ViewerNV Box06
+
+new vtk:LoadHola Box07
+
+new std:ConcatStrings Box08
+  set Box08.In2 "/creaVtk/Vectors.vtk"
+
+new std:Configuration Box09
+
+new vtk:StructuredPointsReader Box10
+
+new wx:LayoutSplit Box11
+  set Box11.Orientation "H"
+
+
+connect Box06.Renderer1 Box05.vtkRenderer
+
+connect Box07.Out Box06.In
+
+connect Box09.DataPath Box08.In1
+
+connect Box08.Out Box10.In
+
+connect Box10.Out Box05.vtkImageData_vectors
+
+connect Box05.widget Box11.Widget1
+
+connect Box06.Widget Box11.Widget2
+
+
+
+# Complex input ports
+exec Box11
index ea59ce22cf20099ff825cfb0d0190fb2273879ff..6fbe5468670268354a8eedfc2a54f9590cb2c96c 100644 (file)
@@ -135,7 +135,7 @@ PORT
 BoxProcessMode:"Reactive"
 FIN_BOX
 BOX
-creaVtk:TensorsVisu_Wideget:Box33
+creaVtk:TensorsVisu_Widget:Box33
 ISEXEC:FALSE
 -3.481701:19.788307:-900.000000
 42.868299:9.788307:-900.000000
@@ -147,7 +147,7 @@ ISEXEC:FALSE
 -16.991295:-29.098017:-900.000000
 FIN_BOX
 BOX
-creaVtk:TensorsVisu_Wideget:Box37
+creaVtk:TensorsVisu_Widget:Box37
 ISEXEC:FALSE
 201.537958:-19.000913:-900.000000
 247.887958:-29.000913:-900.000000
index 9d7e26e403c2f2b0eb3490426e610e4aee2a1d60..83790f29f75524fa5cc91557e829190d5a8c6eb2 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu2.bbg
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu2.bbg
 # ----------------------------------
 
 APP_START
@@ -9,12 +9,12 @@ DESCRIPTION:Description ??
 AUTHOR:Author ??
 COMPLEXBOX:FALSE
 COMPLEXINPUTS:0
-BOXES:8
+BOXES:11
 BOX
 creaMaracasVisu:ViewerNV:Box03
 ISEXEC:FALSE
 57.113475:115.543057:-900.000000
-117.753475:105.543057:-900.000000
+120.833475:105.543057:-900.000000
 PORT
 nTypeView:"5"
 FIN_BOX
@@ -22,7 +22,7 @@ BOX
 wx:LayoutSplit:Box05
 ISEXEC:TRUE
 2.692816:13.173065:-900.000000
-48.267816:3.173065:-900.000000
+41.772816:3.173065:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -30,13 +30,13 @@ BOX
 vtk:LoadHola:Box09
 ISEXEC:FALSE
 63.433818:139.636078:-900.000000
-109.008818:129.636078:-900.000000
+98.983818:129.636078:-900.000000
 FIN_BOX
 BOX
 vtk:StructuredPointsReader:Box10
 ISEXEC:FALSE
 -33.586603:117.343597:-900.000000
-37.588397:107.343597:-900.000000
+15.113397:107.343597:-900.000000
 PORT
 In:"/home/davila/Creatis/creaVtk/data/Vectors.vtk"
 FIN_BOX
@@ -44,7 +44,7 @@ BOX
 vtk:StructuredPointsReader:Box31
 ISEXEC:FALSE
 -113.697803:117.483182:-900.000000
--42.522803:107.483182:-900.000000
+-64.997803:107.483182:-900.000000
 PORT
 In:"/home/davila/tmp/tmpDTI-Cardiac/Data/tensorOriginal3D.vtk"
 FIN_BOX
@@ -52,13 +52,13 @@ BOX
 creaVtk:VectorsTensors_Widget:Box26
 ISEXEC:FALSE
 -108.278239:75.575832:-900.000000
--37.103239:65.575832:-900.000000
+-59.803239:65.575832:-900.000000
 FIN_BOX
 BOX
 creaVtk:VectorsTensors_manualread_Widget:Box12
 ISEXEC:FALSE
 -27.351004:73.971951:-900.000000
-43.823996:63.971951:-900.000000
+34.098996:63.971951:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box13
@@ -66,7 +66,29 @@ ISEXEC:FALSE
 -78.562635:36.838418:-900.000000
 -21.002635:26.838418:-900.000000
 FIN_BOX
-CONNECTIONS:9
+BOX
+std:Configuration:Box14
+ISEXEC:FALSE
+-71.449878:163.381269:-900.000000
+-32.024878:153.381269:-900.000000
+FIN_BOX
+BOX
+std:ConcatStrings:Box15
+ISEXEC:FALSE
+-40.374478:144.783113:-900.000000
+-0.649478:134.783113:-900.000000
+PORT
+In2:"/creaVtk/Vectors.vtk"
+FIN_BOX
+BOX
+std:ConcatStrings:Box16
+ISEXEC:FALSE
+-107.715185:145.714117:-900.000000
+-67.990185:135.714117:-900.000000
+PORT
+In2:"/creaVtk/Tensors.vtk"
+FIN_BOX
+CONNECTIONS:13
 CONNECTION
 Box03:Widget:Box05:Widget2
 NumberOfControlPoints:0
@@ -94,4 +116,16 @@ NumberOfControlPoints:0
 CONNECTION
 Box13:Widget:Box05:Widget1
 NumberOfControlPoints:0
+CONNECTION
+Box14:DataPath:Box15:In1
+NumberOfControlPoints:0
+CONNECTION
+Box15:Out:Box10:In
+NumberOfControlPoints:0
+CONNECTION
+Box14:DataPath:Box16:In1
+NumberOfControlPoints:0
+CONNECTION
+Box16:Out:Box31:In
+NumberOfControlPoints:0
 APP_END
index 70a62137e27f81a855bf119e481093b607a8d3fb..c9c204c68c0faa0c5875775dbac06066ce03025e 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script
-# - /home/davila/Creatis/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu2.bbs
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensorsVisu2.bbs
 # ----------------------------------
 
 # BBTK GEditor Script
@@ -12,30 +12,39 @@ include creaMaracasVisu
 include wx
 include vtk
 include creaVtk
+include std
 
 author "Author ??"
 description "Description ??"
 category "<VOID>"
 
-new ViewerNV Box03
+new creaMaracasVisu:ViewerNV Box03
   set Box03.nTypeView "5"
 
-new LayoutSplit Box05
+new wx:LayoutSplit Box05
   set Box05.Orientation "H"
 
-new LoadHola Box09
+new vtk:LoadHola Box09
 
-new StructuredPointsReader Box10
+new vtk:StructuredPointsReader Box10
   set Box10.In "/home/davila/Creatis/creaVtk/data/Vectors.vtk"
 
-new StructuredPointsReader Box31
+new vtk:StructuredPointsReader Box31
   set Box31.In "/home/davila/tmp/tmpDTI-Cardiac/Data/tensorOriginal3D.vtk"
 
-new VectorsTensors_Widget Box26
+new creaVtk:VectorsTensors_Widget Box26
+
+new creaVtk:VectorsTensors_manualread_Widget Box12
+
+new wx:LayoutTab Box13
+
+new std:Configuration Box14
 
-new VectorsTensors_manualread_Widget Box12
+new std:ConcatStrings Box15
+  set Box15.In2 "/creaVtk/Vectors.vtk"
 
-new LayoutTab Box13
+new std:ConcatStrings Box16
+  set Box16.In2 "/creaVtk/Tensors.vtk"
 
 
 connect Box03.Widget Box05.Widget2
@@ -56,6 +65,14 @@ connect Box26.widget Box13.Widget1
 
 connect Box13.Widget Box05.Widget1
 
+connect Box14.DataPath Box15.In1
+
+connect Box15.Out Box10.In
+
+connect Box14.DataPath Box16.In1
+
+connect Box16.Out Box31.In
+
 
 
 # Complex input ports
diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensors_manualread_Widget.bbg b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensors_manualread_Widget.bbg
new file mode 100644 (file)
index 0000000..ceb87df
--- /dev/null
@@ -0,0 +1,112 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBG BlackBox Diagram file
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensors_manualread_Widget.bbg
+# ----------------------------------
+
+APP_START
+CATEGORY:<VOID>
+DESCRIPTION:Description ??
+AUTHOR:Author ??
+COMPLEXBOX:FALSE
+COMPLEXINPUTS:0
+BOXES:10
+BOX
+creaVtk:VectorsTensors_manualread_Widget:Box02
+ISEXEC:FALSE
+-103.099113:11.121479:-900.000000
+-41.649113:1.121479:-900.000000
+FIN_BOX
+BOX
+vtk:LoadHola:Box03
+ISEXEC:FALSE
+-32.011824:71.838740:-900.000000
+3.538176:61.838740:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:ViewerNV:Box04
+ISEXEC:FALSE
+-42.532141:40.878949:-900.000000
+21.187859:30.878949:-900.000000
+FIN_BOX
+BOX
+wx:LayoutSplit:Box05
+ISEXEC:TRUE
+-90.625022:-42.983012:-900.000000
+-51.545022:-52.983012:-900.000000
+PORT
+Orientation:"H"
+FIN_BOX
+BOX
+wx:OutputText:Box06
+ISEXEC:FALSE
+17.583959:-41.179529:-900.000000
+54.358959:-51.179529:-900.000000
+FIN_BOX
+BOX
+std:Configuration:Box07
+ISEXEC:FALSE
+40.428078:21.040635:-900.000000
+79.853078:11.040635:-900.000000
+FIN_BOX
+BOX
+std:ConcatStrings:Box08
+ISEXEC:FALSE
+7.364222:-3.907547:-900.000000
+47.089222:-13.907547:-900.000000
+PORT
+In2:"/creaVtk/Vectors.vtk"
+FIN_BOX
+BOX
+wx:OutputText:Box09
+ISEXEC:FALSE
+58.925175:-40.416681:-900.000000
+95.700175:-50.416681:-900.000000
+FIN_BOX
+BOX
+std:ConcatStrings:Box10
+ISEXEC:FALSE
+56.821112:-4.347021:-900.000000
+96.546112:-14.347021:-900.000000
+PORT
+In2:"/creaVtk/Tensors.vtk"
+FIN_BOX
+BOX
+wx:LayoutLine:Box11
+ISEXEC:TRUE
+36.520531:-61.619003:-900.000000
+94.080531:-71.619003:-900.000000
+PORT
+WinHeight:"100"
+FIN_BOX
+CONNECTIONS:10
+CONNECTION
+Box03:Out:Box04:In
+NumberOfControlPoints:0
+CONNECTION
+Box02:widget:Box05:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box04:Renderer1:Box02:vtkRenderer
+NumberOfControlPoints:0
+CONNECTION
+Box04:Widget:Box05:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box07:DataPath:Box08:In1
+NumberOfControlPoints:0
+CONNECTION
+Box08:Out:Box06:In
+NumberOfControlPoints:0
+CONNECTION
+Box07:DataPath:Box10:In1
+NumberOfControlPoints:0
+CONNECTION
+Box10:Out:Box09:In
+NumberOfControlPoints:0
+CONNECTION
+Box06:Widget:Box11:Widget1
+NumberOfControlPoints:0
+CONNECTION
+Box09:Widget:Box11:Widget2
+NumberOfControlPoints:0
+APP_END
diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensors_manualread_Widget.bbs b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensors_manualread_Widget.bbs
new file mode 100644 (file)
index 0000000..545d8d5
--- /dev/null
@@ -0,0 +1,70 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBS BlackBox Script
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsTensors_manualread_Widget.bbs
+# ----------------------------------
+
+# BBTK GEditor Script
+# ----------------------
+
+include std
+include itkvtk
+include creaVtk
+include vtk
+include creaMaracasVisu
+include wx
+include std
+
+author "Author ??"
+description "Description ??"
+category "<VOID>"
+
+new creaVtk:VectorsTensors_manualread_Widget Box02
+
+new vtk:LoadHola Box03
+
+new creaMaracasVisu:ViewerNV Box04
+
+new wx:LayoutSplit Box05
+  set Box05.Orientation "H"
+
+new wx:OutputText Box06
+
+new std:Configuration Box07
+
+new std:ConcatStrings Box08
+  set Box08.In2 "/creaVtk/Vectors.vtk"
+
+new wx:OutputText Box09
+
+new std:ConcatStrings Box10
+  set Box10.In2 "/creaVtk/Tensors.vtk"
+
+new wx:LayoutLine Box11
+  set Box11.WinHeight "100"
+
+
+connect Box03.Out Box04.In
+
+connect Box02.widget Box05.Widget1
+
+connect Box04.Renderer1 Box02.vtkRenderer
+
+connect Box04.Widget Box05.Widget2
+
+connect Box07.DataPath Box08.In1
+
+connect Box08.Out Box06.In
+
+connect Box07.DataPath Box10.In1
+
+connect Box10.Out Box09.In
+
+connect Box06.Widget Box11.Widget1
+
+connect Box09.Widget Box11.Widget2
+
+
+
+# Complex input ports
+exec Box05
+exec Box11
index 54ec6c85a1cd3df6a34552b5ac03942ad8f4aaa5..cf3f0753c7a7d6fb42396f3623c6882f7d57d358 100644 (file)
@@ -16,7 +16,7 @@ ISEXEC:FALSE
 -87.126923:-1.070619:-900.000000
 -50.976923:-11.070619:-900.000000
 PORT
-Ratio:"1"
+Ratio:"30"
 FIN_BOX
 BOX
 creaVtk:VectorsVisu:Box02
diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu_Widget.bbg b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu_Widget.bbg
new file mode 100644 (file)
index 0000000..0c6cedf
--- /dev/null
@@ -0,0 +1,81 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBG BlackBox Diagram file
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu_Widget.bbg
+# ----------------------------------
+
+APP_START
+CATEGORY:<VOID>
+DESCRIPTION:Description ??
+AUTHOR:Author ??
+COMPLEXBOX:FALSE
+COMPLEXINPUTS:0
+BOXES:7
+BOX
+creaVtk:VectorsVisu_Widget:Box00
+ISEXEC:FALSE
+-23.144699:0.601161:-900.000000
+22.280301:-9.398839:-900.000000
+FIN_BOX
+BOX
+vtk:LoadHola:Box01
+ISEXEC:FALSE
+35.769080:65.526550:-900.000000
+71.319080:55.526550:-900.000000
+FIN_BOX
+BOX
+creaMaracasVisu:ViewerNV:Box02
+ISEXEC:FALSE
+20.740055:22.242957:-900.000000
+84.460055:12.242957:-900.000000
+FIN_BOX
+BOX
+vtk:StructuredPointsReader:Box03
+ISEXEC:FALSE
+-48.393461:24.948182:-900.000000
+0.306539:14.948182:-900.000000
+FIN_BOX
+BOX
+std:ConcatStrings:Box04
+ISEXEC:FALSE
+-42.381851:45.387656:-900.000000
+-2.656851:35.387656:-900.000000
+PORT
+In2:"/creaVtk/Vectors.vtk"
+FIN_BOX
+BOX
+std:Configuration:Box05
+ISEXEC:FALSE
+-36.670822:64.925389:-900.000000
+2.754178:54.925389:-900.000000
+FIN_BOX
+BOX
+wx:LayoutSplit:Box06
+ISEXEC:TRUE
+12.323801:-42.081271:-900.000000
+51.403801:-52.081271:-900.000000
+PORT
+Orientation:"H"
+FIN_BOX
+CONNECTIONS:7
+CONNECTION
+Box01:Out:Box02:In
+NumberOfControlPoints:0
+CONNECTION
+Box02:Renderer1:Box00:renderer
+NumberOfControlPoints:0
+CONNECTION
+Box04:Out:Box03:In
+NumberOfControlPoints:0
+CONNECTION
+Box05:DataPath:Box04:In1
+NumberOfControlPoints:0
+CONNECTION
+Box03:Out:Box00:vtkDataObject
+NumberOfControlPoints:0
+CONNECTION
+Box02:Widget:Box06:Widget2
+NumberOfControlPoints:0
+CONNECTION
+Box00:Widget:Box06:Widget1
+NumberOfControlPoints:0
+APP_END
diff --git a/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu_Widget.bbs b/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu_Widget.bbs
new file mode 100644 (file)
index 0000000..1456ef1
--- /dev/null
@@ -0,0 +1,55 @@
+# ----------------------------------
+# - BBTKGEditor v 1.4 BBS BlackBox Script
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/appli/exampleVectorsVisu_Widget.bbs
+# ----------------------------------
+
+# BBTK GEditor Script
+# ----------------------
+
+include std
+include itkvtk
+include creaVtk
+include vtk
+include creaMaracasVisu
+include std
+include wx
+
+author "Author ??"
+description "Description ??"
+category "<VOID>"
+
+new creaVtk:VectorsVisu_Widget Box00
+
+new vtk:LoadHola Box01
+
+new creaMaracasVisu:ViewerNV Box02
+
+new vtk:StructuredPointsReader Box03
+
+new std:ConcatStrings Box04
+  set Box04.In2 "/creaVtk/Vectors.vtk"
+
+new std:Configuration Box05
+
+new wx:LayoutSplit Box06
+  set Box06.Orientation "H"
+
+
+connect Box01.Out Box02.In
+
+connect Box02.Renderer1 Box00.renderer
+
+connect Box04.Out Box03.In
+
+connect Box05.DataPath Box04.In1
+
+connect Box03.Out Box00.vtkDataObject
+
+connect Box02.Widget Box06.Widget2
+
+connect Box00.Widget Box06.Widget1
+
+
+
+# Complex input ports
+exec Box06
index 30c568c7a3450c128444ec2095bc7571d30edd0c..aca1f166181ba14cd6d15eb686feabf8ea6a600e 100644 (file)
@@ -43,31 +43,31 @@ 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 +75,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,7 +85,7 @@ 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
 BOX
 std:MagicBox:Box11
index 0d83e76eed089e9e9f282a1de689c422fbfbb694..1605ab1e85171784e27e249de83d8780a5c007e9 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/PlaneWidget_StreamLineVisu_Widget.bbg
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/PlaneWidget_StreamLineVisu_Widget.bbg
 # ----------------------------------
 
 APP_START
@@ -28,12 +28,12 @@ COMPLEX_PORT
 In
 99.025068:96.869980:-900.000000
 FIN_COMPLEX_PORT
-BOXES:6
+BOXES:7
 BOX
 creaVtk:StreamLineVisu:Box00
 ISEXEC:FALSE
 -68.064181:-82.926665:-900.000000
--22.489181:-92.926665:-900.000000
+-27.189181:-92.926665:-900.000000
 PORT
 Active:"true"
 PORT
@@ -43,7 +43,7 @@ BOX
 creaVtk:PlaneWidget:Box01
 ISEXEC:FALSE
 15.861308:-23.632229:-900.000000
-61.436308:-33.632229:-900.000000
+54.386308:-33.632229:-900.000000
 PORT
 Active:"true"
 PORT
@@ -53,29 +53,35 @@ BOX
 std:MagicBox:Box02
 ISEXEC:FALSE
 21.476726:47.966538:-900.000000
-67.051726:37.966538:-900.000000
+57.551726:37.966538:-900.000000
 FIN_BOX
 BOX
 creaVtk:PlaneWidget_StreamLineVisu_Interface:Box03
 ISEXEC:FALSE
 -76.332059:46.908709:-900.000000
--5.157059:36.908709:-900.000000
+-12.557059:36.908709:-900.000000
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box04
 ISEXEC:FALSE
 81.238099:47.686190:-900.000000
-152.413099:37.686190:-900.000000
+133.413099:37.686190:-900.000000
 FIN_BOX
 BOX
 creaVtk:StreamTracer:Box05
 ISEXEC:FALSE
 10.778711:-57.880203:-900.000000
-56.353711:-67.880203:-900.000000
+49.903711:-67.880203:-900.000000
 PORT
 Active:"true"
 FIN_BOX
-CONNECTIONS:19
+BOX
+std:MultipleInputs:Box06
+ISEXEC:FALSE
+-88.821539:-46.589978:-900.000000
+-49.121539:-56.589978:-900.000000
+FIN_BOX
+CONNECTIONS:21
 CONNECTION
 Renderer:Renderer:Box02:In
 NumberOfControlPoints:0
@@ -101,9 +107,6 @@ CONNECTION
 Box03:boxChange:Box01:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-Box03:boxChange:Box00:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
 Box03:widget:Widget:Widget
 NumberOfControlPoints:0
 CONNECTION
@@ -133,4 +136,13 @@ NumberOfControlPoints:0
 CONNECTION
 Box03:boxChange:Box05:BoxExecute
 NumberOfControlPoints:0
+CONNECTION
+Box03:boxChange:Box06:In1
+NumberOfControlPoints:0
+CONNECTION
+Box01:BoxChange:Box06:In2
+NumberOfControlPoints:0
+CONNECTION
+Box06:BoxChange:Box00:BoxExecute
+NumberOfControlPoints:0
 APP_END
index e45359fc830533195b6d6b520a96ff379966656a..39d382cc23c828e5bb6563174042996b5e808374 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/PlaneWidget_StreamLineVisu_Widget.bbs
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/PlaneWidget_StreamLineVisu_Widget.bbs
 # ----------------------------------
 
 include std
@@ -16,23 +16,25 @@ description "Description ??"
 
 category "<VOID>"
 
-new StreamLineVisu Box00
+new creaVtk:StreamLineVisu Box00
   set Box00.Active "true"
   set Box00.ScaleFactor "5"
 
-new PlaneWidget Box01
+new creaVtk:PlaneWidget Box01
   set Box01.Active "true"
   set Box01.Resolution "10"
 
-new MagicBox Box02
+new std:MagicBox Box02
 
-new PlaneWidget_StreamLineVisu_Interface Box03
+new creaVtk:PlaneWidget_StreamLineVisu_Interface Box03
 
-new vtkImageDataPointerRelay Box04
+new vtk:vtkImageDataPointerRelay Box04
 
-new StreamTracer Box05
+new creaVtk:StreamTracer Box05
   set Box05.Active "true"
 
+new std:MultipleInputs Box06
+
 
 connect Box02.Out Box00.Renderer
 connect Box02.Out Box01.Renderer
@@ -41,7 +43,6 @@ connect Box03.ActiveStreamLine Box00.Active
 connect Box03.Opacity Box00.Opacity
 connect Box03.Resolution Box01.Resolution
 connect Box03.boxChange Box01.BoxExecute
-connect Box03.boxChange Box00.BoxExecute
 connect Box04.Out Box01.In
 connect Box03.TypeStreamLine Box00.TypeForm
 connect Box03.ScaleFactor Box00.ScaleFactor
@@ -49,6 +50,9 @@ connect Box01.Out Box05.Source
 connect Box04.Out Box05.In
 connect Box05.Out Box00.PolyData
 connect Box03.boxChange Box05.BoxExecute
+connect Box03.boxChange Box06.In1
+connect Box01.BoxChange Box06.In2
+connect Box06.BoxChange Box00.BoxExecute
 
 # Complex input ports
 input Renderer Box02.In " "
similarity index 84%
rename from bbtk_creaVtk_PKG/bbs/boxes/StreamlineExploration_Wideget.bbg
rename to bbtk_creaVtk_PKG/bbs/boxes/StreamLineExploration_Widget.bbg
index b9f6695d8e0865e97c00cfa1a73ffbea2eb55043..f0488f19a56a5b83cc40154e654ba76b88c23d46 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/StreamlineExploration_Wideget.bbg
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/StreamLineExploration_Widget.bbg
 # ----------------------------------
 
 APP_START
@@ -33,7 +33,7 @@ BOX
 vtk:UpdateRender:Box22
 ISEXEC:FALSE
 6.334285:28.952024:-900.000000
-51.909285:18.952024:-900.000000
+46.659285:18.952024:-900.000000
 PORT
 Active:"true"
 FIN_BOX
@@ -41,13 +41,13 @@ BOX
 wx:LayoutTab:Box17
 ISEXEC:FALSE
 -107.033271:7.331640:-900.000000
--49.473271:-2.668360:-900.000000
+-60.868719:-2.668360:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box23
 ISEXEC:FALSE
 -34.049213:48.794295:-900.000000
-11.525787:38.794295:-900.000000
+5.650787:38.794295:-900.000000
 PORT
 BoxProcessMode:"Reactive"
 FIN_BOX
@@ -55,31 +55,31 @@ BOX
 creaVtk:PlaneWidget_StreamLineVisu_Widget:Box30
 ISEXEC:FALSE
 -123.664308:72.163231:-900.000000
--52.489308:62.163231:-900.000000
+-61.789308:62.163231:-900.000000
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box26
 ISEXEC:FALSE
 -172.222151:92.257373:-900.000000
--101.047151:82.257373:-900.000000
+-120.047151:82.257373:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box28
 ISEXEC:FALSE
 6.018852:102.199182:-900.000000
-51.593852:92.199182:-900.000000
+42.093852:92.199182:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box14
 ISEXEC:FALSE
 -122.299506:43.713393:-900.000000
--64.739506:33.713393:-900.000000
+-65.377426:33.713393:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box07
 ISEXEC:FALSE
 -64.010236:96.562792:-900.000000
--18.435236:86.562792:-900.000000
+-27.935236:86.562792:-900.000000
 FIN_BOX
 CONNECTIONS:12
 CONNECTION
similarity index 71%
rename from bbtk_creaVtk_PKG/bbs/boxes/StreamlineExploration_Wideget.bbs
rename to bbtk_creaVtk_PKG/bbs/boxes/StreamLineExploration_Widget.bbs
index fb8d0c34861d401429a6e44911a32344696c1955..8c199a55bdda2b3de64cf363bb3e559da9f50f80 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/StreamlineExploration_Wideget.bbs
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/StreamLineExploration_Widget.bbs
 # ----------------------------------
 
 include std
@@ -17,23 +17,23 @@ description "Description ??"
 
 category "<VOID>"
 
-new UpdateRender Box22
+new vtk:UpdateRender Box22
   set Box22.Active "true"
 
-new LayoutTab Box17
+new wx:LayoutTab Box17
 
-new MultipleInputs Box23
+new std:MultipleInputs Box23
   set Box23.BoxProcessMode "Reactive"
 
-new PlaneWidget_StreamLineVisu_Widget Box30
+new creaVtk:PlaneWidget_StreamLineVisu_Widget Box30
 
-new vtkImageDataPointerRelay Box26
+new vtk:vtkImageDataPointerRelay Box26
 
-new MagicBox Box28
+new std:MagicBox Box28
 
-new LayoutLine Box14
+new wx:LayoutLine Box14
 
-new MagicBox Box07
+new std:MagicBox Box07
 
 
 connect Box23.BoxChange Box22.BoxExecute
similarity index 86%
rename from bbtk_creaVtk_PKG/bbs/boxes/TensorsExploration_Wideget.bbg
rename to bbtk_creaVtk_PKG/bbs/boxes/TensorsExploration_Widget.bbg
index 31a6dab09480a4f1baae1ff5644ef4d01dd24741..b129330eedd4594ca9f8acbacf519ff4f896012b 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/TensorsExploration_Wideget.bbg
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/TensorsExploration_Widget.bbg
 # ----------------------------------
 
 APP_START
@@ -33,7 +33,7 @@ BOX
 vtk:UpdateRender:Box22
 ISEXEC:FALSE
 50.421230:29.527651:-900.000000
-95.996230:19.527651:-900.000000
+90.746230:19.527651:-900.000000
 PORT
 Active:"true"
 FIN_BOX
@@ -41,7 +41,7 @@ BOX
 wx:LayoutTab:Box17
 ISEXEC:FALSE
 -155.143275:4.881948:-900.000000
--97.583275:-5.118052:-900.000000
+-75.296583:-5.118052:-900.000000
 PORT
 WinTitle:"VectorsTensors Analysis"
 FIN_BOX
@@ -49,13 +49,13 @@ BOX
 std:MultipleInputs:Box23
 ISEXEC:FALSE
 3.709669:55.066372:-900.000000
-49.284669:45.066372:-900.000000
+43.409669:45.066372:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box16
 ISEXEC:FALSE
 -66.220097:53.516083:-900.000000
--8.660097:43.516083:-900.000000
+-29.645097:43.516083:-900.000000
 PORT
 WinTitle:"Tensors"
 FIN_BOX
@@ -63,25 +63,25 @@ BOX
 creaVtk:VolumeTensorVisu_Widget:Box19
 ISEXEC:FALSE
 15.919649:97.987432:-900.000000
-87.094649:87.987432:-900.000000
+67.619649:87.987432:-900.000000
 FIN_BOX
 BOX
 creaVtk:PlaneTensorVisu_Widget:Box21
 ISEXEC:FALSE
 -83.100097:95.241049:-900.000000
--11.925097:85.241049:-900.000000
+-33.500097:85.241049:-900.000000
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box27
 ISEXEC:FALSE
 -89.314298:137.998626:-900.000000
--18.139298:127.998626:-900.000000
+-37.139298:127.998626:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box28
 ISEXEC:FALSE
 21.602067:137.982960:-900.000000
-67.177067:127.982960:-900.000000
+57.677067:127.982960:-900.000000
 FIN_BOX
 CONNECTIONS:16
 CONNECTION
similarity index 74%
rename from bbtk_creaVtk_PKG/bbs/boxes/TensorsExploration_Wideget.bbs
rename to bbtk_creaVtk_PKG/bbs/boxes/TensorsExploration_Widget.bbs
index e93a1334236326c94890df9a1da1d4ede37e1b68..12f9687b8fb6a64281209f1d033c7a99d3d092de 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/TensorsExploration_Wideget.bbs
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/TensorsExploration_Widget.bbs
 # ----------------------------------
 
 include std
@@ -17,24 +17,24 @@ description "Description ??"
 
 category "<VOID>"
 
-new UpdateRender Box22
+new vtk:UpdateRender Box22
   set Box22.Active "true"
 
-new LayoutTab Box17
+new wx:LayoutTab Box17
   set Box17.WinTitle "VectorsTensors Analysis"
 
-new MultipleInputs Box23
+new std:MultipleInputs Box23
 
-new LayoutLine Box16
+new wx:LayoutLine Box16
   set Box16.WinTitle "Tensors"
 
-new VolumeTensorVisu_Widget Box19
+new creaVtk:VolumeTensorVisu_Widget Box19
 
-new PlaneTensorVisu_Widget Box21
+new creaVtk:PlaneTensorVisu_Widget Box21
 
-new vtkImageDataPointerRelay Box27
+new vtk:vtkImageDataPointerRelay Box27
 
-new MagicBox Box28
+new std:MagicBox Box28
 
 
 connect Box23.BoxChange Box22.BoxExecute
similarity index 86%
rename from bbtk_creaVtk_PKG/bbs/boxes/TensorsVisu_Wideget.bbg
rename to bbtk_creaVtk_PKG/bbs/boxes/TensorsVisu_Widget.bbg
index 9c781d7dbb27d85f51bb48a4d2aa9dd8063811b9..abcd86fb5cd9989f338aaa680e5694e364d80447 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/TensorsVisu_Wideget.bbg
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/TensorsVisu_Widget.bbg
 # ----------------------------------
 
 APP_START
@@ -8,7 +8,7 @@ CATEGORY:<VOID>
 DESCRIPTION:Description ??
 AUTHOR:Author ??
 COMPLEXBOX:TRUE
-COMPLEXBOXNAME:TensorsVisu_Wideget
+COMPLEXBOXNAME:TensorsVisu_Widget
 PACKAGENAME:creaVtk
 COMPLEXOUTPUTS:2
 COMPLEX_PORT
@@ -37,13 +37,13 @@ BOX
 creaVtk:VectorsVisu_Interface:Box05
 ISEXEC:FALSE
 -97.776890:18.173350:-900.000000
--26.601890:8.173350:-900.000000
+-50.451890:8.173350:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box07
 ISEXEC:FALSE
 -192.695856:-9.602961:-900.000000
--147.120856:-19.602961:-900.000000
+-115.642864:-19.602961:-900.000000
 PORT
 BoxProcessMode:"Reactive"
 FIN_BOX
@@ -51,7 +51,7 @@ BOX
 creaVtk:TensorsVisu:Box04
 ISEXEC:FALSE
 -127.718192:-57.759725:-900.000000
--82.143192:-67.759725:-900.000000
+-90.443192:-67.759725:-900.000000
 FIN_BOX
 CONNECTIONS:10
 CONNECTION
similarity index 75%
rename from bbtk_creaVtk_PKG/bbs/boxes/TensorsVisu_Wideget.bbs
rename to bbtk_creaVtk_PKG/bbs/boxes/TensorsVisu_Widget.bbs
index 42b4db9c975daeafa8af5919f9b4dc1526ceba39..826d6513fdfc37db361aa3db1cc843f19ea7c9a8 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/TensorsVisu_Wideget.bbs
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/TensorsVisu_Widget.bbs
 # ----------------------------------
 
 include std
@@ -8,19 +8,19 @@ include itkvtk
 include creaVtk
 include std
 
-define TensorsVisu_Wideget creaVtk
+define TensorsVisu_Widget creaVtk
 
 author "Author ??"
 description "Description ??"
 
 category "<VOID>"
 
-new VectorsVisu_Interface Box05
+new creaVtk:VectorsVisu_Interface Box05
 
-new MultipleInputs Box07
+new std:MultipleInputs Box07
   set Box07.BoxProcessMode "Reactive"
 
-new TensorsVisu Box04
+new creaVtk:TensorsVisu Box04
 
 
 connect Box05.boxChange Box07.In2
similarity index 86%
rename from bbtk_creaVtk_PKG/bbs/boxes/VectorsExploration_Wideget.bbg
rename to bbtk_creaVtk_PKG/bbs/boxes/VectorsExploration_Widget.bbg
index bb9a83582fb8d4eb8fadc87696b518102c7a2449..300ebb8b28b2f22384b01c669825fa892100d101 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/VectorsExploration_Wideget.bbg
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/VectorsExploration_Widget.bbg
 # ----------------------------------
 
 APP_START
@@ -33,7 +33,7 @@ BOX
 vtk:UpdateRender:Box22
 ISEXEC:FALSE
 -109.905905:-14.897333:-900.000000
--64.330905:-24.897333:-900.000000
+-69.580905:-24.897333:-900.000000
 PORT
 Active:"true"
 FIN_BOX
@@ -41,7 +41,7 @@ BOX
 wx:LayoutTab:Box17
 ISEXEC:FALSE
 -184.622210:-20.410541:-900.000000
--127.062210:-30.410541:-900.000000
+-84.013417:-30.410541:-900.000000
 PORT
 WinTitle:"VectorsTensors Analysis"
 FIN_BOX
@@ -49,7 +49,7 @@ BOX
 std:MultipleInputs:Box23
 ISEXEC:FALSE
 -151.066256:11.353972:-900.000000
--105.491256:1.353972:-900.000000
+-95.654261:1.353972:-900.000000
 PORT
 BoxProcessMode:"Reactive"
 FIN_BOX
@@ -57,13 +57,13 @@ BOX
 creaVtk:PlaneVectorVisu_Widget:Box41
 ISEXEC:FALSE
 -268.440972:51.457315:-900.000000
--197.265972:41.457315:-900.000000
+-157.542180:41.457315:-900.000000
 FIN_BOX
 BOX
 wx:LayoutLine:Box14
 ISEXEC:FALSE
 -232.798631:5.736817:-900.000000
--175.238631:-4.263183:-900.000000
+-98.441282:-4.263183:-900.000000
 PORT
 WinTitle:"Field"
 FIN_BOX
@@ -71,19 +71,19 @@ BOX
 creaVtk:VolumeVectorVisu_Widget:Box18
 ISEXEC:FALSE
 -187.068807:50.505798:-900.000000
--115.893807:40.505798:-900.000000
+-133.195159:40.505798:-900.000000
 FIN_BOX
 BOX
 vtk:vtkImageDataPointerRelay:Box26
 ISEXEC:FALSE
 -226.504734:87.499150:-900.000000
--155.329734:77.499150:-900.000000
+-142.837799:77.499150:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box28
 ISEXEC:FALSE
 -94.829944:83.888857:-900.000000
--49.254944:73.888857:-900.000000
+-58.754944:73.888857:-900.000000
 FIN_BOX
 CONNECTIONS:16
 CONNECTION
similarity index 75%
rename from bbtk_creaVtk_PKG/bbs/boxes/VectorsExploration_Wideget.bbs
rename to bbtk_creaVtk_PKG/bbs/boxes/VectorsExploration_Widget.bbs
index 007449c4c936aae9eb460e4c86908dc6ed9f6f72..9e274050acd826a20ac91b0d7ebb3a56d3db4002 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/creaTools/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/VectorsExploration_Wideget.bbs
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/VectorsExploration_Widget.bbs
 # ----------------------------------
 
 include std
@@ -17,25 +17,25 @@ description "Description ??"
 
 category "<VOID>"
 
-new UpdateRender Box22
+new vtk:UpdateRender Box22
   set Box22.Active "true"
 
-new LayoutTab Box17
+new wx:LayoutTab Box17
   set Box17.WinTitle "VectorsTensors Analysis"
 
-new MultipleInputs Box23
+new std:MultipleInputs Box23
   set Box23.BoxProcessMode "Reactive"
 
-new PlaneVectorVisu_Widget Box41
+new creaVtk:PlaneVectorVisu_Widget Box41
 
-new LayoutLine Box14
+new wx:LayoutLine Box14
   set Box14.WinTitle "Field"
 
-new VolumeVectorVisu_Widget Box18
+new creaVtk:VolumeVectorVisu_Widget Box18
 
-new vtkImageDataPointerRelay Box26
+new vtk:vtkImageDataPointerRelay Box26
 
-new MagicBox Box28
+new std:MagicBox Box28
 
 
 connect Box23.BoxChange Box22.BoxExecute
similarity index 89%
rename from bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Wideget.bbg
rename to bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Widget.bbg
index 2ca220314869ad9e1684f81f23d0fd412d37709b..c4687a37ec7a6b58af800810e163f1bc7a10e670 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Wideget.bbg
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Widget.bbg
 # ----------------------------------
 
 APP_START
@@ -37,7 +37,7 @@ BOX
 creaVtk:VectorsVisu:Box03
 ISEXEC:FALSE
 -138.705440:-34.751328:-900.000000
--93.130440:-44.751328:-900.000000
+-101.080440:-44.751328:-900.000000
 PORT
 Active:"true"
 PORT
@@ -47,13 +47,13 @@ BOX
 creaVtk:VectorsVisu_Interface:Box05
 ISEXEC:FALSE
 -97.776890:18.173350:-900.000000
--26.601890:8.173350:-900.000000
+-50.451890:8.173350:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box07
 ISEXEC:FALSE
 -199.014629:-6.443575:-900.000000
--153.439629:-16.443575:-900.000000
+-148.406139:-16.443575:-900.000000
 PORT
 BoxProcessMode:"Reactive"
 FIN_BOX
similarity index 80%
rename from bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Wideget.bbs
rename to bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Widget.bbs
index a074cbdf0b715fbfa7cf444ce5a142c7c4874499..1b46f4a5841f8c47e03ff13c059032a2ff8dbd52 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Wideget.bbs
+# - /tmpEED/creaTools2/creatools_source/creaVtk/bbtk_creaVtk_PKG/bbs/boxes/VectorsVisu_Widget.bbs
 # ----------------------------------
 
 include std
@@ -15,13 +15,13 @@ description "Description ??"
 
 category "<VOID>"
 
-new VectorsVisu Box03
+new creaVtk:VectorsVisu Box03
   set Box03.Active "true"
   set Box03.ScaleFactor "10"
 
-new VectorsVisu_Interface Box05
+new creaVtk:VectorsVisu_Interface Box05
 
-new MultipleInputs Box07
+new std:MultipleInputs Box07
   set Box07.BoxProcessMode "Reactive"
 
 
index 39a3f8edddc45a47e93bafd2bc18f70d4f04135a..6b002489e95175181c7ef321052d601dbd0b5c8f 100644 (file)
@@ -3,6 +3,9 @@
 //===== 
 #include "bbcreaVtkActor.h"
 #include "bbcreaVtkPackage.h"
+#include "vtkProperty.h"
+
+
 namespace bbcreaVtk
 {
 
@@ -30,12 +33,19 @@ void Actor::Process()
 //    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
  
 
-     vtkProp3D* vtkactor=bbGetInputIn();
-//     vtkactor->GetProperty()->SetOpacity( bbGetInputOpacity() );
+     vtkProp3D* vtkprop3D=bbGetInputIn();
+
+
+    std::string className = vtkprop3D->GetClassName();
+    std::string wantedClass = "vtkOpenGLActor";
+    if(className == wantedClass)
+    {
+               ((vtkActor*)vtkprop3D)->GetProperty()->SetOpacity( bbGetInputOpacity() );
+    }
      
      if ( bbGetInputTransform()!=NULL )
      {
-        vtkactor->SetUserTransform( bbGetInputTransform() );
+        vtkprop3D->SetUserTransform( bbGetInputTransform() );
      }
 
 //     bbSetOutputOut( vtkactor );
@@ -47,9 +57,9 @@ void Actor::Process()
        
        if (bbGetInputActive()==true )
        {
-                       bbGetInputRenderer()->AddActor( vtkactor );
+                       bbGetInputRenderer()->AddActor( vtkprop3D );
        }  else {
-                       bbGetInputRenderer()->RemoveActor( vtkactor );
+                       bbGetInputRenderer()->RemoveActor( vtkprop3D );
        }  //if Active
                backActive=bbGetInputActive();
        } // if Renderer
index 9ecd02a9edf6d5d6849f384bca1e1d8a147f5fc7..2f515a891b226c78f12b659c35050b32af4f9dec 100644 (file)
@@ -22,7 +22,6 @@ class bbcreaVtk_EXPORT GenerateArrowSource
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
-  BBTK_DECLARE_INPUT(Point,std::vector<double>);
   BBTK_DECLARE_OUTPUT(ArrowSource,vtkPolyData*);
   BBTK_PROCESS(Process);
   void Process();
@@ -34,9 +33,8 @@ class bbcreaVtk_EXPORT GenerateArrowSource
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(GenerateArrowSource,bbtk::AtomicBlackBox);
 BBTK_NAME("GenerateArrowSource");
 BBTK_AUTHOR("Monica ESPINOSA");
-BBTK_DESCRIPTION("No Description.");
+BBTK_DESCRIPTION("To be used as the source for a glyph");
 BBTK_CATEGORY("empty");
-BBTK_INPUT(GenerateArrowSource,Point,"Coordinate of Point",std::vector<double>,"");
 BBTK_OUTPUT(GenerateArrowSource,ArrowSource,"Arrow Representation",vtkPolyData*,"");
 BBTK_END_DESCRIBE_BLACK_BOX(GenerateArrowSource);
 //===== 
index 0e7ea7ccfa2538c6a8903498957be33acfdbbd7b..6007c187875158322764e4fe6af64e2c1a1a890d 100644 (file)
@@ -34,7 +34,12 @@ void ImageAccumulate::Process()
                acc->Delete();
        }
        acc = vtkImageAccumulate::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        acc->SetInput( bbGetInputIn() ); 
+#else
+       acc->SetInputData( bbGetInputIn() ); 
+#endif
        acc->IgnoreZeroOn();
        acc->Update();
        bbSetOutputVoxelCount(acc->GetVoxelCount());
index 815f0294ac6633309016af80a255583a25e120d1..f7ab4265629b9284018e1a5bd9c2d084385962df 100644 (file)
@@ -16,7 +16,12 @@ void ImageContinuousDilate3D::Process()
 vtkImageData* ImageContinuousDilate3D::dilateFilterRecursive(vtkImageData* image, int repetitions, double x, double y, double z)
 {
                vtkImageContinuousDilate3D *dilateFilter = vtkImageContinuousDilate3D ::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     dilateFilter->SetInput (image);
+#else
+    dilateFilter->SetInputData(image);
+#endif
     dilateFilter->SetKernelSize(x, y, z);
                dilateFilter->Modified();               
                dilateFilter->Update();
@@ -25,16 +30,17 @@ vtkImageData* ImageContinuousDilate3D::dilateFilterRecursive(vtkImageData* image
                {
                        resultRec = dilateFilter->GetOutput();
                        return resultRec;
-               }
-               else {
-                       vtkImageData* resultRec = dilateFilterRecursive(dilateFilter->GetOutput(), (repetitions-1), x, y, z);
-               }
+               }else{
+                       dilateFilterRecursive(dilateFilter->GetOutput(), (repetitions-1), x, y, z);
+               }// if repetitions
 }
 
 void ImageContinuousDilate3D::bbUserSetDefaultValues()
 {
-
-
+       bbSetInputX(3); 
+       bbSetInputY(3); 
+       bbSetInputY(3); 
+       bbSetInputRepetitions(0); 
 }
 
 void ImageContinuousDilate3D::bbUserInitializeProcessing()
index c6e2a8b5d0aee2341f426ce5ff9086c7db5557dc..738e9f3748f54353c51c52e1b89eceac7a29c2d1 100644 (file)
@@ -40,10 +40,10 @@ BBTK_NAME("ImageContinuousDilate3D");
 BBTK_AUTHOR("Carlos Torres");
 BBTK_DESCRIPTION("No Description.");
 BBTK_CATEGORY("empty");
-BBTK_INPUT(ImageContinuousDilate3D,X,"X",double,"");
-BBTK_INPUT(ImageContinuousDilate3D,Y,"Y",double,"");
-BBTK_INPUT(ImageContinuousDilate3D,Z,"Z",double,"");
-BBTK_INPUT(ImageContinuousDilate3D,Repetitions,"Repetitions",int,"");
+BBTK_INPUT(ImageContinuousDilate3D,X,"X (default 3)",double,"");
+BBTK_INPUT(ImageContinuousDilate3D,Y,"Y (default 3)",double,"");
+BBTK_INPUT(ImageContinuousDilate3D,Z,"Z (default 3)",double,"");
+BBTK_INPUT(ImageContinuousDilate3D,Repetitions,"Repetitions (default 0, it works minimum ones) ",int,"");
 BBTK_INPUT(ImageContinuousDilate3D,Image,"Image input",vtkImageData*,"");
 BBTK_OUTPUT(ImageContinuousDilate3D,Out,"Image output",vtkImageData*,"");
 BBTK_END_DESCRIBE_BLACK_BOX(ImageContinuousDilate3D);
index 95fd998886d33a2b18c3cef2813331fd64f1db73..4784991cf9ed9f611ffcd211d7289875e704b66f 100644 (file)
@@ -16,7 +16,12 @@ void ImageContinuousErode3D::Process()
 vtkImageData* ImageContinuousErode3D::erodeFilterRecursive(vtkImageData* image, int repetitions, double x, double y, double z)
 {
                vtkImageContinuousErode3D *erodeFilter = vtkImageContinuousErode3D ::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     erodeFilter->SetInput (image);
+#else
+    erodeFilter->SetInputData(image);
+#endif
     erodeFilter->SetKernelSize(x, y, z);
                erodeFilter->Modified();                
                erodeFilter->Update();
@@ -25,10 +30,9 @@ vtkImageData* ImageContinuousErode3D::erodeFilterRecursive(vtkImageData* image,
                {
                        resultRec = erodeFilter->GetOutput();
                        return resultRec;
-               }
-               else {
-                       vtkImageData* resultRec = erodeFilterRecursive(erodeFilter->GetOutput(), (repetitions-1), x, y, z);
-               }
+               }else{
+                       erodeFilterRecursive(erodeFilter->GetOutput(), (repetitions-1), x, y, z);
+               } // if repetitions
 }
 
 void ImageContinuousErode3D::bbUserSetDefaultValues()
@@ -40,7 +44,10 @@ void ImageContinuousErode3D::bbUserSetDefaultValues()
 //===== 
 void ImageContinuousErode3D::bbUserInitializeProcessing()
 {
-  
+       bbSetInputX(3); 
+       bbSetInputY(3); 
+       bbSetInputY(3); 
+       bbSetInputRepetitions(0); 
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
index ed6810acbdd5635380c2264357473f721229aa0f..efe2127ecd4085413930da29b9a2662f390d1e41 100644 (file)
@@ -39,10 +39,10 @@ BBTK_NAME("ImageContinuousErode3D");
 BBTK_AUTHOR("Carlos Torres");
 BBTK_DESCRIPTION("No Description.");
 BBTK_CATEGORY("empty");
-BBTK_INPUT(ImageContinuousErode3D,X,"X",double,"");
-BBTK_INPUT(ImageContinuousErode3D,Y,"Y",double,"");
-BBTK_INPUT(ImageContinuousErode3D,Z,"Z",double,"");
-BBTK_INPUT(ImageContinuousErode3D,Repetitions,"Repetitions",int,"");
+BBTK_INPUT(ImageContinuousErode3D,X,"X (default 3)",double,"");
+BBTK_INPUT(ImageContinuousErode3D,Y,"Y (default 3)",double,"");
+BBTK_INPUT(ImageContinuousErode3D,Z,"Z (default 3)",double,"");
+BBTK_INPUT(ImageContinuousErode3D,Repetitions,"Repetitions  (default 0, it works minimum ones)",int,"");
 BBTK_INPUT(ImageContinuousErode3D,Image,"Image input",vtkImageData*,"");
 BBTK_OUTPUT(ImageContinuousErode3D,Out,"Image output",vtkImageData*,"");
 BBTK_END_DESCRIBE_BLACK_BOX(ImageContinuousErode3D);
index 2860baa1f9433983f356027f2e79584da319154d..764464214a8062919c0a671c851340a76c4adc8d 100644 (file)
@@ -34,7 +34,14 @@ void ImageCutByAxis::Process()
        newData->DeepCopy( bbGetInputIn() );
 
        int ext[6];
+       
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        bbGetInputIn()->GetWholeExtent(ext);
+#else
+       bbGetInputIn()->GetExtent(ext);
+#endif
+
        double dimX=ext[1]-ext[0]+1;
        double dimY=ext[3]-ext[2]+1;
        double dimZ=ext[5]-ext[4]+1;
index d89990567b05e2e6c8e8918a62e9cc64e7ac4413..2769f798ee23f5ef242bb9891f5934e2f646f518 100644 (file)
@@ -36,7 +36,12 @@ void ImageExtractComponents::Process()
 
        if (bbGetInputComponent0()!=-1)
        {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                IEC0->SetInput( bbGetInputIn() );
+#else
+               IEC0->SetInputData( bbGetInputIn() );
+#endif
                IEC0->SetComponents( bbGetInputComponent0() );
                IEC0->Update();
                bbSetOutputOut0( IEC0->GetOutput() ); 
@@ -44,7 +49,12 @@ void ImageExtractComponents::Process()
 
        if (bbGetInputComponent1()!=-1)
        {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                IEC1->SetInput( bbGetInputIn() );
+#else
+               IEC1->SetInputData( bbGetInputIn() );
+#endif
                IEC1->SetComponents( bbGetInputComponent1() );
                IEC1->Update();
                bbSetOutputOut1( IEC1->GetOutput() ); 
@@ -52,7 +62,12 @@ void ImageExtractComponents::Process()
 
        if (bbGetInputComponent2()!=-1)
        {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                IEC2->SetInput( bbGetInputIn() );
+#else
+               IEC2->SetInputData( bbGetInputIn() );
+#endif
                IEC2->SetComponents( bbGetInputComponent2() );
                IEC2->Update();
                bbSetOutputOut2( IEC2->GetOutput() ); 
@@ -60,7 +75,13 @@ void ImageExtractComponents::Process()
 
        if (bbGetInputComponent3()!=-1)
        {
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                IEC3->SetInput( bbGetInputIn() );
+#else
+               IEC3->SetInputData( bbGetInputIn() );
+#endif
                IEC3->SetComponents( bbGetInputComponent2() );
                IEC3->Update();
                bbSetOutputOut3( IEC3->GetOutput() ); 
index 9b9f33d1026c93f9c6d8904e19167afd980d4f6e..53dbbb40119415366e6ef514c93456b5625932f4 100644 (file)
@@ -39,10 +39,16 @@ void ImageSlab::Process()
        if (bbGetInputType()==1) { imageSlab->SetOperationToSum(); }
        if (bbGetInputType()==2) { imageSlab->SetOperationToMin(); }
        if (bbGetInputType()==3) { imageSlab->SetOperationToMax(); }
-
-       imageSlab->SetInput( bbGetInputIn() );  
        imageSlab->MultiSliceOutputOff();
        imageSlab->SetOutputScalarTypeToInputScalarType();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+       imageSlab->SetInput( bbGetInputIn() );  
+#else
+       imageSlab->SetInputData( bbGetInputIn() );  
+       imageSlab->Update();  
+#endif
        bbSetOutputOut( imageSlab->GetOutput() );
 
 }
index 1335f371bd9fe235b57953579779e33ed7ebaa7d..ac02887ef61afb5c4f60964b62f3ca840b4a5ad5 100644 (file)
@@ -39,7 +39,7 @@ class bbcreaVtk_EXPORT ImageSlab
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(ImageSlab,bbtk::AtomicBlackBox);
   BBTK_NAME("ImageSlab");
   BBTK_AUTHOR("InfoDev");
-  BBTK_DESCRIPTION("No Description.");
+  BBTK_DESCRIPTION("Operation of all planes in one plane (projection)");
   BBTK_CATEGORY("empty");
 
   BBTK_INPUT(ImageSlab,In,"Input image",vtkImageData*,"");
index 111efb526a8a5b24e53b26dea94f5363cc59ee82..70a8429bff556c75a14f0b52022c6f212f9e3876 100644 (file)
@@ -39,7 +39,12 @@ void MeshCutByAxis::Process()
                vtkPlane                *clipPlane      = vtkPlane::New();      
                vtkBox                  *clipBox        = vtkBox::New();        
                vtkClipPolyData *clipper        = vtkClipPolyData::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
            clipper             -> SetInput( bbGetInputIn() );
+#else
+           clipper             -> SetInputData( bbGetInputIn() );
+#endif
                clipper->SetInsideOut( bbGetInputInsideVol() );
 
                int a;  // correction border 
index 1662b1a7f1d4af0cce800c798a60ca392c59a7fc..e9634ee8169fbe19093cf0279f4ee95048cb31c0 100644 (file)
@@ -13,8 +13,9 @@
 #include <sys/types.h>
 
 #if defined(_WIN32)
+       #include <share.h> 
 #else
-#include <unistd.h>
+       #include <unistd.h>
 #endif // defined(_WIN32)
 
 #include <stdlib.h>
@@ -42,14 +43,19 @@ vtkImageData* ReadMHDPlane::CreateDefaultImage()
        sizeZ = 1;
        vtkImageData *newImage = vtkImageData::New();
        newImage->Initialize();
-       newImage->SetScalarTypeToUnsignedChar();
        newImage->SetSpacing( 1,1,1 );
        newImage->SetDimensions(  sizeX,sizeY,sizeZ );
+       newImage->SetExtent(0,  sizeX-1,0,sizeY-1,0,sizeZ-1 );  
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        newImage->SetWholeExtent(0,  sizeX-1,0,sizeY-1,0,sizeZ-1 );
-       newImage->SetExtent(0,  sizeX-1,0,sizeY-1,0,sizeZ-1 );
+       newImage->SetScalarTypeToUnsignedChar();
        newImage->SetNumberOfScalarComponents(1);
        newImage->AllocateScalars();
        newImage->Update();
+#else
+       newImage->AllocateScalars(VTK_UNSIGNED_CHAR,1);
+#endif
        memset ( (void*)newImage->GetScalarPointer(), 0, sizeX*sizeY*1 );
        for (i=0; i<sizeX; i++)
        {
@@ -65,7 +71,12 @@ vtkImageData* ReadMHDPlane::ChangeOrientation(vtkImageData* imgOrg)
        int     ext[6];
        int     sizeXOrg, sizeYOrg,sizeZOrg;
        int     sizeXDst, sizeYDst,sizeZDst;
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        imgOrg->GetWholeExtent(ext);
+#else
+       imgOrg->GetExtent(ext);
+#endif
        int     sizeLine;
        
        sizeXOrg        = ext[1]-ext[0]+1;
@@ -94,14 +105,20 @@ vtkImageData* ReadMHDPlane::ChangeOrientation(vtkImageData* imgOrg)
        } // ZX
        vtkImageData *imgDst  = vtkImageData::New();
        imgDst->Initialize();
-       imgDst->SetScalarType( imgOrg->GetScalarType() );
        imgDst->SetSpacing( imgOrg->GetSpacing() );
        imgDst->SetDimensions( sizeXDst,sizeYDst,sizeZDst );
-       imgDst->SetWholeExtent(0,sizeXDst-1,0,sizeYDst-1,0,sizeZDst-1 );
        imgDst->SetExtent(0,sizeXDst-1,0,sizeYDst-1,0,sizeZDst-1 );
+       
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+       imgDst->SetWholeExtent(0,sizeXDst-1,0,sizeYDst-1,0,sizeZDst-1 );
+       imgDst->SetScalarType( imgOrg->GetScalarType() );
        imgDst->SetNumberOfScalarComponents(1);
        imgDst->AllocateScalars();
        imgDst->Update();
+#else
+       imgDst->AllocateScalars(imgOrg->GetScalarType(),1);
+#endif
 
        char *ptrDst,*ptrOrg;
        int sizeBytes = imgOrg->GetScalarSize();                
@@ -169,6 +186,7 @@ vtkImageData* ReadMHDPlane::ChangeOrientation(vtkImageData* imgOrg)
 
 void ReadMHDPlane::Read64lseek(std::string fileNameIn, std::string plane)
 {
+       int             imageType;
        int             slice;
        int             width;
        width = bbGetInputWidth();
@@ -195,32 +213,32 @@ void ReadMHDPlane::Read64lseek(std::string fileNameIn, std::string plane)
                {
            strcpy(mystring,"\n");
                        fgets(mystring,250,ffIn);
-               if (strncmp("NDims",mystring,5)==0)                     { sscanf(mystring,"%s %s %d"            ,strTmp, strTmp, &dim);                                                                 }
-               if (strncmp("DimSize",mystring,6)==0)                   { sscanf(mystring,"%s %s %d %d %d"      ,strTmp, strTmp, &dimX, &dimY,&dimZ);                                   } 
-                       if (strncmp("ElementType",mystring,11)==0)              { sscanf(mystring,"%s %s %s"            ,strTmp, strTmp, strTmp2); formattype=strTmp2;                  }
-                       if (strncmp("ElementSpacing",mystring,14)==0)   { sscanf(mystring,"%s %s %f %f %f"      ,strTmp, strTmp, &spcX,&spcY,&spcZ);                                    }
-                       if (strncmp("ElementSize",mystring,11)==0)              { sscanf(mystring,"%s %s %f %f %f"      ,strTmp, strTmp, &spcX,&spcY,&spcZ);                                    }
-               if (strncmp("Offset",mystring,6)==0)                    { sscanf(mystring,"%s %s %f %f %f"      ,strTmp, strTmp, &ox, &oy, &oz);                                                }
-               if (strncmp("HeaderSize",mystring,10)==0)               { sscanf(mystring,"%s %s %ld"           ,strTmp, strTmp, &headersize);                                                  }
-                       if (strncmp("ElementDataFile",mystring,15)==0)  { sscanf(mystring,"%s %s %s"            ,strTmp, strTmp, strTmp2); elementdatafile=strTmp2;             }
-               if (strncmp("ElementType = MET_CHAR",mystring,22)==0)                   { newImage->SetScalarTypeToChar();                      dataSize=sizeof(char);                  }
-               if (strncmp("ElementType = VTK_CHAR",mystring,22)==0)                   { newImage->SetScalarTypeToChar();                      dataSize=sizeof(char);                  }
-               if (strncmp("ElementType = MET_UCHAR",mystring,23)==0)                  { newImage->SetScalarTypeToUnsignedChar();      dataSize=sizeof(unsigned char); }
-               if (strncmp("ElementType = VTK_UNSIGNED_CHAR",mystring,31)==0)  { newImage->SetScalarTypeToUnsignedChar();      dataSize=sizeof(unsigned char); }
-               if (strncmp("ElementType = MET_USHORT",mystring,24)==0)                 { newImage->SetScalarTypeToUnsignedShort();     dataSize=sizeof(unsigned short);}
-               if (strncmp("ElementType = VTK_UNSIGNED_SHORT",mystring,32)==0) { newImage->SetScalarTypeToUnsignedShort();     dataSize=sizeof(unsigned short);}
-               if (strncmp("ElementType = MET_SHORT",mystring,23)==0)                  { newImage->SetScalarTypeToShort();                     dataSize=sizeof(short);                 }
-               if (strncmp("ElementType = VTK_SHORT",mystring,23)==0)                  { newImage->SetScalarTypeToShort();                     dataSize=sizeof(short);                 }
-               if (strncmp("ElementType = MET_UINT",mystring,22)==0)                   { newImage->SetScalarTypeToUnsignedInt();       dataSize=sizeof(unsigned int);  }
-               if (strncmp("ElementType = VTK_UNSIGNED_INT",mystring,30)==0)   { newImage->SetScalarTypeToUnsignedInt();       dataSize=sizeof(unsigned int);  }
-               if (strncmp("ElementType = MET_INT",mystring,21)==0)                    { newImage->SetScalarTypeToInt();                       dataSize=sizeof(int);                   }
-               if (strncmp("ElementType = VTK_INT",mystring,21)==0)                    { newImage->SetScalarTypeToInt();                       dataSize=sizeof(int);                   }
-               if (strncmp("ElementType = MET_FLOAT",mystring,23)==0)                  { newImage->SetScalarTypeToFloat();                     dataSize=sizeof(float);                 }
-               if (strncmp("ElementType = VTK_FLOAT",mystring,23)==0)                  { newImage->SetScalarTypeToFloat();                     dataSize=sizeof(float);                 }
-               if (strncmp("ElementType = MET_LONG",mystring,22)==0)                   { newImage->SetScalarTypeToLong();                      dataSize=sizeof(long);                  }
-               if (strncmp("ElementType = VTK_LONG",mystring,22)==0)                   { newImage->SetScalarTypeToLong();                      dataSize=sizeof(long);                  }
-               if (strncmp("ElementType = MET_DOUBLE",mystring,24)==0)                 { newImage->SetScalarTypeToDouble();            dataSize=sizeof(double);                }
-               if (strncmp("ElementType = VTK_DOUBLE",mystring,24)==0)                 { newImage->SetScalarTypeToDouble();            dataSize=sizeof(double);                }
+               if (strncmp("NDims",mystring,5)==0)                                                     { sscanf(mystring,"%s %s %d"            ,strTmp, strTmp, &dim);                                                                 }
+               if (strncmp("DimSize",mystring,6)==0)                                                   { sscanf(mystring,"%s %s %d %d %d"      ,strTmp, strTmp, &dimX, &dimY,&dimZ);                                   } 
+                       if (strncmp("ElementType",mystring,11)==0)                                              { sscanf(mystring,"%s %s %s"            ,strTmp, strTmp, strTmp2); formattype=strTmp2;                  }
+                       if (strncmp("ElementSpacing",mystring,14)==0)                                   { sscanf(mystring,"%s %s %f %f %f"      ,strTmp, strTmp, &spcX,&spcY,&spcZ);                                    }
+                       if (strncmp("ElementSize",mystring,11)==0)                                              { sscanf(mystring,"%s %s %f %f %f"      ,strTmp, strTmp, &spcX,&spcY,&spcZ);                                    }
+               if (strncmp("Offset",mystring,6)==0)                                                    { sscanf(mystring,"%s %s %f %f %f"      ,strTmp, strTmp, &ox, &oy, &oz);                                                }
+               if (strncmp("HeaderSize",mystring,10)==0)                                               { sscanf(mystring,"%s %s %ld"           ,strTmp, strTmp, &headersize);                                                  }
+                       if (strncmp("ElementDataFile",mystring,15)==0)                                  { sscanf(mystring,"%s %s %s"            ,strTmp, strTmp, strTmp2); elementdatafile=strTmp2;             }
+               if (strncmp("ElementType = MET_CHAR",mystring,22)==0)                   { imageType=VTK_CHAR;                   dataSize=sizeof(char);                  }
+               if (strncmp("ElementType = VTK_CHAR",mystring,22)==0)                   { imageType=VTK_CHAR;                   dataSize=sizeof(char);                  }
+               if (strncmp("ElementType = MET_UCHAR",mystring,23)==0)                  { imageType=VTK_UNSIGNED_CHAR;  dataSize=sizeof(unsigned char); }
+               if (strncmp("ElementType = VTK_UNSIGNED_CHAR",mystring,31)==0)  { imageType=VTK_UNSIGNED_CHAR;  dataSize=sizeof(unsigned char); }
+               if (strncmp("ElementType = MET_USHORT",mystring,24)==0)                 { imageType=VTK_UNSIGNED_SHORT; dataSize=sizeof(unsigned short);}
+               if (strncmp("ElementType = VTK_UNSIGNED_SHORT",mystring,32)==0) { imageType=VTK_UNSIGNED_SHORT; dataSize=sizeof(unsigned short);}
+               if (strncmp("ElementType = MET_SHORT",mystring,23)==0)                  { imageType=VTK_SHORT;                  dataSize=sizeof(short);                 }
+               if (strncmp("ElementType = VTK_SHORT",mystring,23)==0)                  { imageType=VTK_SHORT;                  dataSize=sizeof(short);                 }
+               if (strncmp("ElementType = MET_UINT",mystring,22)==0)                   { imageType=VTK_UNSIGNED_INT;   dataSize=sizeof(unsigned int);  }
+               if (strncmp("ElementType = VTK_UNSIGNED_INT",mystring,30)==0)   { imageType=VTK_UNSIGNED_INT;   dataSize=sizeof(unsigned int);  }
+               if (strncmp("ElementType = MET_INT",mystring,21)==0)                    { imageType=VTK_INT;                    dataSize=sizeof(int);                   }
+               if (strncmp("ElementType = VTK_INT",mystring,21)==0)                    { imageType=VTK_INT;                    dataSize=sizeof(int);                   }
+               if (strncmp("ElementType = MET_FLOAT",mystring,23)==0)                  { imageType=VTK_FLOAT;                  dataSize=sizeof(float);                 }
+               if (strncmp("ElementType = VTK_FLOAT",mystring,23)==0)                  { imageType=VTK_FLOAT;                  dataSize=sizeof(float);                 }
+               if (strncmp("ElementType = MET_LONG",mystring,22)==0)                   { imageType=VTK_LONG;                   dataSize=sizeof(long);                  }
+               if (strncmp("ElementType = VTK_LONG",mystring,22)==0)                   { imageType=VTK_LONG;                   dataSize=sizeof(long);                  }
+               if (strncmp("ElementType = MET_DOUBLE",mystring,24)==0)                 { imageType=VTK_DOUBLE;                 dataSize=sizeof(double);                }
+               if (strncmp("ElementType = VTK_DOUBLE",mystring,24)==0)                 { imageType=VTK_DOUBLE;                 dataSize=sizeof(double);                }
        } // while
                fclose(ffIn);
                newImage->Initialize();
@@ -248,11 +266,21 @@ void ReadMHDPlane::Read64lseek(std::string fileNameIn, std::string plane)
                { 
                        newImage->SetSpacing( spcX,spcY,spcZ );
                        newImage->SetDimensions(  dimX,dimY,width );
-                       newImage->SetWholeExtent(0,  dimX-1,0,dimY-1,0,width-1 );
                        newImage->SetExtent(0,  dimX-1,0,dimY-1,0,width-1 );
+
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+                       newImage->SetScalarType( imageType );
+                       newImage->SetWholeExtent(0,  dimX-1,0,dimY-1,0,width-1 );
                        newImage->SetNumberOfScalarComponents(1);
                        newImage->AllocateScalars();
                        newImage->Update();
+#else
+               newImage->AllocateScalars(imageType,1);
+#endif 
+                       
                        pos = dimX*dimY*(long long)slice*dataSize;
 #if defined(_WIN32)
                        if (_lseeki64( fd, pos, SEEK_SET ) < 0)
@@ -274,11 +302,20 @@ void ReadMHDPlane::Read64lseek(std::string fileNameIn, std::string plane)
                { 
                        newImage->SetSpacing( spcX,spcZ,spcY );
                        newImage->SetDimensions(  dimX,dimZ,width );
-                       newImage->SetWholeExtent(0,  dimX-1,0,dimZ-1,0,width-1 );
                        newImage->SetExtent(0,  dimX-1,0,dimZ-1,0,width-1 );
+                       
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+                       newImage->SetScalarType( imageType );
+                       newImage->SetWholeExtent(0,  dimX-1,0,dimZ-1,0,width-1 );
                        newImage->SetNumberOfScalarComponents(1);
                        newImage->AllocateScalars();
                        newImage->Update();
+#else
+                       newImage->AllocateScalars(imageType,1);
+#endif 
+
                        int iWidth;
                        for (iWidth=0;iWidth<width;iWidth++)
                        {
@@ -289,11 +326,19 @@ void ReadMHDPlane::Read64lseek(std::string fileNameIn, std::string plane)
                { 
                        newImage->SetSpacing( spcY,spcZ,spcX );
                        newImage->SetDimensions(  dimY,dimZ,width );
-                       newImage->SetWholeExtent(0,  dimY-1,0,dimZ-1,0,width-1 );
                        newImage->SetExtent(0,  dimY-1,0,dimZ-1,0,width-1 );
+                       
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+                       newImage->SetScalarType( imageType );
+                       newImage->SetWholeExtent(0,  dimY-1,0,dimZ-1,0,width-1 );
                        newImage->SetNumberOfScalarComponents(1);
                        newImage->AllocateScalars();
                        newImage->Update();
+#else
+                       newImage->AllocateScalars(imageType,1);
+#endif 
+                       
                        int iWidth;
                        for (iWidth=0;iWidth<width;iWidth++)
                        {
index 578b30c936eb98dfa40b817ca9c758c98fbf009c..b9b71f75549fbda3017ff1f1d05c2a160a02697b 100644 (file)
@@ -20,7 +20,6 @@ BBTK_BLACK_BOX_IMPLEMENTATION(StreamLineNumeration,bbtk::AtomicBlackBox);
 //===== 
 void StreamLineNumeration::Process()
 {
-
 // THE MAIN PROCESSING METHOD BODY
 //   Here we simply set the input 'In' value to the output 'Out'
 //   And print out the output value
@@ -32,9 +31,7 @@ void StreamLineNumeration::Process()
 //      (the one provided in the attribute 'name' of the tag 'input')
 //    * TYPE is the C++ type of the input/output
 //      (the one provided in the attribute 'type' of the tag 'input')
-
        std::string namascalararray="creaNumeration";
-
        if (bbGetInputStreamLinesIn()!=NULL)
        {
                vtkIdList               *_vtkidlist             = vtkIdList::New();
@@ -42,13 +39,10 @@ void StreamLineNumeration::Process()
                long int                nLinesCell                      = vtkcellarray->GetNumberOfCells(); 
                long int                ii,iLine;
                long int                numberofids;
-
-
                vtkDoubleArray  *numeration                     = vtkDoubleArray::New();
                numeration->SetName( namascalararray.c_str() );                 
                numeration->SetNumberOfComponents(1); 
                numeration->SetNumberOfTuples(nLinesCell);
-
                // FOR EACH LINE
                ii=0;
                for ( iLine=0 ; iLine<nLinesCell ; iLine++ )
@@ -60,11 +54,11 @@ void StreamLineNumeration::Process()
                } // for iLine
 
                bbGetInputStreamLinesIn()->GetPointData()->AddArray( numeration );
+               bbGetInputStreamLinesIn()->GetPointData()->Modified( );
+               bbGetInputStreamLinesIn()->GetPointData()->Update( );
        } // if bbGetInputStreamLinesIn()
-
        bbSetOutputStreamLinesOut( bbGetInputStreamLinesIn() );
        bbSetOutputNameOfScalarArray( namascalararray );
-    
 }
 
 //===== 
@@ -75,34 +69,30 @@ void StreamLineNumeration::bbUserSetDefaultValues()
 //  SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX 
 //    Here we initialize the input 'In' to 0
        bbSetInputStreamLinesIn( NULL );
-
 }
+
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
 void StreamLineNumeration::bbUserInitializeProcessing()
 {
-
 //  THE INITIALIZATION METHOD BODY :
 //    Here does nothing 
 //    but this is where you should allocate the internal/output pointers 
-//    if any 
-
-  
+//    if any  
 }
+
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
 void StreamLineNumeration::bbUserFinalizeProcessing()
 {
-
 //  THE FINALIZATION METHOD BODY :
 //    Here does nothing 
 //    but this is where you should desallocate the internal/output pointers 
-//    if any
-  
-}
+//    if any  
 }
-// EO namespace bbcreaVtk
+
+} // EO namespace bbcreaVtk
 
 
index d05e1a75a642f175fa8382711b62d676ad2d01a8..bab4780ab3fba9185341b9de6be40cfba8fc50f0 100644 (file)
@@ -30,8 +30,6 @@ void TensorsVisu::Process()
 //      (the one provided in the attribute 'type' of the tag 'input')
 
 
-printf("EED TensorsVisu::Process() Start\n");
-
      tensorsvisu.SetActive( bbGetInputActive() );
      tensorsvisu.SetDataObject( bbGetInputIn() );
      tensorsvisu.SetScaleFactor( bbGetInputScaleFactor() );
@@ -40,7 +38,6 @@ printf("EED TensorsVisu::Process() Start\n");
      tensorsvisu.SetTypeForm( bbGetInputTypeForm() );
      tensorsvisu.Process();
      bbSetOutputOut( tensorsvisu.GetProp3D() );
-printf("EED TensorsVisu::Process() End\n");
 
 }
 //===== 
index 4b4e2760af8a6bd1a18c36b5dc94ff89f6db1f62..7da041e3971de06ee3a430c65c49609681d2c496 100644 (file)
@@ -27,13 +27,15 @@ class bbcreaVtk_EXPORT UnMosaicVectorVtkImageData
 };
 
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(UnMosaicVectorVtkImageData,bbtk::AtomicBlackBox);
-BBTK_NAME("UnMosaicVectorVtkImageData");
-BBTK_AUTHOR("carlos torres");
-BBTK_DESCRIPTION("No Description.");
-BBTK_CATEGORY("empty");
-BBTK_INPUT(UnMosaicVectorVtkImageData,In,"2D image list",std::vector<vtkImageData*>,"");
-BBTK_INPUT(UnMosaicVectorVtkImageData,NbImagesInMosaicVector,"Vector of Number of Images In Mosaic ",std::vector<int>,"");
-BBTK_OUTPUT(UnMosaicVectorVtkImageData,Out,"3D image Vector",std::vector<vtkImageData*>,"");
+  BBTK_NAME("UnMosaicVectorVtkImageData");
+  BBTK_AUTHOR("carlos torres");
+  BBTK_DESCRIPTION("No Description.");
+  BBTK_CATEGORY("empty");
+
+  BBTK_INPUT(UnMosaicVectorVtkImageData,In,"2D image list",std::vector<vtkImageData*>,"");
+  BBTK_INPUT(UnMosaicVectorVtkImageData,NbImagesInMosaicVector,"Vector of Number of Images In Mosaic ",std::vector<int>,"");
+
+  BBTK_OUTPUT(UnMosaicVectorVtkImageData,Out,"3D image Vector",std::vector<vtkImageData*>,"");
 BBTK_END_DESCRIBE_BLACK_BOX(UnMosaicVectorVtkImageData);
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
index 38f2ffb1e9c8f34d1712daf04c3578bad6a550a8..33b2347ddf962cad47e285e157226befa185f0a8 100644 (file)
@@ -28,68 +28,79 @@ void VectorsExtraction::Process()
 //      (the one provided in the attribute 'name' of the tag 'input')
 //    * TYPE is the C++ type of the input/output
 //      (the one provided in the attribute 'type' of the tag 'input')
-    std::cout<< "MLER VectorsExtraction Process Start" << std::endl;
-
+std::cout<< "MLER VectorsExtraction Process Start" << std::endl;
     if(bbGetInputVectorsFieldImage() != NULL )
        {
-               vtkImageData         *m_VectorImage = bbGetInputVectorsFieldImage();
-               vtkIdType             m_idType;
-      vtkDoubleArray       *velocity      = vtkDoubleArray::New();
-
-      std::vector<double> coord           = bbGetInputCoordinates();
-      std::vector<double> vec;
-
-      vec.push_back(0);
-      vec.push_back(0);
-      vec.push_back(0);
-
-      double ang1 = 0;//Angle 1
-      double ang2 = 0;//ANgle 2
-      double comp = 0;//Component x + y
+               vtkImageData            *m_VectorImage = bbGetInputVectorsFieldImage();
+               vtkIdType               m_idType;
+       vtkDoubleArray          *velocity      = vtkDoubleArray::New();
+       std::vector<double>     coord          = bbGetInputCoordinates();
+       std::vector<double>     vec;
+       vec.push_back(0);
+       vec.push_back(0);
+       vec.push_back(0);
+       double ang1 = 0;//Angle 1
+       double ang2 = 0;//ANgle 2
+       double comp = 0;//Component x + y
+       //Find coordinate into the image      
+std::cout << "ups ." << std::endl;
+       m_idType = m_VectorImage->FindPoint(coord[0],coord[1],coord[2]);
+std::cout << "m_idType" << m_idType << std::endl;
+       //Recuperate vector of vectorFieldImage
+               m_VectorImage->Print(std::cout);
+
+
+               int sizeArrays= m_VectorImage->GetPointData()->GetNumberOfArrays();
+               for (int iArray=0; iArray<sizeArrays;iArray++)
+               {
+                       printf("%s\n", m_VectorImage->GetPointData()->GetArrayName(iArray) );
+               } // for iArrays
+
+vtkDataArray *dataArray = m_VectorImage->GetPointData()->GetArray("velocity");
+if (dataArray!=NULL)
+{
+       printf("DataArrya ok \n");      
+       double *vecData;
+       vecData=dataArray->GetTuple3(m_idType);
+       printf("info data: %f %f %f \n", vecData[0], vecData[1], vecData[2] );
+       vec[0]=vecData[0];
+       vec[1]=vecData[1];
+       vec[2]=vecData[2];
+       bbSetOutputVector(vec);
 
-      //Find coordinate into the image      
-      m_idType = m_VectorImage->FindPoint(coord[0],coord[1],coord[2]);
-      std::cout << m_idType;
+} // if dataArray
 
-      //Recuperate vector of vectorFieldImage
                velocity = vtkDoubleArray::SafeDownCast(m_VectorImage->GetPointData()->GetArray("velocity"));
-      //velocity->Print(std::cout);
-
-      std::cout<< "# components velocity: " << velocity->GetNumberOfComponents()<<std::endl;
-      std::cout<< "# tuples velocity: " << velocity->GetNumberOfTuples()<<std::endl;
-
-      vec[0] = velocity->GetComponent(m_idType,0);
-      vec[1] = velocity->GetComponent(m_idType,1);
-      vec[2] = velocity->GetComponent(m_idType,2);
-
-      std::cout << "velocity :" << vec[0] << "," <<vec[1] << ","<< vec[2] << std::endl;
-
-
-      //Miss calcule of angles -----
-      comp = sqrt((vec[0]*vec[0])+(vec[1]*vec[1]));
-      
-      ang1 = atan2(vec[2],comp) * 180 / PI;
-
-
-      ang2 = atan2(vec[1],vec[0]) * 180 / PI;
-
-      
-               //m_VectorImage->Print(std::cout);
-
-      std::cout << "ang1: " << ang1 << std::endl;
-      std::cout << "ang2: " << ang2 << std::endl;
-
-       bbSetOutputAngle1(ang1);
-       bbSetOutputAngle2(ang2);
-      bbSetOutputVector(vec);
-      bbSetOutputX(coord[0]);
-      bbSetOutputY(coord[1]);
-      bbSetOutputZ(coord[2]);
-
+       //velocity->Print(std::cout);
+               if (velocity!=NULL)
+               {
+       std::cout<< "# components velocity: " << velocity->GetNumberOfComponents()<<std::endl;
+       std::cout<< "# tuples velocity: " << velocity->GetNumberOfTuples()<<std::endl;
+                       vec[0] = velocity->GetComponent(m_idType,0);
+                       vec[1] = velocity->GetComponent(m_idType,1);
+                       vec[2] = velocity->GetComponent(m_idType,2);
+       std::cout << "velocity :" << vec[0] << "," <<vec[1] << ","<< vec[2] << std::endl;
+                       //Miss calcule of angles -----
+                       comp = sqrt((vec[0]*vec[0])+(vec[1]*vec[1]));
+                       ang1 = atan2(vec[2],comp) * 180 / PI;
+                       ang2 = atan2(vec[1],vec[0]) * 180 / PI;
+                       //m_VectorImage->Print(std::cout);
+       std::cout << "ang1: " << ang1 << std::endl;
+       std::cout << "ang2: " << ang2 << std::endl;
+                       bbSetOutputAngle1(ang1);
+                       bbSetOutputAngle2(ang2);
+                       bbSetOutputVector(vec);
+                       bbSetOutputX(coord[0]);
+                       bbSetOutputY(coord[1]);
+                       bbSetOutputZ(coord[2]);
+
+               } else {
+                       bbSetOutputAngle1(ang1);
+                       bbSetOutputAngle2(ang2);
+                       bbSetOutputVector(vec);
+               }// if velocity
        }// if image != NULL
-    
-    std::cout<< "MLER VectorsExtraction Process END" << std::endl;
-  
+std::cout<< "MLER VectorsExtraction Process END" << std::endl;  
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
index d7770f82fc5c9b2e035a755728a0dfa777afd740..f190d313638cffb357e175d29c532d13dbf4d125 100644 (file)
@@ -40,18 +40,18 @@ class bbcreaVtk_EXPORT VectorsExtraction
 };
 
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(VectorsExtraction,bbtk::AtomicBlackBox);
-BBTK_NAME("VectorsExtraction");
-BBTK_AUTHOR("Monica ESPINOSA");
-BBTK_DESCRIPTION("No Description.");
-BBTK_CATEGORY("empty");
-BBTK_INPUT(VectorsExtraction,Coordinates,"Coordinates (x,y,z)",std::vector<double>,"");
-BBTK_INPUT(VectorsExtraction,VectorsFieldImage,"Image of Vectors Field",vtkImageData*,"");
-BBTK_OUTPUT(VectorsExtraction,Vector,"",std::vector<double>,"");
-BBTK_OUTPUT(VectorsExtraction,X,"x",double,"");
-BBTK_OUTPUT(VectorsExtraction,Y,"y",double,"");
-BBTK_OUTPUT(VectorsExtraction,Z,"z",double,"");
-BBTK_OUTPUT(VectorsExtraction,Angle1,"Angle 1 (Helix Angle)",double,"");
-BBTK_OUTPUT(VectorsExtraction,Angle2,"Angle 2 (Transversal Angle)",double,"");
+  BBTK_NAME("VectorsExtraction");
+  BBTK_AUTHOR("Monica ESPINOSA");
+  BBTK_DESCRIPTION("Warning! looking ofr a 'velocity' array. BOX NOT TESTED!");
+  BBTK_CATEGORY("empty");
+  BBTK_INPUT(VectorsExtraction,Coordinates,"Coordinates (x,y,z)",std::vector<double>,"");
+  BBTK_INPUT(VectorsExtraction,VectorsFieldImage,"Image of Vectors Field",vtkImageData*,"");
+  BBTK_OUTPUT(VectorsExtraction,Vector,"",std::vector<double>,"");
+  BBTK_OUTPUT(VectorsExtraction,X,"x",double,"");
+  BBTK_OUTPUT(VectorsExtraction,Y,"y",double,"");
+  BBTK_OUTPUT(VectorsExtraction,Z,"z",double,"");
+  BBTK_OUTPUT(VectorsExtraction,Angle1,"Angle 1 (Helix Angle)",double,"");
+  BBTK_OUTPUT(VectorsExtraction,Angle2,"Angle 2 (Transversal Angle)",double,"");
 BBTK_END_DESCRIBE_BLACK_BOX(VectorsExtraction);
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
index 080382faada66f2b0baa53a5c479ca5b7e232c0a..062e8e705e0870e3b201c616efed5c2dcfac0cd6 100644 (file)
@@ -26,20 +26,6 @@ void VectorsVisu::Process()
 //    * TYPE is the C++ type of the input/output
 //      (the one provided in the attribute 'type' of the tag 'input')
 
-printf("EED VectorsVisu::Process Start \n");
-
-if ( bbGetInputActive()==true) 
-{
-   printf("EED VectorsVisu::Process active = true \n");
-} else {
-   printf("EED VectorsVisu::Process active = false \n");
-}
-
-   printf("EED VectorsVisu::Process In = %p\n",bbGetInputIn() );
-   printf("EED VectorsVisu::Process ScaleFactor = %f\n",bbGetInputScaleFactor() );
-   printf("EED VectorsVisu::Process Opacity = %f\n",bbGetInputOpacity() );
-   printf("EED VectorsVisu::Process Renderer = %p\n",bbGetInputRenderer() );
-
      vectorsvisu.SetActive( bbGetInputActive() );
      vectorsvisu.SetDataObject( bbGetInputIn() );
      vectorsvisu.SetScaleFactor( bbGetInputScaleFactor() );
@@ -48,7 +34,6 @@ if ( bbGetInputActive()==true)
      vectorsvisu.SetTypeForm( bbGetInputTypeForm() );
      vectorsvisu.Process();
      bbSetOutputOut( vectorsvisu.GetProp3D() );
-printf("EED VectorsVisu::Process End\n");
   
 }
 //===== 
diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkXMLImageDataWriter.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkXMLImageDataWriter.cxx
new file mode 100644 (file)
index 0000000..fff5602
--- /dev/null
@@ -0,0 +1,111 @@
+//===== 
+// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
+//===== 
+#include "bbcreaVtkXMLImageDataWriter.h"
+#include "bbcreaVtkPackage.h"
+
+#include "vtkJSONImageWriter.h"
+#include "vtkXMLImageDataWriter.h"
+#include "vtkXMLDataSetWriter.h"
+#include "vtkDataSetWriter.h"
+#include "vtkPDataSetWriter.h"
+
+
+namespace bbcreaVtk
+{
+
+BBTK_ADD_BLACK_BOX_TO_PACKAGE(creaVtk,XMLImageDataWriter)
+BBTK_BLACK_BOX_IMPLEMENTATION(XMLImageDataWriter,bbtk::AtomicBlackBox);
+//===== 
+// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
+//===== 
+void XMLImageDataWriter::Process()
+{
+
+// THE MAIN PROCESSING METHOD BODY
+//   Here we simply set the input 'In' value to the output 'Out'
+//   And print out the output value
+// INPUT/OUTPUT ACCESSORS ARE OF THE FORM :
+//    void bbSet{Input|Output}NAME(const TYPE&)
+//    const TYPE& bbGet{Input|Output}NAME() const 
+//    Where :
+//    * NAME is the name of the input/output
+//      (the one provided in the attribute 'name' of the tag 'input')
+//    * TYPE is the C++ type of the input/output
+//      (the one provided in the attribute 'type' of the tag 'input')
+
+//    bbSetOutputOut( bbGetInputIn() );
+//    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
+
+
+       auto writer = vtkXMLImageDataWriter::New();
+       writer->SetDataModeToBinary();
+       writer->SetFileName( bbGetInputFileName().c_str() );
+       writer->SetInputData( bbGetInputIn() );
+       writer->Write();
+
+
+/*
+       auto writer = vtkJSONImageWriter::New();
+       writer->SetFileName( bbGetInputFileName().c_str() );
+       writer->SetInputData( bbGetInputIn() );
+       writer->Write();
+*/
+
+/*
+       auto writer = vtkXMLDataSetWriter::New();
+       write->SetDataModeToBinary();
+       writer->SetFileName( bbGetInputFileName().c_str() );
+       writer->SetInputData( bbGetInputIn() );
+       writer->Write();
+*/
+
+/*
+       auto writer = vtkDataSetWriter::New();
+       writer->SetFileTypeToBinary();
+       writer->SetFileName( bbGetInputFileName().c_str() );
+       writer->SetInputData( bbGetInputIn() );
+       writer->Write();
+*/
+}
+
+//===== 
+// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
+//===== 
+void XMLImageDataWriter::bbUserSetDefaultValues()
+{
+
+//  SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX 
+//    Here we initialize the input 'In' to 0
+   bbSetInputIn(0);
+  
+}
+//===== 
+// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
+//===== 
+void XMLImageDataWriter::bbUserInitializeProcessing()
+{
+
+//  THE INITIALIZATION METHOD BODY :
+//    Here does nothing 
+//    but this is where you should allocate the internal/output pointers 
+//    if any 
+
+  
+}
+//===== 
+// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
+//===== 
+void XMLImageDataWriter::bbUserFinalizeProcessing()
+{
+
+//  THE FINALIZATION METHOD BODY :
+//    Here does nothing 
+//    but this is where you should desallocate the internal/output pointers 
+//    if any
+  
+}
+}
+// EO namespace bbcreaVtk
+
+
diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkXMLImageDataWriter.h b/bbtk_creaVtk_PKG/src/bbcreaVtkXMLImageDataWriter.h
new file mode 100644 (file)
index 0000000..7cabdb4
--- /dev/null
@@ -0,0 +1,50 @@
+//===== 
+// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
+//===== 
+#ifndef __bbcreaVtkXMLImageDataWriter_h_INCLUDED__
+#define __bbcreaVtkXMLImageDataWriter_h_INCLUDED__
+
+#include "bbcreaVtk_EXPORT.h"
+#include "bbtkAtomicBlackBox.h"
+#include "iostream"
+
+#include "vtkImageData.h"
+
+namespace bbcreaVtk
+{
+
+class bbcreaVtk_EXPORT XMLImageDataWriter
+ : 
+   public bbtk::AtomicBlackBox
+{
+  BBTK_BLACK_BOX_INTERFACE(XMLImageDataWriter,bbtk::AtomicBlackBox);
+//===== 
+// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
+//===== 
+  BBTK_DECLARE_INPUT(In,vtkImageData*);
+  BBTK_DECLARE_INPUT(FileName,std::string);
+//  BBTK_DECLARE_OUTPUT(FileName,std::string);
+  BBTK_PROCESS(Process);
+  void Process();
+//===== 
+// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
+//===== 
+};
+
+BBTK_BEGIN_DESCRIBE_BLACK_BOX(XMLImageDataWriter,bbtk::AtomicBlackBox);
+  BBTK_NAME("XMLImageDataWriter");
+  BBTK_AUTHOR("Info-Dev");
+  BBTK_DESCRIPTION("No Description.");
+  BBTK_CATEGORY("empty");
+  BBTK_INPUT(XMLImageDataWriter,In,"Input image",vtkImageData*,"");
+  BBTK_INPUT(XMLImageDataWriter,FileName,"File name",std::string,"");
+//  BBTK_OUTPUT(XMLImageDataWriter,Out,"First output",double,"");
+BBTK_END_DESCRIBE_BLACK_BOX(XMLImageDataWriter);
+//===== 
+// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
+//===== 
+}
+// EO namespace bbcreaVtk
+
+#endif // __bbcreaVtkXMLImageDataWriter_h_INCLUDED__
+
index 964e82904b200d4e077cf4afa7deae4019edeb01..6a16f402e27d01341c7f24c985349ebc96b4f60a 100644 (file)
 # ------------------------------------------------------------------------ */ 
 
 
-# --------------------------------
+
+#===========================================================================
+# Include package data configuration cmake script from bbtk dir
+#INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_data.cmake)
+
+SET(DATA_DIR ${PROJECT_SOURCE_DIR}/bbtk_creaVtk_PKG/data )
+FILE(GLOB DATA_FILES "${DATA_DIR}/*.vtk")
+FOREACH( iLST  ${DATA_FILES} )
+   INSTALL( 
+       FILES ${iLST}
+       DESTINATION share/bbtk/data/creaVtk
+   )
+ENDFOREACH(iLST)
+
+#===========================================================================
index 0cb5eea303d3985e2d2e5ec43c587b0de07d91b0..76af319eed93e38ad28984905625250d0e3d5413 100644 (file)
@@ -145,7 +145,14 @@ void creaVtkPlaneWidget::Process()
 {    
     if ((GetActive()==true) && (GetRenderer()!=NULL))
     { 
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _vPlaneWidget->SetInput( GetImage() );
+#else
+       _vPlaneWidget->SetInputData( GetImage() );
+#endif
+
        _vPlaneWidget->SetInteractor( GetRenderer()->GetRenderWindow()->GetInteractor() );
        _vPlaneWidget->NormalToXAxisOn();
        _vPlaneWidget->NormalToZAxisOn();
index 51685afb696fcdfeda105521262d2f2cfc910009..45ae170df5442f1e03fee6c8b94a1ea882e49378 100644 (file)
@@ -108,27 +108,53 @@ void creaVtkStreamLine::Process()
 
                        if (GetTypeForm()==0) 
                        {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                                _tubefilter->SetInput( _polydata );
+#else
+                               _tubefilter->SetInputData( _polydata );
+#endif
                                _tubefilter->SetRadius( GetScaleFactor() );     
                                _tubefilter->SetNumberOfSides(12);
                                _tubefilter->SetVaryRadiusToVaryRadiusOff();            
                                _tubefilter->Modified();
                                _tubefilter->Update();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                                _streamMapper2->SetInput( _tubefilter->GetOutput() );
+#else
+                               _streamMapper2->SetInputData( _tubefilter->GetOutput() );
+#endif
                        } 
                        if (GetTypeForm()==1) 
                        {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                                _ribbonfilter->SetInput( _polydata );
+#else
+                               _ribbonfilter->SetInputData( _polydata );
+#endif
                                _ribbonfilter->SetWidth( GetScaleFactor() );    
                                _ribbonfilter->SetWidthFactor( GetScaleFactor()*10 );
                                _ribbonfilter->GlobalWarningDisplayOff ();  //EED this is to avoid the "BEVEL WARNING"
                                _ribbonfilter->Modified();
                                _ribbonfilter->Update();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                                _streamMapper2->SetInput( _ribbonfilter->GetOutput() );
+#else
+                               _streamMapper2->SetInputData( _ribbonfilter->GetOutput() );
+#endif
                        }                       
                        if (GetTypeForm()==2) 
                        {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                                _streamMapper2->SetInput( _polydata );
+#else
+                               _streamMapper2->SetInputData( _polydata );
+#endif
                        }                       
 //EED                  _streamMapper2->SetLookupTable(vGreenToRedLut);
 
index 95fd4c5f3b11bc5946e311e8f7b9544ffd847ab7..2106ece6befb68b6d6007049cc92dfd7796a6192 100644 (file)
@@ -34,7 +34,7 @@
 // ------------------------------------------------------------------------
 creaVtkStreamLineScalarSeg::creaVtkStreamLineScalarSeg()
 {
-       _vtkidlist                      = vtkIdList::New();
+       _vtkidlist              = vtkIdList::New();
    _newvtkpolydata     = vtkPolyData::New();   
    _newvtkcellarray    = vtkCellArray::New();  
 }
@@ -79,31 +79,25 @@ void creaVtkStreamLineScalarSeg::Process()
                printf(".\n ");
                printf(".\n ");
        }
-
        if ((_StreamLinesIn!=NULL) && (_ScalarArrayName!="") )
        {
                int iLine;
-
                _newvtkcellarray->Initialize();
-
-       vtkCellArray    *vtkcellarray           = _StreamLinesIn->GetLines();
-       int                             nLinesCell                      = vtkcellarray->GetNumberOfCells(); 
+               vtkCellArray    *vtkcellarray           = _StreamLinesIn->GetLines();
+               int                     nLinesCell                      = vtkcellarray->GetNumberOfCells(); 
 //     int                             vtkcellarraysize        = vtkcellarray->GetSize();
-       int                             numberofids; 
-       int                             ii;
-               vtkDataArray    *scalarArray = _StreamLinesIn->GetPointData()->GetArray( _ScalarArrayName.c_str() );
-
-
-               vtkDoubleArray  *newScalarArray                         = vtkDoubleArray::New();
+               int                     numberofids; 
+               int                     ii;
+               vtkDataArray    *scalarArray            = _StreamLinesIn->GetPointData()->GetArray( _ScalarArrayName.c_str() );
+               vtkDoubleArray  *newScalarArray         = vtkDoubleArray::New();
                newScalarArray->SetName( _ScalarArrayName.c_str() );            
                newScalarArray->SetNumberOfComponents(1); 
-
        // FOR EACH LINE
                double scalarValue;
-               long int iLineNew=0;
-       ii=0;
-       for ( iLine=0 ; iLine<nLinesCell ; iLine++ )
-       {
+               long int iLineNew = 0;
+               ii=0;
+               for ( iLine=0 ; iLine<nLinesCell ; iLine++ )
+               {
                        vtkcellarray->GetCell(ii, _vtkidlist );
                        numberofids = _vtkidlist->GetNumberOfIds();
                        scalarValue = scalarArray->GetTuple1(iLine);
@@ -112,24 +106,27 @@ void creaVtkStreamLineScalarSeg::Process()
                                _newvtkcellarray->InsertNextCell( _vtkidlist );
                                newScalarArray->InsertTuple1( iLineNew, scalarValue );
                                iLineNew++;
-                       }
-
+                       } // if Threshold
                        ii=ii+numberofids+1;
-       } // for iLine
-
+               } // for iLine
                _newvtkpolydata->SetPoints( _StreamLinesIn->GetPoints() );
                _newvtkpolydata->SetLines( _newvtkcellarray );
                int iArrays,arraysSize = _StreamLinesIn->GetPointData()->GetNumberOfArrays();
                for ( iArrays=0 ; iArrays<arraysSize ; iArrays++ )
                {       
                        _newvtkpolydata->GetPointData()->AddArray( _StreamLinesIn->GetPointData()->GetArray(iArrays) );
-               }               
+               } // iArrays
                _newvtkpolydata->GetPointData()->RemoveArray( _ScalarArrayName.c_str() );
                _newvtkpolydata->GetPointData()->AddArray( newScalarArray );
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                _newvtkpolydata->Update();
-
-       _StreamLinesOut = _newvtkpolydata;
-
+#else
+               _newvtkcellarray->Modified();
+               _newvtkpolydata->Modified();
+//             _newvtkpolydata->BuildCells();
+#endif
+               _StreamLinesOut = _newvtkpolydata;
        } // _StreamLinesIn
 
 }
index 5c44dc08ebda54800f702db3ad9af882608882aa..ade157ea35f615f698b2262de925e39d63f80cf0 100644 (file)
@@ -67,11 +67,8 @@ void creaVtkStreamTracer::SetSourcePoints( vtkDataSet* sourcepoints)
 //-----------------------------------------------------------------------------
 void creaVtkStreamTracer::Process()
 {
-printf("EED creaVtkStreamTracer::Process() Start \n");
                if (_active==true)
                {
-printf("EED creaVtkStreamTracer::Process() A\n");
-
 //                     if (_firsttime==true)
 //                     {
 //                             _firsttime=false;
@@ -87,9 +84,15 @@ printf("EED creaVtkStreamTracer::Process() A\n");
 //                     _source->SetCenter( c );
 //                     _source->Update();
                        
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        _streamer->SetInput( _dataobject );
 //EED1 _streamer->SetSource( _source->GetOutput() );
                        _streamer->SetSource( _sourcePoints );
+#else
+                       _streamer->SetInputData( _dataobject );
+                       _streamer->SetSourceData( _sourcePoints );
+#endif
                        _streamer->SetIntegratorTypeToRungeKutta45();
                        _streamer->SetMaximumPropagation(500);
 //EED          _streamer->SetMaximumPropagationUnitToTimeUnit();
@@ -98,13 +101,9 @@ printf("EED creaVtkStreamTracer::Process() A\n");
                        _streamer->SetIntegrationDirectionToBoth();
 //EED    streamer->ComputeVorticityOn ();
                        _streamer->Update();
-
 //                     _streamer->Print(std::cout);
 //                     _streamer->GetOutput()->Print(std::cout);
-printf("EED creaVtkStreamTracer::Process() B\n");
-
        } // active
-printf("EED creaVtkStreamTracer::Process() End \n");
 } 
 
 
index 3609557e26bdedac789b54c255b7c1809a0a4daf..93faba51325d36df492f786bc2c5283684e52ddc 100644 (file)
@@ -43,14 +43,12 @@ std::vector<vtkImageData*> creaVtkUnMosaicVectorVtkImageData::unMosaicVectorVtkI
        std::vector<int> nbImagesPerRow;
        std::vector<int> nbImagesInMosaic;
        double imagesInMosaic;
-
        for(int i = 0; i < NbImagesInMosaicVector.size(); i++)
        {
                imagesInMosaic = NbImagesInMosaicVector[i];
                nbImagesPerRow.push_back( ceil(sqrt(imagesInMosaic)) );
                nbImagesInMosaic.push_back(NbImagesInMosaicVector[i]);
-       }
-
+       } // for i
        if(imageInput.size() != NbImagesInMosaicVector.size())
        {
                for(int j = NbImagesInMosaicVector.size(); j < imageInput.size(); j++)  
@@ -58,50 +56,56 @@ std::vector<vtkImageData*> creaVtkUnMosaicVectorVtkImageData::unMosaicVectorVtkI
                        imagesInMosaic = NbImagesInMosaicVector[NbImagesInMosaicVector.size()-1];
                        nbImagesPerRow.push_back( ceil(sqrt(imagesInMosaic)) );         
                        nbImagesInMosaic.push_back( NbImagesInMosaicVector[NbImagesInMosaicVector.size()-1] );
-               }
-       }
-       
+               } // for j
+       } // for imageInput size
        if (nbImagesPerRow.size() == 0 || nbImagesInMosaic.size() == 0) 
-        {
+    {
                std::cout << "VtkUnMosaicVectorVtkImageData ERROR: The number of Images by mosaic is not set " << std::endl; 
-       }
-
+       } // if nbImagesPerRow size
        std::vector<vtkImageData*> imageIn = imageInput;
-
        std::vector<vtkImageData*> mImageOut;
-       for (int i = 0 ; i < (unsigned int)imageIn.size() ; i++) {
-                       mImageOut.push_back( unMosaic(imageIn[i], nbImagesPerRow[i], nbImagesInMosaic[i]) );
-       }
-
+       for (int i = 0 ; i < (unsigned int)imageIn.size() ; i++) 
+       {
+               mImageOut.push_back( unMosaic(imageIn[i], nbImagesPerRow[i], nbImagesInMosaic[i]) );
+       } // for i
        return mImageOut;       
 }
 
+//------------------------------------------------------------------------------
 vtkImageData * creaVtkUnMosaicVectorVtkImageData::unMosaic(vtkImageData *imageIn, int nbImagesPerRow, int numberOfImagesInMosaic)
 {   
-   int inputdims[3];
-   int outputdims[3];
-   imageIn->GetDimensions (inputdims);
-   unsigned short *input = (unsigned short *)(imageIn->GetScalarPointer());
-   imageIn->Update();
-     
-   unsigned int div = (unsigned int)ceil(sqrt( (double)numberOfImagesInMosaic ) );
-   outputdims[0] = inputdims[0] / div;
-   outputdims[1] = inputdims[1] / div;
-   outputdims[2] = numberOfImagesInMosaic;
+       int inputdims[3];
+       int outputdims[3];
+       imageIn->GetDimensions (inputdims);
+       unsigned short *input = (unsigned short *)(imageIn->GetScalarPointer());
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+       imageIn->Update();
+#else
+       // ..
+#endif 
+       unsigned int div = (unsigned int)ceil(sqrt( (double)numberOfImagesInMosaic ) );
+       outputdims[0] = inputdims[0] / div;
+       outputdims[1] = inputdims[1] / div;
+       outputdims[2] = numberOfImagesInMosaic;
  
     vtkImageData *vtkImageOut;
     vtkImageOut = vtkImageData::New();
     vtkImageOut->SetDimensions( outputdims );
     vtkImageOut->SetExtent(0,outputdims[0]-1,0,outputdims[1]-1,0,outputdims[2]-1);
+    
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
     vtkImageOut->SetWholeExtent(0,outputdims[0]-1,0,outputdims[1]-1,0,outputdims[2]-1);
     vtkImageOut->SetNumberOfScalarComponents(1);
 //vtkImageOut->SetSpacing( blabla );
     vtkImageOut->SetScalarType( VTK_UNSIGNED_SHORT );
     vtkImageOut->AllocateScalars();
     vtkImageOut->Update();
-    
+#else
+    vtkImageOut->AllocateScalars(VTK_UNSIGNED_SHORT,1);
+#endif
     unsigned short *output =(unsigned short *)(vtkImageOut->GetScalarPointer());
-
     unsigned short *dest = output;
     int dimXImageElem = outputdims[0];
     int dimYImageElem = outputdims[1];
@@ -118,18 +122,8 @@ vtkImageData * creaVtkUnMosaicVectorVtkImageData::unMosaic(vtkImageData *imageIn
           memcpy(dest, input+debImage, dimXImageElem*sizeof(unsigned short));
           debImage += dimXImageElem*nbImagesPerRow;
           dest += dimXImageElem;
-       }
-    }
+       } // for j
+    } // for i
     return  vtkImageOut;    
 }
 
-//---------------------------------------------
-//Method template
-//---------------------------------------------
-/*
-void creaVtkUnMosaicVectorVtkImageData::FunctionName(int& parameterA)
-{
-  parameterA = 2 * parameterA;
-  return;
-}
-*/
index 9659847a6e891736482aefa7694dd33ca949641b..f898f85d7bee3c7138ca20b8813f0065f2823a67 100644 (file)
@@ -186,21 +186,37 @@ void cutImageSegmentation::Process()
                m_Image->SetOrigin(origin);
 
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                extrude->SetInput(m_Mesh1);
+#else
+               extrude->SetInputData(m_Mesh1);
+#endif
                extrude->SetScaleFactor(1);
                extrude->SetExtrusionTypeToNormalExtrusion();
                extrude->SetVector(0,0,1);
                extrude->Update();
 
                dataToStencil->SetTolerance(0);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                dataToStencil->SetInput(extrude->GetOutput());
+#else
+               dataToStencil->SetInputData(extrude->GetOutput());
+#endif
                dataToStencil->SetOutputOrigin(origin);
                dataToStencil->SetOutputSpacing(spacing);
                dataToStencil->SetOutputWholeExtent(m_Image->GetExtent());
                dataToStencil->Update();
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                imageStencil->SetInput(m_Image);
                imageStencil->SetStencil(dataToStencil->GetOutput());
+#else
+               imageStencil->SetInputData(m_Image);
+               imageStencil->SetStencilData(dataToStencil->GetOutput());
+#endif
                imageStencil->ReverseStencilOff();
                imageStencil->SetBackgroundValue(-200);
                imageStencil->Update();
@@ -211,7 +227,7 @@ void cutImageSegmentation::Process()
        }//i m_Mesh1 != Null
        else{
 
-               std::cout << "MLER cutImageSegmentation :: NO HAY MESH" << std::endl;
+               std::cout << "MLER cutImageSegmentation :: MESH NOT EXIST" << std::endl;
 
        }//else if m_Mesh1
 
index 5ccc9d82bd16859a90b455d19e90c27a6b4b6dbd..1299cdc5c71bcac9de708eca6220b89fb085fb1f 100644 (file)
@@ -38,15 +38,20 @@ vtkImageDataStrucPoints::~vtkImageDataStrucPoints()
 }
 void vtkImageDataStrucPoints::joinComponents(vtkImageData* imageX, vtkImageData* imageY, vtkImageData* imageZ)
 {
+       int ext[6];
        imageY->Modified();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        imageY->Update();
-       int ext[6];
        imageY->GetWholeExtent(ext);
+#else
+       imageY->GetExtent(ext);
+#endif
        int dim[3];
-  double spc[3];;
-  dim[0]=ext[1]-ext[0]+1;
-  dim[1]=ext[3]-ext[2]+1;
-  dim[2]=ext[5]-ext[4]+1;      
+       double spc[3];
+       dim[0]=ext[1]-ext[0]+1;
+       dim[1]=ext[3]-ext[2]+1;
+       dim[2]=ext[5]-ext[4]+1; 
        std::cout<<"dim "<< dim[0] <<" "<< dim[1] <<" "<< dim[2] <<std::endl;
 
        imageY->GetSpacing(spc);
@@ -85,12 +90,26 @@ printf("EED  vtkImageDataStrucPoints::joinComponents  sizeimage %d\n", sizeimage
        _structuredPoints = vtkStructuredPoints::New();
        _structuredPoints->SetDimensions(dim[0], dim[1], dim[2]);
        _structuredPoints->SetSpacing(spc);
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _structuredPoints->SetScalarTypeToDouble();
        _structuredPoints->SetNumberOfScalarComponents(3);
+#else
+       vtkInformation* info=_structuredPoints->GetInformation();
+       vtkDataObject::SetPointDataActiveScalarInfo(info, VTK_DOUBLE, 3);
+
+#endif
+
        _structuredPoints->GetPointData()->SetVectors(array);
        _structuredPoints->GetPointData()->SetNumberOfTuples(sizeimage);
        _structuredPoints->Modified();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _structuredPoints->Update();
+#else
+  //...
+#endif
 
 /*
        _structuredPoints->Print(cout);
index f26bf2e0969562a4a322bfecf21c5ad22e03cfbb..9d522cb3ba4e88b5be2dbc62d8ef2ff7646bdf5c 100644 (file)
@@ -69,7 +69,13 @@ void vtkStreamLineCreateColorInfo::Run()
        double                  vx,vy,vz,mag;
        double                  colorDirX,colorDirY,colorDirZ;
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _StreamLinesIn->Update();
+#else
+  //...
+#endif
+
        vtkCharArray    *mask                           = vtkCharArray::New();
        vtkDoubleArray  *magnitud                       = vtkDoubleArray::New();
        vtkDoubleArray  *velocity                       = vtkDoubleArray::New();
index 7d451f31699b4025d4f1f5f652de92e14f49bd51..9a535195eb1666e548a0173ae90c2bf13490e4c3 100644 (file)
 vtkTensorsVisu::vtkTensorsVisu() : vtkVectorsTensorsVisuBase()
 {
        ss                                      = vtkSphereSource::New();
-       superquadratic  = vtkSuperquadricSource::New();
+       superquadratic          = vtkSuperquadricSource::New();
        cs                                      = vtkCubeSource::New(); 
        tg                                      = vtkTensorGlyph::New();
-       pdn                                     = vtkPolyDataNormals::New();
+       pdn                             = vtkPolyDataNormals::New();
        pd                                      = vtkPolyData::New();
-       pod                                     = vtkPointData::New();
+       pod                             = vtkPointData::New();
 }
 
 //------------------------------------------------------------------------
@@ -52,30 +52,55 @@ vtkTensorsVisu::~vtkTensorsVisu()
 //------------------------------------------------------------------------
 void vtkTensorsVisu::Process()
 {
-printf("EED vtkTensorsVisu::Process Start\n");
-
   if (_active==true)
   {
        if(GetTypeForm()==2)                                                            // source superquadratic
        {
                superquadratic->SetThetaResolution(20);
                superquadratic->SetPhiResolution(20);
+#if VTK_MAJOR_VERSION <= 5
                tg->SetSource(superquadratic->GetOutput());
+#else
+               superquadratic->Update();
+               tg->SetSourceData(superquadratic->GetOutput());
+#endif
        } else if(GetTypeForm()==1) {                                   // source sphere
+#if VTK_MAJOR_VERSION <= 5
                tg->SetSource(ss->GetOutput());
+#else
+               ss->Update();
+               tg->SetSourceData(ss->GetOutput());
+#endif
        } else {                                                                                                // source cube
+#if VTK_MAJOR_VERSION <= 5
                tg->SetSource(cs->GetOutput());         
+#else
+               cs->Update();
+               tg->SetSourceData(cs->GetOutput());     
+#endif
        }
 
+#if VTK_MAJOR_VERSION <= 5
        tg->SetInput( GetDataObject() );
+#else
+       tg->SetInputData( GetDataObject() );
+#endif
        //              tg->ScalingOn();
        //              tg->SetScaling(25);
        tg->SetScaleFactor( GetScaleFactor() );
 
        //The normals are needed to generate the right colors and if
        // not used some of the glyphs are black.
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        pdn->SetInput(tg->GetOutput());
        _pdm->SetInput( pdn->GetOutput() );
+#else
+       pdn->SetInputData(tg->GetOutput());
+       pdn->Update();
+       _pdm->SetInputData( pdn->GetOutput() );
+       _pdm->Update();
+#endif
        _actor->SetMapper( _pdm );
    _actor->GetProperty()->SetOpacity( GetOpacity() );
 
@@ -83,8 +108,15 @@ printf("EED vtkTensorsVisu::Process Start\n");
 //   tg->SetColorModeToScalars();
    tg->Update();
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        pd = tg->GetOutput();
        pd->Update();
+#else
+       tg->Update();
+       pd = tg->GetOutput();
+#endif
+
        pod = pd->GetPointData();
        pod->Update();
 
@@ -103,8 +135,10 @@ printf("EED vtkTensorsVisu::Process Start\n");
        vtkIdType numSourcePts;
 //     vtkIdType numSourceCells;
 
-       vtkPoints *sourcePts = tg->GetSource()->GetPoints();
-       numSourcePts = sourcePts->GetNumberOfPoints();
+       vtkPoints *sourcePts    = tg->GetSource()->GetPoints();
+
+
+       numSourcePts                    = sourcePts->GetNumberOfPoints();
 //     numSourceCells = tg->GetSource()->GetNumberOfCells();
 
        vtkDataArray *tensorsArray = pointdata_do->GetArray("tensors");
@@ -113,7 +147,7 @@ printf("EED vtkTensorsVisu::Process Start\n");
                vtkDoubleArray  *newScalarArray                         = vtkDoubleArray::New();
                newScalarArray->SetName( "NormalsEED" );
                newScalarArray->SetNumberOfComponents(3); 
-               int             iNumPts,iNumSourcePts;
+               int     iNumPts,iNumSourcePts;
                int             iNormalsEED=0;
                double  *normalValue;
                double   sumEigenvalue,sumEigenvalue1,sumEigenvalue2,sumEigenvalue3;
@@ -121,10 +155,10 @@ printf("EED vtkTensorsVisu::Process Start\n");
                int      idEigen;
                for (iNumPts=0;iNumPts<numPnts;iNumPts++)
                {
-                       normalValue     = tensorsArray->GetTuple9(iNumPts);
-         sumEigenvalue1 = sqrt (normalValue[0]*normalValue[0] + normalValue[1]*normalValue[1] + normalValue[2]*normalValue[2]);
-         sumEigenvalue2 = sqrt (normalValue[3]*normalValue[3] + normalValue[4]*normalValue[4] + normalValue[5]*normalValue[5]);
-         sumEigenvalue3 = sqrt (normalValue[6]*normalValue[6] + normalValue[7]*normalValue[7] + normalValue[8]*normalValue[8]);
+                       normalValue = tensorsArray->GetTuple9(iNumPts);
+               sumEigenvalue1 = sqrt (normalValue[0]*normalValue[0] + normalValue[1]*normalValue[1] + normalValue[2]*normalValue[2]);
+               sumEigenvalue2 = sqrt (normalValue[3]*normalValue[3] + normalValue[4]*normalValue[4] + normalValue[5]*normalValue[5]);
+               sumEigenvalue3 = sqrt (normalValue[6]*normalValue[6] + normalValue[7]*normalValue[7] + normalValue[8]*normalValue[8]);
 
                        if ((sumEigenvalue1>=sumEigenvalue2) && (sumEigenvalue1>=sumEigenvalue3))
                        {
@@ -154,14 +188,14 @@ printf("EED vtkTensorsVisu::Process Start\n");
                        } // for iNumSourcePts
 
                } // for iNumPts
+
+
                pointdata_tg->RemoveArray( "NormalsEED" );
                pointdata_tg->AddArray( newScalarArray );
 //             pointdata_pdn->Update();
                tg->Update();
        } // if  tensorsArray
 
-
-
        _pdm->ScalarVisibilityOn();
        _pdm->SetColorModeToMapScalars();
        //_pdm->SetColorModeToDefault();
@@ -175,6 +209,12 @@ printf("EED vtkTensorsVisu::Process Start\n");
        _pdm->SetLookupTable( _LutEED );
        _pdm->SelectColorArray( "NormalsEED" );
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+  //...
+#else
+       _pdm->Update();
+#endif
 
 /*
                        int i,sizeDa = pointdata_tg->GetNumberOfArrays();
@@ -187,12 +227,7 @@ printf("EED vtkTensorsVisu::Process Start\n");
 
                        }
 */
-
-
   } // _active
-
-    VisibilityActor(); 
-
-printf("EED vtkTensorsVisu::Process End.\n");
+  VisibilityActor(); 
 }
 
index 8f1f135c30644217c058905c90d74d30eccf2583..162521ca3fc0e71e442e52038f812ba055287f2d 100644 (file)
@@ -69,13 +69,13 @@ protected:
 //---------------------------------------------
 private:
 
-   vtkSmartPointer<vtkSphereSource>                    ss;
+   vtkSmartPointer<vtkSphereSource>            ss;
    vtkSmartPointer<vtkSuperquadricSource>      superquadratic;
-   vtkSmartPointer<vtkCubeSource>                              cs; 
-   vtkSmartPointer<vtkTensorGlyph>                             tg;
+   vtkSmartPointer<vtkCubeSource>                      cs; 
+   vtkSmartPointer<vtkTensorGlyph>                     tg;
    vtkSmartPointer<vtkPolyDataNormals>                 pdn;
-   vtkSmartPointer<vtkPolyData>                                        pd;
-   vtkSmartPointer<vtkPointData>                               pod;
+   vtkSmartPointer<vtkPolyData>                        pd;
+   vtkSmartPointer<vtkPointData>                       pod;
 };
 
 //-end of _VTKTENSORSVISU_H_------------------------------------------------------
index 5f6eeed8da7e91a05495f821d73eea2abd913634..3d7c20bba4595da8466fa35800fc7668c56c2e32 100644 (file)
 */
 
 #include "vtkVectorsTensorsVisuBase.h"
-
-
 #include "vtkObjectFactory.h"
 
-
-
-
 vtkStandardNewMacro(vtkLookupTableDirectionVector);
 
 // Construct with range=(0,1); and hsv ranges set up for rainbow color table 
@@ -48,14 +43,11 @@ vtkLookupTableDirectionVector::~vtkLookupTableDirectionVector()
 {
 }
 
-
-
 unsigned char *vtkLookupTableDirectionVector::MapValue(double v)
 {
        
        //int idx = this->GetIndex(v);
-       //return (this->Table->GetPointer(0) + 4*idx);
-       
+       //return (this->Table->GetPointer(0) + 4*idx);  
        return 0;
 }
 
@@ -151,7 +143,6 @@ inIncr=3;
 }
 
 
-
 //----------------------------------------------------------------------------
 void vtkLookupTableDirectionVector::MapScalarsThroughTable2(void *input, 
                                              unsigned char *output,
@@ -196,13 +187,13 @@ void vtkLookupTableDirectionVector::PrintSelf(ostream& os, vtkIndent indent)
 
 vtkVectorsTensorsVisuBase::vtkVectorsTensorsVisuBase()
 {
-       _firsttime      = true;
-       _active         = false;
-       _scalefactor= 1;
-       _opacity        = 1;
-       _dataobject     = NULL;
-       _renderer       = NULL;
-       _typeForm       = 0;
+     _firsttime                = true;
+       _active                 = false;
+       _scalefactor    = 1;
+       _opacity                = 1;
+       _dataobject             = NULL;
+       _renderer               = NULL;
+       _typeForm               = 0;
 
        _LutEED         = vtkLookupTableDirectionVector::New();
        //_LutEED->SetVectorMode(0);
@@ -305,8 +296,6 @@ void vtkVectorsTensorsVisuBase::Process()    // virtual
 {
 }
 
-
-
 //------------------------------------------------------------------------------
 void vtkVectorsTensorsVisuBase::VisibilityActor()
 {
@@ -328,7 +317,6 @@ void vtkVectorsTensorsVisuBase::VisibilityActor()
        } // if _active==false  
 }
 
-
 //------------------------------------------------------------------------------
 void vtkVectorsTensorsVisuBase::SetColorLaw(int colorlaw)
 {
index c1e7b7531bd000fb71f9d63ba98feaec7264fe90..831fc2ccde4b6a719f7da66562bf8ef68b7f2a47 100644 (file)
@@ -28,7 +28,6 @@
 #ifndef _VTKVECTORSTENSORSVISUBASE_H_
 #define _VTKVECTORSTENSORSVISUBASE_H_
 
-
 #include "vtkActor.h"
 #include "vtkLookupTable.h"
 #include "vtkPolyDataMapper.h"
 #include "vtkSmartPointer.h"
 #include "vtkVectorNorm.h"
 
-
 //---------------------------------------------
 // Class Name: vtkVectorsTensorsVisuBase
 // [classdescription]
 //---------------------------------------------
 
-
-
-
 class /*VTK_COMMON_EXPORT*/ vtkLookupTableDirectionVector : public vtkScalarsToColors
 {
 public:
@@ -71,14 +66,11 @@ public:
        void MapScalarsThroughTable2(void *input, unsigned char *output,
                                                                 int inputDataType, int numberOfValues,
                                                                 int inputIncrement, int outputIncrement);
-       
-       
+               
 protected:
-       
-        double TableRange[2];
+       double TableRange[2];
        vtkLookupTableDirectionVector(int sze=256, int ext=256);
        ~vtkLookupTableDirectionVector();
-       
                
 private:
        vtkLookupTableDirectionVector(const vtkLookupTableDirectionVector&);  // Not implemented.
@@ -86,18 +78,6 @@ private:
 };
 
 
-
-
-
-
-
-
-
-
-
-
-
-
 class vtkVectorsTensorsVisuBase
 {
 
@@ -117,16 +97,16 @@ public :
    void                                        SetColorLaw(int);
    void                                        SetColor(std::vector<double>);
 
-   bool                                        GetActive();
+   bool                                GetActive();
    vtkDataObject*              GetDataObject();
-   vtkRenderer*                GetRenderer();
+   vtkRenderer*                        GetRenderer();
    double                              GetScaleFactor();
    double                              GetOpacity();
    vtkProp3D*                  GetProp3D();
    int                                 GetTypeForm();
 
    virtual void                Process();
-   void                                        VisibilityActor();
+   void                                VisibilityActor();
 
 
 
@@ -140,25 +120,21 @@ protected:
 //Methods and attributes only visible by this class
 //---------------------------------------------
 private:
-   bool                                                                                        _actorAdded;
-
-   double                                                                              _scalefactor;
-   double                                                                              _opacity;
-   vtkDataObject                                                               *_dataobject;
-   vtkRenderer                                                                 *_renderer;
-   int                                                                                 _typeForm;
-
+       bool                                                                            _actorAdded;
+       double                                                                          _scalefactor;
+       double                                                                          _opacity;
+       vtkDataObject                                                           *_dataobject;
+       vtkRenderer                                                             *_renderer;
+       int                                                                                     _typeForm;
 
 protected:
-   bool                                                                                        _firsttime;
-   bool                                                                                        _active;
-
-   vtkSmartPointer<vtkPolyDataMapper>  _pdm;
-   vtkSmartPointer<vtkActor>           _actor;
-   vtkLookupTableDirectionVector                       *_LutEED;
-       int                                                                                     _colorlaw;
+       bool                                                                            _firsttime;
+       bool                                                                            _active;
+       vtkSmartPointer<vtkPolyDataMapper>                      _pdm;
+       vtkSmartPointer<vtkActor>                       _actor;
+       vtkLookupTableDirectionVector                           *_LutEED;
+       int                                                                             _colorlaw;
        double                                                                          _colorR,_colorG,_colorB;
-
 };
 
 //-end of _VTKVECTORSTENSORSVISUBASE_H_------------------------------------------------------
index 5b50b2ae0395e506e8e40c51243479be963eb3d8..376d4036211699121b49e0d31a4b75de98b1f118 100644 (file)
@@ -53,29 +53,49 @@ vtkVectorsVisu::vtkVectorsVisu()
        _vtklinesource->SetPoint2( point2 );
 }
 
-
 //------------------------------------------------------------------------------
 vtkVectorsVisu::~vtkVectorsVisu()
 {
 }
 
+
 //------------------------------------------------------------------------------
 void vtkVectorsVisu::Process()
 {
      if(_active==true)
      {
+#if VTK_MAJOR_VERSION <= 5
          _vtkglyph->SetInput( GetDataObject() );  
+#else
+         _vtkglyph->SetInputData( GetDataObject() );  
+#endif
                        if(GetTypeForm()==1)                                                            // source Arrow
                        {
-                _vtkglyph->SetSource( _vtkarrowsource->GetOutput() );
+#if VTK_MAJOR_VERSION <= 5
+                       _vtkglyph->SetSource( _vtkarrowsource->GetOutput() );
+#else
+                               _vtkarrowsource->Update();
+                       _vtkglyph->SetSourceData( _vtkarrowsource->GetOutput() );
+#endif
                        } else {                                                                                                // source Line
+#if VTK_MAJOR_VERSION <= 5
                                _vtkglyph->SetSource( _vtklinesource->GetOutput() );    
+#else
+                               _vtklinesource->Update();
+                               _vtkglyph->SetSourceData( _vtklinesource->GetOutput() );        
+#endif
                        }
          _vtkglyph->SetScaleModeToScaleByVector();
          _vtkglyph->SetColorModeToColorByVector();
          _vtkglyph->SetScaleFactor( GetScaleFactor() );
-         _vtkglyph->Update();
+               _vtkglyph->Update();
+
+#if VTK_MAJOR_VERSION <= 5
          _pdm->SetInput( _vtkglyph->GetOutput());
+#else
+         _pdm->SetInputData( _vtkglyph->GetOutput());
+#endif
+
 vtkPointData   *data   = _vtkglyph->GetOutput()->GetPointData();
 //printf("EED -------------------------------------------\n");
 //_vtkglyph->GetOutput()->Print(std::cout);
@@ -98,8 +118,6 @@ for (i=0;i<sizeDa;i++)
        //_LutEED->SetVectorModeToRGBColors();
        //_LutEED->SetVectorModeToMagnitud();
 
-
-
 //         _pdm->SetScalarModeToUsePointFieldData();
          _pdm->SetLookupTable( _LutEED );
          _pdm->SelectColorArray( "GlyphVector" );
@@ -107,15 +125,15 @@ for (i=0;i<sizeDa;i++)
 //       vSliceMapperVec->SetLookupTable( vGreenToRedLut );
 //       vSliceMapperVec->SetColorModeToMapScalars();
 
+#if VTK_MAJOR_VERSION <= 5
+               // ..
+#else
+         _pdm->Update();
+#endif
          _actor->SetMapper( _pdm );
          _actor->GetProperty()->SetOpacity( GetOpacity() );
     }// if _active
 
     VisibilityActor(); 
 }
-       
-
-
-
-
 
index 0e2dda4efe67b34a9c90b75fe8d356f0ad593876..8fe751fb9604416d3c49fd5f04053ef976f69032 100644 (file)
@@ -68,7 +68,7 @@ protected:
 private:
        vtkArrowSource  *_vtkarrowsource;
        vtkLineSource   *_vtklinesource;
-       vtkGlyph3D              *_vtkglyph;
+       vtkGlyph3D      *_vtkglyph;
 };
 
 //-end of _vtkVectorsVISU_H_------------------------------------------------------