From 6f17b1559846a7284cb95700cc095206c95fa95d Mon Sep 17 00:00:00 2001 From: "eduardo.davila@creatis.insa-lyon.fr" Date: Sat, 3 Feb 2024 08:49:27 +0100 Subject: [PATCH] #3550 Opacity lines Bug vtk --- bbtk/bbs/boxes/MeshContours_Widget.bbg | 2 +- bbtk/bbs/boxes/MeshContours_Widget.bbs | 2 +- bbtk/bbs/boxes/Mesh_Application.bbg | 10 ++--- bbtk/bbs/boxes/Mesh_Application.bbs | 2 +- .../bbs/boxes/Mesh_tool_ApplyExternalMask.bbg | 44 ++++++++++++------- .../bbs/boxes/Mesh_tool_ApplyExternalMask.bbs | 7 ++- 6 files changed, 43 insertions(+), 24 deletions(-) diff --git a/bbtk/bbs/boxes/MeshContours_Widget.bbg b/bbtk/bbs/boxes/MeshContours_Widget.bbg index a685f66..e76d6a1 100644 --- a/bbtk/bbs/boxes/MeshContours_Widget.bbg +++ b/bbtk/bbs/boxes/MeshContours_Widget.bbg @@ -133,7 +133,7 @@ ISEXEC:FALSE -140.663994:8.891765:-900.000000 -117.903994:6.391765:-900.000000 PORT -In1:"0.99999" +In1:"1" FIN_BOX BOX std:Mul:Box10 diff --git a/bbtk/bbs/boxes/MeshContours_Widget.bbs b/bbtk/bbs/boxes/MeshContours_Widget.bbs index 9635449..124a8c9 100644 --- a/bbtk/bbs/boxes/MeshContours_Widget.bbs +++ b/bbtk/bbs/boxes/MeshContours_Widget.bbs @@ -34,7 +34,7 @@ new creaMaracasVisu:MeshContours Box53 new std:MagicBox Box08 new std:ConcatStrings Box09 - set Box09.In1 "0.99999" + set Box09.In1 "1" new std:Mul Box10 set Box10.In2 "1" diff --git a/bbtk/bbs/boxes/Mesh_Application.bbg b/bbtk/bbs/boxes/Mesh_Application.bbg index 3f9c754..e99f7df 100644 --- a/bbtk/bbs/boxes/Mesh_Application.bbg +++ b/bbtk/bbs/boxes/Mesh_Application.bbg @@ -390,8 +390,8 @@ FIN_BOX BOX std:MagicBox:Box63 ISEXEC:FALSE -266.330339:66.858754:-900.000000 -287.930339:64.358754:-900.000000 +284.333498:63.108096:-900.000000 +305.933498:60.608096:-900.000000 FIN_BOX BOX std:MagicBox:Box65 @@ -1175,9 +1175,6 @@ CONNECTION Box69:Out:Box70:wxvtkbaseview4 NumberOfControlPoints:0 CONNECTION -Box63:BoxChange:Box73:boxChange -NumberOfControlPoints:0 -CONNECTION Box07:Out:Box73:image NumberOfControlPoints:0 CONNECTION @@ -1732,4 +1729,7 @@ NumberOfControlPoints:0 CONNECTION Box123:BoxChange:Box46:boxChange NumberOfControlPoints:0 +CONNECTION +Box123:BoxChange:Box73:boxChange +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_Application.bbs b/bbtk/bbs/boxes/Mesh_Application.bbs index 1056dc0..3a41323 100644 --- a/bbtk/bbs/boxes/Mesh_Application.bbs +++ b/bbtk/bbs/boxes/Mesh_Application.bbs @@ -409,7 +409,6 @@ connect Box66.Out Box70.wxvtkbaseview1 connect Box67.Out Box70.wxvtkbaseview2 connect Box68.Out Box70.wxvtkbaseview3 connect Box69.Out Box70.wxvtkbaseview4 -connect Box63.BoxChange Box73.boxChange connect Box07.Out Box73.image connect Box08.MeshTemp Box73.mesh connect Box08.MeshManagerModel Box73.meshmanagermodel @@ -587,6 +586,7 @@ connect Box23.Out Box142.In connect Box142.Out Box141.In1 connect Box12.BoxChange Box141.BoxExecute connect Box123.BoxChange Box46.boxChange +connect Box123.BoxChange Box73.boxChange # Complex input ports input MeshIn Box56.In " " diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbg index fc18302..e62d169 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbg @@ -60,7 +60,7 @@ COMPLEX_PORT OutDir -306.137122:136.559941:-900.000000 FIN_COMPLEX_PORT -BOXES:96 +BOXES:97 BOX wx:LayoutLine:Box08 ISEXEC:FALSE @@ -94,8 +94,8 @@ FIN_BOX BOX wx:CommandButton:Box80 ISEXEC:FALSE --99.852160:24.016914:-900.000000 --77.577160:21.516914:-900.000000 +-101.016989:25.847360:-900.000000 +-78.741989:23.347360:-900.000000 PORT Label:"Run" FIN_BOX @@ -212,8 +212,10 @@ FIN_BOX BOX creaMaracasVisu:MeshContours_Widget:Box72 ISEXEC:FALSE --111.034351:-74.084180:-900.000000 --88.239351:-76.584180:-900.000000 +-146.561647:-28.389588:-900.000000 +-123.766647:-30.889588:-900.000000 +PORT +active_widget:"true" PORT colorMesh:"0 1 1" FIN_BOX @@ -240,14 +242,14 @@ FIN_BOX BOX creaVtk:MeshManager:Box92 ISEXEC:FALSE --180.315243:-39.690560:-900.000000 --158.285243:-42.190560:-900.000000 +-140.045428:11.894740:-900.000000 +-118.015428:9.394740:-900.000000 FIN_BOX BOX creaVtk:MeshManager_tool:Box93 ISEXEC:FALSE --256.725914:-77.013526:-900.000000 --234.225914:-79.513526:-900.000000 +-249.404129:-78.511164:-900.000000 +-226.904129:-81.011164:-900.000000 PORT BoxProcessMode:"Manual" PORT @@ -550,8 +552,8 @@ FIN_BOX BOX std:MultipleInputs:Box117 ISEXEC:FALSE --373.557684:-2.950613:-900.000000 --351.477684:-5.450613:-900.000000 +-366.711815:14.365408:-900.000000 +-344.631815:11.865408:-900.000000 FIN_BOX BOX std:ConcatStrings:Box120 @@ -799,7 +801,13 @@ OutputFormat:"VTK_SHORT" PORT Type:"0" FIN_BOX -CONNECTIONS:147 +BOX +std:MultipleInputs:Box148 +ISEXEC:FALSE +-65.449786:-14.297276:-900.000000 +-43.369786:-16.797276:-900.000000 +FIN_BOX +CONNECTIONS:149 CONNECTION Box08:Widget:widget:widget NumberOfControlPoints:0 @@ -915,9 +923,6 @@ CONNECTION Box92:MeshManagerModel:Box48:MeshManagerModel NumberOfControlPoints:0 CONNECTION -Box63:BoxChange:Box72:_execute -NumberOfControlPoints:0 -CONNECTION Box92:MeshBase:Box45:Mesh NumberOfControlPoints:0 CONNECTION @@ -1241,4 +1246,13 @@ NumberOfControlPoints:0 CONNECTION Box95:Out:Box101:In1 NumberOfControlPoints:0 +CONNECTION +Box63:BoxChange:Box148:In2 +NumberOfControlPoints:0 +CONNECTION +Box80:BoxChange:Box148:In1 +NumberOfControlPoints:0 +CONNECTION +Box148:BoxChange:Box72:_execute +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbs index 0a2e243..08e4bdb 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbs @@ -73,6 +73,7 @@ new std:MagicBox Box69 new std:MagicBox Box71 new creaMaracasVisu:MeshContours_Widget Box72 + set Box72.active_widget "true" set Box72.colorMesh "0 1 1" new wx:LayoutLine Box81 @@ -292,6 +293,8 @@ new vtk:RescaleSlopeIntercept Box147 set Box147.OutputFormat "VTK_SHORT" set Box147.Type "0" +new std:MultipleInputs Box148 + connect Box66.Out Box11.Renderer connect Box35.Out Box68.In @@ -322,7 +325,6 @@ connect Box100.Out Box41.In connect Box92.MeshManagerModel Box47.MeshManagerModel connect Box43.BoxChange Box48.BoxExecute connect Box92.MeshManagerModel Box48.MeshManagerModel -connect Box63.BoxChange Box72._execute connect Box92.MeshBase Box45.Mesh connect Box47.BoxChange Box51.In5 connect Box37.boxchange Box11.BoxExecute @@ -428,6 +430,9 @@ connect Box146.Out Box56.In1 connect Box135.Out Box147.In connect Box147.Out Box56.In2 connect Box95.Out Box101.In1 +connect Box63.BoxChange Box148.In2 +connect Box80.BoxChange Box148.In1 +connect Box148.BoxChange Box72._execute # Complex input ports input mesh Box67.In " " -- 2.45.1