]> Creatis software - bbtk.git/commitdiff
2381 BBTK Bug New Normal SurfaceExtractor ComplexBox Refresh-conflict
authorEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Tue, 3 Jun 2014 08:18:46 +0000 (10:18 +0200)
committerEduardo DAVILA <eduardo.davila@creatis.insa-lyon.fr>
Tue, 3 Jun 2014 08:18:46 +0000 (10:18 +0200)
packages/vtk/bbs/boxes/bbIsoSurfaceExtractor.bbg
packages/vtk/bbs/boxes/bbIsoSurfaceExtractor.bbs
packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbg
packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs

index 8756b5fb0e2929ee17ff3ac79d83dffc997ef5e3..a81e328266941b0dade0b661f0f79ef38f2e4cee 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/All/creatools_source/bbtk/packages/vtk/bbs/boxes/bbIsoSurfaceExtractor.bbg
+# - /home/davila/Creatis/creaTools/creatools_install/bin/../share/bbtk/bbs/vtk/boxes/bbIsoSurfaceExtractor.bbg
 # ----------------------------------
 
 APP_START
@@ -50,16 +50,12 @@ vtk:MarchingCubes:mc
 ISEXEC:FALSE
 -13.834130:38.831538:-900.000000
 31.740870:28.831538:-900.000000
-PORT
-BoxProcessMode:"Reactive"
 FIN_BOX
 BOX
 vtk:PolyDataToActor:polydatatoactor
 ISEXEC:FALSE
 -99.833324:8.498185:-900.000000
 -28.658324:-1.501815:-900.000000
-PORT
-BoxProcessMode:"Reactive"
 FIN_BOX
 BOX
 std:MultipleInputs:Box03
@@ -67,7 +63,7 @@ ISEXEC:FALSE
 -27.966362:71.986554:-900.000000
 17.608638:61.986554:-900.000000
 PORT
-BoxProcessMode:"Reactive"
+BoxProcessMode:"reactive"
 FIN_BOX
 CONNECTIONS:11
 CONNECTION
@@ -98,9 +94,9 @@ CONNECTION
 BoxExecute:BoxExecute:Box03:In1
 NumberOfControlPoints:0
 CONNECTION
-Box03:BoxChange:polydatatoactor:BoxExecute
+Box03:Out:polydatatoactor:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-Box03:BoxChange:mc:BoxExecute
+Box03:Out:mc:BoxExecute
 NumberOfControlPoints:0
 APP_END
index 71f10b5df87b8346d6179323021dd837e93fd3c0..48d3ab6159a47decdd8de8b04b2160d6595d46b3 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/All/creatools_source/bbtk/packages/vtk/bbs/boxes/bbIsoSurfaceExtractor.bbs
+# - /home/davila/Creatis/creaTools/creatools_install/bin/../share/bbtk/bbs/vtk/boxes/bbIsoSurfaceExtractor.bbs
 # ----------------------------------
 
 include std
@@ -16,18 +16,16 @@ description "Extracts an iso-surface of a 3D image and creates a vtkProp3D objec
 category "3D object creator"
 
 new MarchingCubes mc
-  set mc.BoxProcessMode "Reactive"
 
 new PolyDataToActor polydatatoactor
-  set polydatatoactor.BoxProcessMode "Reactive"
 
 new MultipleInputs Box03
-  set Box03.BoxProcessMode "Reactive"
+  set Box03.BoxProcessMode "reactive"
 
 
 connect mc.Out polydatatoactor.In
-connect Box03.BoxChange polydatatoactor.BoxExecute
-connect Box03.BoxChange mc.BoxExecute
+connect Box03.Out polydatatoactor.BoxExecute
+connect Box03.Out mc.BoxExecute
 
 # Complex input ports
 input In mc.In " "
index ac1ecf98216d0fa23874c261899d779d2aa76e51..a79e53b50af6540a27443b748c34a713997ce110 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/All/creatools_source/bbtk/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbg
+# - /home/davila/Creatis/creaTools/creatools_install/bin/../share/bbtk/bbs/wxvtk/boxes/bbIsoSurfaceWidget.bbg
 # ----------------------------------
 
 APP_START
