#3472 merge vtk8itk5wx3-mingw64

diff --git a/packages/toolsbbtk/bbs/boxes/imageItkPropertiesWidget.bbg b/packages/toolsbbtk/bbs/boxes/imageItkPropertiesWidget.bbg
index b02708aae9300e03cf491a3e187ca3fa64f3cac5..c9b13c73299e70f257f5c40f9eaf03be863735b0 100644 (file)
--- a/packages/toolsbbtk/bbs/boxes/imageItkPropertiesWidget.bbg
+++ b/packages/toolsbbtk/bbs/boxes/imageItkPropertiesWidget.bbg
@@ -1,32 +1,6 @@
-# ---------------------------------------------------------------------
-#
-# 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.2 BBG BlackBox Diagram file
-# - /Users/davila/Creatis/All3/creatools_source/bbtk/packages/toolsbbtk/bbs/boxes/imageItkPropertiesWidget.bbg
+# - BBTKGEditor v 1.4 BBG BlackBox Diagram file
+# - /home/davila/Creatis/C10/creatools_source/bbtk/packages/toolsbbtk/bbs/boxes/imageItkPropertiesWidget.bbg
 # ----------------------------------
 
 APP_START
@@ -36,104 +10,162 @@ AUTHOR:Author ??
 COMPLEXBOX:TRUE
 COMPLEXBOXNAME:ImageItkPropertiesWidget
 PACKAGENAME:toolsbbtk
-COMPLEXINPUTS:1
-COMPLEX_PORT
-in
--80.663770:148.604993:900.000000
-FIN_COMPLEX_PORT
-COMPLEXOUTPUTS:7
+COMPLEXOUTPUTS:8
 COMPLEX_PORT
 widget
--142.967861:-58.247376:900.000000
+-142.967861:-58.247376:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Dimensions
--124.883681:-57.175644:900.000000
+-124.883681:-57.175644:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Index
--108.940640:-56.720128:900.000000
+-108.940640:-56.720128:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 MinMax
--92.628104:-54.898845:900.000000
+-92.628104:-54.898845:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Size
--81.734224:-56.500886:900.000000
+-55.578467:-54.074063:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Spacing
--70.199528:-56.180478:900.000000
+-38.111538:-54.967067:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 TypeName
--57.383199:-56.821294:900.000000
+-25.564856:-54.529295:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+origin
+-75.421485:-52.421824:-900.000000
+FIN_COMPLEX_PORT
+COMPLEXINPUTS:2
+COMPLEX_PORT
+in
+-80.663770:148.604993:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+FileName
+-13.739739:147.116939:-900.000000
 FIN_COMPLEX_PORT
-BOXES:8
+BOXES:14
 BOX
 itk:ImageProperties:Box00
 ISEXEC:FALSE
--86.392715:120.167267:900.000000
--40.817715:110.167267:900.000000
+-86.392715:120.167267:-900.000000
+-44.192715:110.167267:-900.000000
 FIN_BOX
 BOX
 wx:OutputText:Box02
 ISEXEC:FALSE
--348.493528:57.422012:900.000000
--302.918528:47.422012:900.000000
+-348.493528:57.422012:-900.000000
+-311.718528:47.422012:-900.000000
 PORT
 Title:"Dimension"
 FIN_BOX
 BOX
 wx:OutputText:Box14
 ISEXEC:FALSE
--306.197846:44.988878:900.000000
--260.622846:34.988878:900.000000
+-306.197846:44.988878:-900.000000
+-269.422846:34.988878:-900.000000
 PORT
 Title:"Index"
 FIN_BOX
 BOX
 wx:LayoutLine:Box15
 ISEXEC:FALSE
--196.596247:-31.096236:900.000000
--139.036247:-41.096236:900.000000
+-196.596247:-31.096236:-900.000000
+-139.036247:-41.096236:-900.000000
 PORT
 WinTitle:"Image Properties"
 FIN_BOX
 BOX
 wx:OutputText:Box17
 ISEXEC:FALSE
--262.616712:54.641899:900.000000
--217.041712:44.641899:900.000000
+-262.616712:54.641899:-900.000000
+-225.841712:44.641899:-900.000000
 PORT
 Title:"Size"
 FIN_BOX
 BOX
 wx:OutputText:Box20
 ISEXEC:FALSE
--232.876715:39.300084:900.000000
--187.301715:29.300084:900.000000
+-232.876715:39.300084:-900.000000
+-196.101715:29.300084:-900.000000
 PORT
 Title:"Spacing"
 FIN_BOX
 BOX
 wx:OutputText:Box22
 ISEXEC:FALSE
