From 42ac093e6cf2baf474f2bc6c970d763bb453f138 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Sat, 12 Aug 2023 11:06:16 +0200 Subject: [PATCH] #3535 Mesh application Region Growing optimization --- .../boxes/Mesh_tool_ApplyRegionGrowing.bbg | 86 +++++++------------ .../boxes/Mesh_tool_ApplyRegionGrowing.bbs | 23 ++--- 2 files changed, 41 insertions(+), 68 deletions(-) diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbg index 5a22c61..6811848 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbg @@ -60,7 +60,7 @@ COMPLEX_PORT meshmanagermodel -153.486767:202.488610:-900.000000 FIN_COMPLEX_PORT -BOXES:93 +BOXES:92 BOX creaMaracasVisu:ShowNPoints:showNpoints ISEXEC:FALSE @@ -80,20 +80,6 @@ ISEXEC:FALSE -144.419418:-172.801977:-900.000000 FIN_BOX BOX -vtk:UpdateRender:Box11 -ISEXEC:FALSE -51.386486:-20.764581:-900.000000 -73.411486:-23.264581:-900.000000 -PORT -Active:"true" -FIN_BOX -BOX -std:MultipleInputs:Box31 -ISEXEC:FALSE -52.642658:-1.993608:-900.000000 -74.612658:-4.493608:-900.000000 -FIN_BOX -BOX creaMaracasVisu:wxPopupMenu:Box57 ISEXEC:FALSE -291.724262:77.620511:-900.000000 @@ -180,8 +166,8 @@ FIN_BOX BOX creaMaracasVisu:PolyDataToActor_Widget:Box48 ISEXEC:FALSE -55.278169:7.595913:-900.000000 -78.298169:5.095913:-900.000000 +58.110381:4.052125:-900.000000 +81.130381:1.552125:-900.000000 PORT meshOpacity:"50" FIN_BOX @@ -300,8 +286,8 @@ FIN_BOX BOX std:MagicBox:Box63 ISEXEC:FALSE --27.899190:191.545123:-900.000000 --6.299190:189.045123:-900.000000 +-32.775386:183.480645:-900.000000 +-11.175386:180.980645:-900.000000 FIN_BOX BOX std:MagicBox:Box64 @@ -490,14 +476,14 @@ FIN_BOX BOX std:MultipleInputs:Box111 ISEXEC:FALSE --35.999448:19.228424:-900.000000 --13.919448:16.728424:-900.000000 +-35.317463:-7.198513:-900.000000 +-13.237463:-9.698513:-900.000000 FIN_BOX BOX std:MultipleInputs:Box112 ISEXEC:FALSE --124.029588:-67.860277:-900.000000 --101.949588:-70.360277:-900.000000 +-125.402519:-66.212760:-900.000000 +-103.322519:-68.712760:-900.000000 FIN_BOX BOX creaVtk:MarchingCubes2:Box113 @@ -524,8 +510,8 @@ FIN_BOX BOX std:MultipleInputs:Box118 ISEXEC:FALSE -11.310956:21.501957:-900.000000 -33.390956:19.001957:-900.000000 +14.209394:20.478979:-900.000000 +36.289394:17.978979:-900.000000 FIN_BOX BOX std:MagicBox:Box120 @@ -799,10 +785,13 @@ ISEXEC:FALSE -308.988987:59.885268:-900.000000 -285.273987:57.385268:-900.000000 FIN_BOX -CONNECTIONS:170 -CONNECTION -Box31:BoxChange:Box11:BoxExecute -NumberOfControlPoints:0 +BOX +std:MagicBox:Box158 +ISEXEC:FALSE +-28.340233:193.606657:-900.000000 +-6.630233:191.106657:-900.000000 +FIN_BOX +CONNECTIONS:166 CONNECTION Box58:Out:Box57:In NumberOfControlPoints:0 @@ -819,9 +808,6 @@ CONNECTION Box08:Widget:widget:widget NumberOfControlPoints:0 CONNECTION -Box66:Out:Box11:Renderer -NumberOfControlPoints:0 -CONNECTION Box66:Out:showNpoints:Renderer NumberOfControlPoints:0 CONNECTION @@ -831,9 +817,6 @@ CONNECTION Box66:Out:Box48:render NumberOfControlPoints:0 CONNECTION -Box48:boxchange:Box31:In1 -NumberOfControlPoints:0 -CONNECTION image:image:Box35:In NumberOfControlPoints:0 CONNECTION @@ -879,9 +862,6 @@ CONNECTION Box52:BoxChange:Box55:In2 NumberOfControlPoints:0 CONNECTION -boxChange:boxChange:Box63:In -NumberOfControlPoints:0 -CONNECTION wxvtkbaseview2:wxvtkbaseview2:Box64:In NumberOfControlPoints:0 CONNECTION @@ -1023,12 +1003,6 @@ CONNECTION Box110:Out:Box102:Threshold NumberOfControlPoints:0 CONNECTION -Box63:BoxChange:Box111:In1 -NumberOfControlPoints:0 -CONNECTION -Box31:BoxChange:Box111:In3 -NumberOfControlPoints:0 -CONNECTION Box111:BoxChange:Box62:_execute NumberOfControlPoints:0 CONNECTION @@ -1041,18 +1015,12 @@ CONNECTION Box112:BoxChange:Box72:_execute NumberOfControlPoints:0 CONNECTION -Box113:BoxChange:Box31:BoxExecute -NumberOfControlPoints:0 -CONNECTION Box113:Out:Box48:polydata NumberOfControlPoints:0 CONNECTION Box113:Out:Box62:_polydata NumberOfControlPoints:0 CONNECTION -Box113:BoxChange:Box48:boxexecute -NumberOfControlPoints:0 -CONNECTION Box114:Out:Box113:In NumberOfControlPoints:0 CONNECTION @@ -1284,9 +1252,6 @@ CONNECTION Box153:Out:Box155:In NumberOfControlPoints:0 CONNECTION -Box63:BoxChange:Box154:BoxExecute -NumberOfControlPoints:0 -CONNECTION Box152:Box_ConcatStrings:Box154:Box_ConcatString NumberOfControlPoints:0 CONNECTION @@ -1310,4 +1275,19 @@ NumberOfControlPoints:0 CONNECTION Box153:BoxChange:Box157:BoxExecute NumberOfControlPoints:0 +CONNECTION +boxChange:boxChange:Box158:In +NumberOfControlPoints:0 +CONNECTION +Box158:BoxChange:Box154:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box158:BoxChange:Box111:In1 +NumberOfControlPoints:0 +CONNECTION +Box118:BoxChange:Box48:boxexecute +NumberOfControlPoints:0 +CONNECTION +Box118:BoxChange:Box111:In2 +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbs index 129e377..407eadf 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbs @@ -7,8 +7,8 @@ include std include itkvtk include creaMaracasVisu include wx -include vtk include std +include vtk include creaVtk include PackRecalage include toolsbbtk @@ -27,11 +27,6 @@ new creaMaracasVisu:ShowNPoints showNpoints new wx:LayoutLine Box08 -new vtk:UpdateRender Box11 - set Box11.Active "true" - -new std:MultipleInputs Box31 - new creaMaracasVisu:wxPopupMenu Box57 set Box57.WithCtrlKey "true" @@ -296,16 +291,15 @@ new std:MagicBox Box156 new creaMaracasVisu:InteractorStyleMaracas_Model Box157 +new std:MagicBox Box158 + -connect Box31.BoxChange Box11.BoxExecute connect Box58.Out Box57.In connect showNpoints.WidgetShowNPoints Box60.WidgetShowNPoints connect Box57.BoxChange Box60.BoxExecute connect Box68.Spacing Box60.Spacing -connect Box66.Out Box11.Renderer connect Box66.Out showNpoints.Renderer connect Box66.Out Box48.render -connect Box48.boxchange Box31.In1 connect Box35.Out Box68.In connect Box35.Out showNpoints.Image connect Box66.Out Box37.render @@ -361,16 +355,12 @@ connect Box107.Out Box102.Border connect Box106.OutStart Box110.In1 connect Box106.OutEnd Box110.In3 connect Box110.Out Box102.Threshold -connect Box63.BoxChange Box111.In1 -connect Box31.BoxChange Box111.In3 connect Box111.BoxChange Box62._execute connect Box63.BoxChange Box112.In1 connect Box37.boxchange Box112.In3 connect Box112.BoxChange Box72._execute -connect Box113.BoxChange Box31.BoxExecute connect Box113.Out Box48.polydata connect Box113.Out Box62._polydata -connect Box113.BoxChange Box48.boxexecute connect Box114.Out Box113.In connect Box118.BoxChange Box113.BoxExecute connect Box108.BoxChange Box118.In3 @@ -447,7 +437,6 @@ connect Box152.Out showNpoints.In connect Box156.Out Box154.In1 connect Box155.Out Box154.Type connect Box153.Out Box155.In -connect Box63.BoxChange Box154.BoxExecute connect Box152.Box_ConcatStrings Box154.Box_ConcatString connect Box57.InteractorStyleMaracas Box157.InteractorStyleMaracas connect Box57.InteractorStyleMaracas2 Box157.InteractorStyleMaracas2 @@ -455,18 +444,22 @@ connect Box57.InteractorStyleMaracas3 Box157.InteractorStyleMaracas3 connect Box57.InteractorStyleMaracas4 Box157.InteractorStyleMaracas4 connect Box153.Out Box157.Active connect Box153.BoxChange Box157.BoxExecute +connect Box158.BoxChange Box154.BoxExecute +connect Box158.BoxChange Box111.In1 +connect Box118.BoxChange Box48.boxexecute +connect Box118.BoxChange Box111.In2 # Complex input ports input mesh Box67.In " " input image Box35.In " " input title Box08.WinTitle " " input meshmanagermodel Box46.In " " -input boxChange Box63.In " " input wxvtkbaseview2 Box64.In " " input wxvtkbaseview3 Box65.In " " input wxvtkbaseview4 Box69.In " " input wxvtkbaseview1 Box71.In " " input point Box156.In " " +input boxChange Box158.In " " # Complex output ports output widget Box08.Widget " " -- 2.47.1