#3542 Clean SetPositionPointerPicker and PolyDataToActor_Widget with ScalarVisibilityOn

diff --git a/bbtk/bbs/boxes/Mesh_Application.bbg b/bbtk/bbs/boxes/Mesh_Application.bbg
index 2b3e829912ae89dac5ccaaec1162fa213f2a66cc..861bae19013b5a6184facc0586e63c8528e3fcb3 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_Application.bbg
+++ b/bbtk/bbs/boxes/Mesh_Application.bbg
@@ -873,7 +873,7 @@ ISEXEC:FALSE
 -80.144058:-47.284744:-900.000000
 -58.064058:-49.784744:-900.000000
 FIN_BOX
-CONNECTIONS:263
+CONNECTIONS:261
 CONNECTION
 Box08:MeshBase:Box15:polydata
 NumberOfControlPoints:0
@@ -887,9 +887,6 @@ CONNECTION
 Box07:Out:Box10:image
 NumberOfControlPoints:0
 CONNECTION
-Box07:Out:Box13:image
-NumberOfControlPoints:0
-CONNECTION
 Box10:widget:Box12:Widget3
 NumberOfControlPoints:0
 CONNECTION
@@ -1049,9 +1046,6 @@ CONNECTION
 Render3D:Render3D:Box65:In
 NumberOfControlPoints:0
 CONNECTION
-Box65:Out:Box13:render
-NumberOfControlPoints:0
-CONNECTION
 Box65:Out:Box48:Renderer
 NumberOfControlPoints:0
 CONNECTION

diff --git a/bbtk/bbs/boxes/Mesh_Application.bbs b/bbtk/bbs/boxes/Mesh_Application.bbs
index bedbb763e7de4200fcbae3b2763d006ff017532d..41b44f5a0778e96a794a667464446b427a2767d9 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_Application.bbs
+++ b/bbtk/bbs/boxes/Mesh_Application.bbs
@@ -320,7 +320,6 @@ connect Box08.MeshBase Box15.polydata
 connect Box08.MeshTemp Box10.mesh
 connect Box12.Widget Box11.Widget2
 connect Box07.Out Box10.image
-connect Box07.Out Box13.image
 connect Box10.widget Box12.Widget3
 connect Box08.MeshManagerModel Box10.meshmanagermodel
 connect Box08.MeshBase Box17._polydata
@@ -371,7 +370,6 @@ connect Box61.Spacing Box60.In1
 connect Box54.Out Box59.Active
 connect Box63.BoxChange Box28.In4
 connect Box63.BoxChange Box46.boxChange
-connect Box65.Out Box13.render
 connect Box65.Out Box48.Renderer
 connect Box65.Out Box15.render
 connect Box66.Out Box13.wxvtkbaseview

diff --git a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg
index c2e012a3e889528742a5278c3e39629233e36640..001373e7087fb5533b95967c93034a56aed6f679 100644 (file)
--- a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg
+++ b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg
@@ -17,11 +17,11 @@ widget
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 boxchange
-33.374070:-83.852889:-900.000000
+61.957160:-80.927061:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 vtkprop3D
-45.419298:-83.304649:-900.000000
+74.002388:-80.378821:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 widgetA
@@ -31,18 +31,18 @@ COMPLEX_PORT
 widgetB
 -2.559335:-81.468916:-900.000000
 FIN_COMPLEX_PORT
-COMPLEXINPUTS:8
+COMPLEXINPUTS:11
 COMPLEX_PORT
 render
 76.597115:16.454041:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 polydata
-59.372710:16.212789:-900.000000
+62.523602:15.650130:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 color
-47.300764:15.643841:-900.000000
+53.715079:15.643841:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 boxexecute
@@ -50,7 +50,7 @@ boxexecute
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 scalarvisibility
-115.077037:16.977197:-900.000000
+104.085947:16.823475:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 active
@@ -58,38 +58,50 @@ active
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 meshOpacity
--5.910539:15.975956:-900.000000
+-16.713597:15.638360:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 backfacecolour
-28.526393:14.772115:-900.000000
+38.429196:15.447306:-900.000000
 FIN_COMPLEX_PORT
-BOXES:10
+COMPLEX_PORT
+scalarvisibilityOn_lookuptable
+125.321483:17.524255:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+scalarvisibiltyOn_NamaColorArray
+152.186446:16.779567:-900.000000
+FIN_COMPLEX_PORT
+COMPLEX_PORT
+scalarvisibilityOn_ScalarRange
+173.339041:17.639600:-900.000000
+FIN_COMPLEX_PORT
+BOXES:14
 BOX
 wx:LayoutLine:Box04
 ISEXEC:FALSE