--191.029461:30.782065:900.000000
--145.454461:20.782065:900.000000
+-191.029461:30.782065:-900.000000
+-154.254461:20.782065:-900.000000
 PORT
 Title:"TypeName"
 FIN_BOX
 BOX
 wx:OutputText:Box26
 ISEXEC:FALSE
--166.067448:13.413901:900.000000
--120.492448:3.413901:900.000000
+-154.877098:-1.551506:-900.000000
+-118.102098:-11.551506:-900.000000
 PORT
 Title:"Min Max"
 FIN_BOX
-CONNECTIONS:20
+BOX
+wx:OutputText:Box09
+ISEXEC:FALSE
+-174.515204:12.516260:-900.000000
+-137.740204:2.516260:-900.000000
+PORT
+Title:"Origin"
+FIN_BOX
+BOX
+std:ConcatStrings:Box10
+ISEXEC:FALSE
+-15.155386:29.281210:-900.000000
+24.569614:19.281210:-900.000000
+PORT
+In2:"  "
+PORT
+In4:"  "
+FIN_BOX
+BOX
+std:GetVectorDoubleElement:Box11
+ISEXEC:FALSE
+-11.582563:52.605674:-900.000000
+39.467437:42.605674:-900.000000
+PORT
+I:"0"
+FIN_BOX
+BOX
+std:GetVectorDoubleElement:Box12
+ISEXEC:FALSE
+8.417437:72.605674:-900.000000
+59.467437:62.605674:-900.000000
+PORT
+I:"1"
+FIN_BOX
+BOX
+std:GetVectorDoubleElement:Box13
+ISEXEC:FALSE
+28.417437:92.605674:-900.000000
+79.467437:82.605674:-900.000000
+PORT
+I:"2"
+FIN_BOX
+BOX
+wx:OutputText:Box16
+ISEXEC:FALSE
+-141.887920:-15.796672:-900.000000
+-105.112920:-25.796672:-900.000000
+PORT
+Title:"Name"
+FIN_BOX
+CONNECTIONS:31
 CONNECTION
 Box00:Dimension:Box02:In
 NumberOfControlPoints:0
@@ -174,9 +206,6 @@ CONNECTION
 Box22:Widget:Box15:Widget5
 NumberOfControlPoints:0
 CONNECTION
-Box26:Widget:Box15:Widget6
-NumberOfControlPoints:0
-CONNECTION
 Box00:Dimension:Dimensions:Dimensions
 NumberOfControlPoints:0
 CONNECTION
@@ -194,4 +223,40 @@ NumberOfControlPoints:0
 CONNECTION
 Box00:TypeName:TypeName:TypeName
 NumberOfControlPoints:0
+CONNECTION
+Box00:Origin:origin:origin
+NumberOfControlPoints:0
+CONNECTION
+Box09:Widget:Box15:Widget6
+NumberOfControlPoints:0
+CONNECTION
+Box00:Origin:Box13:In
+NumberOfControlPoints:0
+CONNECTION
+Box00:Origin:Box12:In
+NumberOfControlPoints:0
+CONNECTION
+Box00:Origin:Box11:In
+NumberOfControlPoints:0
+CONNECTION
+Box11:Out:Box10:In1
+NumberOfControlPoints:0
+CONNECTION
+Box12:Out:Box10:In3
+NumberOfControlPoints:0
+CONNECTION
+Box13:Out:Box10:In5
+NumberOfControlPoints:0
+CONNECTION
+Box10:Out:Box09:In
+NumberOfControlPoints:0
+CONNECTION
+Box26:Widget:Box15:Widget7
+NumberOfControlPoints:0
+CONNECTION
+Box16:Widget:Box15:Widget9
+NumberOfControlPoints:0
+CONNECTION
+FileName:FileName:Box16:In
+NumberOfControlPoints:0
 APP_END

diff --git a/packages/toolsbbtk/bbs/boxes/imageItkPropertiesWidget.bbs b/packages/toolsbbtk/bbs/boxes/imageItkPropertiesWidget.bbs
index 7650f62d09b0060dac6da454fc927be9ae2f15d0..801c6977daeba17d92ba64bb5bbae6f85bd5931f 100644 (file)
--- a/packages/toolsbbtk/bbs/boxes/imageItkPropertiesWidget.bbs
+++ b/packages/toolsbbtk/bbs/boxes/imageItkPropertiesWidget.bbs
@@ -1,38 +1,13 @@
-# ---------------------------------------------------------------------
-#
-# 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.2 BBS BlackBox Script (Complex Box)
-# - /Users/davila/Creatis/All3/creatools_source/bbtk/packages/toolsbbtk/bbs/boxes/imageItkPropertiesWidget.bbs
+# - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
+# - /home/davila/Creatis/C10/creatools_source/bbtk/packages/toolsbbtk/bbs/boxes/imageItkPropertiesWidget.bbs
 # ----------------------------------
 
 include std
 include itkvtk
 include itk
 include wx
