From dc1b2ab9ed7a36b1dfaf1215cba3635c56c5cef6 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 6 Jul 2023 19:21:30 +0200 Subject: [PATCH] Clean Code --- bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg | 89 +++++++--- bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs | 30 +++- .../bbs/boxes/Mesh_tool_ApplyExternalMask.bbg | 84 +++++++-- .../bbs/boxes/Mesh_tool_ApplyExternalMask.bbs | 25 ++- bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg | 152 ++++++++++++---- bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs | 52 ++++-- bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbg | 164 ++++++++++++++---- bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbs | 51 +++++- .../boxes/Mesh_tool_ApplyRegionGrowing.bbg | 136 ++++++++++++--- .../boxes/Mesh_tool_ApplyRegionGrowing.bbs | 50 +++++- bbtk/bbs/boxes/Mesh_tool_ApplySmooth.bbg | 80 +++++++-- bbtk/bbs/boxes/Mesh_tool_ApplySmooth.bbs | 26 ++- bbtk/bbs/boxes/Mesh_tool_Help.bbg | 4 +- bbtk/bbs/boxes/Mesh_tool_Help.bbs | 2 +- .../wxWindows/widgets/WidgetShowNPoints.cxx | 7 +- 15 files changed, 753 insertions(+), 199 deletions(-) diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg index 5ea7257..4adb2fa 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg @@ -56,7 +56,7 @@ COMPLEX_PORT meshmanagermodel -131.800179:136.578564:-900.000000 FIN_COMPLEX_PORT -BOXES:81 +BOXES:84 BOX wx:LayoutLine:Box08 ISEXEC:FALSE @@ -74,22 +74,14 @@ FIN_BOX BOX wx:LayoutLine:Box79 ISEXEC:FALSE --144.989740:-96.536068:-900.000000 --111.669740:-99.036068:-900.000000 +-148.703291:-103.062915:-900.000000 +-115.383291:-105.562915:-900.000000 PORT Orientation:"H" PORT WinTitle:"New Surface ( Magenta )" FIN_BOX BOX -wx:CommandButton:Box80 -ISEXEC:FALSE --106.415574:-14.764137:-900.000000 --84.140574:-17.264137:-900.000000 -PORT -Label:"Run" -FIN_BOX -BOX std:MagicBox:Box66 ISEXEC:FALSE -8.767256:-65.552297:-900.000000 @@ -110,8 +102,8 @@ FIN_BOX BOX creaMaracasVisu:PolyDataToActor_Widget:Box37 ISEXEC:FALSE --204.608881:-41.015696:-900.000000 --181.588881:-43.515696:-900.000000 +-200.782798:-43.378865:-900.000000 +-177.762798:-45.878865:-900.000000 PORT color:"0 1 1" FIN_BOX @@ -200,8 +192,8 @@ FIN_BOX BOX creaMaracasVisu:MeshContours_Widget:Box72 ISEXEC:FALSE --120.723459:-80.874814:-900.000000 --97.928459:-83.374814:-900.000000 +-116.529090:-80.670211:-900.000000 +-93.734090:-83.170211:-900.000000 PORT colorMesh:"0 1 1" FIN_BOX @@ -669,9 +661,9 @@ ISEXEC:FALSE -123.187569:-88.834024:-900.000000 -89.867569:-91.334024:-900.000000 PORT -Orientation:"H" +Orientation:"V" PORT -WinTitle:"New Surface ( Magenta )" +WinTitle:"Visu" FIN_BOX BOX wx:LayoutTab:Box126 @@ -679,7 +671,35 @@ ISEXEC:FALSE -135.688159:-55.669810:-900.000000 -102.368159:-58.169810:-900.000000 FIN_BOX -CONNECTIONS:156 +BOX +wx:LayoutLine:Box127 +ISEXEC:FALSE +-84.205498:-88.798212:-900.000000 +-50.885498:-91.298212:-900.000000 +PORT +Orientation:"V" +PORT +WinTitle:"conf" +FIN_BOX +BOX +wx:LayoutTab:Box128 +ISEXEC:FALSE +-120.033910:-95.085876:-900.000000 +-86.713910:-97.585876:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box129 +ISEXEC:FALSE +-133.993679:-84.081030:-900.000000 +-112.213679:-86.581030:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box130 +ISEXEC:FALSE +-78.065349:-79.242161:-900.000000 +-56.285349:-81.742161:-900.000000 +FIN_BOX +CONNECTIONS:161 CONNECTION Box08:Widget:widget:widget NumberOfControlPoints:0 @@ -702,9 +722,6 @@ CONNECTION Box79:Widget:Box40:Widget2 NumberOfControlPoints:0 CONNECTION -Box80:Widget:Box44:Widget5 -NumberOfControlPoints:0 -CONNECTION meshmanagermodel:meshmanagermodel:Box46:In NumberOfControlPoints:0 CONNECTION @@ -1131,21 +1148,39 @@ CONNECTION Box62:MeshBase:Box122:In NumberOfControlPoints:0 CONNECTION -Box37:widget:Box125:Widget5 +Box44:Widget:Box126:Widget2 NumberOfControlPoints:0 CONNECTION -Box72:_widget:Box125:Widget2 +Box126:Widget:Box79:Widget2 NumberOfControlPoints:0 CONNECTION -Box125:Widget:Box79:Widget7 +Box82:Widget:Box79:Widget4 NumberOfControlPoints:0 CONNECTION -Box44:Widget:Box126:Widget2 +Box37:widgetB:Box127:Widget2 NumberOfControlPoints:0 CONNECTION -Box126:Widget:Box79:Widget2 +Box72:_widgetB:Box127:Widget4 NumberOfControlPoints:0 CONNECTION -Box82:Widget:Box79:Widget4 +Box72:_widgetA:Box125:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box37:widgetA:Box125:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box128:Widget:Box79:Widget6 +NumberOfControlPoints:0 +CONNECTION +Box125:Widget:Box128:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box127:Widget:Box128:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box129:Widget:Box125:Widget9 +NumberOfControlPoints:0 +CONNECTION +Box130:Widget:Box127:Widget9 NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs index 84d5bef..b3dfcaf 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs @@ -28,9 +28,6 @@ new wx:LayoutLine Box79 set Box79.Orientation "H" set Box79.WinTitle "New Surface ( Magenta )" -new wx:CommandButton Box80 - set Box80.Label "Run" - new std:MagicBox Box66 new std:MagicBox Box67 @@ -244,16 +241,25 @@ new wx:LayoutLine Box124 set Box124.WinTitle "1.2 Apply Changes" new wx:LayoutLine Box125 - set Box125.Orientation "H" - set Box125.WinTitle "New Surface ( Magenta )" + set Box125.Orientation "V" + set Box125.WinTitle "Visu" new wx:LayoutTab Box126 +new wx:LayoutLine Box127 + set Box127.Orientation "V" + set Box127.WinTitle "conf" + +new wx:LayoutTab Box128 + +new wx:OutputText Box129 + +new wx:OutputText Box130 + connect Box66.Out Box11.Renderer connect Box66.Out Box37.render connect Box79.Widget Box40.Widget2 -connect Box80.Widget Box44.Widget5 connect Box46.Out Box45.MeshManagerModel connect Box45.BoxChange Box51.In2 connect Box71.Out Box72._wxvtkbaseview3D1 @@ -389,12 +395,18 @@ 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 +connect Box37.widgetB Box127.Widget2 +connect Box72._widgetB Box127.Widget4 +connect Box72._widgetA Box125.Widget2 +connect Box37.widgetA Box125.Widget4 +connect Box128.Widget Box79.Widget6 +connect Box125.Widget Box128.Widget2 +connect Box127.Widget Box128.Widget4 +connect Box129.Widget Box125.Widget9 +connect Box130.Widget Box127.Widget9 # 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 063efd2..c538190 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbg @@ -60,18 +60,18 @@ COMPLEX_PORT OutDir -306.137122:136.559941:-900.000000 FIN_COMPLEX_PORT -BOXES:87 +BOXES:91 BOX wx:LayoutLine:Box08 ISEXEC:FALSE --191.490538:-129.735971:-900.000000 --158.170538:-132.235971:-900.000000 +-191.790098:-162.387988:-900.000000 +-158.470098:-164.887988:-900.000000 FIN_BOX BOX vtk:UpdateRender:Box11 ISEXEC:FALSE --7.745536:-95.586489:-900.000000 -14.279464:-98.086489:-900.000000 +9.389284:-94.927457:-900.000000 +31.414284:-97.427457:-900.000000 PORT Active:"true" FIN_BOX @@ -84,8 +84,8 @@ FIN_BOX BOX wx:LayoutLine:Box79 ISEXEC:FALSE --146.488605:-101.350645:-900.000000 --113.168605:-103.850645:-900.000000 +-150.832222:-123.218509:-900.000000 +-117.512222:-125.718509:-900.000000 PORT Orientation:"H" PORT @@ -120,8 +120,8 @@ FIN_BOX BOX creaMaracasVisu:PolyDataToActor_Widget:Box37 ISEXEC:FALSE --33.972623:-79.041343:-900.000000 --10.952623:-81.541343:-900.000000 +-69.953722:-71.659494:-900.000000 +-46.933722:-74.159494:-900.000000 PORT color:"0 1 1" PORT @@ -130,8 +130,8 @@ FIN_BOX BOX wx:LayoutTab:Box40 ISEXEC:FALSE --182.535138:-107.612723:-900.000000 --149.215138:-110.112723:-900.000000 +-182.834698:-140.264740:-900.000000 +-149.514698:-142.764740:-900.000000 FIN_BOX BOX wx:CommandButton:Box42 @@ -220,8 +220,8 @@ FIN_BOX BOX wx:LayoutLine:Box81 ISEXEC:FALSE --186.050677:-117.835921:-900.000000 --152.730677:-120.335921:-900.000000 +-186.350237:-150.487938:-900.000000 +-153.030237:-152.987938:-900.000000 PORT WinTitle:"Step 1. Surface" FIN_BOX @@ -715,9 +715,39 @@ ISEXEC:FALSE -76.171365:-94.451965:-900.000000 -42.851365:-96.951965:-900.000000 PORT -Orientation:"H" +Orientation:"V" +PORT +WinTitle:"Visu" +FIN_BOX +BOX +wx:OutputText:Box138 +ISEXEC:FALSE +-59.463050:-87.454275:-900.000000 +-37.683050:-89.954275:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box139 +ISEXEC:FALSE +-41.576630:-93.888975:-900.000000 +-8.256630:-96.388975:-900.000000 +PORT +Orientation:"V" +PORT +WinTitle:"conf" +FIN_BOX +BOX +wx:OutputText:Box140 +ISEXEC:FALSE +-32.187708:-86.334555:-900.000000 +-10.407708:-88.834555:-900.000000 FIN_BOX -CONNECTIONS:134 +BOX +wx:LayoutTab:Box141 +ISEXEC:FALSE +-64.712874:-101.886840:-900.000000 +-31.392874:-104.386840:-900.000000 +FIN_BOX +CONNECTIONS:140 CONNECTION Box08:Widget:widget:widget NumberOfControlPoints:0 @@ -1112,12 +1142,30 @@ CONNECTION Box136:Widget:Box79:Widget4 NumberOfControlPoints:0 CONNECTION -Box37:widget:Box137:Widget4 +Box138:Widget:Box137:Widget9 +NumberOfControlPoints:0 +CONNECTION +Box140:Widget:Box139:Widget9 +NumberOfControlPoints:0 +CONNECTION +Box72:_widgetA:Box137:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box37:widgetA:Box137:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box72:_widgetB:Box139:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box37:widgetB:Box139:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box137:Widget:Box141:Widget2 NumberOfControlPoints:0 CONNECTION -Box72:_widget:Box137:Widget2 +Box141:Widget:Box79:Widget7 NumberOfControlPoints:0 CONNECTION -Box137:Widget:Box79:Widget7 +Box139:Widget:Box141:Widget4 NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbs index 5bd843e..2894c8c 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyExternalMask.bbs @@ -258,7 +258,18 @@ new vtk:GetVectorVtkImageDataElement Box135 new wx:LayoutTab Box136 new wx:LayoutLine Box137 - set Box137.Orientation "H" + set Box137.Orientation "V" + set Box137.WinTitle "Visu" + +new wx:OutputText Box138 + +new wx:LayoutLine Box139 + set Box139.Orientation "V" + set Box139.WinTitle "conf" + +new wx:OutputText Box140 + +new wx:LayoutTab Box141 connect Box66.Out Box11.Renderer @@ -380,9 +391,15 @@ 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 +connect Box138.Widget Box137.Widget9 +connect Box140.Widget Box139.Widget9 +connect Box72._widgetA Box137.Widget2 +connect Box37.widgetA Box137.Widget4 +connect Box72._widgetB Box139.Widget2 +connect Box37.widgetB Box139.Widget4 +connect Box137.Widget Box141.Widget2 +connect Box141.Widget Box79.Widget7 +connect Box139.Widget Box141.Widget4 # 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 8a07f07..7fcb474 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:86 +BOXES:94 BOX creaMaracasVisu:ShowNPoints:showNpoints ISEXEC:FALSE @@ -225,9 +225,9 @@ ISEXEC:FALSE -130.558274:-118.720047:-900.000000 -97.238274:-121.220047:-900.000000 PORT -Orientation:"H" +Orientation:"V" PORT -WinTitle:"New Surface ( Magenta = Red+Yellow )" +WinTitle:"Visu" FIN_BOX BOX wx:CommandButton:Box80 @@ -284,8 +284,8 @@ FIN_BOX BOX creaMaracasVisu:PolyDataToActor_Widget:Box37 ISEXEC:FALSE --84.802772:-84.730517:-900.000000 --61.782772:-87.230517:-900.000000 +-96.686135:-86.463508:-900.000000 +-73.666135:-88.963508:-900.000000 PORT color:"0 1 1" PORT @@ -294,8 +294,8 @@ FIN_BOX BOX wx:LayoutLine:Box38 ISEXEC:FALSE --187.702443:-113.525159:-900.000000 --154.382443:-116.025159:-900.000000 +-189.115078:-140.522056:-900.000000 +-155.795078:-143.022056:-900.000000 PORT Orientation:"H" FIN_BOX @@ -538,8 +538,8 @@ FIN_BOX BOX wx:LayoutLine:Box102 ISEXEC:FALSE -52.209923:-76.556283:-900.000000 -85.529923:-79.056283:-900.000000 +47.580363:-71.654396:-900.000000 +80.900363:-74.154396:-900.000000 PORT Orientation:"H" PORT @@ -560,8 +560,8 @@ FIN_BOX BOX wx:LayoutTab:Box106 ISEXEC:FALSE -46.665246:-82.031336:-900.000000 -79.985246:-84.531336:-900.000000 +44.078139:-78.491084:-900.000000 +77.398139:-80.991084:-900.000000 FIN_BOX BOX creaMaracasVisu:MeshContours_Widget:Box107 @@ -765,9 +765,9 @@ ISEXEC:FALSE 89.335340:-76.337637:-900.000000 122.655340:-78.837637:-900.000000 PORT -Orientation:"H" +Orientation:"V" PORT -WinTitle:"Extrusion" +WinTitle:"Visu" FIN_BOX BOX wx:LayoutLine:Box146 @@ -785,7 +785,63 @@ ISEXEC:FALSE -119.981994:-45.601028:-900.000000 -86.661994:-48.101028:-900.000000 FIN_BOX -CONNECTIONS:166 +BOX +wx:LayoutLine:Box138 +ISEXEC:FALSE +-95.638603:-119.033084:-900.000000 +-62.318603:-121.533084:-900.000000 +PORT +Orientation:"V" +PORT +WinTitle:"conf" +FIN_BOX +BOX +wx:LayoutTab:Box139 +ISEXEC:FALSE +-123.166111:-124.651531:-900.000000 +-89.846111:-127.151531:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box140 +ISEXEC:FALSE +124.985343:-75.648015:-900.000000 +158.305343:-78.148015:-900.000000 +PORT +Orientation:"V" +PORT +WinTitle:"conf" +FIN_BOX +BOX +wx:LayoutTab:Box141 +ISEXEC:FALSE +99.546126:-86.355008:-900.000000 +132.866126:-88.855008:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box142 +ISEXEC:FALSE +-110.609888:-112.378131:-900.000000 +-88.829888:-114.878131:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box143 +ISEXEC:FALSE +-82.111194:-110.002805:-900.000000 +-60.331194:-112.502805:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box144 +ISEXEC:FALSE +112.472285:-66.410682:-900.000000 +134.252285:-68.910682:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box148 +ISEXEC:FALSE +139.158642:-65.682934:-900.000000 +160.938642:-68.182934:-900.000000 +FIN_BOX +CONNECTIONS:178 CONNECTION Box06:LstContourPointsX:Box04:LstX NumberOfControlPoints:0 @@ -985,9 +1041,6 @@ CONNECTION Box69:Out:Box72:_wxvtkbaseview2D3 NumberOfControlPoints:0 CONNECTION -Box37:widget:Box79:Widget4 -NumberOfControlPoints:0 -CONNECTION Box44:Widget:Box82:Widget2 NumberOfControlPoints:0 CONNECTION @@ -1123,9 +1176,6 @@ CONNECTION Box96:Out:Box110:In NumberOfControlPoints:0 CONNECTION -Box72:_widget:Box79:Widget3 -NumberOfControlPoints:0 -CONNECTION Box58:Out:Box111:StringVector NumberOfControlPoints:0 CONNECTION @@ -1255,33 +1305,75 @@ CONNECTION Box106:Widget:Box38:Widget4 NumberOfControlPoints:0 CONNECTION -Box98:widget:Box145:Widget4 +Box146:Widget:Box40:Widget2 NumberOfControlPoints:0 CONNECTION -Box107:_widget:Box145:Widget2 +Box82:Widget:Box146:Widget2 NumberOfControlPoints:0 CONNECTION -Box145:Widget:Box38:Widget7 +Box134:Widget:Box147:Widget2 NumberOfControlPoints:0 CONNECTION -Box79:Widget:Box146:Widget6 +Box147:Widget:Box146:Widget3 NumberOfControlPoints:0 CONNECTION -Box146:Widget:Box40:Widget2 +Box42:BoxChange:Box53:In3 NumberOfControlPoints:0 CONNECTION -Box82:Widget:Box146:Widget2 +Box38:Widget:Box81:Widget2 NumberOfControlPoints:0 CONNECTION -Box134:Widget:Box147:Widget2 +Box72:_widgetB:Box138:Widget2 NumberOfControlPoints:0 CONNECTION -Box147:Widget:Box146:Widget3 +Box37:widgetB:Box138:Widget4 NumberOfControlPoints:0 CONNECTION -Box42:BoxChange:Box53:In3 +Box72:_widgetA:Box79:Widget2 NumberOfControlPoints:0 CONNECTION -Box38:Widget:Box81:Widget2 +Box37:widgetA:Box79:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box79:Widget:Box139:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box138:Widget:Box139:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box139:Widget:Box146:Widget6 +NumberOfControlPoints:0 +CONNECTION +Box107:_widgetB:Box140:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box98:widgetB:Box140:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box107:_widgetA:Box145:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box98:widgetA:Box145:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box145:Widget:Box141:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box140:Widget:Box141:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box141:Widget:Box38:Widget7 +NumberOfControlPoints:0 +CONNECTION +Box142:Widget:Box79:Widget9 +NumberOfControlPoints:0 +CONNECTION +Box143:Widget:Box138:Widget9 +NumberOfControlPoints:0 +CONNECTION +Box144:Widget:Box145:Widget9 +NumberOfControlPoints:0 +CONNECTION +Box148:Widget:Box140:Widget9 NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs index 3845851..7636446 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs @@ -77,8 +77,8 @@ new wx:ComboBox Box78 set Box78.In "Union Intersection Difference" new wx:LayoutLine Box79 - set Box79.Orientation "H" - set Box79.WinTitle "New Surface ( Magenta = Red+Yellow )" + set Box79.Orientation "V" + set Box79.WinTitle "Visu" new wx:CommandButton Box80 set Box80.Label "Run" @@ -279,8 +279,8 @@ new wx:LayoutLine Box134 set Box134.WinTitle "1.3 Apply Changes" new wx:LayoutLine Box145 - set Box145.Orientation "H" - set Box145.WinTitle "Extrusion" + set Box145.Orientation "V" + set Box145.WinTitle "Visu" new wx:LayoutLine Box146 set Box146.Orientation "H" @@ -288,6 +288,26 @@ new wx:LayoutLine Box146 new wx:LayoutTab Box147 +new wx:LayoutLine Box138 + set Box138.Orientation "V" + set Box138.WinTitle "conf" + +new wx:LayoutTab Box139 + +new wx:LayoutLine Box140 + set Box140.Orientation "V" + set Box140.WinTitle "conf" + +new wx:LayoutTab Box141 + +new wx:OutputText Box142 + +new wx:OutputText Box143 + +new wx:OutputText Box144 + +new wx:OutputText Box148 + connect Box06.LstContourPointsX Box04.LstX connect showNpoints.lstIndexs Box06.LstIndexsIn @@ -344,7 +364,6 @@ connect Box71.Out Box72._wxvtkbaseview3D1 connect Box64.Out Box72._wxvtkbaseview2D1 connect Box65.Out Box72._wxvtkbaseview2D2 connect Box69.Out Box72._wxvtkbaseview2D3 -connect Box37.widget Box79.Widget4 connect Box44.Widget Box82.Widget2 connect Box86.Widget Box38.Widget2 connect Box50.Widget Box86.Widget4 @@ -386,7 +405,6 @@ connect Box109.Out Box98.polydata connect Box109.Out Box107._polydata connect Box109.Out Box77.In2 connect Box96.Out Box110.In -connect Box72._widget Box79.Widget3 connect Box58.Out Box111.StringVector connect Box111.Out Box57.In connect Box57.Out Box112.sk1 @@ -430,16 +448,30 @@ connect Box133.Out Box115.In connect Box42.Widget Box134.Widget3 connect Box42.BoxChange Box51.BoxExecute connect Box106.Widget Box38.Widget4 -connect Box98.widget Box145.Widget4 -connect Box107._widget Box145.Widget2 -connect Box145.Widget Box38.Widget7 -connect Box79.Widget Box146.Widget6 connect Box146.Widget Box40.Widget2 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 +connect Box72._widgetB Box138.Widget2 +connect Box37.widgetB Box138.Widget4 +connect Box72._widgetA Box79.Widget2 +connect Box37.widgetA Box79.Widget4 +connect Box79.Widget Box139.Widget2 +connect Box138.Widget Box139.Widget4 +connect Box139.Widget Box146.Widget6 +connect Box107._widgetB Box140.Widget2 +connect Box98.widgetB Box140.Widget4 +connect Box107._widgetA Box145.Widget2 +connect Box98.widgetA Box145.Widget4 +connect Box145.Widget Box141.Widget2 +connect Box140.Widget Box141.Widget4 +connect Box141.Widget Box38.Widget7 +connect Box142.Widget Box79.Widget9 +connect Box143.Widget Box138.Widget9 +connect Box144.Widget Box145.Widget9 +connect Box148.Widget Box140.Widget9 # 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 538348f..f6d42bf 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:79 +BOXES:87 BOX creaMaracasVisu:ShowNPoints:showNpoints ISEXEC:FALSE @@ -108,8 +108,8 @@ FIN_BOX BOX wx:LayoutLine:Box08 ISEXEC:FALSE --186.730255:-147.861875:-900.000000 --153.410255:-150.361875:-900.000000 +-186.358900:-168.781546:-900.000000 +-153.038900:-171.281546:-900.000000 FIN_BOX BOX vtk:UpdateRender:Box11 @@ -204,8 +204,8 @@ FIN_BOX BOX wx:LayoutLine:Box79 ISEXEC:FALSE --149.516140:-121.109366:-900.000000 --116.196140:-123.609366:-900.000000 +-146.916654:-138.191701:-900.000000 +-113.596654:-140.691701:-900.000000 PORT Orientation:"H" PORT @@ -272,8 +272,8 @@ FIN_BOX BOX creaMaracasVisu:PolyDataToActor_Widget:Box37 ISEXEC:FALSE --79.429463:-91.018426:-900.000000 --56.409463:-93.518426:-900.000000 +-78.990878:-90.579841:-900.000000 +-55.970878:-93.079841:-900.000000 PORT color:"0 1 1" PORT @@ -290,8 +290,8 @@ FIN_BOX BOX wx:LayoutTab:Box40 ISEXEC:FALSE --152.959161:-129.398201:-900.000000 --119.639161:-131.898201:-900.000000 +-152.587806:-150.317872:-900.000000 +-119.267806:-152.817872:-900.000000 FIN_BOX BOX wx:CommandButton:Box42 @@ -430,8 +430,8 @@ FIN_BOX BOX wx:LayoutLine:Box81 ISEXEC:FALSE --180.022846:-140.278086:-900.000000 --146.702846:-142.778086:-900.000000 +-179.651491:-161.197757:-900.000000 +-146.331491:-163.697757:-900.000000 PORT WinTitle:"Step 1. Surface" FIN_BOX @@ -660,10 +660,12 @@ FIN_BOX BOX wx:LayoutLine:Box145 ISEXEC:FALSE --184.114856:-99.165135:-900.000000 --150.794856:-101.665135:-900.000000 +-194.860200:-96.095037:-900.000000 +-161.540200:-98.595037:-900.000000 PORT -Orientation:"H" +Orientation:"V" +PORT +WinTitle:"Visu" FIN_BOX BOX wx:LayoutTab:Box146 @@ -677,9 +679,9 @@ ISEXEC:FALSE -115.155031:-108.866360:-900.000000 -81.835031:-111.366360:-900.000000 PORT -Orientation:"H" +Orientation:"V" PORT -WinTitle:"New Surface ( Magenta = Red+Yellow )" +WinTitle:"Visu" FIN_BOX BOX wx:LayoutTab:Box148 @@ -719,7 +721,63 @@ ISEXEC:FALSE 44.500333:-130.635183:-900.000000 66.580333:-133.135183:-900.000000 FIN_BOX -CONNECTIONS:163 +BOX +wx:LayoutLine:Box136 +ISEXEC:FALSE +-177.132224:-101.278966:-900.000000 +-143.812224:-103.778966:-900.000000 +PORT +Orientation:"V" +PORT +WinTitle:"conf" +FIN_BOX +BOX +wx:LayoutTab:Box137 +ISEXEC:FALSE +-183.471822:-110.130222:-900.000000 +-150.151822:-112.630222:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box138 +ISEXEC:FALSE +-79.740220:-108.684257:-900.000000 +-46.420220:-111.184257:-900.000000 +PORT +Orientation:"V" +PORT +WinTitle:"conf" +FIN_BOX +BOX +wx:LayoutTab:Box144 +ISEXEC:FALSE +-111.664211:-115.642230:-900.000000 +-78.344211:-118.142230:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box149 +ISEXEC:FALSE +-185.398926:-84.289935:-900.000000 +-163.618926:-86.789935:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box153 +ISEXEC:FALSE +-176.733974:-71.540076:-900.000000 +-154.953974:-74.040076:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box155 +ISEXEC:FALSE +-102.710522:-103.476615:-900.000000 +-80.930522:-105.976615:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box156 +ISEXEC:FALSE +-62.727956:-100.753344:-900.000000 +-40.947956:-103.253344:-900.000000 +FIN_BOX +CONNECTIONS:175 CONNECTION Box06:LstContourPointsX:Box04:LstX NumberOfControlPoints:0 @@ -1135,15 +1193,6 @@ CONNECTION Box139:Out:Box142:In NumberOfControlPoints:0 CONNECTION -Box62:_widget:Box145:Widget2 -NumberOfControlPoints:0 -CONNECTION -Box48:widget:Box145:Widget4 -NumberOfControlPoints:0 -CONNECTION -Box145:Widget:Box38:Widget8 -NumberOfControlPoints:0 -CONNECTION Box129:Widget:Box146:Widget2 NumberOfControlPoints:0 CONNECTION @@ -1153,15 +1202,6 @@ CONNECTION Box42:BoxChange:Box51:BoxExecute NumberOfControlPoints:0 CONNECTION -Box72:_widget:Box147:Widget2 -NumberOfControlPoints:0 -CONNECTION -Box37:widget:Box147:Widget4 -NumberOfControlPoints:0 -CONNECTION -Box147:Widget:Box79:Widget6 -NumberOfControlPoints:0 -CONNECTION Box134:Widget:Box148:Widget3 NumberOfControlPoints:0 CONNECTION @@ -1209,4 +1249,58 @@ NumberOfControlPoints:0 CONNECTION Box38:Widget:Box81:Widget2 NumberOfControlPoints:0 +CONNECTION +Box62:_widgetB:Box136:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box48:widgetB:Box136:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box62:_widgetA:Box145:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box48:widgetA:Box145:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box145:Widget:Box137:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box137:Widget:Box38:Widget6 +NumberOfControlPoints:0 +CONNECTION +Box136:Widget:Box137:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box72:_widgetA:Box147:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box37:widgetA:Box147:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box72:_widgetB:Box138:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box37:widgetB:Box138:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box147:Widget:Box144:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box138:Widget:Box144:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box144:Widget:Box79:Widget6 +NumberOfControlPoints:0 +CONNECTION +Box149:Widget:Box145:Widget9 +NumberOfControlPoints:0 +CONNECTION +Box153:Widget:Box136:Widget9 +NumberOfControlPoints:0 +CONNECTION +Box155:Widget:Box147:Widget9 +NumberOfControlPoints:0 +CONNECTION +Box156:Widget:Box138:Widget9 +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbs index 3e9a5e5..359643c 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyPatchSimple.bbs @@ -240,13 +240,14 @@ new creaVtk:MeshReduction_DecimatePro Box143 set Box143.TargetReduction "0.8" new wx:LayoutLine Box145 - set Box145.Orientation "H" + set Box145.Orientation "V" + set Box145.WinTitle "Visu" new wx:LayoutTab Box146 new wx:LayoutLine Box147 - set Box147.Orientation "H" - set Box147.WinTitle "New Surface ( Magenta = Red+Yellow )" + set Box147.Orientation "V" + set Box147.WinTitle "Visu" new wx:LayoutTab Box148 @@ -262,6 +263,26 @@ new creaVtk:MarchingCubes2 Box152 new std:MultipleInputs Box154 +new wx:LayoutLine Box136 + set Box136.Orientation "V" + set Box136.WinTitle "conf" + +new wx:LayoutTab Box137 + +new wx:LayoutLine Box138 + set Box138.Orientation "V" + set Box138.WinTitle "conf" + +new wx:LayoutTab Box144 + +new wx:OutputText Box149 + +new wx:OutputText Box153 + +new wx:OutputText Box155 + +new wx:OutputText Box156 + connect Box06.LstContourPointsX Box04.LstX connect showNpoints.lstIndexs Box06.LstIndexsIn @@ -386,15 +407,9 @@ connect Box68.Size Box140.Dimensions connect Box68.TypeName Box140.OutputFormat connect Box140.Out Box139.InImage connect Box139.Out Box142.In -connect Box62._widget Box145.Widget2 -connect Box48.widget Box145.Widget4 -connect Box145.Widget Box38.Widget8 connect Box129.Widget Box146.Widget2 connect Box146.Widget Box38.Widget4 connect Box42.BoxChange Box51.BoxExecute -connect Box72._widget Box147.Widget2 -connect Box37.widget Box147.Widget4 -connect Box147.Widget Box79.Widget6 connect Box134.Widget Box148.Widget3 connect Box148.Widget Box79.Widget4 connect Box143.Out Box45.Mesh @@ -411,6 +426,24 @@ connect Box150.BoxChange Box154.In1 connect Box143.BoxChange Box154.In3 connect Box154.BoxChange Box93.BoxExecute connect Box38.Widget Box81.Widget2 +connect Box62._widgetB Box136.Widget2 +connect Box48.widgetB Box136.Widget4 +connect Box62._widgetA Box145.Widget2 +connect Box48.widgetA Box145.Widget4 +connect Box145.Widget Box137.Widget2 +connect Box137.Widget Box38.Widget6 +connect Box136.Widget Box137.Widget4 +connect Box72._widgetA Box147.Widget2 +connect Box37.widgetA Box147.Widget4 +connect Box72._widgetB Box138.Widget2 +connect Box37.widgetB Box138.Widget4 +connect Box147.Widget Box144.Widget2 +connect Box138.Widget Box144.Widget4 +connect Box144.Widget Box79.Widget6 +connect Box149.Widget Box145.Widget9 +connect Box153.Widget Box136.Widget9 +connect Box155.Widget Box147.Widget9 +connect Box156.Widget Box138.Widget9 # Complex input ports input point showNpoints.In " " diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbg index 7ee246e..2cc61d9 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.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 @@ -206,8 +206,8 @@ FIN_BOX BOX creaMaracasVisu:PolyDataToActor_Widget:Box37 ISEXEC:FALSE --61.408146:-48.900936:-900.000000 --38.388146:-51.400936:-900.000000 +-64.104184:-51.447194:-900.000000 +-41.084184:-53.947194:-900.000000 PORT color:"0 1 1" PORT @@ -342,8 +342,8 @@ FIN_BOX BOX creaMaracasVisu:MeshContours_Widget:Box72 ISEXEC:FALSE --168.253628:-93.491307:-900.000000 --145.458628:-95.991307:-900.000000 +-166.306489:-91.544168:-900.000000 +-143.511489:-94.044168:-900.000000 PORT colorMesh:"0 1 1" FIN_BOX @@ -695,7 +695,9 @@ ISEXEC:FALSE -124.969632:-108.254141:-900.000000 -91.649632:-110.754141:-900.000000 PORT -Orientation:"H" +Orientation:"V" +PORT +WinTitle:"Visu" FIN_BOX BOX wx:LayoutTab:Box142 @@ -706,12 +708,70 @@ FIN_BOX BOX wx:LayoutLine:Box143 ISEXEC:FALSE --180.167942:-113.951950:-900.000000 --146.847942:-116.451950:-900.000000 +-192.229043:-106.057411:-900.000000 +-158.909043:-108.557411:-900.000000 PORT -Orientation:"H" +Orientation:"V" +PORT +WinTitle:"Visu" +FIN_BOX +BOX +wx:LayoutLine:Box144 +ISEXEC:FALSE +-86.555509:-108.395117:-900.000000 +-53.235509:-110.895117:-900.000000 +PORT +Orientation:"V" +PORT +WinTitle:"conf" +FIN_BOX +BOX +wx:LayoutTab:Box145 +ISEXEC:FALSE +-111.863023:-119.499046:-900.000000 +-78.543023:-121.999046:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box146 +ISEXEC:FALSE +-176.474701:-111.460634:-900.000000 +-143.154701:-113.960634:-900.000000 +PORT +Orientation:"V" +PORT +WinTitle:"conf" +FIN_BOX +BOX +wx:LayoutTab:Box147 +ISEXEC:FALSE +-178.744166:-117.123719:-900.000000 +-145.424166:-119.623719:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box148 +ISEXEC:FALSE +-199.461798:-95.458407:-900.000000 +-177.681798:-97.958407:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box149 +ISEXEC:FALSE +-168.756920:-98.603785:-900.000000 +-146.976920:-101.103785:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box150 +ISEXEC:FALSE +-119.928675:-97.105986:-900.000000 +-98.148675:-99.605986:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box151 +ISEXEC:FALSE +-85.629080:-97.555325:-900.000000 +-63.849080:-100.055325:-900.000000 FIN_BOX -CONNECTIONS:150 +CONNECTIONS:162 CONNECTION Box31:BoxChange:Box11:BoxExecute NumberOfControlPoints:0 @@ -1133,33 +1193,69 @@ CONNECTION Box140:widget:Box125:Widget3 NumberOfControlPoints:0 CONNECTION -Box72:_widget:Box141:Widget2 +Box124:Widget:Box142:Widget2 NumberOfControlPoints:0 CONNECTION -Box37:widget:Box141:Widget4 +Box142:Widget:Box79:Widget4 NumberOfControlPoints:0 CONNECTION -Box141:Widget:Box79:Widget7 +Box86:Widget:Box38:Widget2 NumberOfControlPoints:0 CONNECTION -Box124:Widget:Box142:Widget2 +Box125:Widget:Box38:Widget4 NumberOfControlPoints:0 CONNECTION -Box142:Widget:Box79:Widget4 +Box72:_widgetA:Box141:Widget2 NumberOfControlPoints:0 CONNECTION -Box62:_widget:Box143:Widget2 +Box37:widgetA:Box141:Widget4 NumberOfControlPoints:0 CONNECTION -Box48:widget:Box143:Widget4 +Box72:_widgetB:Box144:Widget2 NumberOfControlPoints:0 CONNECTION -Box143:Widget:Box38:Widget7 +Box37:widgetB:Box144:Widget4 NumberOfControlPoints:0 CONNECTION -Box86:Widget:Box38:Widget2 +Box141:Widget:Box145:Widget2 NumberOfControlPoints:0 CONNECTION -Box125:Widget:Box38:Widget4 +Box144:Widget:Box145:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box145:Widget:Box79:Widget6 +NumberOfControlPoints:0 +CONNECTION +Box62:_widgetA:Box143:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box48:widgetA:Box143:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box62:_widgetB:Box146:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box48:widgetB:Box146:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box143:Widget:Box147:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box146:Widget:Box147:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box147:Widget:Box38:Widget6 +NumberOfControlPoints:0 +CONNECTION +Box148:Widget:Box143:Widget9 +NumberOfControlPoints:0 +CONNECTION +Box149:Widget:Box146:Widget9 +NumberOfControlPoints:0 +CONNECTION +Box151:Widget:Box144:Widget9 +NumberOfControlPoints:0 +CONNECTION +Box150:Widget:Box141:Widget9 NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbs index 889e9cf..d7075fb 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyRegionGrowing.bbs @@ -253,12 +253,34 @@ new vtk:CreateImage Box139 new toolsbbtk:ImageVtkPropertiesWidget Box140 new wx:LayoutLine Box141 - set Box141.Orientation "H" + set Box141.Orientation "V" + set Box141.WinTitle "Visu" new wx:LayoutTab Box142 new wx:LayoutLine Box143 - set Box143.Orientation "H" + set Box143.Orientation "V" + set Box143.WinTitle "Visu" + +new wx:LayoutLine Box144 + set Box144.Orientation "V" + set Box144.WinTitle "conf" + +new wx:LayoutTab Box145 + +new wx:LayoutLine Box146 + set Box146.Orientation "V" + set Box146.WinTitle "conf" + +new wx:LayoutTab Box147 + +new wx:OutputText Box148 + +new wx:OutputText Box149 + +new wx:OutputText Box150 + +new wx:OutputText Box151 connect Box31.BoxChange Box11.BoxExecute @@ -386,16 +408,28 @@ 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 +connect Box72._widgetA Box141.Widget2 +connect Box37.widgetA Box141.Widget4 +connect Box72._widgetB Box144.Widget2 +connect Box37.widgetB Box144.Widget4 +connect Box141.Widget Box145.Widget2 +connect Box144.Widget Box145.Widget4 +connect Box145.Widget Box79.Widget6 +connect Box62._widgetA Box143.Widget2 +connect Box48.widgetA Box143.Widget4 +connect Box62._widgetB Box146.Widget2 +connect Box48.widgetB Box146.Widget4 +connect Box143.Widget Box147.Widget2 +connect Box146.Widget Box147.Widget4 +connect Box147.Widget Box38.Widget6 +connect Box148.Widget Box143.Widget9 +connect Box149.Widget Box146.Widget9 +connect Box151.Widget Box144.Widget9 +connect Box150.Widget Box141.Widget9 # Complex input ports input point showNpoints.In " " diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySmooth.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplySmooth.bbg index 4c12ee8..f8a21a8 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplySmooth.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplySmooth.bbg @@ -52,18 +52,18 @@ COMPLEX_PORT meshmanagermodel -131.800179:136.578564:-900.000000 FIN_COMPLEX_PORT -BOXES:39 +BOXES:43 BOX wx:LayoutLine:Box08 ISEXEC:FALSE --191.490538:-129.735971:-900.000000 --158.170538:-132.235971:-900.000000 +-192.579846:-162.823711:-900.000000 +-159.259846:-165.323711:-900.000000 FIN_BOX BOX vtk:UpdateRender:Box11 ISEXEC:FALSE --7.745536:-95.586489:-900.000000 -14.279464:-98.086489:-900.000000 +-3.524466:-92.590891:-900.000000 +18.500534:-95.090891:-900.000000 PORT Active:"true" FIN_BOX @@ -76,8 +76,8 @@ FIN_BOX BOX wx:LayoutLine:Box79 ISEXEC:FALSE --142.444548:-98.205267:-900.000000 --109.124548:-100.705267:-900.000000 +-145.576309:-116.178854:-900.000000 +-112.256309:-118.678854:-900.000000 PORT Orientation:"H" PORT @@ -122,8 +122,8 @@ FIN_BOX BOX wx:LayoutTab:Box40 ISEXEC:FALSE --182.535138:-107.612723:-900.000000 --149.215138:-110.112723:-900.000000 +-183.624446:-140.700463:-900.000000 +-150.304446:-143.200463:-900.000000 FIN_BOX BOX wx:CommandButton:Box42 @@ -212,8 +212,8 @@ FIN_BOX BOX wx:LayoutLine:Box81 ISEXEC:FALSE --186.050677:-117.835921:-900.000000 --152.730677:-120.335921:-900.000000 +-187.139985:-150.923661:-900.000000 +-153.819985:-153.423661:-900.000000 PORT WinTitle:"Step 1. Surface" FIN_BOX @@ -337,11 +337,39 @@ ISEXEC:FALSE -75.572246:-93.852846:-900.000000 -42.252246:-96.352846:-900.000000 PORT -Orientation:"H" +Orientation:"V" PORT -WinTitle:"New Surface ( Magenta )" +WinTitle:"Visu" +FIN_BOX +BOX +wx:LayoutLine:Box53 +ISEXEC:FALSE +-41.011552:-93.707878:-900.000000 +-7.691552:-96.207878:-900.000000 +PORT +Orientation:"V" +PORT +WinTitle:"conf" +FIN_BOX +BOX +wx:LayoutTab:Box54 +ISEXEC:FALSE +-62.599904:-100.523415:-900.000000 +-29.279904:-103.023415:-900.000000 +FIN_BOX +BOX +wx:OutputText:Box55 +ISEXEC:FALSE +-65.670256:-84.468011:-900.000000 +-44.000256:-86.968011:-900.000000 FIN_BOX -CONNECTIONS:56 +BOX +wx:OutputText:Box56 +ISEXEC:FALSE +-23.051068:-86.101973:-900.000000 +-1.381068:-88.601973:-900.000000 +FIN_BOX +CONNECTIONS:62 CONNECTION Box08:Widget:widget:widget NumberOfControlPoints:0 @@ -502,12 +530,30 @@ CONNECTION Box50:Widget:Box79:Widget4 NumberOfControlPoints:0 CONNECTION -Box72:_widget:Box52:Widget2 +Box72:_widgetA:Box52:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box37:widgetA:Box52:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box72:_widgetB:Box53:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box37:widgetB:Box53:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box52:Widget:Box54:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box53:Widget:Box54:Widget4 +NumberOfControlPoints:0 +CONNECTION +Box54:Widget:Box79:Widget7 NumberOfControlPoints:0 CONNECTION -Box37:widget:Box52:Widget4 +Box55:Widget:Box52:Widget9 NumberOfControlPoints:0 CONNECTION -Box52:Widget:Box79:Widget6 +Box56:Widget:Box53:Widget9 NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySmooth.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplySmooth.bbs index 8ce709e..d578689 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplySmooth.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplySmooth.bbs @@ -120,8 +120,18 @@ new wx:LayoutLine Box49 new wx:LayoutTab Box50 new wx:LayoutLine Box52 - set Box52.Orientation "H" - set Box52.WinTitle "New Surface ( Magenta )" + set Box52.Orientation "V" + set Box52.WinTitle "Visu" + +new wx:LayoutLine Box53 + set Box53.Orientation "V" + set Box53.WinTitle "conf" + +new wx:LayoutTab Box54 + +new wx:OutputText Box55 + +new wx:OutputText Box56 connect Box66.Out Box11.Renderer @@ -167,9 +177,15 @@ 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 +connect Box72._widgetA Box52.Widget2 +connect Box37.widgetA Box52.Widget4 +connect Box72._widgetB Box53.Widget2 +connect Box37.widgetB Box53.Widget4 +connect Box52.Widget Box54.Widget2 +connect Box53.Widget Box54.Widget4 +connect Box54.Widget Box79.Widget7 +connect Box55.Widget Box52.Widget9 +connect Box56.Widget Box53.Widget9 # Complex input ports input mesh Box67.In " " diff --git a/bbtk/bbs/boxes/Mesh_tool_Help.bbg b/bbtk/bbs/boxes/Mesh_tool_Help.bbg index c57e05f..efcf301 100644 --- a/bbtk/bbs/boxes/Mesh_tool_Help.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_Help.bbg @@ -41,7 +41,7 @@ BOX std:ConcatStrings:Box11 ISEXEC:FALSE 43.226534:9.783608:-900.000000 -65.986534:7.283608:-900.000000 +65.196534:7.283608:-900.000000 PORT In2:"https&&2P&&//www.creatis.insa-lyon.fr/~davila/tmp/tmpCreaSDRA/tutorial001/" FIN_BOX @@ -71,7 +71,7 @@ ISEXEC:FALSE 102.041330:7.935290:-900.000000 124.801330:5.435290:-900.000000 PORT -In2:"https&&2P&&//youtu.be/VtBAtlMufDc" +In2:"https&&2P&&//youtu.be/uZJQ54HZ1HY" FIN_BOX BOX wx:CommandButton:Box19 diff --git a/bbtk/bbs/boxes/Mesh_tool_Help.bbs b/bbtk/bbs/boxes/Mesh_tool_Help.bbs index b7f3340..91d34bc 100644 --- a/bbtk/bbs/boxes/Mesh_tool_Help.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_Help.bbs @@ -34,7 +34,7 @@ new wx:CommandButton Box15 set Box15.Label "Open tutorials page" new std:ConcatStrings Box18 - set Box18.In2 "https://youtu.be/VtBAtlMufDc" + set Box18.In2 "https://youtu.be/uZJQ54HZ1HY" new wx:CommandButton Box19 set Box19.Label "Run General Video" diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx index ae720ae..aaff102 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx @@ -1388,7 +1388,6 @@ void WidgetShowNPoints::OnInsertCollectionAfter(wxCommandEvent &event) //------------------------------------------------------------------------ void WidgetShowNPoints::CreatePointsIntoNewCollection() { - // --------------------------------------------- int c1 = mActualCollection-1; int c2 = mActualCollection+1; int modelSize = lstModelShowNPoints.size(); @@ -1460,8 +1459,8 @@ void WidgetShowNPoints::CreatePointsIntoNewCollection() } // for delete m; // ----------------- Add new Points -------------------- - vtkPoints *points; - vtkStaticPointLocator *pointLocator; + vtkPoints *points = NULL; + vtkStaticPointLocator *pointLocator = NULL; if (aux_mesh!=NULL) { points = aux_mesh->GetPoints(); @@ -1490,7 +1489,7 @@ void WidgetShowNPoints::CreatePointsIntoNewCollection() } // aux_mesh AddPoint(x,y,z,""); } - pointLocator->Delete(); + if (pointLocator!=NULL) { pointLocator->Delete(); } RefreshCollectionText(); RefreshColourCollection(); } // if size of c1LstX c2LstX -- 2.47.1