@@ -78,8 +78,8 @@ FIN_BOX
 BOX
 wx:Slider:isovalue
 ISEXEC:FALSE
-97.896195:33.580835:-900.000000
-149.296195:23.580835:-900.000000
+97.623363:33.580835:-900.000000
+149.023363:23.580835:-900.000000
 PORT
 ChangeResolution:"true"
 PORT
@@ -112,16 +112,14 @@ FIN_BOX
 BOX
 std:MultipleInputs:refresh
 ISEXEC:FALSE
--92.618071:-105.393837:-900.000000
--47.043071:-115.393837:-900.000000
-PORT
-BoxProcessMode:"Reactive"
+-92.618071:-104.029679:-900.000000
+-47.043071:-114.029679:-900.000000
 FIN_BOX
 BOX
 std:Div:div
 ISEXEC:FALSE
 0.000000:-110.000000:-900.000000
-32.775000:-120.000000:-900.000000
+26.375000:-120.000000:-900.000000
 PORT
 In2:"100"
 FIN_BOX
@@ -139,7 +137,7 @@ ISEXEC:FALSE
 170.465036:-148.550905:-900.000000
 216.040036:-158.550905:-900.000000
 FIN_BOX
-CONNECTIONS:26
+CONNECTIONS:27
 CONNECTION
 isovalue:Out:surface:Isovalue
 NumberOfControlPoints:0
@@ -171,12 +169,6 @@ CONNECTION
 opacity:Widget:controls:Widget2
 NumberOfControlPoints:0
 CONNECTION
-refresh:BoxChange:surface:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
-refresh:BoxChange:Box08:BoxExecute
-NumberOfControlPoints:0
-CONNECTION
 Box09:Out:surface:Renderer
 NumberOfControlPoints:0
 CONNECTION
@@ -216,6 +208,15 @@ CONNECTION
 controls:Widget:Widget:Widget
 NumberOfControlPoints:0
 CONNECTION
-refresh:BoxChange:BoxChange:BoxChange
+refresh:Out:BoxChange:BoxChange
+NumberOfControlPoints:0
+CONNECTION
+refresh:Out:Box08:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+refresh:Out:surface:BoxExecute
+NumberOfControlPoints:0
+CONNECTION
+opacity:BoxChange:refresh:BoxExecute
 NumberOfControlPoints:0
 APP_END
index 995a4a0501e5e2553096029caf7185ab699dc27a..6c25ef9740ff50f7d0eda1b1087a3c77b928532b 100644 (file)
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/All/creatools_source/bbtk/packages/wxvtk/bbs/boxes/bbIsoSurfaceWidget.bbs
+# - /home/davila/Creatis/creaTools/creatools_install/bin/../share/bbtk/bbs/wxvtk/boxes/bbIsoSurfaceWidget.bbs
 # ----------------------------------
 
 include std
@@ -36,7 +36,6 @@ new Slider opacity
 new ColourSelectorButton colour
 
 new MultipleInputs refresh
-  set refresh.BoxProcessMode "Reactive"
 
 new Div div
   set div.In2 "100"
@@ -57,10 +56,11 @@ connect colour.BoxChange refresh.In3
 connect colour.Widget controls.Widget3
 connect isovalue.Widget controls.Widget1
 connect opacity.Widget controls.Widget2
-connect refresh.BoxChange surface.BoxExecute
-connect refresh.BoxChange Box08.BoxExecute
 connect Box09.Out surface.Renderer
 connect Box09.Out Box08.Renderer
+connect refresh.Out Box08.BoxExecute
+connect refresh.Out surface.BoxExecute
+connect opacity.BoxChange refresh.BoxExecute
 
 # Complex input ports
 input Title controls.WinTitle " "
@@ -76,7 +76,7 @@ input vtkRenderer Box09.In " "
 # Complex output ports
 output Out surface.Out " "
 output Widget controls.Widget " "
-output BoxChange refresh.BoxChange " "
+output BoxChange refresh.Out " "
 
 
 endefine