+include std
 
 define ImageItkPropertiesWidget toolsbbtk
 
@@ -41,29 +16,48 @@ description "Description ??"
 
 category "<VOID>"
 
-new ImageProperties Box00
+new itk:ImageProperties Box00
 
-new OutputText Box02
+new wx:OutputText Box02
   set Box02.Title "Dimension"
 
-new OutputText Box14
+new wx:OutputText Box14
   set Box14.Title "Index"
 
-new LayoutLine Box15
+new wx:LayoutLine Box15
   set Box15.WinTitle "Image Properties"
 
-new OutputText Box17
+new wx:OutputText Box17
   set Box17.Title "Size"
 
-new OutputText Box20
+new wx:OutputText Box20
   set Box20.Title "Spacing"
 
-new OutputText Box22
+new wx:OutputText Box22
   set Box22.Title "TypeName"
 
-new OutputText Box26
+new wx:OutputText Box26
   set Box26.Title "Min Max"
 
+new wx:OutputText Box09
+  set Box09.Title "Origin"
+
+new std:ConcatStrings Box10
+  set Box10.In2 "  "
+  set Box10.In4 "  "
+
+new std:GetVectorDoubleElement Box11
+  set Box11.I "0"
+
+new std:GetVectorDoubleElement Box12
+  set Box12.I "1"
+
+new std:GetVectorDoubleElement Box13
+  set Box13.I "2"
+
+new wx:OutputText Box16
+  set Box16.Title "Name"
+
 
 connect Box00.Dimension Box02.In
 connect Box00.Index Box14.In
@@ -76,11 +70,20 @@ connect Box14.Widget Box15.Widget2
 connect Box17.Widget Box15.Widget3
 connect Box20.Widget Box15.Widget4
 connect Box22.Widget Box15.Widget5
-connect Box26.Widget Box15.Widget6
-
+connect Box09.Widget Box15.Widget6
+connect Box00.Origin Box13.In
+connect Box00.Origin Box12.In
+connect Box00.Origin Box11.In
+connect Box11.Out Box10.In1
+connect Box12.Out Box10.In3
+connect Box13.Out Box10.In5
+connect Box10.Out Box09.In
+connect Box26.Widget Box15.Widget7
+connect Box16.Widget Box15.Widget9
 
 # Complex input ports
 input in Box00.In " "
+input FileName Box16.In " "
 
 # Complex output ports
 output widget Box15.Widget " "
@@ -90,5 +93,7 @@ output MinMax Box00.MinMax " "
 output Size Box00.Size " "
 output Spacing Box00.Spacing " "
 output TypeName Box00.TypeName " "
+output origin Box00.Origin " "
+
 
 endefine

diff --git a/packages/toolsbbtk/bbs/boxes/imageVtkPropertiesWidget.bbg b/packages/toolsbbtk/bbs/boxes/imageVtkPropertiesWidget.bbg
index 9666d1c03c8f0dae9aef2fa0b34d74d925063e82..a8242ab9e0ff91b63cf4124c8dda33bf983d7fa6 100644 (file)
--- a/packages/toolsbbtk/bbs/boxes/imageVtkPropertiesWidget.bbg
+++ b/packages/toolsbbtk/bbs/boxes/imageVtkPropertiesWidget.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - imageVtkPropertiesWidget.bbg
+# - /home/davila/Creatis/C10/creatools_source/bbtk/packages/toolsbbtk/bbs/boxes/imageVtkPropertiesWidget.bbg
 # ----------------------------------
 
 APP_START
@@ -10,7 +10,7 @@ AUTHOR:Author ??
 COMPLEXBOX:TRUE
 COMPLEXBOXNAME:ImageVtkPropertiesWidget
 PACKAGENAME:toolsbbtk
-COMPLEXOUTPUTS:6
+COMPLEXOUTPUTS:7
 COMPLEX_PORT
 widget
 3.333144:-72.520645:-900.000000
@@ -25,15 +25,19 @@ MinMax
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Size
-64.566781:-70.774155:-900.000000
+76.763110:-69.490331:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Spacing
-76.101477:-70.453747:-900.000000
+87.976850:-69.972313:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 TypeName
-88.917806:-71.094563:-900.000000
+98.867443:-69.650261:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+origin
+65.467976:-67.826409:-900.000000
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:3
 COMPLEX_PORT
@@ -48,12 +52,12 @@ COMPLEX_PORT
 boxExecute
 -92.186317:150.079323:-900.000000
 FIN_COMPLEX_PORT
