From: Eduardo DAVILA Date: Tue, 22 Aug 2017 18:59:26 +0000 (+0200) Subject: #3110 creaVtk Bug New Normal - branch vtk7itk4 compilation with vtk7 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=82f0d43e64f8ba8098f0cd1c8759b436a40109bc;p=creaVtk.git #3110 creaVtk Bug New Normal - branch vtk7itk4 compilation with vtk7 --- 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 index 0000000..300a792 --- /dev/null +++ b/bbtk_creaVtk_PKG/bbs/appli/examplePlaneWidget_StreamLineVisu_Widget.bbg @@ -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: +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 index 0000000..a17a9f9 --- /dev/null +++ b/bbtk_creaVtk_PKG/bbs/appli/examplePlaneWidget_StreamLineVisu_Widget.bbs @@ -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 "" + +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 diff --git a/bbtk_creaVtk_PKG/bbs/boxes/PlaneWidget_StreamLineVisu_Widget.bbg b/bbtk_creaVtk_PKG/bbs/boxes/PlaneWidget_StreamLineVisu_Widget.bbg index 0d83e76..1605ab1 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/PlaneWidget_StreamLineVisu_Widget.bbg +++ b/bbtk_creaVtk_PKG/bbs/boxes/PlaneWidget_StreamLineVisu_Widget.bbg @@ -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 diff --git a/bbtk_creaVtk_PKG/bbs/boxes/PlaneWidget_StreamLineVisu_Widget.bbs b/bbtk_creaVtk_PKG/bbs/boxes/PlaneWidget_StreamLineVisu_Widget.bbs index e45359f..39d382c 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/PlaneWidget_StreamLineVisu_Widget.bbs +++ b/bbtk_creaVtk_PKG/bbs/boxes/PlaneWidget_StreamLineVisu_Widget.bbs @@ -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 "" -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 " " diff --git a/lib/creaVtk/creaVtkStreamTracer.cpp b/lib/creaVtk/creaVtkStreamTracer.cpp index a88192f..ade157e 100644 --- a/lib/creaVtk/creaVtkStreamTracer.cpp +++ b/lib/creaVtk/creaVtkStreamTracer.cpp @@ -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; @@ -104,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"); }