--16.179920:-48.062580:-900.000000
-17.140080:-50.562580:-900.000000
+-16.855111:-47.950048:-900.000000
+16.464889:-50.450048:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
 BOX
 vtk:PolyDataToActor:Box09
 ISEXEC:FALSE
-70.617040:-39.528817:-900.000000
-98.657040:-42.028817:-900.000000
+67.016021:-47.856174:-900.000000
+95.056021:-50.356174:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box10
 ISEXEC:FALSE
-72.472185:-3.767646:-900.000000
-94.072185:-6.267646:-900.000000
+72.318463:0.229114:-900.000000
+93.918463:-2.270886:-900.000000
 FIN_BOX
 BOX
 vtk:UpdateRender:Box11
 ISEXEC:FALSE
-82.812123:-61.772234:-900.000000
-104.837123:-64.272234:-900.000000
+97.553795:-59.296533:-900.000000
+119.578795:-61.796533:-900.000000
 PORT
 Active:"true"
 FIN_BOX
@@ -122,8 +134,8 @@ FIN_BOX
 BOX
 wx:ComboBox:Box15
 ISEXEC:FALSE
-12.773765:-12.626379:-900.000000
-39.053765:-15.126379:-900.000000
+-0.955121:-25.004883:-900.000000
+25.324879:-27.504883:-900.000000
 PORT
 In:"Points WireFrame Surface"
 PORT
@@ -134,8 +146,8 @@ FIN_BOX
 BOX
 std:MultipleInputs:Box08
 ISEXEC:FALSE
--36.135097:-21.729535:-900.000000
--14.165097:-24.229535:-900.000000
+-35.910033:-25.218022:-900.000000
+-13.940033:-27.718022:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box12
@@ -149,7 +161,31 @@ ISEXEC:FALSE
 33.569240:-0.283971:-900.000000
 55.169240:-2.783971:-900.000000
 FIN_BOX
-CONNECTIONS:25
+BOX
+std:MagicBox:Box17
+ISEXEC:FALSE
+98.616186:-0.380912:-900.000000
+120.216186:-2.880912:-900.000000
+FIN_BOX
+BOX
+std:MagicBox:Box18
+ISEXEC:FALSE
+122.761808:-0.145470:-900.000000
+144.361808:-2.645470:-900.000000
+FIN_BOX
+BOX
+std:MagicBox:Box19
+ISEXEC:FALSE
+148.240057:0.115406:-900.000000
+169.840057:-2.384594:-900.000000
+FIN_BOX
+BOX
+std:MagicBox:Box20
+ISEXEC:FALSE
+172.030328:0.488813:-900.000000
+193.630328:-2.011187:-900.000000
+FIN_BOX
+CONNECTIONS:32
 CONNECTION
 Box10:Out:Box11:Renderer
 NumberOfControlPoints:0
@@ -199,9 +235,6 @@ CONNECTION
 Box08:BoxChange:Box09:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-scalarvisibility:scalarvisibility:Box09:ScalarVisibility
-NumberOfControlPoints:0
-CONNECTION
 Box09:Out:vtkprop3D:vtkprop3D
 NumberOfControlPoints:0
 CONNECTION
@@ -225,4 +258,28 @@ NumberOfControlPoints:0
 CONNECTION
 Box16:Out:Box09:BackFaceColour
 NumberOfControlPoints:0
+CONNECTION
+scalarvisibility:scalarvisibility:Box17:In
+NumberOfControlPoints:0
+CONNECTION
+Box17:Out:Box09:ScalarVisibility
+NumberOfControlPoints:0
+CONNECTION
+scalarvisibilityOn_lookuptable:scalarvisibilityOn_lookuptable:Box18:In
+NumberOfControlPoints:0
+CONNECTION
+Box18:Out:Box09:ScalarVisibilityOn_LookupTable
+NumberOfControlPoints:0
+CONNECTION
+scalarvisibiltyOn_NamaColorArray:scalarvisibiltyOn_NamaColorArray:Box19:In
+NumberOfControlPoints:0
+CONNECTION
+Box19:Out:Box09:ScalarVisibilityOn_NameColorArray
+NumberOfControlPoints:0
+CONNECTION
+scalarvisibilityOn_ScalarRange:scalarvisibilityOn_ScalarRange:Box20:In
+NumberOfControlPoints:0
+CONNECTION
+Box20:Out:Box09:ScalarVisibilityOn_ScalarRange
+NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs
index 4ee94530c2866ded998cb1f9775681f8d5bae551..524b0ef5a16723185000da03a4069ea095464ff3 100644 (file)
--- a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs
+++ b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs
@@ -48,6 +48,14 @@ new std:MagicBox Box12
 
 new std:MagicBox Box16
 