-BOXES:10
+BOXES:15
 BOX
 wx:OutputText:Box02
 ISEXEC:FALSE
 -173.282353:46.940241:-900.000000
--127.707353:36.940241:-900.000000
+-136.507353:36.940241:-900.000000
 PORT
 Title:"Dimensions"
 FIN_BOX
@@ -61,7 +65,7 @@ BOX
 wx:OutputText:Box17
 ISEXEC:FALSE
 -81.960343:34.681383:-900.000000
--36.385343:24.681383:-900.000000
+-45.185343:24.681383:-900.000000
 PORT
 Title:"Size"
 FIN_BOX
@@ -69,7 +73,7 @@ BOX
 wx:OutputText:Box20
 ISEXEC:FALSE
 -52.452230:20.761380:-900.000000
--6.877230:10.761380:-900.000000
+-15.677230:10.761380:-900.000000
 PORT
 Title:"Spacing"
 FIN_BOX
@@ -77,7 +81,7 @@ BOX
 wx:OutputText:Box22
 ISEXEC:FALSE
 -33.844911:1.230494:-900.000000
-11.730089:-8.769506:-900.000000
+2.930089:-8.769506:-900.000000
 PORT
 Title:"TypeName"
 FIN_BOX
@@ -85,7 +89,7 @@ BOX
 wx:OutputText:Box26
 ISEXEC:FALSE
 -128.670557:28.919600:-900.000000
--83.095557:18.919600:-900.000000
+-91.895557:18.919600:-900.000000
 PORT
 Title:"Min Max"
 FIN_BOX
@@ -93,29 +97,29 @@ BOX
 vtk:ImageVtkProperties:Box09
 ISEXEC:FALSE
 14.396297:109.880107:-900.000000
-59.971297:99.880107:-900.000000
+59.746297:99.880107:-900.000000
 FIN_BOX
 BOX
 wx:OutputText:Box10
 ISEXEC:FALSE
 -196.439793:65.504307:-900.000000
--150.584398:55.504307:-900.000000
+-159.664793:55.504307:-900.000000
 PORT
 Title:"Components"
 FIN_BOX
 BOX
 wx:LayoutLine:Box11
 ISEXEC:FALSE
--69.746079:-39.358124:-900.000000
--12.186079:-49.358124:-900.000000
+-57.992403:-49.764245:-900.000000
+-0.432403:-59.764245:-900.000000
 PORT
 WinTitle:"Image properties"
 FIN_BOX
 BOX
 wx:OutputText:Box13
 ISEXEC:FALSE
--27.886899:-16.541426:-900.000000
-17.688101:-26.541426:-900.000000
+8.178439:-32.145808:-900.000000
+44.953439:-42.145808:-900.000000
 PORT
 Title:"Name"
 FIN_BOX
@@ -123,9 +127,51 @@ BOX
 std:MagicBox:Box14
 ISEXEC:FALSE
 -98.823731:125.742136:-900.000000
--53.248731:115.742136:-900.000000
+-62.748731:115.742136:-900.000000
+FIN_BOX
+BOX
+wx:OutputText:Box15
+ISEXEC:FALSE
+-27.670236:-19.010277:-900.000000
+9.104764:-29.010277:-900.000000
+PORT
+Title:"Origin"
+FIN_BOX
+BOX
+std:ConcatStrings:Box16
+ISEXEC:FALSE
+113.399842:22.194464:-900.000000
+153.124842:12.194464:-900.000000
+PORT
+In2:"  "
+PORT
+In4:"  "
+FIN_BOX
+BOX
+std:GetVectorDoubleElement:Box18
+ISEXEC:FALSE
+77.073454:52.393509:-900.000000
+128.123454:42.393509:-900.000000
+PORT
+I:"0"
+FIN_BOX
+BOX
+std:GetVectorDoubleElement:Box19
+ISEXEC:FALSE
+94.301561:68.016836:-900.000000
+145.351561:58.016836:-900.000000
+PORT
+I:"1"
+FIN_BOX
+BOX
+std:GetVectorDoubleElement:Box21
+ISEXEC:FALSE
+114.301561:88.016836:-900.000000
+165.351561:78.016836:-900.000000
+PORT
+I:"2"
 FIN_BOX
-CONNECTIONS:30
+CONNECTIONS:40
 CONNECTION
 Box09:Components:Box10:In
 NumberOfControlPoints:0
@@ -187,9 +233,6 @@ CONNECTION
 FileName:FileName:Box13:In
 NumberOfControlPoints:0
 CONNECTION
-Box13:Widget:Box11:Widget7
-NumberOfControlPoints:0
-CONNECTION
 boxExecute:boxExecute:Box14:In
 NumberOfControlPoints:0
 CONNECTION
