From: Eduardo DAVILA Date: Mon, 21 Aug 2017 14:32:05 +0000 (+0200) Subject: #3107 BBTK Bug New Normal - branch vtk7itk4 compilation with vtk7 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0270a43057e5a74a7c1c9c6081f026261a2d313f;p=bbtk.git #3107 BBTK Bug New Normal - branch vtk7itk4 compilation with vtk7 --- diff --git a/kernel/cmake/BBTKConfigurePackage_data.cmake b/kernel/cmake/BBTKConfigurePackage_data.cmake index 6dad172..0e2706d 100644 --- a/kernel/cmake/BBTKConfigurePackage_data.cmake +++ b/kernel/cmake/BBTKConfigurePackage_data.cmake @@ -25,7 +25,7 @@ -FILE(GLOB_RECURSE ALL RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.*") +FILE(GLOB_RECURSE ALL RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*") # TO DO : REMOVE CMakeLists.txt FROM LIST !!! diff --git a/packages/gdcmvtk/bbs/appli/exampleGetInfoGdcmReader.bbg b/packages/gdcmvtk/bbs/appli/exampleGetInfoGdcmReader.bbg new file mode 100644 index 0000000..b01888a --- /dev/null +++ b/packages/gdcmvtk/bbs/appli/exampleGetInfoGdcmReader.bbg @@ -0,0 +1,133 @@ +# ---------------------------------- +# - BBTKGEditor v 1.4 BBG BlackBox Diagram file +# - /tmpEED/creaTools2/creatools_source/bbtk/packages/gdcmvtk/bbs/appli/exampleGetInfoGdcmReader.bbg +# ---------------------------------- + +APP_START +CATEGORY:example +DESCRIPTION:Description ?? +AUTHOR:Author ?? +COMPLEXBOX:FALSE +COMPLEXINPUTS:0 +BOXES:11 +BOX +wx:FileSelector:openFileDialog +ISEXEC:FALSE +-66.428291:81.722640:-900.000000 +-20.328291:71.722640:-900.000000 +FIN_BOX +BOX +gdcmvtk:GetInfoGdcmReader:readerginf +ISEXEC:FALSE +-70.412484:36.879021:-900.000000 +-19.512484:26.879021:-900.000000 +FIN_BOX +BOX +std:Configuration:Box02 +ISEXEC:FALSE +-1.653193:82.659639:-900.000000 +37.771807:72.659639:-900.000000 +FIN_BOX +BOX +std:ConcatStrings:Box03 +ISEXEC:FALSE +-5.861320:59.815520:-900.000000 +33.863680:49.815520:-900.000000 +PORT +In2:"/gdcmvtk/dicom01/466" +FIN_BOX +BOX +wx:OutputText:Box04 +ISEXEC:FALSE +-98.965429:-34.997965:-900.000000 +-62.190429:-44.997965:-900.000000 +PORT +Title:"IOP" +FIN_BOX +BOX +wx:LayoutLine:Box05 +ISEXEC:FALSE +-52.597120:-59.500261:-900.000000 +4.962880:-69.500261:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box06 +ISEXEC:FALSE +-81.670654:-19.843773:-900.000000 +-44.895654:-29.843773:-900.000000 +PORT +Title:"IPP" +FIN_BOX +BOX +wx:OutputText:Box07 +ISEXEC:FALSE +-62.533069:-3.150159:-900.000000 +-25.758069:-13.150159:-900.000000 +PORT +Title:"InterSlice" +FIN_BOX +BOX +wx:OutputText:Box08 +ISEXEC:FALSE +-40.819498:13.505161:-900.000000 +-4.044498:3.505161:-900.000000 +PORT +Title:"PixelSpacing" +FIN_BOX +BOX +creaMaracasVisu:ViewerNV:Box09 +ISEXEC:FALSE +13.959072:-59.021307:-900.000000 +77.679072:-69.021307:-900.000000 +PORT +nTypeView:"0" +FIN_BOX +BOX +wx:LayoutSplit:Box11 +ISEXEC:TRUE +-13.676413:-79.653834:-900.000000 +25.403587:-89.653834:-900.000000 +PORT +Orientation:"H" +FIN_BOX +CONNECTIONS:13 +CONNECTION +Box02:DataPath:Box03:In1 +NumberOfControlPoints:0 +CONNECTION +Box03:Out:readerginf:In +NumberOfControlPoints:0 +CONNECTION +readerginf:IOP:Box04:In +NumberOfControlPoints:0 +CONNECTION +Box04:Widget:Box05:Widget1 +NumberOfControlPoints:0 +CONNECTION +readerginf:IPP:Box06:In +NumberOfControlPoints:0 +CONNECTION +Box06:Widget:Box05:Widget2 +NumberOfControlPoints:0 +CONNECTION +readerginf:InterSlice:Box07:In +NumberOfControlPoints:0 +CONNECTION +Box07:Widget:Box05:Widget3 +NumberOfControlPoints:0 +CONNECTION +readerginf:PixelSpacing:Box08:In +NumberOfControlPoints:0 +CONNECTION +Box08:Widget:Box05:Widget4 +NumberOfControlPoints:0 +CONNECTION +readerginf:Out:Box09:In +NumberOfControlPoints:0 +CONNECTION +Box05:Widget:Box11:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box09:Widget:Box11:Widget2 +NumberOfControlPoints:0 +APP_END diff --git a/packages/gdcmvtk/bbs/appli/exampleGetInfoGdcmReader.bbs b/packages/gdcmvtk/bbs/appli/exampleGetInfoGdcmReader.bbs index a56b60e..3b3a495 100644 --- a/packages/gdcmvtk/bbs/appli/exampleGetInfoGdcmReader.bbs +++ b/packages/gdcmvtk/bbs/appli/exampleGetInfoGdcmReader.bbs @@ -1,56 +1,79 @@ - # --------------------------------------------------------------------- - # - # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image - # pour la SantÈ) - # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton - # Previous Authors : Laurent Guigues, Jean-Pierre Roux - # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil - # - # This software is governed by the CeCILL-B license under French law and - # abiding by the rules of distribution of free software. You can use, - # modify and/ or redistribute the software under the terms of the CeCILL-B - # license as circulated by CEA, CNRS and INRIA at the following URL - # http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html - # or in the file LICENSE.txt. - # - # As a counterpart to the access to the source code and rights to copy, - # modify and redistribute granted by the license, users are provided only - # with a limited warranty and the software's author, the holder of the - # economic rights, and the successive licensors have only limited - # liability. - # - # The fact that you are presently reading this means that you have had - # knowledge of the CeCILL-B license and that you accept its terms. - # ------------------------------------------------------------------------ */ - +# ---------------------------------- +# - BBTKGEditor v 1.4 BBS BlackBox Script +# - /tmpEED/creaTools2/creatools_source/bbtk/packages/gdcmvtk/bbs/appli/exampleGetInfoGdcmReader.bbs +# ---------------------------------- + +# BBTK GEditor Script +# ---------------------- + +include std +include itkvtk +include wx +include gdcmvtk +include std +include creaMaracasVisu + +author "Author ??" +description "Description ??" category "example" +new wx:FileSelector openFileDialog + +new gdcmvtk:GetInfoGdcmReader readerginf + +new std:Configuration Box02 + +new std:ConcatStrings Box03 + set Box03.In2 "/gdcmvtk/dicom01/466" + +new wx:OutputText Box04 + set Box04.Title "IOP" + +new wx:LayoutLine Box05 + +new wx:OutputText Box06 + set Box06.Title "IPP" + +new wx:OutputText Box07 + set Box07.Title "InterSlice" + +new wx:OutputText Box08 + set Box08.Title "PixelSpacing" + +new creaMaracasVisu:ViewerNV Box09 + set Box09.nTypeView "0" + +new wx:LayoutSplit Box11 + set Box11.Orientation "H" + + +connect Box02.DataPath Box03.In1 + +connect Box03.Out readerginf.In + +connect readerginf.IOP Box04.In + +connect Box04.Widget Box05.Widget1 + +connect readerginf.IPP Box06.In + +connect Box06.Widget Box05.Widget2 -load gdcmvtk -load std -load wx +connect readerginf.InterSlice Box07.In +connect Box07.Widget Box05.Widget3 -//message all 9 +connect readerginf.PixelSpacing Box08.In -new FileSelector openFileDialog -new GetInfoGdcmReader readerginf - connect openFileDialog.Out readerginf.In -exec readerginf - -// No adaptor -//print $readerginf.Out$ +connect Box08.Widget Box05.Widget4 -print IOP -print $readerginf.IOP$ +connect readerginf.Out Box09.In -print IPP -print $readerginf.IPP$ +connect Box05.Widget Box11.Widget1 -print PixelSpacing -print $readerginf.PixelSpacing$ +connect Box09.Widget Box11.Widget2 -print InterSlice -print $readerginf.InterSlice$ +# Complex input ports +exec Box11 diff --git a/packages/gdcmvtk/bbs/appli/exampleGetXCoherentInfoGdcmReader.bbg b/packages/gdcmvtk/bbs/appli/exampleGetXCoherentInfoGdcmReader.bbg new file mode 100644 index 0000000..5682a0e --- /dev/null +++ b/packages/gdcmvtk/bbs/appli/exampleGetXCoherentInfoGdcmReader.bbg @@ -0,0 +1,126 @@ +# ---------------------------------- +# - BBTKGEditor v 1.4 BBG BlackBox Diagram file +# - /tmpEED/creaTools2/creatools_source/bbtk/packages/gdcmvtk/bbs/appli/exampleGetXCoherentInfoGdcmReader.bbg +# ---------------------------------- + +APP_START +CATEGORY:example +DESCRIPTION:Description ?? +AUTHOR:Author ?? +COMPLEXBOX:FALSE +COMPLEXINPUTS:0 +BOXES:11 +BOX +std:Configuration:Box02 +ISEXEC:FALSE +-38.753415:87.335854:-900.000000 +0.671585:77.335854:-900.000000 +FIN_BOX +BOX +std:ConcatStrings:Box03 +ISEXEC:FALSE +-52.654242:69.240631:-900.000000 +-12.929242:59.240631:-900.000000 +PORT +In2:"/gdcmvtk/dicom01" +FIN_BOX +BOX +wx:OutputText:Box04 +ISEXEC:FALSE +-98.965429:-34.997965:-900.000000 +-62.190429:-44.997965:-900.000000 +PORT +Title:"IOP" +FIN_BOX +BOX +wx:LayoutLine:Box05 +ISEXEC:FALSE +-65.243633:-57.360082:-900.000000 +-7.683633:-67.360082:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box06 +ISEXEC:FALSE +-81.670654:-19.843773:-900.000000 +-44.895654:-29.843773:-900.000000 +PORT +Title:"IPP" +FIN_BOX +BOX +wx:OutputText:Box08 +ISEXEC:FALSE +-63.079632:-1.609744:-900.000000 +-26.304632:-11.609744:-900.000000 +PORT +Title:"PixelSpacing" +FIN_BOX +BOX +creaMaracasVisu:ViewerNV:Box09 +ISEXEC:FALSE +8.622122:-57.999232:-900.000000 +72.342122:-67.999232:-900.000000 +FIN_BOX +BOX +gdcmvtk:GetXCoherentInfoGdcmReader:Box11 +ISEXEC:FALSE +-76.899274:28.508473:-900.000000 +-19.924274:18.508473:-900.000000 +FIN_BOX +BOX +wx:DirectorySelector:Box12 +ISEXEC:FALSE +-101.781353:71.143492:-900.000000 +-58.831353:61.143492:-900.000000 +FIN_BOX +BOX +std:FilesFromDirectory:Box13 +ISEXEC:FALSE +-70.012805:52.008449:-900.000000 +-26.137805:42.008449:-900.000000 +FIN_BOX +BOX +wx:LayoutSplit:Box14 +ISEXEC:TRUE +-11.430502:-80.373451:-900.000000 +27.649498:-90.373451:-900.000000 +PORT +Orientation:"H" +FIN_BOX +CONNECTIONS:12 +CONNECTION +Box02:DataPath:Box03:In1 +NumberOfControlPoints:0 +CONNECTION +Box04:Widget:Box05:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box06:Widget:Box05:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box08:Widget:Box05:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box11:IOP:Box04:In +NumberOfControlPoints:0 +CONNECTION +Box11:IPP:Box06:In +NumberOfControlPoints:0 +CONNECTION +Box11:PixelSpacing:Box08:In +NumberOfControlPoints:0 +CONNECTION +Box03:Out:Box13:In +NumberOfControlPoints:0 +CONNECTION +Box11:Out:Box09:In +NumberOfControlPoints:0 +CONNECTION +Box05:Widget:Box14:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box09:Widget:Box14:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box13:Out:Box11:In +NumberOfControlPoints:0 +APP_END diff --git a/packages/gdcmvtk/bbs/appli/exampleGetXCoherentInfoGdcmReader.bbs b/packages/gdcmvtk/bbs/appli/exampleGetXCoherentInfoGdcmReader.bbs index ca04548..ded983f 100644 --- a/packages/gdcmvtk/bbs/appli/exampleGetXCoherentInfoGdcmReader.bbs +++ b/packages/gdcmvtk/bbs/appli/exampleGetXCoherentInfoGdcmReader.bbs @@ -1,61 +1,75 @@ - # --------------------------------------------------------------------- - # - # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image - # pour la SantÈ) - # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton - # Previous Authors : Laurent Guigues, Jean-Pierre Roux - # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil - # - # This software is governed by the CeCILL-B license under French law and - # abiding by the rules of distribution of free software. You can use, - # modify and/ or redistribute the software under the terms of the CeCILL-B - # license as circulated by CEA, CNRS and INRIA at the following URL - # http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html - # or in the file LICENSE.txt. - # - # As a counterpart to the access to the source code and rights to copy, - # modify and redistribute granted by the license, users are provided only - # with a limited warranty and the software's author, the holder of the - # economic rights, and the successive licensors have only limited - # liability. - # - # The fact that you are presently reading this means that you have had - # knowledge of the CeCILL-B license and that you accept its terms. - # ------------------------------------------------------------------------ */ - +# ---------------------------------- +# - BBTKGEditor v 1.4 BBS BlackBox Script +# - /tmpEED/creaTools2/creatools_source/bbtk/packages/gdcmvtk/bbs/appli/exampleGetXCoherentInfoGdcmReader.bbs +# ---------------------------------- + +# BBTK GEditor Script +# ---------------------- + +include std +include itkvtk +include std +include wx +include creaMaracasVisu +include gdcmvtk + +author "Author ??" +description "Description ??" category "example" -load gdcmvtk -load std -load wx +new std:Configuration Box02 + +new std:ConcatStrings Box03 + set Box03.In2 "/gdcmvtk/dicom01" + +new wx:OutputText Box04 + set Box04.Title "IOP" + +new wx:LayoutLine Box05 + +new wx:OutputText Box06 + set Box06.Title "IPP" + +new wx:OutputText Box08 + set Box08.Title "PixelSpacing" + +new creaMaracasVisu:ViewerNV Box09 + +new gdcmvtk:GetXCoherentInfoGdcmReader Box11 + +new wx:DirectorySelector Box12 + +new std:FilesFromDirectory Box13 + +new wx:LayoutSplit Box14 + set Box14.Orientation "H" + + +connect Box02.DataPath Box03.In1 + +connect Box04.Widget Box05.Widget1 + +connect Box06.Widget Box05.Widget2 + +connect Box08.Widget Box05.Widget4 + +connect Box11.IOP Box04.In +connect Box11.IPP Box06.In -//message all 9 +connect Box11.PixelSpacing Box08.In -// To choose the directory -new DirectorySelector ds -// To get the image names into a vector -new FilesFromDirectory fd - connect ds.Out fd.In -// list of files as input -#print "In $ds.Out$\n -#print "Files found : $fd.Out$\n -// user choosen directory as input -new GetXCoherentInfoGdcmReader reader -connect fd.Out reader.In -exec reader +connect Box03.Out Box13.In -// No adaptor -#print $reader.Out$ +connect Box11.Out Box09.In -print IOP -print $reader.IOP$ +connect Box05.Widget Box14.Widget1 -print IPP -print $reader.IPP$ +connect Box09.Widget Box14.Widget2 -print PixelSpacing -print $reader.PixelSpacing$ +connect Box13.Out Box11.In +# Complex input ports +exec Box14 diff --git a/packages/gdcmvtk/data/dicom01/466 b/packages/gdcmvtk/data/dicom01/466 new file mode 100644 index 0000000..ef512ba Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/466 differ diff --git a/packages/gdcmvtk/data/dicom01/467 b/packages/gdcmvtk/data/dicom01/467 new file mode 100644 index 0000000..b09af51 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/467 differ diff --git a/packages/gdcmvtk/data/dicom01/468 b/packages/gdcmvtk/data/dicom01/468 new file mode 100644 index 0000000..66eae5a Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/468 differ diff --git a/packages/gdcmvtk/data/dicom01/469 b/packages/gdcmvtk/data/dicom01/469 new file mode 100644 index 0000000..a22f877 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/469 differ diff --git a/packages/gdcmvtk/data/dicom01/470 b/packages/gdcmvtk/data/dicom01/470 new file mode 100644 index 0000000..f8b9cff Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/470 differ diff --git a/packages/gdcmvtk/data/dicom01/471 b/packages/gdcmvtk/data/dicom01/471 new file mode 100644 index 0000000..a33d92f Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/471 differ diff --git a/packages/gdcmvtk/data/dicom01/472 b/packages/gdcmvtk/data/dicom01/472 new file mode 100644 index 0000000..273e491 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/472 differ diff --git a/packages/gdcmvtk/data/dicom01/473 b/packages/gdcmvtk/data/dicom01/473 new file mode 100644 index 0000000..3c63c42 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/473 differ diff --git a/packages/gdcmvtk/data/dicom01/474 b/packages/gdcmvtk/data/dicom01/474 new file mode 100644 index 0000000..0e2598c Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/474 differ diff --git a/packages/gdcmvtk/data/dicom01/475 b/packages/gdcmvtk/data/dicom01/475 new file mode 100644 index 0000000..b53d8a5 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/475 differ diff --git a/packages/gdcmvtk/data/dicom01/476 b/packages/gdcmvtk/data/dicom01/476 new file mode 100644 index 0000000..415ce05 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/476 differ diff --git a/packages/gdcmvtk/data/dicom01/477 b/packages/gdcmvtk/data/dicom01/477 new file mode 100644 index 0000000..ca9a6db Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/477 differ diff --git a/packages/gdcmvtk/data/dicom01/478 b/packages/gdcmvtk/data/dicom01/478 new file mode 100644 index 0000000..b986c71 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/478 differ diff --git a/packages/gdcmvtk/data/dicom01/479 b/packages/gdcmvtk/data/dicom01/479 new file mode 100644 index 0000000..1d2e6fe Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/479 differ diff --git a/packages/gdcmvtk/data/dicom01/480 b/packages/gdcmvtk/data/dicom01/480 new file mode 100644 index 0000000..1925433 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/480 differ diff --git a/packages/gdcmvtk/data/dicom01/481 b/packages/gdcmvtk/data/dicom01/481 new file mode 100644 index 0000000..d88140c Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/481 differ diff --git a/packages/gdcmvtk/data/dicom01/482 b/packages/gdcmvtk/data/dicom01/482 new file mode 100644 index 0000000..1f14ac4 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/482 differ diff --git a/packages/gdcmvtk/data/dicom01/483 b/packages/gdcmvtk/data/dicom01/483 new file mode 100644 index 0000000..798c573 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/483 differ diff --git a/packages/gdcmvtk/data/dicom01/484 b/packages/gdcmvtk/data/dicom01/484 new file mode 100644 index 0000000..9050b31 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/484 differ diff --git a/packages/gdcmvtk/data/dicom01/485 b/packages/gdcmvtk/data/dicom01/485 new file mode 100644 index 0000000..b3e10be Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/485 differ diff --git a/packages/gdcmvtk/data/dicom01/486 b/packages/gdcmvtk/data/dicom01/486 new file mode 100644 index 0000000..d06748b Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/486 differ diff --git a/packages/gdcmvtk/data/dicom01/487 b/packages/gdcmvtk/data/dicom01/487 new file mode 100644 index 0000000..23edca0 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/487 differ diff --git a/packages/gdcmvtk/data/dicom01/488 b/packages/gdcmvtk/data/dicom01/488 new file mode 100644 index 0000000..78e7b63 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/488 differ diff --git a/packages/gdcmvtk/data/dicom01/489 b/packages/gdcmvtk/data/dicom01/489 new file mode 100644 index 0000000..dcc4846 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/489 differ diff --git a/packages/gdcmvtk/data/dicom01/490 b/packages/gdcmvtk/data/dicom01/490 new file mode 100644 index 0000000..0ca03f6 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/490 differ diff --git a/packages/gdcmvtk/data/dicom01/491 b/packages/gdcmvtk/data/dicom01/491 new file mode 100644 index 0000000..db80f36 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/491 differ diff --git a/packages/gdcmvtk/data/dicom01/492 b/packages/gdcmvtk/data/dicom01/492 new file mode 100644 index 0000000..c3ddf9e Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/492 differ diff --git a/packages/gdcmvtk/data/dicom01/493 b/packages/gdcmvtk/data/dicom01/493 new file mode 100644 index 0000000..5584047 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/493 differ diff --git a/packages/gdcmvtk/data/dicom01/494 b/packages/gdcmvtk/data/dicom01/494 new file mode 100644 index 0000000..2643496 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/494 differ diff --git a/packages/gdcmvtk/data/dicom01/495 b/packages/gdcmvtk/data/dicom01/495 new file mode 100644 index 0000000..0c4622c Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/495 differ diff --git a/packages/gdcmvtk/data/dicom01/496 b/packages/gdcmvtk/data/dicom01/496 new file mode 100644 index 0000000..30b1b8a Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/496 differ diff --git a/packages/gdcmvtk/data/dicom01/497 b/packages/gdcmvtk/data/dicom01/497 new file mode 100644 index 0000000..5f300e2 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/497 differ diff --git a/packages/gdcmvtk/data/dicom01/498 b/packages/gdcmvtk/data/dicom01/498 new file mode 100644 index 0000000..6e6f1de Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/498 differ diff --git a/packages/gdcmvtk/data/dicom01/499 b/packages/gdcmvtk/data/dicom01/499 new file mode 100644 index 0000000..f01f1af Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/499 differ diff --git a/packages/gdcmvtk/data/dicom01/500 b/packages/gdcmvtk/data/dicom01/500 new file mode 100644 index 0000000..6071501 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/500 differ diff --git a/packages/gdcmvtk/data/dicom01/501 b/packages/gdcmvtk/data/dicom01/501 new file mode 100644 index 0000000..1c9f55f Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/501 differ diff --git a/packages/gdcmvtk/data/dicom01/502 b/packages/gdcmvtk/data/dicom01/502 new file mode 100644 index 0000000..b758568 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/502 differ diff --git a/packages/gdcmvtk/data/dicom01/503 b/packages/gdcmvtk/data/dicom01/503 new file mode 100644 index 0000000..596e7fa Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/503 differ diff --git a/packages/gdcmvtk/data/dicom01/504 b/packages/gdcmvtk/data/dicom01/504 new file mode 100644 index 0000000..366a8d5 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/504 differ diff --git a/packages/gdcmvtk/data/dicom01/505 b/packages/gdcmvtk/data/dicom01/505 new file mode 100644 index 0000000..56fc863 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/505 differ diff --git a/packages/gdcmvtk/data/dicom01/506 b/packages/gdcmvtk/data/dicom01/506 new file mode 100644 index 0000000..97ccd7d Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/506 differ diff --git a/packages/gdcmvtk/data/dicom01/507 b/packages/gdcmvtk/data/dicom01/507 new file mode 100644 index 0000000..45cb3f7 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/507 differ diff --git a/packages/gdcmvtk/data/dicom01/508 b/packages/gdcmvtk/data/dicom01/508 new file mode 100644 index 0000000..e0108b8 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/508 differ diff --git a/packages/gdcmvtk/data/dicom01/509 b/packages/gdcmvtk/data/dicom01/509 new file mode 100644 index 0000000..c6fd3d8 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/509 differ diff --git a/packages/gdcmvtk/data/dicom01/510 b/packages/gdcmvtk/data/dicom01/510 new file mode 100644 index 0000000..3b965e6 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/510 differ diff --git a/packages/gdcmvtk/data/dicom01/511 b/packages/gdcmvtk/data/dicom01/511 new file mode 100644 index 0000000..bb2ff00 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/511 differ diff --git a/packages/gdcmvtk/data/dicom01/512 b/packages/gdcmvtk/data/dicom01/512 new file mode 100644 index 0000000..18f9973 Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/512 differ diff --git a/packages/gdcmvtk/data/dicom01/513 b/packages/gdcmvtk/data/dicom01/513 new file mode 100644 index 0000000..85ddb9f Binary files /dev/null and b/packages/gdcmvtk/data/dicom01/513 differ diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx index 50dea74..87012ec 100644 --- a/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx +++ b/packages/gdcmvtk/src/bbgdcmvtkGetInfoGdcmReader.cxx @@ -99,7 +99,7 @@ void GetInfoGdcmReader::Process() reader->GetOutput(); vtkIndent indent ; - reader->GetOutput()->PrintSelf(std::cout, indent); +// reader->GetOutput()->PrintSelf(std::cout, indent); bbSetOutputOut( reader->GetOutput() ); } #endif diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx index 9d945b1..751c683 100644 --- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx +++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx @@ -210,8 +210,9 @@ void GetXCoherentInfoGdcmReader::Process() deIpp.GetValue().Print(ss); gdcm::Element ipp; ipp.Read( ss ); - for(i=0; i< 3; i++) + for(i=0; i< 3; i++){ v_ipp.push_back((float)(ipp[i])); + } // for 3 bbSetOutputIPP(v_ipp ); // Add *all the files* to the IPPsorter diff --git a/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_1.bbg b/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_1.bbg new file mode 100644 index 0000000..a2956e9 --- /dev/null +++ b/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_1.bbg @@ -0,0 +1,58 @@ +# ---------------------------------- +# - BBTKGEditor v 1.4 BBG BlackBox Diagram file +# - /tmpEED/creaTools2/creatools_source/bbtk/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_1.bbg +# ---------------------------------- + +APP_START +CATEGORY:example mesh +DESCRIPTION:LoadHola box example +AUTHOR:Info-dev at creatis.insa-lyon.fr +COMPLEXBOX:FALSE +COMPLEXINPUTS:0 +BOXES:5 +BOX +vtk:PolyDataReader:pdr +ISEXEC:FALSE +-42.643201:37.859821:-900.000000 +-3.143201:27.859821:-900.000000 +FIN_BOX +BOX +vtk:PolyDataToActor:pdActor +ISEXEC:FALSE +-43.231617:15.778483:-900.000000 +1.293383:5.778483:-900.000000 +FIN_BOX +BOX +wxvtk:Viewer3D:viewer +ISEXEC:TRUE +-58.052491:-20.642054:-900.000000 +5.667509:-30.642054:-900.000000 +FIN_BOX +BOX +std:Configuration:Box04 +ISEXEC:FALSE +-32.462694:83.943937:-900.000000 +6.962306:73.943937:-900.000000 +FIN_BOX +BOX +std:ConcatStrings:Box05 +ISEXEC:FALSE +-40.946976:65.422216:-900.000000 +-1.221976:55.422216:-900.000000 +PORT +In2:"/vtk/bunny.vtk" +FIN_BOX +CONNECTIONS:4 +CONNECTION +pdr:Out:pdActor:In +NumberOfControlPoints:0 +CONNECTION +pdActor:Out:viewer:In1 +NumberOfControlPoints:0 +CONNECTION +Box04:DataPath:Box05:In1 +NumberOfControlPoints:0 +CONNECTION +Box05:Out:pdr:In +NumberOfControlPoints:0 +APP_END diff --git a/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_1.bbs b/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_1.bbs index 3620221..0605209 100644 --- a/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_1.bbs +++ b/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_1.bbs @@ -1,49 +1,42 @@ -# --------------------------------------------------------------------- -# -# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image -# pour la SantÈ) -# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton -# Previous Authors : Laurent Guigues, Jean-Pierre Roux -# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil -# -# This software is governed by the CeCILL-B license under French law and -# abiding by the rules of distribution of free software. You can use, -# modify and/ or redistribute the software under the terms of the CeCILL-B -# license as circulated by CEA, CNRS and INRIA at the following URL -# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -# or in the file LICENSE.txt. -# -# As a counterpart to the access to the source code and rights to copy, -# modify and redistribute granted by the license, users are provided only -# with a limited warranty and the software's author, the holder of the -# economic rights, and the successive licensors have only limited -# liability. -# -# The fact that you are presently reading this means that you have had -# knowledge of the CeCILL-B license and that you accept its terms. -# ------------------------------------------------------------------------ */ +# ---------------------------------- +# - BBTKGEditor v 1.4 BBS BlackBox Script +# - /tmpEED/creaTools2/creatools_source/bbtk/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_1.bbs +# ---------------------------------- +# BBTK GEditor Script +# ---------------------- +include std +include itkvtk +include vtk +include wxvtk +include std -description "LoadHola box example" author "Info-dev at creatis.insa-lyon.fr" +description "LoadHola box example" category "example mesh" -load vtk -load wx -load wxvtk -load std +new vtk:PolyDataReader pdr + +new vtk:PolyDataToActor pdActor + +new wxvtk:Viewer3D viewer + +new std:Configuration Box04 + +new std:ConcatStrings Box05 + set Box05.In2 "/vtk/bunny.vtk" + + +connect pdr.Out pdActor.In + +connect pdActor.Out viewer.In1 -new FileSelector fileName - set fileName.Wildcard "*.vtk" +connect Box04.DataPath Box05.In1 -new PolyDataReader pdr - connect fileName.Out pdr.In +connect Box05.Out pdr.In -new PolyDataToActor pdActor - connect pdr.Out pdActor.In -new Viewer3D viewer - connect pdActor.Out viewer.In1 +# Complex input ports exec viewer diff --git a/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_2.bbg b/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_2.bbg new file mode 100644 index 0000000..d28e355 --- /dev/null +++ b/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_2.bbg @@ -0,0 +1,38 @@ +# ---------------------------------- +# - BBTKGEditor v 1.4 BBG BlackBox Diagram file +# - /tmpEED/creaTools2/creatools_source/bbtk/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_2.bbg +# ---------------------------------- + +APP_START +CATEGORY:example mesh +DESCRIPTION:LoadBunny_vtkPolyData box example +AUTHOR:Info-dev at creatis.insa-lyon.fr +COMPLEXBOX:FALSE +COMPLEXINPUTS:0 +BOXES:3 +BOX +vtk:LoadBunny_vtkPolyData:pdr +ISEXEC:FALSE +0.000000:70.000000:-900.000000 +47.075000:60.000000:-900.000000 +FIN_BOX +BOX +vtk:PolyDataToActor:pdActor +ISEXEC:FALSE +-7.244640:41.412518:-900.000000 +37.280360:31.412518:-900.000000 +FIN_BOX +BOX +wxvtk:Viewer3D:viewer +ISEXEC:TRUE +0.000000:10.000000:-900.000000 +63.720000:0.000000:-900.000000 +FIN_BOX +CONNECTIONS:2 +CONNECTION +pdr:Out:pdActor:In +NumberOfControlPoints:0 +CONNECTION +pdActor:Out:viewer:In1 +NumberOfControlPoints:0 +APP_END diff --git a/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_2.bbs b/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_2.bbs index 1601b7f..2f7d40e 100644 --- a/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_2.bbs +++ b/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_2.bbs @@ -1,49 +1,32 @@ -# --------------------------------------------------------------------- -# -# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image -# pour la SantÈ) -# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton -# Previous Authors : Laurent Guigues, Jean-Pierre Roux -# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil -# -# This software is governed by the CeCILL-B license under French law and -# abiding by the rules of distribution of free software. You can use, -# modify and/ or redistribute the software under the terms of the CeCILL-B -# license as circulated by CEA, CNRS and INRIA at the following URL -# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -# or in the file LICENSE.txt. -# -# As a counterpart to the access to the source code and rights to copy, -# modify and redistribute granted by the license, users are provided only -# with a limited warranty and the software's author, the holder of the -# economic rights, and the successive licensors have only limited -# liability. -# -# The fact that you are presently reading this means that you have had -# knowledge of the CeCILL-B license and that you accept its terms. -# ------------------------------------------------------------------------ */ +# ---------------------------------- +# - BBTKGEditor v 1.4 BBS BlackBox Script +# - /tmpEED/creaTools2/creatools_source/bbtk/packages/vtk/bbs/appli/exampleReadView_vtkPolyData_2.bbs +# ---------------------------------- +# BBTK GEditor Script +# ---------------------- +include std +include itkvtk +include vtk +include wxvtk -description "LoadBunny_vtkPolyData box example" author "Info-dev at creatis.insa-lyon.fr" +description "LoadBunny_vtkPolyData box example" category "example mesh" +new vtk:LoadBunny_vtkPolyData pdr + +new vtk:PolyDataToActor pdActor + +new wxvtk:Viewer3D viewer -load wx -load wxvtk -load std -include vtk -//new PolyDataReader pdr -// set pdr.In "/Users/davila/Borrame/Images/Helena/bunny.vtk" +connect pdr.Out pdActor.In -new LoadBunny_vtkPolyData pdr +connect pdActor.Out viewer.In1 -new PolyDataToActor pdActor - connect pdr.Out pdActor.In -new Viewer3D viewer - connect pdActor.Out viewer.In1 +# Complex input ports exec viewer diff --git a/packages/vtk/bbs/appli/exampleSave_vtkPolyData.bbg b/packages/vtk/bbs/appli/exampleSave_vtkPolyData.bbg new file mode 100644 index 0000000..3895ebd --- /dev/null +++ b/packages/vtk/bbs/appli/exampleSave_vtkPolyData.bbg @@ -0,0 +1,94 @@ +# ---------------------------------- +# - BBTKGEditor v 1.4 BBG BlackBox Diagram file +# - /tmpEED/creaTools2/creatools_source/bbtk/packages/vtk/bbs/appli/exampleSave_vtkPolyData.bbg +# ---------------------------------- + +APP_START +CATEGORY:example mesh +DESCRIPTION:Save a vtkPolyData example +AUTHOR:info-dev at creatis.insa-lyon.fr +COMPLEXBOX:FALSE +COMPLEXINPUTS:0 +BOXES:8 +BOX +vtk:LoadHola:reader +ISEXEC:FALSE +-64.799460:68.621288:-900.000000 +-28.549460:58.621288:-900.000000 +FIN_BOX +BOX +vtk:MarchingCubes:mc +ISEXEC:FALSE +-48.298304:41.378712:-900.000000 +-9.148304:31.378712:-900.000000 +PORT +Value:"1000" +FIN_BOX +BOX +wx:FileSelector:saveFileName +ISEXEC:FALSE +9.650983:40.331662:-900.000000 +54.950983:30.331662:-900.000000 +PORT +OpenSave:"Save" +FIN_BOX +BOX +vtk:PolyDataWriter:pdw +ISEXEC:FALSE +-67.600270:-21.034034:-900.000000 +-28.700270:-31.034034:-900.000000 +FIN_BOX +BOX +vtk:PolyDataToActor:pdActor +ISEXEC:FALSE +11.029695:-8.293965:-900.000000 +55.554695:-18.293965:-900.000000 +FIN_BOX +BOX +wxvtk:Viewer3D:viewer +ISEXEC:FALSE +-35.889896:-61.732067:-900.000000 +27.830104:-71.732067:-900.000000 +FIN_BOX +BOX +wx:CommandButton:button +ISEXEC:FALSE +-122.705360:20.288275:-900.000000 +-79.530360:10.288275:-900.000000 +PORT +Label:"Save vtkPolyData" +FIN_BOX +BOX +wx:LayoutSplit:main +ISEXEC:TRUE +-52.779117:-102.430101:-900.000000 +-13.699117:-112.430101:-900.000000 +PORT +Proportion:"90" +FIN_BOX +CONNECTIONS:8 +CONNECTION +reader:Out:mc:In +NumberOfControlPoints:0 +CONNECTION +saveFileName:Out:pdw:Filename +NumberOfControlPoints:0 +CONNECTION +mc:Out:pdw:In +NumberOfControlPoints:0 +CONNECTION +mc:Out:pdActor:In +NumberOfControlPoints:0 +CONNECTION +pdActor:Out:viewer:In1 +NumberOfControlPoints:0 +CONNECTION +button:BoxChange:pdw:BoxExecute +NumberOfControlPoints:0 +CONNECTION +viewer:Widget:main:Widget1 +NumberOfControlPoints:0 +CONNECTION +button:Widget:main:Widget2 +NumberOfControlPoints:0 +APP_END diff --git a/packages/vtk/bbs/appli/exampleSave_vtkPolyData.bbs b/packages/vtk/bbs/appli/exampleSave_vtkPolyData.bbs index 61ff88f..b3b0211 100644 --- a/packages/vtk/bbs/appli/exampleSave_vtkPolyData.bbs +++ b/packages/vtk/bbs/appli/exampleSave_vtkPolyData.bbs @@ -1,68 +1,59 @@ -# --------------------------------------------------------------------- -# -# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image -# pour la SantÈ) -# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton -# Previous Authors : Laurent Guigues, Jean-Pierre Roux -# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil -# -# This software is governed by the CeCILL-B license under French law and -# abiding by the rules of distribution of free software. You can use, -# modify and/ or redistribute the software under the terms of the CeCILL-B -# license as circulated by CEA, CNRS and INRIA at the following URL -# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -# or in the file LICENSE.txt. -# -# As a counterpart to the access to the source code and rights to copy, -# modify and redistribute granted by the license, users are provided only -# with a limited warranty and the software's author, the holder of the -# economic rights, and the successive licensors have only limited -# liability. -# -# The fact that you are presently reading this means that you have had -# knowledge of the CeCILL-B license and that you accept its terms. -# ------------------------------------------------------------------------ */ +# ---------------------------------- +# - BBTKGEditor v 1.4 BBS BlackBox Script +# - /tmpEED/creaTools2/creatools_source/bbtk/packages/vtk/bbs/appli/exampleSave_vtkPolyData.bbs +# ---------------------------------- +# BBTK GEditor Script +# ---------------------- + +include std +include itkvtk +include vtk +include wx +include wxvtk -description "Save a vtkPolyData example" author "info-dev at creatis.insa-lyon.fr" +description "Save a vtkPolyData example" category "example mesh" -load wx -load std -load vtk -load wxvtk +new vtk:LoadHola reader -include "vtk/boxes/bbLoadHola" -new LoadHola reader +new vtk:MarchingCubes mc + set mc.Value "1000" -new MarchingCubes mc - set mc.Value 1000 - connect reader.Out mc.In +new wx:FileSelector saveFileName + set saveFileName.OpenSave "Save" +new vtk:PolyDataWriter pdw -new FileSelector saveFileName - set saveFileName.OpenSave Save +new vtk:PolyDataToActor pdActor -new PolyDataWriter pdw - connect saveFileName.Out pdw.Filename - connect mc.Out pdw.In +new wxvtk:Viewer3D viewer -new PolyDataToActor pdActor - connect mc.Out pdActor.In +new wx:CommandButton button + set button.Label "Save vtkPolyData" -new Viewer3D viewer - connect pdActor.Out viewer.In1 +new wx:LayoutSplit main + set main.Proportion "90" -new CommandButton button - set button.Label "Save vtkPolyData" - connect button.BoxChange pdw.BoxExecute -new LayoutSplit main - set main.Proportion 90 - connect viewer.Widget main.Widget1 - connect button.Widget main.Widget2 +connect reader.Out mc.In -exec main +connect saveFileName.Out pdw.Filename + +connect mc.Out pdw.In +connect mc.Out pdActor.In +connect pdActor.Out viewer.In1 + +connect button.BoxChange pdw.BoxExecute + +connect viewer.Widget main.Widget1 + +connect button.Widget main.Widget2 + + + +# Complex input ports +exec main diff --git a/packages/wxvtk/bbs/appli/exampleDoubleSlicer.bbg b/packages/wxvtk/bbs/appli/exampleDoubleSlicer.bbg new file mode 100644 index 0000000..8f0aa7f --- /dev/null +++ b/packages/wxvtk/bbs/appli/exampleDoubleSlicer.bbg @@ -0,0 +1,179 @@ +# ---------------------------------- +# - BBTKGEditor v 1.4 BBG BlackBox Diagram file +# - /tmpEED/creaTools2/creatools_source/bbtk/packages/wxvtk/bbs/appli/exampleDoubleSlicer.bbg +# ---------------------------------- + +APP_START +CATEGORY: +DESCRIPTION:Simple viewer displaying the same slice of two images. The slice is controlled by a slider. See exampleDoubleSlicer.bbs. +AUTHOR:laurent.guigues at creatis.insa-lyon.fr +COMPLEXBOX:TRUE +COMPLEXBOXNAME:DoubleSlicer +PACKAGENAME:wxvtk +COMPLEXOUTPUTS:1 +COMPLEX_PORT +Widget +114.692614:-148.835476:-900.000000 +FIN_COMPLEX_PORT +COMPLEXINPUTS:11 +COMPLEX_PORT +In1 +113.645640:101.221236:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +In2 +-23.203486:97.557528:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +WinDialog +175.787320:91.451347:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +WinTitle +226.397938:91.451347:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +WinWidth +252.583834:92.672583:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +WinHeight +200.000000:100.000000:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +Orientation +-99.503468:98.965966:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +RefreshSlicer1 +86.989011:98.965966:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +RefreshSlicer2 +10.496359:92.061965:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +BoxProcessModeSlicer1 +101.407769:98.778764:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +BoxProcessModeSlicer2 +-58.644844:96.336292:-900.000000 +FIN_COMPLEX_PORT +BOXES:7 +BOX +wx:LayoutSplit:main +ISEXEC:TRUE +90.617386:-106.093473:-900.000000 +129.697386:-116.093473:-900.000000 +PORT +Proportion:"80" +FIN_BOX +BOX +wx:LayoutLine:slicers +ISEXEC:FALSE +5.679546:-77.487776:-900.000000 +63.239546:-87.487776:-900.000000 +PORT +Orientation:"HORIZONTAL" +FIN_BOX +BOX +wxvtk:Viewer2D:slicer1 +ISEXEC:FALSE +80.764708:-7.676600:-900.000000 +119.844708:-17.676600:-900.000000 +FIN_BOX +BOX +wxvtk:Viewer2D:slicer2 +ISEXEC:FALSE +-18.360331:-0.894079:-900.000000 +20.719669:-10.894079:-900.000000 +FIN_BOX +BOX +wx:Slider:slider +ISEXEC:FALSE +33.020789:74.281715:-900.000000 +84.420789:64.281715:-900.000000 +PORT +Title:"Slice" +FIN_BOX +BOX +std:MultipleInputs:refresh1 +ISEXEC:FALSE +56.039503:38.668844:-900.000000 +97.539503:28.668844:-900.000000 +FIN_BOX +BOX +std:MultipleInputs:refresh2 +ISEXEC:FALSE +-5.624910:34.913382:-900.000000 +35.875090:24.913382:-900.000000 +FIN_BOX +CONNECTIONS:22 +CONNECTION +slicers:Widget:main:Widget1 +NumberOfControlPoints:0 +CONNECTION +slicer1:Widget:slicers:Widget1 +NumberOfControlPoints:0 +CONNECTION +slicer2:Widget:slicers:Widget2 +NumberOfControlPoints:0 +CONNECTION +slider:Widget:main:Widget2 +NumberOfControlPoints:0 +CONNECTION +slider:Out:slicer1:Slice +NumberOfControlPoints:0 +CONNECTION +slider:Out:slicer2:Slice +NumberOfControlPoints:0 +CONNECTION +refresh1:Out:slicer1:BoxExecute +NumberOfControlPoints:0 +CONNECTION +refresh2:Out:slicer2:BoxExecute +NumberOfControlPoints:0 +CONNECTION +slider:BoxChange:refresh2:In1 +NumberOfControlPoints:0 +CONNECTION +slider:BoxChange:refresh1:In1 +NumberOfControlPoints:0 +CONNECTION +In1:In1:slicer1:In +NumberOfControlPoints:0 +CONNECTION +In2:In2:slicer2:In +NumberOfControlPoints:0 +CONNECTION +WinDialog:WinDialog:main:WinDialog +NumberOfControlPoints:0 +CONNECTION +WinTitle:WinTitle:main:WinTitle +NumberOfControlPoints:0 +CONNECTION +WinWidth:WinWidth:main:WinWidth +NumberOfControlPoints:0 +CONNECTION +WinHeight:WinHeight:main:WinHeight +NumberOfControlPoints:0 +CONNECTION +Orientation:Orientation:slicers:Orientation +NumberOfControlPoints:0 +CONNECTION +RefreshSlicer1:RefreshSlicer1:refresh1:In2 +NumberOfControlPoints:0 +CONNECTION +RefreshSlicer2:RefreshSlicer2:refresh2:In2 +NumberOfControlPoints:0 +CONNECTION +BoxProcessModeSlicer1:BoxProcessModeSlicer1:slicer1:BoxProcessMode +NumberOfControlPoints:0 +CONNECTION +BoxProcessModeSlicer2:BoxProcessModeSlicer2:slicer2:BoxProcessMode +NumberOfControlPoints:0 +CONNECTION +main:Widget:Widget:Widget +NumberOfControlPoints:0 +APP_END diff --git a/packages/wxvtk/bbs/appli/exampleDoubleSlicer.bbs b/packages/wxvtk/bbs/appli/exampleDoubleSlicer.bbs index f16bdd9..f794ae8 100644 --- a/packages/wxvtk/bbs/appli/exampleDoubleSlicer.bbs +++ b/packages/wxvtk/bbs/appli/exampleDoubleSlicer.bbs @@ -1,48 +1,66 @@ - # --------------------------------------------------------------------- - # - # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image - # pour la SantÈ) - # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton - # Previous Authors : Laurent Guigues, Jean-Pierre Roux - # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil - # - # This software is governed by the CeCILL-B license under French law and - # abiding by the rules of distribution of free software. You can use, - # modify and/ or redistribute the software under the terms of the CeCILL-B - # license as circulated by CEA, CNRS and INRIA at the following URL - # http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html - # or in the file LICENSE.txt. - # - # As a counterpart to the access to the source code and rights to copy, - # modify and redistribute granted by the license, users are provided only - # with a limited warranty and the software's author, the holder of the - # economic rights, and the successive licensors have only limited - # liability. - # - # The fact that you are presently reading this means that you have had - # knowledge of the CeCILL-B license and that you accept its terms. - # ------------------------------------------------------------------------ */ - - -description "Demo of the box DoubleSlicer." +# ---------------------------------- +# - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box) +# - /tmpEED/creaTools2/creatools_source/bbtk/packages/wxvtk/bbs/appli/exampleDoubleSlicer.bbs +# ---------------------------------- + +include std +include itkvtk +include wx +include wxvtk +include std + +define DoubleSlicer wxvtk + author "laurent.guigues at creatis.insa-lyon.fr" -category "example" +description "Simple viewer displaying the same slice of two images. The slice is controlled by a slider. See exampleDoubleSlicer.bbs." + +category "" + +new wx:LayoutSplit main + set main.Proportion "80" + +new wx:LayoutLine slicers + set slicers.Orientation "HORIZONTAL" + +new wxvtk:Viewer2D slicer1 + +new wxvtk:Viewer2D slicer2 + +new wx:Slider slider + set slider.Title "Slice" + +new std:MultipleInputs refresh1 + +new std:MultipleInputs refresh2 -include vtk/boxes/bbLoadHola -include wxvtk/boxes/bbDoubleSlicer -new LoadHola reader1 -new LoadHola reader2 -new DoubleSlicer viewer +connect slicers.Widget main.Widget1 +connect slicer1.Widget slicers.Widget1 +connect slicer2.Widget slicers.Widget2 +connect slider.Widget main.Widget2 +connect slider.Out slicer1.Slice +connect slider.Out slicer2.Slice +connect refresh1.Out slicer1.BoxExecute +connect refresh2.Out slicer2.BoxExecute +connect slider.BoxChange refresh2.In1 +connect slider.BoxChange refresh1.In1 -connect reader1.Out viewer.In1 -connect reader2.Out viewer.In2 +# Complex input ports +input In1 slicer1.In " " +input In2 slicer2.In " " +input WinDialog main.WinDialog " " +input WinTitle main.WinTitle " " +input WinWidth main.WinWidth " " +input WinHeight main.WinHeight " " +input Orientation slicers.Orientation " " +input RefreshSlicer1 refresh1.In2 " " +input RefreshSlicer2 refresh2.In2 " " +input BoxProcessModeSlicer1 slicer1.BoxProcessMode " " +input BoxProcessModeSlicer2 slicer2.BoxProcessMode " " -load std -set viewer.WinTitle "ExampleDoubleSlicer" -set viewer.WinWidth 600 -set viewer.WinHeight 400 -set viewer.Orientation 0 +# Complex output ports +output Widget main.Widget " " -exec viewer +exec main +endefine diff --git a/packages/wxvtk/bbs/appli/exampleViewer2D.bbg b/packages/wxvtk/bbs/appli/exampleViewer2D.bbg new file mode 100644 index 0000000..a75099a --- /dev/null +++ b/packages/wxvtk/bbs/appli/exampleViewer2D.bbg @@ -0,0 +1,57 @@ +# ---------------------------------- +# - BBTKGEditor v 1.4 BBG BlackBox Diagram file +# - /tmpEED/creaTools2/creatools_source/bbtk/packages/wxvtk/bbs/appli/exampleViewer2D.bbg +# ---------------------------------- + +APP_START +CATEGORY:example +DESCRIPTION:Example of the box Viewer2D. +AUTHOR:laurent.guigues@creatis.insa-lyon.fr +COMPLEXBOX:FALSE +COMPLEXINPUTS:0 +BOXES:4 +BOX +vtk:LoadHola:reader +ISEXEC:FALSE +-64.740416:33.745367:-900.000000 +-28.490416:23.745367:-900.000000 +FIN_BOX +BOX +wxvtk:Viewer2D:viewer +ISEXEC:FALSE +-60.449491:0.214071:-900.000000 +-21.369491:-9.785929:-900.000000 +PORT +Slice:"20" +FIN_BOX +BOX +wx:Slider:Box02 +ISEXEC:FALSE +-6.120912:33.429597:-900.000000 +45.279088:23.429597:-900.000000 +FIN_BOX +BOX +wx:LayoutSplit:Box03 +ISEXEC:TRUE +-30.369141:-30.133721:-900.000000 +8.710859:-40.133721:-900.000000 +PORT +Proportion:"90" +FIN_BOX +CONNECTIONS:5 +CONNECTION +reader:Out:viewer:In +NumberOfControlPoints:0 +CONNECTION +viewer:Widget:Box03:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box02:Widget:Box03:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box02:Out:viewer:Slice +NumberOfControlPoints:0 +CONNECTION +Box02:BoxChange:viewer:BoxExecute +NumberOfControlPoints:0 +APP_END diff --git a/packages/wxvtk/bbs/appli/exampleViewer2D.bbs b/packages/wxvtk/bbs/appli/exampleViewer2D.bbs index 74e1087..2ff41ff 100644 --- a/packages/wxvtk/bbs/appli/exampleViewer2D.bbs +++ b/packages/wxvtk/bbs/appli/exampleViewer2D.bbs @@ -1,42 +1,43 @@ - # --------------------------------------------------------------------- - # - # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image - # pour la SantÈ) - # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton - # Previous Authors : Laurent Guigues, Jean-Pierre Roux - # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil - # - # This software is governed by the CeCILL-B license under French law and - # abiding by the rules of distribution of free software. You can use, - # modify and/ or redistribute the software under the terms of the CeCILL-B - # license as circulated by CEA, CNRS and INRIA at the following URL - # http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html - # or in the file LICENSE.txt. - # - # As a counterpart to the access to the source code and rights to copy, - # modify and redistribute granted by the license, users are provided only - # with a limited warranty and the software's author, the holder of the - # economic rights, and the successive licensors have only limited - # liability. - # - # The fact that you are presently reading this means that you have had - # knowledge of the CeCILL-B license and that you accept its terms. - # ------------------------------------------------------------------------ */ +# ---------------------------------- +# - BBTKGEditor v 1.4 BBS BlackBox Script +# - /tmpEED/creaTools2/creatools_source/bbtk/packages/wxvtk/bbs/appli/exampleViewer2D.bbs +# ---------------------------------- +# BBTK GEditor Script +# ---------------------- + +include std +include itkvtk +include vtk +include wxvtk +include wx -description "Example of the box Viewer2D." author "laurent.guigues@creatis.insa-lyon.fr" +description "Example of the box Viewer2D." category "example" -include vtk/boxes/bbLoadHola -load wxvtk +new vtk:LoadHola reader + +new wxvtk:Viewer2D viewer + set viewer.Slice "20" + +new wx:Slider Box02 + +new wx:LayoutSplit Box03 + set Box03.Proportion "90" + -new LoadHola reader -new Viewer2D viewer connect reader.Out viewer.In -# To get the string to int adaptor and set the slice -load std -set viewer.Slice 20 +connect viewer.Widget Box03.Widget1 + +connect Box02.Widget Box03.Widget2 + +connect Box02.Out viewer.Slice + +connect Box02.BoxChange viewer.BoxExecute + + -exec viewer +# Complex input ports +exec Box03 diff --git a/packages/wxvtk/src/wxvtkImageViewer2.cxx b/packages/wxvtk/src/wxvtkImageViewer2.cxx index dc3dcfc..0e96065 100644 --- a/packages/wxvtk/src/wxvtkImageViewer2.cxx +++ b/packages/wxvtk/src/wxvtkImageViewer2.cxx @@ -379,7 +379,7 @@ void wxvtkImageViewer2::UpdateOrientation() cam->SetFocalPoint(0,0,0); break; } - + /* switch (this->SliceOrientation) { @@ -468,9 +468,7 @@ void wxvtkImageViewer2::UpdateDisplayExtent() this->InteractorStyle->GetAutoAdjustCameraClippingRange()) { this->Renderer->ResetCameraClippingRange(); - } - else - { + } else { vtkCamera *cam = this->Renderer->GetActiveCamera(); if (cam) { @@ -485,9 +483,9 @@ void wxvtkImageViewer2::UpdateDisplayExtent() spacing[2]; // JPR?? cam->SetClippingRange( range - avg_spacing * 3.0, range + avg_spacing * 3.0); - } - } - } + } // if cam + } // if InteractorStyle + } // if Renderer } //---------------------------------------------------------------------------- @@ -704,6 +702,7 @@ void wxvtkImageViewer2::InstallPipeline() #if VTK_MAJOR_VERSION <= 5 this->ImageActor->SetInput(this->WindowLevel->GetOutput()); #else + this->WindowLevel->Update(); this->ImageActor->SetInputData(this->WindowLevel->GetOutput()); #endif }