+new std:MagicBox Box17
+
+new std:MagicBox Box18
+
+new std:MagicBox Box19
+
+new std:MagicBox Box20
+
 
 connect Box10.Out Box11.Renderer
 connect Box09.BoxChange Box11.BoxExecute
@@ -61,16 +69,23 @@ connect Box13.BoxChange Box08.In1
 connect Box08.BoxChange Box09.BoxExecute
 connect Box12.Out Box09.Active
 connect Box16.Out Box09.BackFaceColour
+connect Box17.Out Box09.ScalarVisibility
+connect Box18.Out Box09.ScalarVisibilityOn_LookupTable
+connect Box19.Out Box09.ScalarVisibilityOn_NameColorArray
+connect Box20.Out Box09.ScalarVisibilityOn_ScalarRange
 
 # Complex input ports
 input render Box10.In " "
 input polydata Box09.In " "
 input color Box09.Colour " "
 input boxexecute Box08.In3 " "
-input scalarvisibility Box09.ScalarVisibility " "
 input meshOpacity Box13.In " "
 input active Box12.In " "
 input backfacecolour Box16.In " "
+input scalarvisibility Box17.In " "
+input scalarvisibilityOn_lookuptable Box18.In " "
+input scalarvisibiltyOn_NamaColorArray Box19.In " "
+input scalarvisibilityOn_ScalarRange Box20.In " "
 
 # Complex output ports
 output widget Box04.Widget " "

diff --git a/bbtk/bbs/boxes/SetPositionPointPicker.bbg b/bbtk/bbs/boxes/SetPositionPointPicker.bbg
index 91ccc4e30945d6aaddb25143516ea2bd3fdc1ff9..1f74db2a92df0c23948bc82f7cdb3cf954e739d0 100644 (file)
--- a/bbtk/bbs/boxes/SetPositionPointPicker.bbg
+++ b/bbtk/bbs/boxes/SetPositionPointPicker.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.5 BBG BlackBox Diagram file
-# - /Users/davila/Creatis/C22/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/SetPositionPointPicker.bbg
+# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/SetPositionPointPicker.bbg
 # ----------------------------------
 
 APP_START
@@ -13,95 +13,91 @@ PACKAGENAME:creaMaracasVisu
 COMPLEXOUTPUTS:5
 COMPLEX_PORT
 boxchange
--9.290100:10.166468:-900.000000
+66.193293:31.711009:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 pointid
-31.820358:11.298533:-900.000000
+107.923738:30.983114:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 normal
-12.220862:10.376204:-900.000000
+87.549258:31.610752:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 PositionWorld
-22.366484:12.682027:-900.000000
+97.384887:31.746621:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 PositionImage
-43.733777:12.144001:-900.000000
-FIN_COMPLEX_PORT
-COMPLEXINPUTS:4
-COMPLEX_PORT
-render
-69.901565:137.945660:-900.000000
-FIN_COMPLEX_PORT
-COMPLEX_PORT
-image
-43.932766:136.718787:-900.000000
+2.814648:31.828582:-900.000000
 FIN_COMPLEX_PORT
+COMPLEXINPUTS:2
 COMPLEX_PORT
 wxvtkbaseview
-90.962875:134.060564:-900.000000
+17.649436:123.210795:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 vtkprop3D
-55.493475:137.580775:-900.000000
+64.948274:123.321079:-900.000000
 FIN_COMPLEX_PORT
-BOXES:7
+BOXES:8
 BOX
 vtk:ImageVtkProperties:Box24
 ISEXEC:FALSE
--12.953599:80.216888:-900.000000
-9.581401:77.716888:-900.000000
+5.491008:75.876980:-900.000000
+28.026008:73.376980:-900.000000
 FIN_BOX
 BOX
 creaVtk:PointPicker:Box47
 ISEXEC:FALSE
-17.881052:80.436334:-900.000000
-39.576052:77.936334:-900.000000
+51.825329:75.011449:-900.000000
+73.520329:72.511449:-900.000000
 PORT
 TypeEvent:"2"
 FIN_BOX
 BOX
 std:MathOperationVector:Box48
 ISEXEC:FALSE
-60.725755:69.336900:-900.000000
-85.245755:66.836900:-900.000000
+6.941900:63.912015:-900.000000
+31.461900:61.412015:-900.000000
 PORT
 Type:"3"
 FIN_BOX
 BOX
 std:MathOperationVector:Box49
 ISEXEC:FALSE
-58.961771:62.886752:-900.000000
-83.481771:60.386752:-900.000000
+5.177916:57.461867:-900.000000
+29.697916:54.961867:-900.000000
 PORT
 Type:"23"
 FIN_BOX
 BOX
 creaMaracasVisu:SetPosition:Box50
 ISEXEC:FALSE