@@ -216,4 +259,37 @@ NumberOfControlPoints:0
 CONNECTION
 Box14:Out:Box26:BoxExecute
 NumberOfControlPoints:0
+CONNECTION
+Box13:Widget:Box11:Widget9
+NumberOfControlPoints:0
+CONNECTION
+Box15:Widget:Box11:Widget7
+NumberOfControlPoints:0
+CONNECTION
+Box14:Out:Box15:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+Box09:Origin:Box18:In
+NumberOfControlPoints:0
+CONNECTION
+Box09:Origin:Box19:In
+NumberOfControlPoints:0
+CONNECTION
+Box09:Origin:Box21:In
+NumberOfControlPoints:0
+CONNECTION
+Box21:Out:Box16:In5
+NumberOfControlPoints:0
+CONNECTION
+Box18:Out:Box16:In1
+NumberOfControlPoints:0
+CONNECTION
+Box19:Out:Box16:In3
+NumberOfControlPoints:0
+CONNECTION
+Box16:Out:Box15:In
+NumberOfControlPoints:0
+CONNECTION
+Box09:Origin:origin:origin
+NumberOfControlPoints:0
 APP_END

diff --git a/packages/toolsbbtk/bbs/boxes/imageVtkPropertiesWidget.bbs b/packages/toolsbbtk/bbs/boxes/imageVtkPropertiesWidget.bbs
index d4e082047b818fbecd57fd41ceb20d78ec3e7c5b..472e5f774085c2be16e77138a9076240f9f7b48b 100644 (file)
--- a/packages/toolsbbtk/bbs/boxes/imageVtkPropertiesWidget.bbs
+++ b/packages/toolsbbtk/bbs/boxes/imageVtkPropertiesWidget.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - imageVtkPropertiesWidget.bbs
+# - /home/davila/Creatis/C10/creatools_source/bbtk/packages/toolsbbtk/bbs/boxes/imageVtkPropertiesWidget.bbs
 # ----------------------------------
 
 include std
@@ -44,6 +44,22 @@ new wx:OutputText Box13
 
 new std:MagicBox Box14
 
+new wx:OutputText Box15
+  set Box15.Title "Origin"
+
+new std:ConcatStrings Box16
+  set Box16.In2 "  "
+  set Box16.In4 "  "
+
+new std:GetVectorDoubleElement Box18
+  set Box18.I "0"
+
+new std:GetVectorDoubleElement Box19
+  set Box19.I "1"
+
+new std:GetVectorDoubleElement Box21
+  set Box21.I "2"
+
 
 connect Box09.Components Box10.In
 connect Box09.MinMax Box26.In
@@ -57,7 +73,6 @@ connect Box20.Widget Box11.Widget4
 connect Box22.Widget Box11.Widget5
 connect Box26.Widget Box11.Widget6
 connect Box09.Dimension Box02.In
-connect Box13.Widget Box11.Widget7
 connect Box14.Out Box10.BoxExecute
 connect Box14.Out Box02.BoxExecute
 connect Box14.Out Box17.BoxExecute
@@ -66,6 +81,16 @@ connect Box14.Out Box22.BoxExecute
 connect Box14.Out Box13.BoxExecute
 connect Box14.BoxChange Box09.BoxExecute
 connect Box14.Out Box26.BoxExecute
+connect Box13.Widget Box11.Widget9
+connect Box15.Widget Box11.Widget7
+connect Box14.Out Box15.BoxExecute
+connect Box09.Origin Box18.In
+connect Box09.Origin Box19.In
+connect Box09.Origin Box21.In
+connect Box21.Out Box16.In5
+connect Box18.Out Box16.In1
+connect Box19.Out Box16.In3
+connect Box16.Out Box15.In
 
 # Complex input ports
 input in Box09.In " "
@@ -79,6 +104,7 @@ output MinMax Box09.MinMax " "
 output Size Box09.Size " "
 output Spacing Box09.Spacing " "
 output TypeName Box09.TypeName " "
+output origin Box09.Origin " "
 
 
 endefine

diff --git a/packages/wxvtk/bbs/boxes/SphereListWidget.bbg b/packages/wxvtk/bbs/boxes/SphereListWidget.bbg
index dcbec1cd609b28fef55b7c1208f8b2b7fb788869..92a7c8d2b6fc6cbe94ffc865299364da644a4120 100644 (file)
--- a/packages/wxvtk/bbs/boxes/SphereListWidget.bbg
+++ b/packages/wxvtk/bbs/boxes/SphereListWidget.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/All/creatools_source/bbtk/packages/wxvtk/bbs/boxes/SphereListWidget.bbg
+# - /home/davila/Creatis/C11/creatools_source/bbtk/packages/wxvtk/bbs/boxes/SphereListWidget.bbg
 # ----------------------------------
 
 APP_START
