From: Eduardo DAVILA Date: Thu, 6 Jul 2023 09:57:08 +0000 (+0200) Subject: 3523 Mesh_tool_ApplyRegionGrowing Mesh_tool_ApplySmooth X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=dd2200914c63fd4f0f2cc12c74895e2b3f397592;p=creaMaracasVisu.git 3523 Mesh_tool_ApplyRegionGrowing Mesh_tool_ApplySmooth --- diff --git a/bbtk/bbs/boxes/MeshContours_Interface.bbg b/bbtk/bbs/boxes/MeshContours_Interface.bbg index 81c59ca..c1d0bae 100644 --- a/bbtk/bbs/boxes/MeshContours_Interface.bbg +++ b/bbtk/bbs/boxes/MeshContours_Interface.bbg @@ -10,34 +10,42 @@ AUTHOR:Author ?? COMPLEXBOX:TRUE COMPLEXBOXNAME:MeshContours_Interface PACKAGENAME:creaMaracasVisu -COMPLEXOUTPUTS:3 +COMPLEXOUTPUTS:5 COMPLEX_PORT widget --69.516706:-21.006612:-900.000000 +-49.254177:-20.075001:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT active --89.058002:-21.047792:-900.000000 +-94.298311:-20.465535:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT LineWidth --24.040895:-23.017879:-900.000000 +-89.719437:-20.339499:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +widgetA +-73.026620:-19.109661:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +widgetB +-68.368567:-19.226112:-900.000000 FIN_COMPLEX_PORT COMPLEXINPUTS:0 BOXES:3 BOX wx:LayoutLine:Box54 ISEXEC:FALSE --75.444652:-2.045893:-900.000000 --42.124652:-4.545893:-900.000000 +-50.756973:3.077965:-900.000000 +33.320000:0.577965:-900.000000 PORT Orientation:"H" FIN_BOX BOX wx:CheckBox:Box07 ISEXEC:FALSE --86.093387:21.763572:-900.000000 --64.463387:19.263572:-900.000000 +-99.368837:21.996475:-900.000000 +-77.738837:19.496475:-900.000000 PORT In:"false" PORT @@ -46,16 +54,16 @@ FIN_BOX BOX wx:ComboBox:Box02 ISEXEC:FALSE --59.846484:20.664940:-900.000000 --33.566484:18.164940:-900.000000 +-76.848376:21.713002:-900.000000 +-50.568376:19.213002:-900.000000 PORT In:"0.5 1.0 1.5 2.0 2.5" PORT Selection:"3" PORT -Title:"Line width " +Title:"Contour width " FIN_BOX -CONNECTIONS:5 +CONNECTIONS:7 CONNECTION Box54:Widget:widget:widget NumberOfControlPoints:0 @@ -71,4 +79,10 @@ NumberOfControlPoints:0 CONNECTION Box02:OutString:LineWidth:LineWidth NumberOfControlPoints:0 +CONNECTION +Box07:Widget:widgetA:widgetA +NumberOfControlPoints:0 +CONNECTION +Box02:Widget:widgetB:widgetB +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/MeshContours_Interface.bbs b/bbtk/bbs/boxes/MeshContours_Interface.bbs index 9879b4f..35db93a 100644 --- a/bbtk/bbs/boxes/MeshContours_Interface.bbs +++ b/bbtk/bbs/boxes/MeshContours_Interface.bbs @@ -24,7 +24,7 @@ new wx:CheckBox Box07 new wx:ComboBox Box02 set Box02.In "0.5 1.0 1.5 2.0 2.5" set Box02.Selection "3" - set Box02.Title "Line width " + set Box02.Title "Contour width " connect Box07.Widget Box54.Widget3 @@ -36,6 +36,8 @@ connect Box02.Widget Box54.Widget4 output widget Box54.Widget " " output active Box07.Out " " output LineWidth Box02.OutString " " +output widgetA Box07.Widget " " +output widgetB Box02.Widget " " endefine diff --git a/bbtk/bbs/boxes/MeshContours_Widget.bbg b/bbtk/bbs/boxes/MeshContours_Widget.bbg index 54ac950..771c2a6 100644 --- a/bbtk/bbs/boxes/MeshContours_Widget.bbg +++ b/bbtk/bbs/boxes/MeshContours_Widget.bbg @@ -10,7 +10,7 @@ AUTHOR:Author ?? COMPLEXBOX:TRUE COMPLEXBOXNAME:MeshContours_Widget PACKAGENAME:creaMaracasVisu -COMPLEXOUTPUTS:2 +COMPLEXOUTPUTS:4 COMPLEX_PORT _widget -98.407711:-38.881249:-900.000000 @@ -19,6 +19,14 @@ COMPLEX_PORT ActiveOut -104.528773:-38.804811:-900.000000 FIN_COMPLEX_PORT +COMPLEX_PORT +_widgetA +-92.525863:-38.958258:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +_widgetB +-87.656081:-38.746528:-900.000000 +FIN_COMPLEX_PORT COMPLEXINPUTS:7 COMPLEX_PORT _polydata @@ -111,7 +119,7 @@ ISEXEC:FALSE PORT In1:"1" FIN_BOX -CONNECTIONS:21 +CONNECTIONS:23 CONNECTION _polydata:_polydata:Box38:In NumberOfControlPoints:0 @@ -175,4 +183,10 @@ NumberOfControlPoints:0 CONNECTION Box52:LineWidth:Box53:lineWidth NumberOfControlPoints:0 +CONNECTION +Box52:widgetA:_widgetA:_widgetA +NumberOfControlPoints:0 +CONNECTION +Box52:widgetB:_widgetB:_widgetB +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/MeshContours_Widget.bbs b/bbtk/bbs/boxes/MeshContours_Widget.bbs index 5de0324..b487435 100644 --- a/bbtk/bbs/boxes/MeshContours_Widget.bbs +++ b/bbtk/bbs/boxes/MeshContours_Widget.bbs @@ -62,6 +62,8 @@ input colorMesh Box08.In " " # Complex output ports output _widget Box52.widget " " output ActiveOut Box52.active " " +output _widgetA Box52.widgetA " " +output _widgetB Box52.widgetB " " endefine diff --git a/bbtk/bbs/boxes/Mesh_Application.bbg b/bbtk/bbs/boxes/Mesh_Application.bbg index d5b3814..8c28d3e 100644 --- a/bbtk/bbs/boxes/Mesh_Application.bbg +++ b/bbtk/bbs/boxes/Mesh_Application.bbg @@ -64,7 +64,7 @@ COMPLEX_PORT OutDir_ExMa 334.933146:91.638847:-900.000000 FIN_COMPLEX_PORT -BOXES:83 +BOXES:87 BOX creaMaracasVisu:ImageChangeInformation:Box07 ISEXEC:FALSE @@ -134,10 +134,10 @@ FIN_BOX BOX wx:LayoutLine:Box22 ISEXEC:FALSE --99.372831:-123.783331:-900.000000 --66.052831:-126.283331:-900.000000 +-93.245472:-123.374840:-900.000000 +-59.925472:-125.874840:-900.000000 PORT -Orientation:"H" +Orientation:"V" FIN_BOX BOX std:StringSelect:Box23 @@ -268,10 +268,10 @@ ISEXEC:TRUE 260.813031:-129.838812:-900.000000 FIN_BOX BOX -creaMaracasVisu:Mesh_tool_ApplyByImage:Box46 +creaMaracasVisu:Mesh_tool_ApplySmooth:Box46 ISEXEC:FALSE 249.242000:6.707813:-900.000000 -272.397000:4.207813:-900.000000 +272.267000:4.207813:-900.000000 PORT title:"Smooth" FIN_BOX @@ -298,8 +298,8 @@ FIN_BOX BOX creaVtk:PlaneWidget_Base:Box49 ISEXEC:FALSE --286.533170:-79.025808:-900.000000 --264.123170:-81.525808:-900.000000 +-353.952096:-70.689059:-900.000000 +-331.542096:-73.189059:-900.000000 PORT Param:"-1" PORT @@ -308,8 +308,8 @@ FIN_BOX BOX creaVtk:PlaneWidget_Base:Box50 ISEXEC:FALSE --253.995440:-80.358971:-900.000000 --231.585440:-82.858971:-900.000000 +-321.414366:-72.022222:-900.000000 +-299.004366:-74.522222:-900.000000 PORT Param:"1" PORT @@ -318,32 +318,32 @@ FIN_BOX BOX wx:CommandButton:Box51 ISEXEC:FALSE --287.789041:-65.458170:-900.000000 --265.514041:-67.958170:-900.000000 +-355.207967:-57.121421:-900.000000 +-332.932967:-59.621421:-900.000000 PORT Label:"-" FIN_BOX BOX wx:CommandButton:Box52 ISEXEC:FALSE --251.116181:-64.335441:-900.000000 --228.841181:-66.835441:-900.000000 +-318.535107:-55.998692:-900.000000 +-296.260107:-58.498692:-900.000000 PORT Label:"+" FIN_BOX BOX wx:LayoutLine:Box53 ISEXEC:FALSE --274.774920:-87.894842:-900.000000 --241.454920:-90.394842:-900.000000 +-342.193846:-79.558093:-900.000000 +-308.873846:-82.058093:-900.000000 PORT Orientation:"H" FIN_BOX BOX wx:CheckBox:Box54 ISEXEC:FALSE --211.761741:-50.048031:-900.000000 --190.131741:-52.548031:-900.000000 +-279.180667:-41.711282:-900.000000 +-257.550667:-44.211282:-900.000000 PORT In:"false" PORT @@ -440,10 +440,10 @@ ISEXEC:FALSE 222.541581:75.253594:-900.000000 FIN_BOX BOX -creaMaracasVisu:Mesh_tool_ApplyThresholdConnectivity:Box70 +creaMaracasVisu:Mesh_tool_ApplyRegionGrowing:Box70 ISEXEC:FALSE 337.806041:4.958725:-900.000000 -362.246041:2.458725:-900.000000 +361.596041:2.458725:-900.000000 PORT title:"Region growing" FIN_BOX @@ -585,7 +585,7 @@ ISEXEC:FALSE -67.335991:-70.655133:-900.000000 -45.060991:-73.155133:-900.000000 PORT -Label:"Split Meshes" +Label:"Split" FIN_BOX BOX vtk:AppendPolyData:Box94 @@ -608,26 +608,26 @@ FIN_BOX BOX wx:LayoutLine:Box97 ISEXEC:FALSE --7.462476:-116.170018:-900.000000 -25.857524:-118.670018:-900.000000 +-7.124880:-128.548522:-900.000000 +26.195120:-131.048522:-900.000000 PORT -Orientation:"H" +Orientation:"V" FIN_BOX BOX wx:LayoutLine:Box98 ISEXEC:FALSE --88.847724:-135.992073:-900.000000 --55.527724:-138.492073:-900.000000 +-89.210191:-133.998503:-900.000000 +-55.890191:-136.498503:-900.000000 PORT -Orientation:"V" +Orientation:"H" PORT WinTitle:"Final Surface (Red)" FIN_BOX BOX wx:LayoutLine:Box99 ISEXEC:FALSE --217.801642:-105.382873:-900.000000 --184.481642:-107.882873:-900.000000 +-306.243673:-95.958722:-900.000000 +-272.923673:-98.458722:-900.000000 FIN_BOX BOX wx:ComboBox:Box100 @@ -714,12 +714,46 @@ FIN_BOX BOX wx:LayoutLine:Box112 ISEXEC:FALSE --84.051193:-112.269753:-900.000000 --50.731193:-114.769753:-900.000000 +-92.206708:-99.583396:-900.000000 +-58.886708:-102.083396:-900.000000 +PORT +Orientation:"V" +PORT +WinTitle:"Visu" +FIN_BOX +BOX +wx:LayoutLine:Box113 +ISEXEC:FALSE +-72.407231:-103.732482:-900.000000 +-39.087231:-106.232482:-900.000000 +PORT +Orientation:"V" +PORT +WinTitle:"conf" +FIN_BOX +BOX +wx:LayoutTab:Box114 +ISEXEC:FALSE +-82.189470:-110.733773:-900.000000 +-48.869470:-113.233773:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box115 +ISEXEC:FALSE +31.857190:-110.620145:-900.000000 +65.177190:-113.120145:-900.000000 +PORT +Orientation:"H" +FIN_BOX +BOX +wx:LayoutLine:Box116 +ISEXEC:FALSE +-24.250153:-102.819636:-900.000000 +9.069847:-105.319636:-900.000000 PORT Orientation:"H" FIN_BOX -CONNECTIONS:224 +CONNECTIONS:230 CONNECTION Box08:MeshBase:Box15:polydata NumberOfControlPoints:0 @@ -1258,12 +1292,6 @@ CONNECTION Box82:Widget:Box97:Widget5 NumberOfControlPoints:0 CONNECTION -Box85:Widget:Box97:Widget7 -NumberOfControlPoints:0 -CONNECTION -Box86:Widget:Box97:Widget8 -NumberOfControlPoints:0 -CONNECTION Box22:Widget:Box98:Widget5 NumberOfControlPoints:0 CONNECTION @@ -1282,12 +1310,6 @@ CONNECTION Box100:Out:Box29:In NumberOfControlPoints:0 CONNECTION -Box92:Widget:Box97:Widget1 -NumberOfControlPoints:0 -CONNECTION -Box79:Widget:Box97:Widget3 -NumberOfControlPoints:0 -CONNECTION Box101:widget:Box12:Widget1 NumberOfControlPoints:0 CONNECTION @@ -1378,18 +1400,48 @@ CONNECTION Box110:Out:Box105:Active NumberOfControlPoints:0 CONNECTION -Box17:_widget:Box112:Widget2 +Box100:Widget:Box22:Widget2 NumberOfControlPoints:0 CONNECTION -Box15:widget:Box112:Widget4 +Box99:Widget:Box22:Widget3 NumberOfControlPoints:0 CONNECTION -Box112:Widget:Box22:Widget4 +Box17:_widgetB:Box113:Widget2 NumberOfControlPoints:0 CONNECTION -Box100:Widget:Box22:Widget2 +Box15:widgetB:Box113:Widget4 NumberOfControlPoints:0 CONNECTION -Box99:Widget:Box22:Widget3 +Box17:_widgetA:Box112:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box112:Widget:Box114:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box113:Widget:Box114:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box15:widgetA:Box112:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box114:Widget:Box98:Widget7 +NumberOfControlPoints:0 +CONNECTION +Box85:Widget:Box115:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box86:Widget:Box115:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box79:Widget:Box116:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box116:Widget:Box97:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box115:Widget:Box97:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box92:Widget:Box116:Widget6 NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_Application.bbs b/bbtk/bbs/boxes/Mesh_Application.bbs index 0b65de3..59519ca 100644 --- a/bbtk/bbs/boxes/Mesh_Application.bbs +++ b/bbtk/bbs/boxes/Mesh_Application.bbs @@ -43,7 +43,7 @@ new creaMaracasVisu:MeshContours_Widget Box17 new wx:LayoutTab Box20 new wx:LayoutLine Box22 - set Box22.Orientation "H" + set Box22.Orientation "V" new std:StringSelect Box23 set Box23.In0 "false false false false false false" @@ -95,7 +95,7 @@ new std:GetVectorStringElement Box39 new creaMaracasVisu:InteractorStyleMaracas_Model Box40 -new creaMaracasVisu:Mesh_tool_ApplyByImage Box46 +new creaMaracasVisu:Mesh_tool_ApplySmooth Box46 set Box46.title "Smooth" new creaMaracasVisu:Mesh_tool_ApplyDeformation Box47 @@ -158,7 +158,7 @@ new std:MagicBox Box68 new std:MagicBox Box69 -new creaMaracasVisu:Mesh_tool_ApplyThresholdConnectivity Box70 +new creaMaracasVisu:Mesh_tool_ApplyRegionGrowing Box70 set Box70.title "Region growing" new std:GetVectorStringElement Box71 @@ -212,7 +212,7 @@ new creaVtk:MeshManager_tool Box91 set Box91.Tool "50" new wx:CommandButton Box92 - set Box92.Label "Split Meshes" + set Box92.Label "Split" new vtk:AppendPolyData Box94 @@ -221,10 +221,10 @@ new std:MagicBox Box95 new std:MagicBox Box96 new wx:LayoutLine Box97 - set Box97.Orientation "H" + set Box97.Orientation "V" new wx:LayoutLine Box98 - set Box98.Orientation "V" + set Box98.Orientation "H" set Box98.WinTitle "Final Surface (Red)" new wx:LayoutLine Box99 @@ -260,7 +260,20 @@ new std:Mul Box110 new std:Mul Box111 new wx:LayoutLine Box112 - set Box112.Orientation "H" + set Box112.Orientation "V" + set Box112.WinTitle "Visu" + +new wx:LayoutLine Box113 + set Box113.Orientation "V" + set Box113.WinTitle "conf" + +new wx:LayoutTab Box114 + +new wx:LayoutLine Box115 + set Box115.Orientation "H" + +new wx:LayoutLine Box116 + set Box116.Orientation "H" connect Box08.MeshBase Box15.polydata @@ -429,16 +442,12 @@ connect Box96.Out Box73.OutDir connect Box97.Widget Box98.Widget3 connect Box98.Widget Box20.Widget1 connect Box82.Widget Box97.Widget5 -connect Box85.Widget Box97.Widget7 -connect Box86.Widget Box97.Widget8 connect Box22.Widget Box98.Widget5 connect Box54.Widget Box99.Widget2 connect Box53.Widget Box99.Widget4 connect Box100.BoxChange Box28.In1 connect Box100.Out Box30.In1 connect Box100.Out Box29.In -connect Box92.Widget Box97.Widget1 -connect Box79.Widget Box97.Widget3 connect Box101.widget Box12.Widget1 connect Box103.widget Box102.Widget3 connect Box102.Widget Box12.Widget5 @@ -469,11 +478,21 @@ 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 +connect Box17._widgetB Box113.Widget2 +connect Box15.widgetB Box113.Widget4 +connect Box17._widgetA Box112.Widget2 +connect Box112.Widget Box114.Widget2 +connect Box113.Widget Box114.Widget4 +connect Box15.widgetA Box112.Widget4 +connect Box114.Widget Box98.Widget7 +connect Box85.Widget Box115.Widget2 +connect Box86.Widget Box115.Widget4 +connect Box79.Widget Box116.Widget4 +connect Box116.Widget Box97.Widget2 +connect Box115.Widget Box97.Widget4 +connect Box92.Widget Box116.Widget6 # Complex input ports input MeshIn Box56.In " " diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbg index df5fbe3..5fa1e45 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbg @@ -72,7 +72,7 @@ COMPLEX_PORT meshmanagermodel -150.374274:130.740991:-900.000000 FIN_COMPLEX_PORT -BOXES:141 +BOXES:149 BOX creaMaracasVisu:ShowNPoints:showNpoints ISEXEC:FALSE @@ -224,8 +224,8 @@ FIN_BOX BOX wx:LayoutLine:Box79 ISEXEC:FALSE --144.841026:-82.628158:-900.000000 --111.521026:-85.128158:-900.000000 +-140.715014:-113.385703:-900.000000 +-107.395014:-115.885703:-900.000000 PORT Orientation:"H" PORT @@ -302,8 +302,8 @@ FIN_BOX BOX wx:LayoutLine:Box38 ISEXEC:FALSE --190.391973:-82.767490:-900.000000 --157.071973:-85.267490:-900.000000 +-189.365895:-112.130065:-900.000000 +-156.045895:-114.630065:-900.000000 PORT Orientation:"H" PORT @@ -312,14 +312,14 @@ FIN_BOX BOX wx:LayoutTab:Box39 ISEXEC:FALSE --195.888488:-89.508403:-900.000000 --162.568488:-92.008403:-900.000000 +-191.762476:-120.265948:-900.000000 +-158.442476:-122.765948:-900.000000 FIN_BOX BOX wx:LayoutTab:Box40 ISEXEC:FALSE --148.825313:-89.038628:-900.000000 --115.505313:-91.538628:-900.000000 +-144.699301:-119.796173:-900.000000 +-111.379301:-122.296173:-900.000000 FIN_BOX BOX wx:CommandButton:Box42 @@ -412,8 +412,8 @@ FIN_BOX BOX creaMaracasVisu:MeshContours_Widget:Box62 ISEXEC:FALSE --228.707140:-3.136982:-900.000000 --205.912140:-5.636982:-900.000000 +-225.142216:1.512919:-900.000000 +-202.347216:-0.987081:-900.000000 PORT colorMesh:"1 1 0" FIN_BOX @@ -450,16 +450,16 @@ FIN_BOX BOX creaMaracasVisu:MeshContours_Widget:Box72 ISEXEC:FALSE --180.819147:-56.018495:-900.000000 --158.024147:-58.518495:-900.000000 +-167.091089:-51.181048:-900.000000 +-144.296089:-53.681048:-900.000000 PORT colorMesh:"0 1 1" FIN_BOX BOX wx:LayoutLine:Box81 ISEXEC:FALSE --184.734921:-96.564525:-900.000000 --151.414921:-99.064525:-900.000000 +-180.608909:-127.322070:-900.000000 +-147.288909:-129.822070:-900.000000 PORT WinTitle:"Step 1. Surface" FIN_BOX @@ -1246,10 +1246,12 @@ FIN_BOX BOX wx:LayoutLine:Box222 ISEXEC:FALSE --130.024045:-76.628158:-900.000000 --96.704045:-79.128158:-900.000000 +-268.992908:-80.599530:-900.000000 +-235.672908:-83.099530:-900.000000 PORT -Orientation:"H" +Orientation:"V" +PORT +WinTitle:"Visu" FIN_BOX BOX wx:LayoutTab:Box223 @@ -1260,10 +1262,12 @@ FIN_BOX BOX wx:LayoutLine:Box226 ISEXEC:FALSE --184.922796:-71.172812:-900.000000 --151.602796:-73.672812:-900.000000 +-221.934844:-47.039342:-900.000000 +-188.614844:-49.539342:-900.000000 PORT -Orientation:"H" +Orientation:"V" +PORT +WinTitle:"Visu" FIN_BOX BOX wx:LayoutTab:Box228 @@ -1273,7 +1277,63 @@ ISEXEC:FALSE PORT WinTitle:"Tool" FIN_BOX -CONNECTIONS:244 +BOX +wx:LayoutTab:Box229 +ISEXEC:FALSE +-235.745879:-54.387599:-900.000000 +-202.425879:-56.887599:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box230 +ISEXEC:FALSE +-205.396557:-31.822846:-900.000000 +-183.616557:-34.322846:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box231 +ISEXEC:FALSE +-266.503061:-45.526980:-900.000000 +-233.183061:-48.026980:-900.000000 +PORT +Orientation:"V" +PORT +WinTitle:"config" +FIN_BOX +BOX +wx:OutputText:Box233 +ISEXEC:FALSE +-249.275674:-35.299677:-900.000000 +-227.495674:-37.799677:-900.000000 +FIN_BOX +BOX +wx:LayoutTab:Box234 +ISEXEC:FALSE +-252.747178:-90.038623:-900.000000 +-219.427178:-92.538623:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box235 +ISEXEC:FALSE +-260.792650:-72.045510:-900.000000 +-239.012650:-74.545510:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box236 +ISEXEC:FALSE +-231.469157:-80.892071:-900.000000 +-198.149157:-83.392071:-900.000000 +PORT +Orientation:"V" +PORT +WinTitle:"config" +FIN_BOX +BOX +wx:OutputText:Box237 +ISEXEC:FALSE +-214.516357:-72.312285:-900.000000 +-192.736357:-74.812285:-900.000000 +FIN_BOX +CONNECTIONS:256 CONNECTION Box06:LstContourPointsX:Box04:LstX NumberOfControlPoints:0 @@ -1978,33 +2038,69 @@ CONNECTION Box42:Widget:Box225:Widget1 NumberOfControlPoints:0 CONNECTION -Box72:_widget:Box222:Widget2 +Box225:Widget:Box223:Widget2 NumberOfControlPoints:0 CONNECTION -Box222:Widget:Box79:Widget6 +Box223:Widget:Box79:Widget4 NumberOfControlPoints:0 CONNECTION -Box225:Widget:Box223:Widget2 +Box184:Widget:Box228:Widget1 NumberOfControlPoints:0 CONNECTION -Box223:Widget:Box79:Widget4 +Box228:Widget:Box38:Widget4 NumberOfControlPoints:0 CONNECTION -Box62:_widget:Box226:Widget2 +Box226:Widget:Box229:Widget2 NumberOfControlPoints:0 CONNECTION -Box37:widget:Box222:Widget4 +Box229:Widget:Box38:Widget7 NumberOfControlPoints:0 CONNECTION -Box48:widget:Box226:Widget4 +Box230:Widget:Box226:Widget9 NumberOfControlPoints:0 CONNECTION -Box226:Widget:Box38:Widget6 +Box62:_widgetA:Box226:Widget2 NumberOfControlPoints:0 CONNECTION -Box184:Widget:Box228:Widget1 +Box48:widgetA:Box226:Widget4 NumberOfControlPoints:0 CONNECTION -Box228:Widget:Box38:Widget4 +Box233:Widget:Box231:Widget9 +NumberOfControlPoints:0 +CONNECTION +Box62:_widgetB:Box231:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box48:widgetB:Box231:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box231:Widget:Box229:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box237:Widget:Box236:Widget9 +NumberOfControlPoints:0 +CONNECTION +Box236:Widget:Box234:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box234:Widget:Box79:Widget6 +NumberOfControlPoints:0 +CONNECTION +Box235:Widget:Box222:Widget9 +NumberOfControlPoints:0 +CONNECTION +Box222:Widget:Box234:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box72:_widgetA:Box222:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box37:widgetA:Box222:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box72:_widgetB:Box236:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box37:widgetB:Box236:Widget4 NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbs index 23fc2c2..5c7d7ad 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyCut.bbs @@ -467,16 +467,38 @@ new wx:LayoutLine Box225 set Box225.WinTitle "1.3 Apply Changes" new wx:LayoutLine Box222 - set Box222.Orientation "H" + set Box222.Orientation "V" + set Box222.WinTitle "Visu" new wx:LayoutTab Box223 new wx:LayoutLine Box226 - set Box226.Orientation "H" + set Box226.Orientation "V" + set Box226.WinTitle "Visu" new wx:LayoutTab Box228 set Box228.WinTitle "Tool" +new wx:LayoutTab Box229 + +new wx:OutputText Box230 + +new wx:LayoutLine Box231 + set Box231.Orientation "V" + set Box231.WinTitle "config" + +new wx:OutputText Box233 + +new wx:LayoutTab Box234 + +new wx:OutputText Box235 + +new wx:LayoutLine Box236 + set Box236.Orientation "V" + set Box236.WinTitle "config" + +new wx:OutputText Box237 + connect Box06.LstContourPointsX Box04.LstX connect showNpoints.lstIndexs Box06.LstIndexsIn @@ -697,16 +719,28 @@ connect Box77.Out Box224.In connect Box224.Out Box97.In connect Box97.Out Box93.Mesh connect Box42.Widget Box225.Widget1 -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 +connect Box226.Widget Box229.Widget2 +connect Box229.Widget Box38.Widget7 +connect Box230.Widget Box226.Widget9 +connect Box62._widgetA Box226.Widget2 +connect Box48.widgetA Box226.Widget4 +connect Box233.Widget Box231.Widget9 +connect Box62._widgetB Box231.Widget2 +connect Box48.widgetB Box231.Widget4 +connect Box231.Widget Box229.Widget4 +connect Box237.Widget Box236.Widget9 +connect Box236.Widget Box234.Widget4 +connect Box234.Widget Box79.Widget6 +connect Box235.Widget Box222.Widget9 +connect Box222.Widget Box234.Widget2 +connect Box72._widgetA Box222.Widget2 +connect Box37.widgetA Box222.Widget4 +connect Box72._widgetB Box236.Widget2 +connect Box37.widgetB Box236.Widget4 # Complex input ports input point showNpoints.In " " diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyThresholdConnectivity.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbg similarity index 99% rename from bbtk/bbs/boxes/Mesh_tool_ApplyThresholdConnectivity.bbg rename to bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbg index 043ffa8..7ee246e 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyThresholdConnectivity.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbg @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.5 BBG BlackBox Diagram file -# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyThresholdConnectivity.bbg +# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbg # ---------------------------------- APP_START @@ -8,7 +8,7 @@ CATEGORY:demo DESCRIPTION:Show N Points AUTHOR:info-dev@creatis.insa-lyon.fr COMPLEXBOX:TRUE -COMPLEXBOXNAME:Mesh_tool_ApplyThresholdConnectivity +COMPLEXBOXNAME:Mesh_tool_ApplyRegionGrowing PACKAGENAME:creaMaracasVisu COMPLEXOUTPUTS:5 COMPLEX_PORT diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyThresholdConnectivity.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbs similarity index 98% rename from bbtk/bbs/boxes/Mesh_tool_ApplyThresholdConnectivity.bbs rename to bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbs index 0c52f5a..889e9cf 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyThresholdConnectivity.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbs @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box) -# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyThresholdConnectivity.bbs +# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbs # ---------------------------------- include std @@ -13,7 +13,7 @@ include creaVtk include PackRecalage include toolsbbtk -define Mesh_tool_ApplyThresholdConnectivity creaMaracasVisu +define Mesh_tool_ApplyRegionGrowing creaMaracasVisu author "info-dev@creatis.insa-lyon.fr" description "Show N Points" diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplySmooth.bbg similarity index 99% rename from bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg rename to bbtk/bbs/boxes/Mesh_tool_ApplySmooth.bbg index 24f69b3..4c12ee8 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplySmooth.bbg @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.5 BBG BlackBox Diagram file -# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg +# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplySmooth.bbg # ---------------------------------- APP_START @@ -8,7 +8,7 @@ CATEGORY:demo DESCRIPTION:Show N Points AUTHOR:info-dev@creatis.insa-lyon.fr COMPLEXBOX:TRUE -COMPLEXBOXNAME:Mesh_tool_ApplyByImage +COMPLEXBOXNAME:Mesh_tool_ApplySmooth PACKAGENAME:creaMaracasVisu COMPLEXOUTPUTS:1 COMPLEX_PORT diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplySmooth.bbs similarity index 98% rename from bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs rename to bbtk/bbs/boxes/Mesh_tool_ApplySmooth.bbs index 43b63a1..8ce709e 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplySmooth.bbs @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box) -# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs +# - /Users/davila/Creatis/C23/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/Mesh_tool_ApplySmooth.bbs # ---------------------------------- include std @@ -11,7 +11,7 @@ include std include creaMaracasVisu include creaVtk -define Mesh_tool_ApplyByImage creaMaracasVisu +define Mesh_tool_ApplySmooth creaMaracasVisu author "info-dev@creatis.insa-lyon.fr" description "Show N Points" diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg index 0cf8340..335e4b2 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:79 +BOXES:87 BOX creaMaracasVisu:ShowNPoints:showNpoints ISEXEC:FALSE @@ -108,8 +108,8 @@ FIN_BOX BOX vtk:UpdateRender:Box11 ISEXEC:FALSE -8.762877:-56.586914:-900.000000 -30.787877:-59.086914:-900.000000 +18.651666:-57.609892:-900.000000 +40.676666:-60.109892:-900.000000 PORT Active:"true" FIN_BOX @@ -364,8 +364,8 @@ FIN_BOX BOX wx:LayoutLine:Box50 ISEXEC:FALSE --25.573188:-57.166784:-900.000000 -7.746812:-59.666784:-900.000000 +-16.519831:-71.488479:-900.000000 +16.800169:-73.988479:-900.000000 PORT Orientation:"V" PORT @@ -438,8 +438,8 @@ FIN_BOX BOX creaMaracasVisu:MeshContours_Widget:Box72 ISEXEC:FALSE --180.819147:-56.018495:-900.000000 --158.024147:-58.518495:-900.000000 +-180.819147:-53.955489:-900.000000 +-158.024147:-56.455489:-900.000000 PORT colorMesh:"0 1 1" FIN_BOX @@ -454,8 +454,8 @@ FIN_BOX BOX wx:LayoutTab:Box82 ISEXEC:FALSE --142.045386:-55.210039:-900.000000 --108.725386:-57.710039:-900.000000 +-141.270402:-52.730092:-900.000000 +-107.950402:-55.230092:-900.000000 FIN_BOX BOX wx:OutputText:Box84 @@ -466,8 +466,8 @@ FIN_BOX BOX wx:LayoutTab:Box86 ISEXEC:FALSE --54.839107:-68.339875:-900.000000 --21.519107:-70.839875:-900.000000 +-55.401745:-71.340611:-900.000000 +-22.081745:-73.840611:-900.000000 FIN_BOX BOX creaVtk:MeshManager:Box92 @@ -652,8 +652,8 @@ FIN_BOX BOX wx:LayoutLine:Box121 ISEXEC:FALSE --57.058464:-57.644181:-900.000000 --23.738464:-60.144181:-900.000000 +-52.744906:-64.958475:-900.000000 +-19.424906:-67.458475:-900.000000 PORT Orientation:"V" PORT @@ -670,8 +670,8 @@ FIN_BOX BOX wx:OutputText:Box131 ISEXEC:FALSE --17.624192:-45.101554:-900.000000 -4.155808:-47.601554:-900.000000 +-1.948621:-50.145678:-900.000000 +19.831379:-52.645678:-900.000000 FIN_BOX BOX creaMaracasVisu:ShowNPoints_Tools:Box132 @@ -698,26 +698,86 @@ FIN_BOX BOX wx:LayoutLine:Box123 ISEXEC:FALSE --125.240906:-102.743930:-900.000000 --91.920906:-105.243930:-900.000000 +-124.678268:-98.617918:-900.000000 +-91.358268:-101.117918:-900.000000 PORT -Orientation:"H" +Orientation:"V" +PORT +WinTitle:"Visu" FIN_BOX BOX wx:LayoutTab:Box124 ISEXEC:FALSE --17.115619:-76.494225:-900.000000 -16.204381:-78.994225:-900.000000 +-17.303165:-81.933059:-900.000000 +16.016835:-84.433059:-900.000000 FIN_BOX BOX wx:LayoutLine:Box125 ISEXEC:FALSE --185.601081:-88.570292:-900.000000 --152.281081:-91.070292:-900.000000 +-267.837043:-87.786794:-900.000000 +-234.517043:-90.286794:-900.000000 PORT -Orientation:"H" +Orientation:"V" +PORT +WinTitle:"Visu" +FIN_BOX +BOX +wx:LayoutLine:Box126 +ISEXEC:FALSE +-179.812141:-71.797263:-900.000000 +-146.492141:-74.297263:-900.000000 +PORT +Orientation:"V" +PORT +WinTitle:"config" +FIN_BOX +BOX +wx:LayoutTab:Box128 +ISEXEC:FALSE +-125.937402:-105.186652:-900.000000 +-92.617402:-107.686652:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box129 +ISEXEC:FALSE +-182.463148:-62.401363:-900.000000 +-160.683148:-64.901363:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box134 +ISEXEC:FALSE +-124.188495:-87.955436:-900.000000 +-102.408495:-90.455436:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box135 +ISEXEC:FALSE +-219.822920:-88.895342:-900.000000 +-186.502920:-91.395342:-900.000000 +PORT +Orientation:"V" +PORT +WinTitle:"config" +FIN_BOX +BOX +wx:LayoutTab:Box136 +ISEXEC:FALSE +-252.330390:-98.316800:-900.000000 +-219.010390:-100.816800:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box137 +ISEXEC:FALSE +-220.771854:-80.005991:-900.000000 +-198.991854:-82.505991:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box139 +ISEXEC:FALSE +-270.119436:-70.500638:-900.000000 +-248.339436:-73.000638:-900.000000 FIN_BOX -CONNECTIONS:160 +CONNECTIONS:172 CONNECTION Box06:LstContourPointsX:Box04:LstX NumberOfControlPoints:0 @@ -1175,27 +1235,63 @@ CONNECTION Box122:Widget:Box79:Widget4 NumberOfControlPoints:0 CONNECTION -Box123:Widget:Box79:Widget8 +Box50:Widget:Box124:Widget3 NumberOfControlPoints:0 CONNECTION -Box72:_widget:Box123:Widget2 +Box124:Widget:Box38:Widget4 NumberOfControlPoints:0 CONNECTION -Box37:widget:Box123:Widget4 +Box72:_widgetB:Box126:Widget2 NumberOfControlPoints:0 CONNECTION -Box50:Widget:Box124:Widget3 +Box37:widgetB:Box126:Widget4 NumberOfControlPoints:0 CONNECTION -Box124:Widget:Box38:Widget4 +Box72:_widgetA:Box123:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box37:widgetA:Box123:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box123:Widget:Box128:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box128:Widget:Box79:Widget7 +NumberOfControlPoints:0 +CONNECTION +Box126:Widget:Box128:Widget3 +NumberOfControlPoints:0 +CONNECTION +Box136:Widget:Box38:Widget7 +NumberOfControlPoints:0 +CONNECTION +Box125:Widget:Box136:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box135:Widget:Box136:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box62:_widgetA:Box125:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box48:widgetA:Box125:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box62:_widgetB:Box135:Widget3 +NumberOfControlPoints:0 +CONNECTION +Box48:widgetB:Box135:Widget5 +NumberOfControlPoints:0 +CONNECTION +Box139:Widget:Box125:Widget9 NumberOfControlPoints:0 CONNECTION -Box62:_widget:Box125:Widget2 +Box137:Widget:Box135:Widget9 NumberOfControlPoints:0 CONNECTION -Box48:widget:Box125:Widget4 +Box129:Widget:Box126:Widget9 NumberOfControlPoints:0 CONNECTION -Box125:Widget:Box38:Widget7 +Box134:Widget:Box123:Widget9 NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs index 541f4cc..a6b1664 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs @@ -254,12 +254,34 @@ new std:ConcatStrings Box120 new wx:LayoutTab Box122 new wx:LayoutLine Box123 - set Box123.Orientation "H" + set Box123.Orientation "V" + set Box123.WinTitle "Visu" new wx:LayoutTab Box124 new wx:LayoutLine Box125 - set Box125.Orientation "H" + set Box125.Orientation "V" + set Box125.WinTitle "Visu" + +new wx:LayoutLine Box126 + set Box126.Orientation "V" + set Box126.WinTitle "config" + +new wx:LayoutTab Box128 + +new wx:OutputText Box129 + +new wx:OutputText Box134 + +new wx:LayoutLine Box135 + set Box135.Orientation "V" + set Box135.WinTitle "config" + +new wx:LayoutTab Box136 + +new wx:OutputText Box137 + +new wx:OutputText Box139 connect Box06.LstContourPointsX Box04.LstX @@ -399,14 +421,26 @@ 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 +connect Box72._widgetB Box126.Widget2 +connect Box37.widgetB Box126.Widget4 +connect Box72._widgetA Box123.Widget2 +connect Box37.widgetA Box123.Widget4 +connect Box123.Widget Box128.Widget1 +connect Box128.Widget Box79.Widget7 +connect Box126.Widget Box128.Widget3 +connect Box136.Widget Box38.Widget7 +connect Box125.Widget Box136.Widget2 +connect Box135.Widget Box136.Widget4 +connect Box62._widgetA Box125.Widget2 +connect Box48.widgetA Box125.Widget4 +connect Box62._widgetB Box135.Widget3 +connect Box48.widgetB Box135.Widget5 +connect Box139.Widget Box125.Widget9 +connect Box137.Widget Box135.Widget9 +connect Box129.Widget Box126.Widget9 +connect Box134.Widget Box123.Widget9 # Complex input ports input point showNpoints.In " " diff --git a/bbtk/bbs/boxes/Mesh_tool_Help.bbg b/bbtk/bbs/boxes/Mesh_tool_Help.bbg index 57050f2..c57e05f 100644 --- a/bbtk/bbs/boxes/Mesh_tool_Help.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_Help.bbg @@ -21,7 +21,7 @@ BOX std:StringSelect:Box09 ISEXEC:FALSE 56.418955:30.922394:-900.000000 -80.938955:28.422394:-900.000000 +78.178955:28.422394:-900.000000 PORT In0:"xdg-open " PORT @@ -33,7 +33,7 @@ BOX wx:LayoutLine:Box10 ISEXEC:FALSE 29.171044:-22.567013:-900.000000 -62.491044:-25.067013:-900.000000 +50.831044:-25.067013:-900.000000 PORT Orientation:"V" FIN_BOX @@ -43,7 +43,7 @@ ISEXEC:FALSE 43.226534:9.783608:-900.000000 65.986534:7.283608:-900.000000 PORT -In2:"https&&2P&&//www.creatis.insa-lyon.fr/~davila/sky/sky-Lyon.html" +In2:"https&&2P&&//www.creatis.insa-lyon.fr/~davila/tmp/tmpCreaSDRA/tutorial001/" FIN_BOX BOX std:ExecSystemCommand:Box13 @@ -60,8 +60,8 @@ FIN_BOX BOX wx:CommandButton:Box15 ISEXEC:FALSE -24.618616:16.381549:-900.000000 -46.893616:13.881549:-900.000000 +16.292347:10.104823:-900.000000 +38.567347:7.604823:-900.000000 PORT Label:"Open tutorials page" FIN_BOX @@ -79,7 +79,7 @@ ISEXEC:FALSE 95.908623:17.070283:-900.000000 118.183623:14.570283:-900.000000 PORT -Label:"Run Video" +Label:"Run General Video" FIN_BOX BOX std:ExecSystemCommand:Box20 diff --git a/bbtk/bbs/boxes/Mesh_tool_Help.bbs b/bbtk/bbs/boxes/Mesh_tool_Help.bbs index 92f5357..b7f3340 100644 --- a/bbtk/bbs/boxes/Mesh_tool_Help.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_Help.bbs @@ -24,7 +24,7 @@ new wx:LayoutLine Box10 set Box10.Orientation "V" new std:ConcatStrings Box11 - set Box11.In2 "https://www.creatis.insa-lyon.fr/~davila/sky/sky-Lyon.html" + set Box11.In2 "https://www.creatis.insa-lyon.fr/~davila/tmp/tmpCreaSDRA/tutorial001/" new std:ExecSystemCommand Box13 @@ -37,7 +37,7 @@ new std:ConcatStrings Box18 set Box18.In2 "https://youtu.be/VtBAtlMufDc" new wx:CommandButton Box19 - set Box19.Label "Run Video" + set Box19.Label "Run General Video" new std:ExecSystemCommand Box20 diff --git a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg index dda266c..df4d08b 100644 --- a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg +++ b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg @@ -10,7 +10,7 @@ AUTHOR:Author ?? COMPLEXBOX:TRUE COMPLEXBOXNAME:PolyDataToActor_Widget PACKAGENAME:creaMaracasVisu -COMPLEXOUTPUTS:3 +COMPLEXOUTPUTS:5 COMPLEX_PORT widget -16.692045:-81.340709:-900.000000 @@ -23,6 +23,14 @@ COMPLEX_PORT vtkprop3D 45.419298:-83.304649:-900.000000 FIN_COMPLEX_PORT +COMPLEX_PORT +widgetA +-8.900109:-81.468916:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +widgetB +-2.559335:-81.468916:-900.000000 +FIN_COMPLEX_PORT COMPLEXINPUTS:7 COMPLEX_PORT render @@ -57,7 +65,7 @@ BOX wx:LayoutLine:Box04 ISEXEC:FALSE -16.179920:-48.062580:-900.000000 -17.140080:-50.562580:-900.000000 +33.320000:-50.562580:-900.000000 PORT Orientation:"H" FIN_BOX @@ -111,13 +119,13 @@ BOX wx:ComboBox:Box15 ISEXEC:FALSE 22.112635:-19.005024:-900.000000 -43.827635:-21.505024:-900.000000 +48.392635:-21.505024:-900.000000 PORT In:"Points WireFrame Surface" PORT Selection:"2" PORT -Title:"Representation" +Title:"3D Representation" FIN_BOX BOX std:MultipleInputs:Box08 @@ -125,7 +133,7 @@ ISEXEC:FALSE -36.135097:-21.729535:-900.000000 21.000000:-24.229535:-900.000000 FIN_BOX -CONNECTIONS:20 +CONNECTIONS:22 CONNECTION Box10:Out:Box11:Renderer NumberOfControlPoints:0 @@ -186,4 +194,10 @@ NumberOfControlPoints:0 CONNECTION meshOpacity:meshOpacity:Box13:In NumberOfControlPoints:0 +CONNECTION +Box13:Widget:widgetA:widgetA +NumberOfControlPoints:0 +CONNECTION +Box15:Widget:widgetB:widgetB +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs index 64737be..033e0f5 100644 --- a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs +++ b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs @@ -40,7 +40,7 @@ new std:Div Box14 new wx:ComboBox Box15 set Box15.In "Points WireFrame Surface" set Box15.Selection "2" - set Box15.Title "Representation" + set Box15.Title "3D Representation" new std:MultipleInputs Box08 @@ -69,6 +69,8 @@ input meshOpacity Box13.In " " output widget Box04.Widget " " output boxchange Box09.BoxChange " " output vtkprop3D Box09.Out " " +output widgetA Box13.Widget " " +output widgetB Box15.Widget " " endefine