-33.337006:53.134823:-900.000000
-54.997006:50.634823:-900.000000
+35.041970:48.639919:-900.000000
+56.701970:46.139919:-900.000000
 PORT
 FixAxis2D:"true"
 FIN_BOX
 BOX
-creaMaracasVisu:SetPosition:Box32
+std:MagicBox:Box100
 ISEXEC:FALSE
-66.758461:51.705224:-900.000000
-88.418461:49.205224:-900.000000
-PORT
-FixAxis2D:"false"
+12.131250:112.736766:-900.000000
+33.841250:110.236766:-900.000000
 FIN_BOX
 BOX
-std:MagicBox:Box100
+creaMaracasVisu:wxVtkBaseView_Info:Box07
 ISEXEC:FALSE
-48.710471:81.272436:-900.000000
-70.420471:78.772436:-900.000000
+7.538947:93.244187:-900.000000
+36.578947:90.744187:-900.000000
 FIN_BOX
-CONNECTIONS:15
+BOX
+std:MagicBox:Box10
+ISEXEC:FALSE
+59.815831:113.577004:-900.000000
+81.415831:111.077004:-900.000000
+FIN_BOX
+CONNECTIONS:17
 CONNECTION
 Box47:Point:Box48:In0
 NumberOfControlPoints:0
@@ -118,12 +114,6 @@ CONNECTION
 Box47:BoxChange:Box50:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-render:render:Box47:Renderer
-NumberOfControlPoints:0
-CONNECTION
-image:image:Box24:In
-NumberOfControlPoints:0
-CONNECTION
 wxvtkbaseview:wxvtkbaseview:Box100:In
 NumberOfControlPoints:0
 CONNECTION
@@ -133,9 +123,6 @@ CONNECTION
 Box47:BoxChange:boxchange:boxchange
 NumberOfControlPoints:0
 CONNECTION
-vtkprop3D:vtkprop3D:Box47:Prop3D
-NumberOfControlPoints:0
-CONNECTION
 Box47:PointId:pointid:pointid
 NumberOfControlPoints:0
 CONNECTION
@@ -147,4 +134,19 @@ NumberOfControlPoints:0
 CONNECTION
 Box49:Out:PositionImage:PositionImage
 NumberOfControlPoints:0
+CONNECTION
+Box100:Out:Box07:wxVtkBaseView
+NumberOfControlPoints:0
+CONNECTION
+Box07:Image:Box24:In
+NumberOfControlPoints:0
+CONNECTION
+vtkprop3D:vtkprop3D:Box10:In
+NumberOfControlPoints:0
+CONNECTION
+Box10:Out:Box47:Prop3D
+NumberOfControlPoints:0
+CONNECTION
+Box07:vtkRenderer:Box47:Renderer
+NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/boxes/SetPositionPointPicker.bbs b/bbtk/bbs/boxes/SetPositionPointPicker.bbs
index 5a0a5935a7f37c45c6acdd08ad14803319707fca..9a836e080f3a38124a4594480afa430afa6bff4c 100644 (file)
--- a/bbtk/bbs/boxes/SetPositionPointPicker.bbs
+++ b/bbtk/bbs/boxes/SetPositionPointPicker.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
 # - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box)
-# - /Users/davila/Creatis/C22/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/SetPositionPointPicker.bbs
+# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/SetPositionPointPicker.bbs
 # ----------------------------------
 
 include std
@@ -31,11 +31,12 @@ new std:MathOperationVector Box49
 new creaMaracasVisu:SetPosition Box50
   set Box50.FixAxis2D "true"
 
-new creaMaracasVisu:SetPosition Box32
-  set Box32.FixAxis2D "false"
-
 new std:MagicBox Box100
 
+new creaMaracasVisu:wxVtkBaseView_Info Box07
+
+new std:MagicBox Box10
+
 
 connect Box47.Point Box48.In0
 connect Box24.Spacing Box48.In1
@@ -43,12 +44,14 @@ connect Box48.Out Box49.In0
 connect Box49.Out Box50.Point
 connect Box47.BoxChange Box50.BoxExecute
 connect Box100.Out Box50.wxVtkBaseView
+connect Box100.Out Box07.wxVtkBaseView
+connect Box07.Image Box24.In
+connect Box10.Out Box47.Prop3D
+connect Box07.vtkRenderer Box47.Renderer
 
 # Complex input ports
-input render Box47.Renderer " "
-input image Box24.In " "
 input wxvtkbaseview Box100.In " "
-input vtkprop3D Box47.Prop3D " "
+input vtkprop3D Box10.In " "
 
 # Complex output ports
 output boxchange Box47.BoxChange " "