@@ -10,12 +10,16 @@ AUTHOR:Author ??
 COMPLEXBOX:TRUE
 COMPLEXBOXNAME:SphereListWidget
 PACKAGENAME:wxvtk
-COMPLEXOUTPUTS:1
+COMPLEXOUTPUTS:2
 COMPLEX_PORT
 Widget
--85.905274:-92.354431:-900.000000
+-98.843138:-92.871946:-900.000000
 FIN_COMPLEX_PORT
-COMPLEXINPUTS:6
+COMPLEX_PORT
+BoxChangeForRender
+-27.298894:-91.470701:-900.000000
+FIN_COMPLEX_PORT
+COMPLEXINPUTS:8
 COMPLEX_PORT
 lstPointX
 8.139713:82.586776:-900.000000
@@ -40,12 +44,20 @@ COMPLEX_PORT
 WinTitle
 -55.788338:78.579533:-900.000000
 FIN_COMPLEX_PORT
+COMPLEX_PORT
+transform
+60.235872:85.258911:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+boxExecute
+-81.896681:82.155439:-900.000000
+FIN_COMPLEX_PORT
 BOXES:9
 BOX
 wx:Slider:Box00
 ISEXEC:FALSE
 -167.678079:54.285621:-900.000000
--126.609253:44.285621:-900.000000
+-116.278079:44.285621:-900.000000
 PORT
 In:"50"
 PORT
@@ -62,8 +74,8 @@ FIN_BOX
 BOX
 wx:Slider:Box01
 ISEXEC:FALSE
-71.003339:58.793770:-900.000000
-103.778339:48.793770:-900.000000
+103.249523:55.956106:-900.000000
+154.649523:45.956106:-900.000000
 PORT
 Label:"true"
 PORT
@@ -78,8 +90,8 @@ FIN_BOX
 BOX
 wx:LayoutLine:Box02
 ISEXEC:FALSE
--87.908896:-62.675787:-900.000000
--42.333896:-72.675787:-900.000000
+-119.477285:-59.570700:-900.000000
+-61.917285:-69.570700:-900.000000
 PORT
 WinTitle:"Center Point"
 FIN_BOX
@@ -87,9 +99,9 @@ BOX
 vtk:SphereList:Box03
 ISEXEC:FALSE
 -3.863333:-42.636949:-900.000000
-41.711667:-52.636949:-900.000000
+32.136667:-52.636949:-900.000000
 PORT
-Colour:"0.32 0.12 0.12"
+Colour:"1 0 0"
 PORT
 lstPointX:"10 10"
 PORT
@@ -103,7 +115,7 @@ BOX
 std:Div:Box04
 ISEXEC:FALSE
 -116.710956:22.728582:-900.000000
--83.935956:12.728582:-900.000000
+-87.385956:12.728582:-900.000000
 PORT
 In2:"100"
 FIN_BOX
@@ -111,31 +123,29 @@ BOX
 std:ConcatStrings:Box05
 ISEXEC:FALSE
 50.279055:8.830270:-900.000000
-95.854055:-1.169730:-900.000000
+90.004055:-1.169730:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:Box08
 ISEXEC:FALSE
--98.614166:-13.546822:-900.000000
--53.039166:-23.546822:-900.000000
+-89.040146:-12.511793:-900.000000
+-49.340146:-22.511793:-900.000000
 PORT
 BoxProcessMode:"Reactive"
 FIN_BOX
 BOX
-vtk:UpdateRender:Box07
+std:MagicBox:Box09
 ISEXEC:FALSE
--19.609381:-58.498699:-900.000000
-25.965619:-68.498699:-900.000000
-PORT
-Active:"true"
+-41.657874:42.759098:-900.000000
+-5.582874:32.759098:-900.000000
 FIN_BOX
 BOX
-std:MagicBox:Box09
+std:MagicBox:Box10
 ISEXEC:FALSE
--41.657874:42.759098:-900.000000
-3.917126:32.759098:-900.000000
+52.379365:62.243159:-900.000000
+88.454365:52.243159:-900.000000
 FIN_BOX
-CONNECTIONS:20
+CONNECTIONS:22
 CONNECTION
 Box00:Widget:Box02:Widget1
 NumberOfControlPoints:0
@@ -161,18 +171,12 @@ CONNECTION
 Box08:BoxChange:Box03:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-Box08:BoxChange:Box07:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
 Renderer:Renderer:Box09:In
 NumberOfControlPoints:0
 CONNECTION
 Box09:Out:Box03:Renderer
 NumberOfControlPoints:0
 CONNECTION
-Box09:Out:Box07:Renderer
-NumberOfControlPoints:0
-CONNECTION
 Box05:Out:Box03:lstRadio
 NumberOfControlPoints:0
 CONNECTION
