From 715ea4189445a85070dec43f791d383df67c2e55 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Tue, 4 Jul 2023 17:47:32 +0200 Subject: [PATCH] Clean code --- bbtk/bbs/boxes/Mesh_Application.bbg | 66 ++++++------- bbtk/bbs/boxes/Mesh_Application.bbs | 20 ++-- bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg | 58 ++++++++---- bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs | 20 ++-- bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbg | 92 +++++++++++++----- bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbs | 29 ++++-- bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg | 76 +++++++++------ bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs | 22 +++-- .../bbs/boxes/Mesh_tool_ApplyExternalMask.bbg | 78 +++++++++------ .../bbs/boxes/Mesh_tool_ApplyExternalMask.bbs | 21 +++-- bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg | 25 ++--- bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs | 6 +- bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbg | 21 +---- bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbs | 6 +- bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg | 92 +++++++++++++----- bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs | 26 +++-- .../Mesh_tool_ApplyThresholdConnectivity.bbg | 94 +++++++++++-------- .../Mesh_tool_ApplyThresholdConnectivity.bbs | 34 ++++--- 18 files changed, 491 insertions(+), 295 deletions(-) diff --git a/bbtk/bbs/boxes/Mesh_Application.bbg b/bbtk/bbs/boxes/Mesh_Application.bbg index a86da7e..d5b3814 100644 --- a/bbtk/bbs/boxes/Mesh_Application.bbg +++ b/bbtk/bbs/boxes/Mesh_Application.bbg @@ -80,8 +80,8 @@ FIN_BOX BOX creaMaracasVisu:PolyDataToActor_Widget:Box15 ISEXEC:FALSE --102.522727:-31.382904:-900.000000 --79.502727:-33.882904:-900.000000 +-72.256704:-34.463876:-900.000000 +-49.236704:-36.963876:-900.000000 PORT color:"1 0.7 0.7" PORT @@ -120,8 +120,8 @@ FIN_BOX BOX creaMaracasVisu:MeshContours_Widget:Box17 ISEXEC:FALSE --67.813268:-29.868406:-900.000000 --45.018268:-32.368406:-900.000000 +-98.622992:-34.580481:-900.000000 +-75.827992:-37.080481:-900.000000 PORT colorMesh:"1 0 0" FIN_BOX @@ -134,8 +134,8 @@ FIN_BOX BOX wx:LayoutLine:Box22 ISEXEC:FALSE --97.560494:-121.427293:-900.000000 --64.240494:-123.927293:-900.000000 +-99.372831:-123.783331:-900.000000 +-66.052831:-126.283331:-900.000000 PORT Orientation:"H" FIN_BOX @@ -246,20 +246,12 @@ PORT I:"0" FIN_BOX BOX -wx:LayoutLine:Box34 -ISEXEC:FALSE --208.241265:-123.706763:-900.000000 --174.921265:-126.206763:-900.000000 -PORT -Orientation:"H" -FIN_BOX -BOX creaMaracasVisu:Mesh_tool_ApplyPatch:Box38 ISEXEC:FALSE 206.586242:6.489743:-900.000000 229.426242:3.989743:-900.000000 PORT -title:"Extrusion" +title:"Extrusion (Yellow)" FIN_BOX BOX std:GetVectorStringElement:Box39 @@ -634,8 +626,8 @@ FIN_BOX BOX wx:LayoutLine:Box99 ISEXEC:FALSE --216.714240:-107.013976:-900.000000 --183.394240:-109.513976:-900.000000 +-217.801642:-105.382873:-900.000000 +-184.481642:-107.882873:-900.000000 FIN_BOX BOX wx:ComboBox:Box100 @@ -667,7 +659,7 @@ ISEXEC:FALSE 154.995745:7.213292:-900.000000 178.600745:4.713292:-900.000000 PORT -title:"Simple" +title:"Simple (Yelow)" FIN_BOX BOX creaMaracasVisu:InteractorStyleMaracas_Model:Box105 @@ -719,6 +711,14 @@ ISEXEC:FALSE 197.600426:-121.409234:-900.000000 218.685426:-123.909234:-900.000000 FIN_BOX +BOX +wx:LayoutLine:Box112 +ISEXEC:FALSE +-84.051193:-112.269753:-900.000000 +-50.731193:-114.769753:-900.000000 +PORT +Orientation:"H" +FIN_BOX CONNECTIONS:224 CONNECTION Box08:MeshBase:Box15:polydata @@ -802,9 +802,6 @@ CONNECTION Box31:BoxChange:Box26:BoxExecute NumberOfControlPoints:0 CONNECTION -Box34:Widget:Box22:Widget2 -NumberOfControlPoints:0 -CONNECTION Box07:Out:Box38:image NumberOfControlPoints:0 CONNECTION @@ -829,12 +826,6 @@ CONNECTION Box38:interactorStyleMaracas4:Box40:InteractorStyleMaracas4 NumberOfControlPoints:0 CONNECTION -Box17:_widget:Box22:Widget4 -NumberOfControlPoints:0 -CONNECTION -Box15:widget:Box22:Widget6 -NumberOfControlPoints:0 -CONNECTION Box07:Out:Box46:image NumberOfControlPoints:0 CONNECTION @@ -1282,9 +1273,6 @@ CONNECTION Box53:Widget:Box99:Widget4 NumberOfControlPoints:0 CONNECTION -Box99:Widget:Box34:Widget4 -NumberOfControlPoints:0 -CONNECTION Box100:BoxChange:Box28:In1 NumberOfControlPoints:0 CONNECTION @@ -1294,9 +1282,6 @@ CONNECTION Box100:Out:Box29:In NumberOfControlPoints:0 CONNECTION -Box100:Widget:Box34:Widget2 -NumberOfControlPoints:0 -CONNECTION Box92:Widget:Box97:Widget1 NumberOfControlPoints:0 CONNECTION @@ -1392,4 +1377,19 @@ NumberOfControlPoints:0 CONNECTION Box110:Out:Box105:Active NumberOfControlPoints:0 +CONNECTION +Box17:_widget:Box112:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box15:widget:Box112:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box112:Widget:Box22:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box100:Widget:Box22:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box99:Widget:Box22:Widget3 +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_Application.bbs b/bbtk/bbs/boxes/Mesh_Application.bbs index 7550253..0b65de3 100644 --- a/bbtk/bbs/boxes/Mesh_Application.bbs +++ b/bbtk/bbs/boxes/Mesh_Application.bbs @@ -87,11 +87,8 @@ new std:GetVectorDoubleElement Box32 new std:GetVectorDoubleElement Box33 set Box33.I "0" -new wx:LayoutLine Box34 - set Box34.Orientation "H" - new creaMaracasVisu:Mesh_tool_ApplyPatch Box38 - set Box38.title "Extrusion" + set Box38.title "Extrusion (Yellow)" new std:GetVectorStringElement Box39 set Box39.I "3" @@ -242,7 +239,7 @@ new wx:LayoutTab Box102 set Box102.WinTitle "Patch" new creaMaracasVisu:Mesh_tool_ApplyPatchSimple Box103 - set Box103.title "Simple" + set Box103.title "Simple (Yelow)" new creaMaracasVisu:InteractorStyleMaracas_Model Box105 @@ -262,6 +259,9 @@ new std:Mul Box110 new std:Mul Box111 +new wx:LayoutLine Box112 + set Box112.Orientation "H" + connect Box08.MeshBase Box15.polydata connect Box08.MeshTemp Box10.mesh @@ -290,7 +290,6 @@ connect Box33.Out Box26.ColorWindow connect Box32.Out Box26.ColorLevel connect Box28.BoxChange Box31.BoxExecute connect Box31.BoxChange Box26.BoxExecute -connect Box34.Widget Box22.Widget2 connect Box07.Out Box38.image connect Box08.MeshTemp Box38.mesh connect Box08.MeshManagerModel Box38.meshmanagermodel @@ -299,8 +298,6 @@ connect Box38.interactorStyleMaracas Box40.InteractorStyleMaracas connect Box38.interactorStyleMaracas2 Box40.InteractorStyleMaracas2 connect Box38.interactorStyleMaracas3 Box40.InteractorStyleMaracas3 connect Box38.interactorStyleMaracas4 Box40.InteractorStyleMaracas4 -connect Box17._widget Box22.Widget4 -connect Box15.widget Box22.Widget6 connect Box07.Out Box46.image connect Box08.MeshTemp Box46.mesh connect Box08.MeshManagerModel Box46.meshmanagermodel @@ -437,11 +434,9 @@ connect Box86.Widget Box97.Widget8 connect Box22.Widget Box98.Widget5 connect Box54.Widget Box99.Widget2 connect Box53.Widget Box99.Widget4 -connect Box99.Widget Box34.Widget4 connect Box100.BoxChange Box28.In1 connect Box100.Out Box30.In1 connect Box100.Out Box29.In -connect Box100.Widget Box34.Widget2 connect Box92.Widget Box97.Widget1 connect Box79.Widget Box97.Widget3 connect Box101.widget Box12.Widget1 @@ -474,6 +469,11 @@ connect Box39.Out Box111.In1 connect Box108.Out Box111.In2 connect Box111.Out Box40.Active connect Box110.Out Box105.Active +connect Box17._widget Box112.Widget2 +connect Box15.widget Box112.Widget4 +connect Box112.Widget Box22.Widget4 +connect Box100.Widget Box22.Widget2 +connect Box99.Widget Box22.Widget3 # Complex input ports input MeshIn Box56.In " " diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg index 154dc75..24f69b3 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.5 BBG BlackBox Diagram file -# - /home/garzon/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg +# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg # ---------------------------------- APP_START @@ -52,7 +52,7 @@ COMPLEX_PORT meshmanagermodel -131.800179:136.578564:-900.000000 FIN_COMPLEX_PORT -BOXES:37 +BOXES:39 BOX wx:LayoutLine:Box08 ISEXEC:FALSE @@ -112,8 +112,8 @@ FIN_BOX BOX creaMaracasVisu:PolyDataToActor_Widget:Box37 ISEXEC:FALSE --36.296182:-79.717323:-900.000000 --13.276182:-82.217323:-900.000000 +-40.040679:-78.069744:-900.000000 +-17.020679:-80.569744:-900.000000 PORT color:"0 1 1" PORT @@ -149,7 +149,7 @@ ISEXEC:FALSE PORT Orientation:"V" PORT -WinTitle:"Mesh Action" +WinTitle:"1.1 Mesh Action" FIN_BOX BOX creaVtk:MeshManager_tool:Box45 @@ -204,8 +204,8 @@ FIN_BOX BOX creaMaracasVisu:MeshContours_Widget:Box72 ISEXEC:FALSE --109.985892:-79.925596:-900.000000 --87.190892:-82.425596:-900.000000 +-106.990294:-78.577577:-900.000000 +-84.195294:-81.077577:-900.000000 PORT colorMesh:"0 1 1" FIN_BOX @@ -323,9 +323,25 @@ ISEXEC:FALSE PORT Orientation:"V" PORT -WinTitle:"Apply Changes" +WinTitle:"1.2 Apply Changes" FIN_BOX -CONNECTIONS:54 +BOX +wx:LayoutTab:Box50 +ISEXEC:FALSE +-84.550879:-51.791022:-900.000000 +-51.230879:-54.291022:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box52 +ISEXEC:FALSE +-75.572246:-93.852846:-900.000000 +-42.252246:-96.352846:-900.000000 +PORT +Orientation:"H" +PORT +WinTitle:"New Surface ( Magenta )" +FIN_BOX +CONNECTIONS:56 CONNECTION Box08:Widget:widget:widget NumberOfControlPoints:0 @@ -387,9 +403,6 @@ CONNECTION Box69:Out:Box72:_wxvtkbaseview2D3 NumberOfControlPoints:0 CONNECTION -Box72:_widget:Box79:Widget6 -NumberOfControlPoints:0 -CONNECTION Box44:Widget:Box82:Widget2 NumberOfControlPoints:0 CONNECTION @@ -417,9 +430,6 @@ CONNECTION Box96:vtkRenderer:Box66:In NumberOfControlPoints:0 CONNECTION -Box37:widget:Box79:Widget7 -NumberOfControlPoints:0 -CONNECTION Box98:Out:Box97:InImage NumberOfControlPoints:0 CONNECTION @@ -471,9 +481,6 @@ CONNECTION Box42:Widget:Box49:Widget2 NumberOfControlPoints:0 CONNECTION -Box49:Widget:Box82:Widget4 -NumberOfControlPoints:0 -CONNECTION Box42:BoxChange:Box51:BoxExecute NumberOfControlPoints:0 CONNECTION @@ -488,4 +495,19 @@ NumberOfControlPoints:0 CONNECTION Box92:MeshManagerModel:Box47:MeshManagerModel NumberOfControlPoints:0 +CONNECTION +Box49:Widget:Box50:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box50:Widget:Box79:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box72:_widget:Box52:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box37:widget:Box52:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box52:Widget:Box79:Widget6 +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs index bda8316..43b63a1 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box) -# - /home/garzon/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs +# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs # ---------------------------------- include std @@ -52,7 +52,7 @@ new wx:CommandButton Box43 new wx:LayoutLine Box44 set Box44.Orientation "V" - set Box44.WinTitle "Mesh Action" + set Box44.WinTitle "1.1 Mesh Action" new creaVtk:MeshManager_tool Box45 set Box45.Tool "30" @@ -115,7 +115,13 @@ new creaVtk:PolyDataNormals Box39 new wx:LayoutLine Box49 set Box49.Orientation "V" - set Box49.WinTitle "Apply Changes" + set Box49.WinTitle "1.2 Apply Changes" + +new wx:LayoutTab Box50 + +new wx:LayoutLine Box52 + set Box52.Orientation "H" + set Box52.WinTitle "New Surface ( Magenta )" connect Box66.Out Box11.Renderer @@ -128,7 +134,6 @@ connect Box71.Out Box72._wxvtkbaseview3D1 connect Box64.Out Box72._wxvtkbaseview2D1 connect Box65.Out Box72._wxvtkbaseview2D2 connect Box69.Out Box72._wxvtkbaseview2D3 -connect Box72._widget Box79.Widget6 connect Box44.Widget Box82.Widget2 connect Box82.Widget Box79.Widget2 connect Box84.Widget Box44.Widget9 @@ -138,7 +143,6 @@ connect Box92.MeshBase Box37.polydata connect Box81.Widget Box08.Widget2 connect Box71.Out Box96.wxVtkBaseView connect Box96.vtkRenderer Box66.In -connect Box37.widget Box79.Widget7 connect Box98.Out Box97.InImage connect Box68.Spacing Box98.Spacing connect Box68.Size Box98.Dimensions @@ -156,12 +160,16 @@ connect Box41.Out Box39.In connect Box39.Out Box93.Mesh connect Box43.Widget Box44.Widget2 connect Box42.Widget Box49.Widget2 -connect Box49.Widget Box82.Widget4 connect Box42.BoxChange Box51.BoxExecute connect Box45.BoxChange Box51.In2 connect Box80.BoxChange Box93.BoxExecute connect Box47.BoxChange Box51.In5 connect Box92.MeshManagerModel Box47.MeshManagerModel +connect Box49.Widget Box50.Widget2 +connect Box50.Widget Box79.Widget4 +connect Box72._widget Box52.Widget2 +connect Box37.widget Box52.Widget4 +connect Box52.Widget Box79.Widget6 # Complex input ports input mesh Box67.In " " diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbg index 76b3eed..df5fbe3 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbg @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.5 BBG BlackBox Diagram file -# - /home/garzon/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbg +# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbg # ---------------------------------- APP_START @@ -72,7 +72,7 @@ COMPLEX_PORT meshmanagermodel -150.374274:130.740991:-900.000000 FIN_COMPLEX_PORT -BOXES:137 +BOXES:141 BOX creaMaracasVisu:ShowNPoints:showNpoints ISEXEC:FALSE @@ -302,8 +302,8 @@ FIN_BOX BOX wx:LayoutLine:Box38 ISEXEC:FALSE --190.854929:-82.522396:-900.000000 --157.534929:-85.022396:-900.000000 +-190.391973:-82.767490:-900.000000 +-157.071973:-85.267490:-900.000000 PORT Orientation:"H" PORT @@ -466,14 +466,14 @@ FIN_BOX BOX wx:LayoutTab:Box82 ISEXEC:FALSE --142.286608:-51.350487:-900.000000 --108.966608:-53.850487:-900.000000 +-142.534178:-54.568898:-900.000000 +-109.214178:-57.068898:-900.000000 FIN_BOX BOX wx:OutputText:Box84 ISEXEC:FALSE --127.611417:-38.148449:-900.000000 --105.941417:-40.648449:-900.000000 +-133.924454:-35.177608:-900.000000 +-112.254454:-37.677608:-900.000000 FIN_BOX BOX wx:LayoutTab:Box86 @@ -1243,7 +1243,37 @@ Orientation:"V" PORT WinTitle:"1.3 Apply Changes" FIN_BOX -CONNECTIONS:240 +BOX +wx:LayoutLine:Box222 +ISEXEC:FALSE +-130.024045:-76.628158:-900.000000 +-96.704045:-79.128158:-900.000000 +PORT +Orientation:"H" +FIN_BOX +BOX +wx:LayoutTab:Box223 +ISEXEC:FALSE +-126.491725:-59.870472:-900.000000 +-93.171725:-62.370472:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box226 +ISEXEC:FALSE +-184.922796:-71.172812:-900.000000 +-151.602796:-73.672812:-900.000000 +PORT +Orientation:"H" +FIN_BOX +BOX +wx:LayoutTab:Box228 +ISEXEC:FALSE +35.352920:-77.022907:-900.000000 +68.672920:-79.522907:-900.000000 +PORT +WinTitle:"Tool" +FIN_BOX +CONNECTIONS:244 CONNECTION Box06:LstContourPointsX:Box04:LstX NumberOfControlPoints:0 @@ -1485,12 +1515,6 @@ CONNECTION Box69:Out:Box72:_wxvtkbaseview2D3 NumberOfControlPoints:0 CONNECTION -Box72:_widget:Box79:Widget6 -NumberOfControlPoints:0 -CONNECTION -Box62:_widget:Box38:Widget7 -NumberOfControlPoints:0 -CONNECTION Box39:Widget:Box81:Widget2 NumberOfControlPoints:0 CONNECTION @@ -1560,12 +1584,6 @@ CONNECTION Box96:vtkRenderer:Box66:In NumberOfControlPoints:0 CONNECTION -Box37:widget:Box79:Widget7 -NumberOfControlPoints:0 -CONNECTION -Box48:widget:Box38:Widget8 -NumberOfControlPoints:0 -CONNECTION Box43:Widget:Box44:Widget1 NumberOfControlPoints:0 CONNECTION @@ -1786,9 +1804,6 @@ CONNECTION Box148:Widget:Box184:Widget4 NumberOfControlPoints:0 CONNECTION -Box184:Widget:Box86:Widget6 -NumberOfControlPoints:0 -CONNECTION Box184:Selection:Box185:In NumberOfControlPoints:0 CONNECTION @@ -1963,6 +1978,33 @@ CONNECTION Box42:Widget:Box225:Widget1 NumberOfControlPoints:0 CONNECTION -Box225:Widget:Box82:Widget4 +Box72:_widget:Box222:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box222:Widget:Box79:Widget6 +NumberOfControlPoints:0 +CONNECTION +Box225:Widget:Box223:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box223:Widget:Box79:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box62:_widget:Box226:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box37:widget:Box222:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box48:widget:Box226:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box226:Widget:Box38:Widget6 +NumberOfControlPoints:0 +CONNECTION +Box184:Widget:Box228:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box228:Widget:Box38:Widget4 NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbs index add665b..23fc2c2 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbs @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box) -# - /home/garzon/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbs +# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbs # ---------------------------------- include std @@ -466,6 +466,17 @@ new wx:LayoutLine Box225 set Box225.Orientation "V" set Box225.WinTitle "1.3 Apply Changes" +new wx:LayoutLine Box222 + set Box222.Orientation "H" + +new wx:LayoutTab Box223 + +new wx:LayoutLine Box226 + set Box226.Orientation "H" + +new wx:LayoutTab Box228 + set Box228.WinTitle "Tool" + connect Box06.LstContourPointsX Box04.LstX connect showNpoints.lstIndexs Box06.LstIndexsIn @@ -536,8 +547,6 @@ connect Box71.Out Box72._wxvtkbaseview3D1 connect Box64.Out Box72._wxvtkbaseview2D1 connect Box65.Out Box72._wxvtkbaseview2D2 connect Box69.Out Box72._wxvtkbaseview2D3 -connect Box72._widget Box79.Widget6 -connect Box62._widget Box38.Widget7 connect Box39.Widget Box81.Widget2 connect Box40.Widget Box81.Widget4 connect Box44.Widget Box82.Widget2 @@ -558,8 +567,6 @@ connect Box94.BoxChange Box37.boxexecute connect Box77.BoxChange Box94.BoxExecute connect Box71.Out Box96.wxVtkBaseView connect Box96.vtkRenderer Box66.In -connect Box37.widget Box79.Widget7 -connect Box48.widget Box38.Widget8 connect Box43.Widget Box44.Widget1 connect Box78.Widget Box98.Widget2 connect Box80.Widget Box98.Widget4 @@ -632,7 +639,6 @@ connect Box164.Widget Box168.Widget3 connect Box165.Widget Box168.Widget4 connect Box135.Widget Box184.Widget2 connect Box148.Widget Box184.Widget4 -connect Box184.Widget Box86.Widget6 connect Box184.Selection Box185.In connect Box185.Out Box04.CloseSurface connect Box185.Out Box06.OpenClose @@ -691,7 +697,16 @@ connect Box77.Out Box224.In connect Box224.Out Box97.In connect Box97.Out Box93.Mesh connect Box42.Widget Box225.Widget1 -connect Box225.Widget Box82.Widget4 +connect Box72._widget Box222.Widget2 +connect Box222.Widget Box79.Widget6 +connect Box225.Widget Box223.Widget2 +connect Box223.Widget Box79.Widget4 +connect Box62._widget Box226.Widget2 +connect Box37.widget Box222.Widget4 +connect Box48.widget Box226.Widget4 +connect Box226.Widget Box38.Widget6 +connect Box184.Widget Box228.Widget1 +connect Box228.Widget Box38.Widget4 # Complex input ports input point showNpoints.In " " diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg index 7fc8b09..5ea7257 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.5 BBG BlackBox Diagram file -# - /home/garzon/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg +# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg # ---------------------------------- APP_START @@ -56,7 +56,7 @@ COMPLEX_PORT meshmanagermodel -131.800179:136.578564:-900.000000 FIN_COMPLEX_PORT -BOXES:79 +BOXES:81 BOX wx:LayoutLine:Box08 ISEXEC:FALSE @@ -74,8 +74,8 @@ FIN_BOX BOX wx:LayoutLine:Box79 ISEXEC:FALSE --131.034747:-92.367694:-900.000000 --97.714747:-94.867694:-900.000000 +-144.989740:-96.536068:-900.000000 +-111.669740:-99.036068:-900.000000 PORT Orientation:"H" PORT @@ -140,12 +140,12 @@ FIN_BOX BOX wx:LayoutLine:Box44 ISEXEC:FALSE --115.630816:-43.110903:-900.000000 --82.310816:-45.610903:-900.000000 +-124.481446:-40.387632:-900.000000 +-91.161446:-42.887632:-900.000000 PORT Orientation:"V" PORT -WinTitle:"Mesh Action" +WinTitle:"1.1 Mesh Action" FIN_BOX BOX creaVtk:MeshManager_tool:Box45 @@ -200,8 +200,8 @@ FIN_BOX BOX creaMaracasVisu:MeshContours_Widget:Box72 ISEXEC:FALSE --120.178805:-84.278902:-900.000000 --97.383805:-86.778902:-900.000000 +-120.723459:-80.874814:-900.000000 +-97.928459:-83.374814:-900.000000 PORT colorMesh:"0 1 1" FIN_BOX @@ -216,8 +216,8 @@ FIN_BOX BOX wx:LayoutTab:Box82 ISEXEC:FALSE --124.770231:-53.363834:-900.000000 --91.450231:-55.863834:-900.000000 +-104.618027:-57.040250:-900.000000 +-71.298027:-59.540250:-900.000000 FIN_BOX BOX creaMaracasVisu:wxVtkBaseView_Info:Box96 @@ -656,14 +656,30 @@ FIN_BOX BOX wx:LayoutLine:Box124 ISEXEC:FALSE --150.956440:-43.466836:-900.000000 --117.636440:-45.966836:-900.000000 +-98.261150:-41.696710:-900.000000 +-64.941150:-44.196710:-900.000000 PORT Orientation:"V" PORT -WinTitle:"Apply Changes" +WinTitle:"1.2 Apply Changes" FIN_BOX -CONNECTIONS:154 +BOX +wx:LayoutLine:Box125 +ISEXEC:FALSE +-123.187569:-88.834024:-900.000000 +-89.867569:-91.334024:-900.000000 +PORT +Orientation:"H" +PORT +WinTitle:"New Surface ( Magenta )" +FIN_BOX +BOX +wx:LayoutTab:Box126 +ISEXEC:FALSE +-135.688159:-55.669810:-900.000000 +-102.368159:-58.169810:-900.000000 +FIN_BOX +CONNECTIONS:156 CONNECTION Box08:Widget:widget:widget NumberOfControlPoints:0 @@ -725,24 +741,12 @@ CONNECTION Box69:Out:Box72:_wxvtkbaseview2D3 NumberOfControlPoints:0 CONNECTION -Box72:_widget:Box79:Widget6 -NumberOfControlPoints:0 -CONNECTION -Box44:Widget:Box82:Widget2 -NumberOfControlPoints:0 -CONNECTION -Box82:Widget:Box79:Widget2 -NumberOfControlPoints:0 -CONNECTION Box81:Widget:Box08:Widget2 NumberOfControlPoints:0 CONNECTION Box96:vtkRenderer:Box66:In NumberOfControlPoints:0 CONNECTION -Box37:widget:Box79:Widget7 -NumberOfControlPoints:0 -CONNECTION Box40:Widget:Box81:Widget2 NumberOfControlPoints:0 CONNECTION @@ -1126,4 +1130,22 @@ NumberOfControlPoints:0 CONNECTION Box62:MeshBase:Box122:In NumberOfControlPoints:0 +CONNECTION +Box37:widget:Box125:Widget5 +NumberOfControlPoints:0 +CONNECTION +Box72:_widget:Box125:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box125:Widget:Box79:Widget7 +NumberOfControlPoints:0 +CONNECTION +Box44:Widget:Box126:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box126:Widget:Box79:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box82:Widget:Box79:Widget4 +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs index bc767cd..84d5bef 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box) -# - /home/garzon/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs +# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs # ---------------------------------- include std @@ -50,7 +50,7 @@ new wx:CommandButton Box43 new wx:LayoutLine Box44 set Box44.Orientation "V" - set Box44.WinTitle "Mesh Action" + set Box44.WinTitle "1.1 Mesh Action" new creaVtk:MeshManager_tool Box45 set Box45.Tool "32" @@ -241,7 +241,13 @@ new wx:CheckBox_tool Box123 new wx:LayoutLine Box124 set Box124.Orientation "V" - set Box124.WinTitle "Apply Changes" + set Box124.WinTitle "1.2 Apply Changes" + +new wx:LayoutLine Box125 + set Box125.Orientation "H" + set Box125.WinTitle "New Surface ( Magenta )" + +new wx:LayoutTab Box126 connect Box66.Out Box11.Renderer @@ -254,12 +260,8 @@ connect Box71.Out Box72._wxvtkbaseview3D1 connect Box64.Out Box72._wxvtkbaseview2D1 connect Box65.Out Box72._wxvtkbaseview2D2 connect Box69.Out Box72._wxvtkbaseview2D3 -connect Box72._widget Box79.Widget6 -connect Box44.Widget Box82.Widget2 -connect Box82.Widget Box79.Widget2 connect Box81.Widget Box08.Widget2 connect Box96.vtkRenderer Box66.In -connect Box37.widget Box79.Widget7 connect Box40.Widget Box81.Widget2 connect Box37.boxchange Box11.BoxExecute connect Box50.Out Box58.Active @@ -387,6 +389,12 @@ connect Box62.MeshBase Box37.polydata connect Box62.MeshBase Box75.Mesh connect Box62.MeshBase Box106.Mesh connect Box62.MeshBase Box122.In +connect Box37.widget Box125.Widget5 +connect Box72._widget Box125.Widget2 +connect Box125.Widget Box79.Widget7 +connect Box44.Widget Box126.Widget2 +connect Box126.Widget Box79.Widget2 +connect Box82.Widget Box79.Widget4 # Complex input ports input mesh Box67.In " " diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbg index cf003d7..063efd2 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:85 +BOXES:87 BOX wx:LayoutLine:Box08 ISEXEC:FALSE @@ -84,8 +84,8 @@ FIN_BOX BOX wx:LayoutLine:Box79 ISEXEC:FALSE --142.444548:-98.205267:-900.000000 --109.124548:-100.705267:-900.000000 +-146.488605:-101.350645:-900.000000 +-113.168605:-103.850645:-900.000000 PORT Orientation:"H" PORT @@ -120,8 +120,8 @@ FIN_BOX BOX creaMaracasVisu:PolyDataToActor_Widget:Box37 ISEXEC:FALSE --36.296182:-79.717323:-900.000000 --13.276182:-82.217323:-900.000000 +-33.972623:-79.041343:-900.000000 +-10.952623:-81.541343:-900.000000 PORT color:"0 1 1" PORT @@ -152,12 +152,12 @@ FIN_BOX BOX wx:LayoutLine:Box44 ISEXEC:FALSE --122.128535:-44.031647:-900.000000 --88.808535:-46.531647:-900.000000 +-122.128535:-41.784949:-900.000000 +-88.808535:-44.284949:-900.000000 PORT Orientation:"V" PORT -WinTitle:"Mesh Action" +WinTitle:"1.2 Mesh Action" FIN_BOX BOX creaVtk:MeshManager_tool:Box45 @@ -212,8 +212,8 @@ FIN_BOX BOX creaMaracasVisu:MeshContours_Widget:Box72 ISEXEC:FALSE --109.985892:-79.925596:-900.000000 --87.190892:-82.425596:-900.000000 +-111.034351:-74.084180:-900.000000 +-88.239351:-76.584180:-900.000000 PORT colorMesh:"0 1 1" FIN_BOX @@ -228,20 +228,20 @@ FIN_BOX BOX wx:LayoutTab:Box82 ISEXEC:FALSE --123.564121:-52.398946:-900.000000 --90.244121:-54.898946:-900.000000 +-124.163241:-51.500267:-900.000000 +-90.843241:-54.000267:-900.000000 FIN_BOX BOX wx:OutputText:Box84 ISEXEC:FALSE --90.166444:-34.853291:-900.000000 --68.496444:-37.353291:-900.000000 +-90.466004:-30.210114:-900.000000 +-68.796004:-32.710114:-900.000000 FIN_BOX BOX creaVtk:MeshManager:Box92 ISEXEC:FALSE --180.315243:-41.937258:-900.000000 --158.285243:-44.437258:-900.000000 +-180.315243:-39.690560:-900.000000 +-158.285243:-42.190560:-900.000000 FIN_BOX BOX creaVtk:MeshManager_tool:Box93 @@ -401,7 +401,7 @@ ISEXEC:FALSE PORT Orientation:"H" PORT -WinTitle:"External Mask" +WinTitle:"External Mask (Yellow)" FIN_BOX BOX wx:OutputText:Box89 @@ -429,7 +429,7 @@ ISEXEC:FALSE PORT Orientation:"V" PORT -WinTitle:"Apply Changes" +WinTitle:"1.3 Apply Changes" FIN_BOX BOX std:ConcatStrings:Box78 @@ -443,7 +443,7 @@ ISEXEC:FALSE -420.157760:107.575729:-900.000000 -397.882760:105.075729:-900.000000 PORT -Label:"Run Contour Application" +Label:"1.1 Run Contour Application" FIN_BOX BOX std:ExecSystemCommand:Box94 @@ -703,7 +703,21 @@ ISEXEC:FALSE PORT I:"0" FIN_BOX -CONNECTIONS:132 +BOX +wx:LayoutTab:Box136 +ISEXEC:FALSE +-87.246917:-53.288821:-900.000000 +-53.926917:-55.788821:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box137 +ISEXEC:FALSE +-76.171365:-94.451965:-900.000000 +-42.851365:-96.951965:-900.000000 +PORT +Orientation:"H" +FIN_BOX +CONNECTIONS:134 CONNECTION Box08:Widget:widget:widget NumberOfControlPoints:0 @@ -768,9 +782,6 @@ CONNECTION Box69:Out:Box72:_wxvtkbaseview2D3 NumberOfControlPoints:0 CONNECTION -Box72:_widget:Box79:Widget6 -NumberOfControlPoints:0 -CONNECTION Box44:Widget:Box82:Widget2 NumberOfControlPoints:0 CONNECTION @@ -798,9 +809,6 @@ CONNECTION Box96:vtkRenderer:Box66:In NumberOfControlPoints:0 CONNECTION -Box37:widget:Box79:Widget7 -NumberOfControlPoints:0 -CONNECTION Box98:Out:Box97:InImage NumberOfControlPoints:0 CONNECTION @@ -897,9 +905,6 @@ CONNECTION Box91:Widget:Box50:Widget2 NumberOfControlPoints:0 CONNECTION -Box77:Widget:Box82:Widget4 -NumberOfControlPoints:0 -CONNECTION Box42:Widget:Box77:Widget2 NumberOfControlPoints:0 CONNECTION @@ -1100,4 +1105,19 @@ NumberOfControlPoints:0 CONNECTION Box135:Out:Box133:In NumberOfControlPoints:0 +CONNECTION +Box77:Widget:Box136:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box136:Widget:Box79:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box37:widget:Box137:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box72:_widget:Box137:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box137:Widget:Box79:Widget7 +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbs index 3a58431..5bd843e 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbs @@ -53,7 +53,7 @@ new wx:CommandButton Box43 new wx:LayoutLine Box44 set Box44.Orientation "V" - set Box44.WinTitle "Mesh Action" + set Box44.WinTitle "1.2 Mesh Action" new creaVtk:MeshManager_tool Box45 set Box45.Tool "30" @@ -142,7 +142,7 @@ new vtk:ImageVtkProperties Box87 new wx:LayoutLine Box88 set Box88.Orientation "H" - set Box88.WinTitle "External Mask" + set Box88.WinTitle "External Mask (Yellow)" new wx:OutputText Box89 @@ -152,12 +152,12 @@ new wx:OutputText Box91 new wx:LayoutLine Box77 set Box77.Orientation "V" - set Box77.WinTitle "Apply Changes" + set Box77.WinTitle "1.3 Apply Changes" new std:ConcatStrings Box78 new wx:CommandButton Box86 - set Box86.Label "Run Contour Application" + set Box86.Label "1.1 Run Contour Application" new std:ExecSystemCommand Box94 @@ -255,6 +255,11 @@ new PackRecalage:AddImageToVector Box134 new vtk:GetVectorVtkImageDataElement Box135 set Box135.I "0" +new wx:LayoutTab Box136 + +new wx:LayoutLine Box137 + set Box137.Orientation "H" + connect Box66.Out Box11.Renderer connect Box35.Out Box68.In @@ -268,7 +273,6 @@ connect Box71.Out Box72._wxvtkbaseview3D1 connect Box64.Out Box72._wxvtkbaseview2D1 connect Box65.Out Box72._wxvtkbaseview2D2 connect Box69.Out Box72._wxvtkbaseview2D3 -connect Box72._widget Box79.Widget6 connect Box44.Widget Box82.Widget2 connect Box82.Widget Box79.Widget2 connect Box84.Widget Box44.Widget9 @@ -278,7 +282,6 @@ connect Box92.MeshBase Box37.polydata connect Box81.Widget Box08.Widget2 connect Box71.Out Box96.wxVtkBaseView connect Box96.vtkRenderer Box66.In -connect Box37.widget Box79.Widget7 connect Box98.Out Box97.InImage connect Box68.Spacing Box98.Spacing connect Box68.Size Box98.Dimensions @@ -311,7 +314,6 @@ connect Box89.Widget Box88.Widget2 connect Box90.Widget Box88.Widget3 connect Box88.Widget Box49.Widget2 connect Box91.Widget Box50.Widget2 -connect Box77.Widget Box82.Widget4 connect Box42.Widget Box77.Widget2 connect Box78.Out Box08.WinTitle connect Box86.Widget Box50.Widget4 @@ -376,6 +378,11 @@ connect Box135.Out Box87.In connect Box135.Out Box83.ImageFix connect Box135.Out Box123.In connect Box135.Out Box133.In +connect Box77.Widget Box136.Widget2 +connect Box136.Widget Box79.Widget4 +connect Box37.widget Box137.Widget4 +connect Box72._widget Box137.Widget2 +connect Box137.Widget Box79.Widget7 # Complex input ports input mesh Box67.In " " diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg index 84148c7..8a07f07 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg @@ -72,7 +72,7 @@ COMPLEX_PORT meshmanagermodel -150.374274:130.740991:-900.000000 FIN_COMPLEX_PORT -BOXES:87 +BOXES:86 BOX creaMaracasVisu:ShowNPoints:showNpoints ISEXEC:FALSE @@ -294,18 +294,10 @@ FIN_BOX BOX wx:LayoutLine:Box38 ISEXEC:FALSE --186.054864:-109.780662:-900.000000 --152.734864:-112.280662:-900.000000 +-187.702443:-113.525159:-900.000000 +-154.382443:-116.025159:-900.000000 PORT Orientation:"H" -PORT -WinTitle:"Interpolated Surface (Yellow)" -FIN_BOX -BOX -wx:LayoutTab:Box39 -ISEXEC:FALSE --199.676272:-131.174024:-900.000000 --166.356272:-133.674024:-900.000000 FIN_BOX BOX wx:LayoutTab:Box40 @@ -793,7 +785,7 @@ ISEXEC:FALSE -119.981994:-45.601028:-900.000000 -86.661994:-48.101028:-900.000000 FIN_BOX -CONNECTIONS:167 +CONNECTIONS:166 CONNECTION Box06:LstContourPointsX:Box04:LstX NumberOfControlPoints:0 @@ -918,9 +910,6 @@ CONNECTION Box66:Out:Box37:render NumberOfControlPoints:0 CONNECTION -Box38:Widget:Box39:Widget2 -NumberOfControlPoints:0 -CONNECTION meshmanagermodel:meshmanagermodel:Box46:In NumberOfControlPoints:0 CONNECTION @@ -999,9 +988,6 @@ CONNECTION Box37:widget:Box79:Widget4 NumberOfControlPoints:0 CONNECTION -Box39:Widget:Box81:Widget2 -NumberOfControlPoints:0 -CONNECTION Box44:Widget:Box82:Widget2 NumberOfControlPoints:0 CONNECTION @@ -1295,4 +1281,7 @@ NumberOfControlPoints:0 CONNECTION Box42:BoxChange:Box53:In3 NumberOfControlPoints:0 +CONNECTION +Box38:Widget:Box81:Widget2 +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs index 1169eb3..3845851 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs @@ -106,9 +106,6 @@ new creaMaracasVisu:PolyDataToActor_Widget Box37 new wx:LayoutLine Box38 set Box38.Orientation "H" - set Box38.WinTitle "Interpolated Surface (Yellow)" - -new wx:LayoutTab Box39 new wx:LayoutTab Box40 @@ -328,7 +325,6 @@ connect Box34.Out Box36.In1 connect Box36.Out Box30.Opacity connect Box34.BoxChange Box31.In2 connect Box66.Out Box37.render -connect Box38.Widget Box39.Widget2 connect Box46.Out Box45.MeshManagerModel connect Box49.OutString Box06.NbPoints connect Box45.BoxChange Box51.In2 @@ -349,7 +345,6 @@ connect Box64.Out Box72._wxvtkbaseview2D1 connect Box65.Out Box72._wxvtkbaseview2D2 connect Box69.Out Box72._wxvtkbaseview2D3 connect Box37.widget Box79.Widget4 -connect Box39.Widget Box81.Widget2 connect Box44.Widget Box82.Widget2 connect Box86.Widget Box38.Widget2 connect Box50.Widget Box86.Widget4 @@ -444,6 +439,7 @@ connect Box82.Widget Box146.Widget2 connect Box134.Widget Box147.Widget2 connect Box147.Widget Box146.Widget3 connect Box42.BoxChange Box53.In3 +connect Box38.Widget Box81.Widget2 # Complex input ports input point showNpoints.In " " diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbg index 393c957..538348f 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbg @@ -72,7 +72,7 @@ COMPLEX_PORT meshmanagermodel -150.374274:130.740991:-900.000000 FIN_COMPLEX_PORT -BOXES:80 +BOXES:79 BOX creaMaracasVisu:ShowNPoints:showNpoints ISEXEC:FALSE @@ -286,14 +286,6 @@ ISEXEC:FALSE -155.579529:-121.415301:-900.000000 PORT Orientation:"H" -PORT -WinTitle:"Interpolated Surface (Yellow)" -FIN_BOX -BOX -wx:LayoutTab:Box39 -ISEXEC:FALSE --189.869959:-129.650219:-900.000000 --156.549959:-132.150219:-900.000000 FIN_BOX BOX wx:LayoutTab:Box40 @@ -727,7 +719,7 @@ ISEXEC:FALSE 44.500333:-130.635183:-900.000000 66.580333:-133.135183:-900.000000 FIN_BOX -CONNECTIONS:164 +CONNECTIONS:163 CONNECTION Box06:LstContourPointsX:Box04:LstX NumberOfControlPoints:0 @@ -855,9 +847,6 @@ CONNECTION Box66:Out:Box37:render NumberOfControlPoints:0 CONNECTION -Box38:Widget:Box39:Widget2 -NumberOfControlPoints:0 -CONNECTION Box79:Widget:Box40:Widget2 NumberOfControlPoints:0 CONNECTION @@ -948,9 +937,6 @@ CONNECTION Box69:Out:Box72:_wxvtkbaseview2D3 NumberOfControlPoints:0 CONNECTION -Box39:Widget:Box81:Widget2 -NumberOfControlPoints:0 -CONNECTION Box44:Widget:Box82:Widget2 NumberOfControlPoints:0 CONNECTION @@ -1220,4 +1206,7 @@ NumberOfControlPoints:0 CONNECTION Box154:BoxChange:Box93:BoxExecute NumberOfControlPoints:0 +CONNECTION +Box38:Widget:Box81:Widget2 +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbs index 624cae1..3e9a5e5 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbs @@ -101,9 +101,6 @@ new creaMaracasVisu:PolyDataToActor_Widget Box37 new wx:LayoutLine Box38 set Box38.Orientation "H" - set Box38.WinTitle "Interpolated Surface (Yellow)" - -new wx:LayoutTab Box39 new wx:LayoutTab Box40 @@ -303,7 +300,6 @@ connect Box34.Out Box36.In1 connect Box36.Out Box30.Opacity connect Box34.BoxChange Box31.In2 connect Box66.Out Box37.render -connect Box38.Widget Box39.Widget2 connect Box79.Widget Box40.Widget2 connect Box46.Out Box45.MeshManagerModel connect Box49.OutString Box06.NbPoints @@ -328,7 +324,6 @@ connect Box71.Out Box72._wxvtkbaseview3D1 connect Box64.Out Box72._wxvtkbaseview2D1 connect Box65.Out Box72._wxvtkbaseview2D2 connect Box69.Out Box72._wxvtkbaseview2D3 -connect Box39.Widget Box81.Widget2 connect Box44.Widget Box82.Widget2 connect Box82.Widget Box79.Widget2 connect Box86.Widget Box38.Widget2 @@ -415,6 +410,7 @@ connect Box150.BoxChange Box37.boxexecute connect Box150.BoxChange Box154.In1 connect Box143.BoxChange Box154.In3 connect Box154.BoxChange Box93.BoxExecute +connect Box38.Widget Box81.Widget2 # Complex input ports input point showNpoints.In " " diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg index e38385c..0cf8340 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg @@ -72,7 +72,7 @@ COMPLEX_PORT meshmanagermodel -150.374274:130.740991:-900.000000 FIN_COMPLEX_PORT -BOXES:75 +BOXES:79 BOX creaMaracasVisu:ShowNPoints:showNpoints ISEXEC:FALSE @@ -364,8 +364,8 @@ FIN_BOX BOX wx:LayoutLine:Box50 ISEXEC:FALSE --26.479356:-58.435420:-900.000000 -6.840644:-60.935420:-900.000000 +-25.573188:-57.166784:-900.000000 +7.746812:-59.666784:-900.000000 PORT Orientation:"V" PORT @@ -454,8 +454,8 @@ FIN_BOX BOX wx:LayoutTab:Box82 ISEXEC:FALSE --142.286608:-51.350487:-900.000000 --108.966608:-53.850487:-900.000000 +-142.045386:-55.210039:-900.000000 +-108.725386:-57.710039:-900.000000 FIN_BOX BOX wx:OutputText:Box84 @@ -652,8 +652,8 @@ FIN_BOX BOX wx:LayoutLine:Box121 ISEXEC:FALSE --55.608595:-58.187882:-900.000000 --22.288595:-60.687882:-900.000000 +-57.058464:-57.644181:-900.000000 +-23.738464:-60.144181:-900.000000 PORT Orientation:"V" PORT @@ -689,7 +689,35 @@ ISEXEC:FALSE 134.627918:41.900202:-900.000000 157.387918:39.400202:-900.000000 FIN_BOX -CONNECTIONS:156 +BOX +wx:LayoutTab:Box122 +ISEXEC:FALSE +-131.307592:-66.064771:-900.000000 +-97.987592:-68.564771:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box123 +ISEXEC:FALSE +-125.240906:-102.743930:-900.000000 +-91.920906:-105.243930:-900.000000 +PORT +Orientation:"H" +FIN_BOX +BOX +wx:LayoutTab:Box124 +ISEXEC:FALSE +-17.115619:-76.494225:-900.000000 +16.204381:-78.994225:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box125 +ISEXEC:FALSE +-185.601081:-88.570292:-900.000000 +-152.281081:-91.070292:-900.000000 +PORT +Orientation:"H" +FIN_BOX +CONNECTIONS:160 CONNECTION Box06:LstContourPointsX:Box04:LstX NumberOfControlPoints:0 @@ -928,12 +956,6 @@ CONNECTION Box69:Out:Box72:_wxvtkbaseview2D3 NumberOfControlPoints:0 CONNECTION -Box72:_widget:Box79:Widget6 -NumberOfControlPoints:0 -CONNECTION -Box62:_widget:Box38:Widget7 -NumberOfControlPoints:0 -CONNECTION Box39:Widget:Box81:Widget2 NumberOfControlPoints:0 CONNECTION @@ -952,9 +974,6 @@ CONNECTION Box86:Widget:Box38:Widget2 NumberOfControlPoints:0 CONNECTION -Box50:Widget:Box86:Widget4 -NumberOfControlPoints:0 -CONNECTION Box49:Widget:Box50:Widget2 NumberOfControlPoints:0 CONNECTION @@ -1006,12 +1025,6 @@ CONNECTION Box96:vtkRenderer:Box66:In NumberOfControlPoints:0 CONNECTION -Box37:widget:Box79:Widget7 -NumberOfControlPoints:0 -CONNECTION -Box48:widget:Box38:Widget8 -NumberOfControlPoints:0 -CONNECTION Box97:Out:Box45:Mesh NumberOfControlPoints:0 CONNECTION @@ -1102,9 +1115,6 @@ CONNECTION Box42:Widget:Box114:Widget2 NumberOfControlPoints:0 CONNECTION -Box114:Widget:Box82:Widget3 -NumberOfControlPoints:0 -CONNECTION Box105:Out:Box48:polydata NumberOfControlPoints:0 CONNECTION @@ -1158,4 +1168,34 @@ NumberOfControlPoints:0 CONNECTION Box120:Out:Box132:Params NumberOfControlPoints:0 +CONNECTION +Box114:Widget:Box122:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box122:Widget:Box79:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box123:Widget:Box79:Widget8 +NumberOfControlPoints:0 +CONNECTION +Box72:_widget:Box123:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box37:widget:Box123:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box50:Widget:Box124:Widget3 +NumberOfControlPoints:0 +CONNECTION +Box124:Widget:Box38:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box62:_widget:Box125:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box48:widget:Box125:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box125:Widget:Box38:Widget7 +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs index 6a33a41..541f4cc 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs @@ -251,6 +251,16 @@ new creaMaracasVisu:ShowNPoints_Tools Box132 new std:ConcatStrings Box120 +new wx:LayoutTab Box122 + +new wx:LayoutLine Box123 + set Box123.Orientation "H" + +new wx:LayoutTab Box124 + +new wx:LayoutLine Box125 + set Box125.Orientation "H" + connect Box06.LstContourPointsX Box04.LstX connect showNpoints.lstIndexs Box06.LstIndexsIn @@ -320,15 +330,12 @@ connect Box71.Out Box72._wxvtkbaseview3D1 connect Box64.Out Box72._wxvtkbaseview2D1 connect Box65.Out Box72._wxvtkbaseview2D2 connect Box69.Out Box72._wxvtkbaseview2D3 -connect Box72._widget Box79.Widget6 -connect Box62._widget Box38.Widget7 connect Box39.Widget Box81.Widget2 connect Box40.Widget Box81.Widget4 connect Box44.Widget Box82.Widget2 connect Box82.Widget Box79.Widget2 connect Box84.Widget Box44.Widget9 connect Box86.Widget Box38.Widget2 -connect Box50.Widget Box86.Widget4 connect Box49.Widget Box50.Widget2 connect Box34.Widget Box50.Widget4 connect Box57.BoxChange Box08.BoxExecute @@ -342,8 +349,6 @@ connect Box94.BoxChange Box37.boxexecute connect Box77.BoxChange Box94.BoxExecute connect Box71.Out Box96.wxVtkBaseView connect Box96.vtkRenderer Box66.In -connect Box37.widget Box79.Widget7 -connect Box48.widget Box38.Widget8 connect Box97.Out Box45.Mesh connect Box97.Out Box93.Mesh connect Box43.Widget Box44.Widget1 @@ -374,7 +379,6 @@ connect Box77.Out Box113.In connect Box113.Out Box97.In connect Box04.Out Box77.In2 connect Box42.Widget Box114.Widget2 -connect Box114.Widget Box82.Widget3 connect Box105.Out Box48.polydata connect Box58.Out Box115.StringVector connect Box115.Out Box57.In @@ -393,6 +397,16 @@ connect Box105.Out Box132.Mesh connect Box105.BoxChange Box132.BoxExecute connect Box108.Out Box120.In1 connect Box120.Out Box132.Params +connect Box114.Widget Box122.Widget2 +connect Box122.Widget Box79.Widget4 +connect Box123.Widget Box79.Widget8 +connect Box72._widget Box123.Widget2 +connect Box37.widget Box123.Widget4 +connect Box50.Widget Box124.Widget3 +connect Box124.Widget Box38.Widget4 +connect Box62._widget Box125.Widget2 +connect Box48.widget Box125.Widget4 +connect Box125.Widget Box38.Widget7 # Complex input ports input point showNpoints.In " " diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyThresholdConnectivity.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyThresholdConnectivity.bbg index fd85d5b..043ffa8 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyThresholdConnectivity.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyThresholdConnectivity.bbg @@ -72,7 +72,7 @@ COMPLEX_PORT meshmanagermodel -150.374274:130.740991:-900.000000 FIN_COMPLEX_PORT -BOXES:77 +BOXES:79 BOX creaMaracasVisu:ShowNPoints:showNpoints ISEXEC:FALSE @@ -259,7 +259,7 @@ ISEXEC:FALSE PORT Orientation:"V" PORT -WinTitle:"1.2 Mesh Action" +WinTitle:"1.3 Mesh Action" FIN_BOX BOX creaVtk:MeshManager_tool:Box45 @@ -297,7 +297,7 @@ ISEXEC:FALSE FIN_BOX BOX std:MultipleInputs:Box55 -ISEXEC:FALSE +ISEXEC:TRUE -53.140304:-173.517708:-900.000000 -31.170304:-176.017708:-900.000000 FIN_BOX @@ -565,7 +565,7 @@ ISEXEC:FALSE PORT Orientation:"V" PORT -WinTitle:"1.3 Apply Changes" +WinTitle:"1.4 Apply Changes" FIN_BOX BOX wx:LayoutTab:Box125 @@ -574,14 +574,6 @@ ISEXEC:FALSE 130.911803:-87.064597:-900.000000 FIN_BOX BOX -wx:LayoutLine:Box126 -ISEXEC:FALSE -79.081175:-100.057927:-900.000000 -112.401175:-102.557927:-900.000000 -PORT -Orientation:"H" -FIN_BOX -BOX creaVtk:PolyDataToImageData:Box127 ISEXEC:FALSE -14.496502:-51.621874:-900.000000 @@ -697,7 +689,29 @@ ISEXEC:FALSE 143.159186:-49.514511:-900.000000 166.484186:-52.014511:-900.000000 FIN_BOX -CONNECTIONS:148 +BOX +wx:LayoutLine:Box141 +ISEXEC:FALSE +-124.969632:-108.254141:-900.000000 +-91.649632:-110.754141:-900.000000 +PORT +Orientation:"H" +FIN_BOX +BOX +wx:LayoutTab:Box142 +ISEXEC:FALSE +-108.604787:-50.797029:-900.000000 +-75.284787:-53.297029:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box143 +ISEXEC:FALSE +-180.167942:-113.951950:-900.000000 +-146.847942:-116.451950:-900.000000 +PORT +Orientation:"H" +FIN_BOX +CONNECTIONS:150 CONNECTION Box31:BoxChange:Box11:BoxExecute NumberOfControlPoints:0 @@ -834,12 +848,6 @@ CONNECTION Box69:Out:Box72:_wxvtkbaseview2D3 NumberOfControlPoints:0 CONNECTION -Box72:_widget:Box79:Widget6 -NumberOfControlPoints:0 -CONNECTION -Box62:_widget:Box38:Widget7 -NumberOfControlPoints:0 -CONNECTION Box39:Widget:Box81:Widget2 NumberOfControlPoints:0 CONNECTION @@ -894,12 +902,6 @@ CONNECTION Box96:vtkRenderer:Box66:In NumberOfControlPoints:0 CONNECTION -Box37:widget:Box79:Widget7 -NumberOfControlPoints:0 -CONNECTION -Box48:widget:Box38:Widget8 -NumberOfControlPoints:0 -CONNECTION Box43:Widget:Box44:Widget1 NumberOfControlPoints:0 CONNECTION @@ -1035,21 +1037,9 @@ CONNECTION Box42:Widget:Box124:Widget1 NumberOfControlPoints:0 CONNECTION -Box124:Widget:Box82:Widget4 -NumberOfControlPoints:0 -CONNECTION Box105:Widget:Box125:Widget2 NumberOfControlPoints:0 CONNECTION -Box86:Widget:Box126:Widget2 -NumberOfControlPoints:0 -CONNECTION -Box125:Widget:Box126:Widget4 -NumberOfControlPoints:0 -CONNECTION -Box126:Widget:Box38:Widget2 -NumberOfControlPoints:0 -CONNECTION Box67:Out:Box127:InPolyData NumberOfControlPoints:0 CONNECTION @@ -1142,4 +1132,34 @@ NumberOfControlPoints:0 CONNECTION Box140:widget:Box125:Widget3 NumberOfControlPoints:0 +CONNECTION +Box72:_widget:Box141:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box37:widget:Box141:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box141:Widget:Box79:Widget7 +NumberOfControlPoints:0 +CONNECTION +Box124:Widget:Box142:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box142:Widget:Box79:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box62:_widget:Box143:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box48:widget:Box143:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box143:Widget:Box38:Widget7 +NumberOfControlPoints:0 +CONNECTION +Box86:Widget:Box38:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box125:Widget:Box38:Widget4 +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyThresholdConnectivity.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyThresholdConnectivity.bbs index e3349ce..0c52f5a 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyThresholdConnectivity.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyThresholdConnectivity.bbs @@ -90,7 +90,7 @@ new wx:CommandButton Box43 new wx:LayoutLine Box44 set Box44.Orientation "V" - set Box44.WinTitle "1.2 Mesh Action" + set Box44.WinTitle "1.3 Mesh Action" new creaVtk:MeshManager_tool Box45 set Box45.Tool "30" @@ -204,13 +204,10 @@ new creaMaracasVisu:ColorLayerImageView Box122 new wx:LayoutLine Box124 set Box124.Orientation "V" - set Box124.WinTitle "1.3 Apply Changes" + set Box124.WinTitle "1.4 Apply Changes" new wx:LayoutTab Box125 -new wx:LayoutLine Box126 - set Box126.Orientation "H" - new creaVtk:PolyDataToImageData Box127 set Box127.BoxProcessMode "Manual" @@ -255,6 +252,14 @@ new vtk:CreateImage Box139 new toolsbbtk:ImageVtkPropertiesWidget Box140 +new wx:LayoutLine Box141 + set Box141.Orientation "H" + +new wx:LayoutTab Box142 + +new wx:LayoutLine Box143 + set Box143.Orientation "H" + connect Box31.BoxChange Box11.BoxExecute connect Box58.Out Box57.In @@ -290,8 +295,6 @@ connect Box71.Out Box72._wxvtkbaseview3D1 connect Box64.Out Box72._wxvtkbaseview2D1 connect Box65.Out Box72._wxvtkbaseview2D2 connect Box69.Out Box72._wxvtkbaseview2D3 -connect Box72._widget Box79.Widget6 -connect Box62._widget Box38.Widget7 connect Box39.Widget Box81.Widget2 connect Box40.Widget Box81.Widget4 connect Box44.Widget Box82.Widget2 @@ -306,8 +309,6 @@ connect Box81.Widget Box08.Widget2 connect Box94.BoxChange Box37.boxexecute connect Box71.Out Box96.wxVtkBaseView connect Box96.vtkRenderer Box66.In -connect Box37.widget Box79.Widget7 -connect Box48.widget Box38.Widget8 connect Box43.Widget Box44.Widget1 connect Box78.Widget Box98.Widget2 connect Box80.Widget Box98.Widget4 @@ -353,11 +354,7 @@ connect Box106.BoxChange Box122.BoxExecute connect Box122.Widget Box105.Widget7 connect Box102.Out Box122.In connect Box42.Widget Box124.Widget1 -connect Box124.Widget Box82.Widget4 connect Box105.Widget Box125.Widget2 -connect Box86.Widget Box126.Widget2 -connect Box125.Widget Box126.Widget4 -connect Box126.Widget Box38.Widget2 connect Box67.Out Box127.InPolyData connect Box68.Spacing Box128.Spacing connect Box68.TypeName Box128.OutputFormat @@ -389,6 +386,16 @@ connect Box138.Out Box114.In connect Box53.BoxChange Box127.BoxExecute connect Box35.Out Box140.in connect Box140.widget Box125.Widget3 +connect Box72._widget Box141.Widget2 +connect Box37.widget Box141.Widget4 +connect Box141.Widget Box79.Widget7 +connect Box124.Widget Box142.Widget2 +connect Box142.Widget Box79.Widget4 +connect Box62._widget Box143.Widget2 +connect Box48.widget Box143.Widget4 +connect Box143.Widget Box38.Widget7 +connect Box86.Widget Box38.Widget2 +connect Box125.Widget Box38.Widget4 # Complex input ports input point showNpoints.In " " @@ -409,5 +416,6 @@ output interactorStyleMaracas2 Box57.InteractorStyleMaracas2 " " output interactorStyleMaracas3 Box57.InteractorStyleMaracas3 " " output interactorStyleMaracas4 Box57.InteractorStyleMaracas4 " " +exec Box55 endefine -- 2.45.1