@@ -196,4 +200,16 @@ NumberOfControlPoints:0
 CONNECTION
 WinTitle:WinTitle:Box02:WinTitle
 NumberOfControlPoints:0
+CONNECTION
+Box10:Out:Box03:Transform
+NumberOfControlPoints:0
+CONNECTION
+transform:transform:Box10:In
+NumberOfControlPoints:0
+CONNECTION
+boxExecute:boxExecute:Box08:In5
+NumberOfControlPoints:0
+CONNECTION
+Box08:BoxChange:BoxChangeForRender:BoxChangeForRender
+NumberOfControlPoints:0
 APP_END

diff --git a/packages/wxvtk/bbs/boxes/SphereListWidget.bbs b/packages/wxvtk/bbs/boxes/SphereListWidget.bbs
index 584e3252b4c2158cea3a26a60deb8a5a3c62c1ba..2e41b77b1815f804997b4fa32c1edf11d0179017 100644 (file)
--- a/packages/wxvtk/bbs/boxes/SphereListWidget.bbs
+++ b/packages/wxvtk/bbs/boxes/SphereListWidget.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/All/creatools_source/bbtk/packages/wxvtk/bbs/boxes/SphereListWidget.bbs
+# - /home/davila/Creatis/C11/creatools_source/bbtk/packages/wxvtk/bbs/boxes/SphereListWidget.bbs
 # ----------------------------------
 
 include std
@@ -16,7 +16,7 @@ description "Description ??"
 
 category "<VOID>"
 
-new Slider Box00
+new wx:Slider Box00
   set Box00.In "50"
   set Box00.Label "true"
   set Box00.Max "100"
@@ -24,35 +24,34 @@ new Slider Box00
   set Box00.ReactiveOnTrack "true"
   set Box00.Title "Opacity4"
 
-new Slider Box01
+new wx:Slider Box01
   set Box01.Label "true"
   set Box01.Max "50"
   set Box01.Min "1"
   set Box01.ReactiveOnTrack "true"
   set Box01.Title "Radio"
 
-new LayoutLine Box02
+new wx:LayoutLine Box02
   set Box02.WinTitle "Center Point"
 
-new SphereList Box03
-  set Box03.Colour "0.32 0.12 0.12"
+new vtk:SphereList Box03
+  set Box03.Colour "1 0 0"
   set Box03.lstPointX "10 10"
   set Box03.lstPointY "10 20"
   set Box03.lstPointZ "10 30"
   set Box03.lstRadio "10"
 
-new Div Box04
+new std:Div Box04
   set Box04.In2 "100"
 
-new ConcatStrings Box05
+new std:ConcatStrings Box05
 
-new MultipleInputs Box08
+new std:MultipleInputs Box08
   set Box08.BoxProcessMode "Reactive"
 
-new UpdateRender Box07
-  set Box07.Active "true"
+new std:MagicBox Box09
 
-new MagicBox Box09
+new std:MagicBox Box10
 
 
 connect Box00.Widget Box02.Widget1
@@ -62,12 +61,11 @@ connect Box00.Out Box04.In1
 connect Box01.Out Box05.In1
 connect Box00.BoxChange Box08.In1
 connect Box08.BoxChange Box03.BoxExecute
-connect Box08.BoxChange Box07.BoxExecute
 connect Box09.Out Box03.Renderer
-connect Box09.Out Box07.Renderer
 connect Box05.Out Box03.lstRadio
 connect Box05.BoxChange Box08.In2
 connect Box01.BoxChange Box08.In3
+connect Box10.Out Box03.Transform
 
 # Complex input ports
 input Renderer Box09.In " "
@@ -76,9 +74,12 @@ input lstPointY Box03.lstPointY " "
 input lstPointZ Box03.lstPointZ " "
 input spc Box03.Spacing " "
 input WinTitle Box02.WinTitle " "
+input transform Box10.In " "
+input boxExecute Box08.In5 " "
 
 # Complex output ports
 output Widget Box02.Widget " "
+output BoxChangeForRender Box08.BoxChange " "
 
 
 endefine

diff --git a/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbg b/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbg
index aeff7d93d25052c834d59038a7d934311b307236..1f487e793281fb6c07c8c8d066f83f79565cc57a 100644 (file)
--- a/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbg
+++ b/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - bbIsoSurfaceWidget.bbg
+# - /home/davila/Creatis/C8/creatools_source/bbtk/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbg
 # ----------------------------------
 
 APP_START
@@ -10,7 +10,7 @@ AUTHOR:laurent.guigues@creatis.insa-lyon.fr
 COMPLEXBOX:TRUE
 COMPLEXBOXNAME:IsoSurfaceWidget
 PACKAGENAME:wxvtk
-COMPLEXOUTPUTS:3
+COMPLEXOUTPUTS:4
 COMPLEX_PORT
 Out
 58.302298:-288.767464:-900.000000
@@ -23,6 +23,10 @@ COMPLEX_PORT
 BoxChange
 -72.512970:-286.784432:-900.000000
 FIN_COMPLEX_PORT
+COMPLEX_PORT
+OutIsovalue
+113.740743:-288.099994:-900.000000
+FIN_COMPLEX_PORT
 COMPLEXINPUTS:9
 COMPLEX_PORT
 Title
@@ -65,7 +69,7 @@ BOX
 wx:LayoutLine:controls
 ISEXEC:FALSE
 97.896195:-54.335314:-900.000000
-143.471195:-64.335314:-900.000000
+155.456195:-64.335314:-900.000000
 PORT
 Orientation:"HORIZONTAL"
 FIN_BOX
@@ -73,13 +77,13 @@ BOX
 vtk:IsoSurfaceExtractor:Asurface
 ISEXEC:FALSE
 43.917303:-225.853762:-900.000000
-89.492303:-235.853762:-900.000000
+91.642303:-235.853762:-900.000000
 FIN_BOX
 BOX
 wx:Slider:isovalue
 ISEXEC:FALSE
 98.069545:33.134653:-900.000000
-130.844545:23.134653:-900.000000
+149.469545:23.134653:-900.000000
 PORT
 ChangeResolution:"true"
 PORT
@@ -91,7 +95,7 @@ BOX
 wx:Slider:opacity
 ISEXEC:FALSE
 32.910163:-25.716566:-900.000000
-65.685163:-35.716566:-900.000000
+84.310163:-35.716566:-900.000000
 PORT
 In:"100"
 PORT
@@ -107,19 +111,19 @@ BOX
 wx:ColourSelectorButton:colour
 ISEXEC:FALSE
 5.737517:35.117885:-900.000000
-76.912517:25.117885:-900.000000
+52.737517:25.117885:-900.000000
 FIN_BOX
 BOX
 std:MultipleInputs:refresh
 ISEXEC:FALSE
 -92.618071:-104.029679:-900.000000
--47.043071:-114.029679:-900.000000
+-52.243071:-114.029679:-900.000000
 FIN_BOX
 BOX
 std:Div:Adiv
 ISEXEC:FALSE
 1.523741:-151.750497:-900.000000
-34.298741:-161.750497:-900.000000
+29.448741:-161.750497:-900.000000
 PORT
 In2:"100"
 FIN_BOX
@@ -127,7 +131,7 @@ BOX
 vtk:UpdateRender:Box08
 ISEXEC:FALSE
 -38.587305:-230.303310:-900.000000
-6.987695:-240.303310:-900.000000
+1.737695:-240.303310:-900.000000
 PORT
 Active:"true"
 FIN_BOX
@@ -135,13 +139,13 @@ BOX
 std:MagicBox:Box09
 ISEXEC:FALSE
 170.465036:-148.550905:-900.000000
-216.040036:-158.550905:-900.000000
+206.540036:-158.550905:-900.000000
 FIN_BOX
 BOX
 wx:CheckBox:Box10
 ISEXEC:FALSE
 134.946534:-6.270599:-900.000000
-180.521534:-16.270599:-900.000000
+171.271534:-16.270599:-900.000000
 PORT
 In:"false"
 PORT
@@ -149,7 +153,7 @@ ReactiveOnKeystroke:"true"
 PORT
 Title:"Active"
 FIN_BOX
-CONNECTIONS:31
+CONNECTIONS:32
 CONNECTION
 isovalue:Out:Asurface:Isovalue
 NumberOfControlPoints:0
@@ -243,4 +247,7 @@ NumberOfControlPoints:0
 CONNECTION
 Box10:Widget:controls:Widget1
 NumberOfControlPoints:0
+CONNECTION
+isovalue:Out:OutIsovalue:OutIsovalue
+NumberOfControlPoints:0
 APP_END

diff --git a/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs b/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs
index 5e349f10b60c61c166024d1b772c4078916fbb8b..656b702c9e80caf8ca365565a669f6767db33790 100644 (file)
--- a/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs
+++ b/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - bbIsoSurfaceWidget.bbs
+# - /home/davila/Creatis/C8/creatools_source/bbtk/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs
 # ----------------------------------
 
 include std
@@ -86,6 +86,7 @@ input vtkRenderer Box09.In " "
 output Out Asurface.Out " "
 output Widget controls.Widget " "
 output BoxChange refresh.BoxChange " "
+output OutIsovalue isovalue.Out " "
 
 
 endefine