From fb8d33728a13ae2efd33a731867cbd08fb58551f Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 15 Sep 2022 14:02:03 +0200 Subject: [PATCH] MeshManager --- bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg | 65 ++++------ bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs | 10 +- bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg | 62 +++++---- bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs | 12 +- bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg | 121 ++++++++++-------- bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs | 7 +- bbtk/src/bbmaracasvisuShowNPoints.cxx | 3 +- .../wxWindows/widgets/ModelShowNPoints.cxx | 2 +- 8 files changed, 151 insertions(+), 131 deletions(-) diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg index d1da017..3980d2f 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:76 +BOXES:75 BOX wx:LayoutLine:Box08 ISEXEC:FALSE @@ -132,16 +132,16 @@ FIN_BOX BOX wx:CommandButton:Box43 ISEXEC:FALSE --48.515334:99.967497:-900.000000 --26.240334:97.467497:-900.000000 +-26.322909:-16.783959:-900.000000 +-4.047909:-19.283959:-900.000000 PORT Label:"Reset Tool" FIN_BOX BOX wx:LayoutLine:Box44 ISEXEC:FALSE --119.475093:-36.602009:-900.000000 --86.155093:-39.102009:-900.000000 +-454.960003:-36.610889:-900.000000 +-421.640003:-39.110889:-900.000000 PORT Orientation:"V" PORT @@ -216,8 +216,8 @@ FIN_BOX BOX wx:LayoutTab:Box82 ISEXEC:FALSE --123.564121:-52.398946:-900.000000 --90.244121:-54.898946:-900.000000 +-124.770231:-53.363834:-900.000000 +-91.450231:-55.863834:-900.000000 FIN_BOX BOX creaMaracasVisu:wxVtkBaseView_Info:Box96 @@ -244,8 +244,8 @@ FIN_BOX BOX wx:Slider:Box49 ISEXEC:FALSE --422.817623:3.779003:-900.000000 --393.017623:1.279003:-900.000000 +-437.135083:3.054068:-900.000000 +-407.335083:0.554068:-900.000000 PORT In:"40" PORT @@ -268,14 +268,6 @@ PORT Title:"Active" FIN_BOX BOX -wx:LayoutLine:Box52 -ISEXEC:FALSE --465.947270:-6.599954:-900.000000 --432.627270:-9.099954:-900.000000 -PORT -Orientation:"V" -FIN_BOX -BOX creaVtk:PlaneWidget:Box58 ISEXEC:FALSE -260.210750:-38.996691:-900.000000 @@ -296,24 +288,24 @@ FIN_BOX BOX wx:CommandButton:Box53 ISEXEC:FALSE --390.223238:63.843854:-900.000000 --367.948238:61.343854:-900.000000 +-401.459726:17.448034:-900.000000 +-379.184726:14.948034:-900.000000 PORT Label:"-" FIN_BOX BOX wx:CommandButton:Box54 ISEXEC:FALSE --357.232644:65.146757:-900.000000 --334.957644:62.646757:-900.000000 +-372.818740:17.482302:-900.000000 +-350.543740:14.982302:-900.000000 PORT Label:"+" FIN_BOX BOX wx:LayoutLine:Box56 ISEXEC:FALSE --385.265172:52.931125:-900.000000 --351.945172:50.431125:-900.000000 +-396.501660:6.535305:-900.000000 +-363.181660:4.035305:-900.000000 PORT Orientation:"H" FIN_BOX @@ -548,8 +540,8 @@ FIN_BOX BOX wx:LayoutLine:Box108 ISEXEC:FALSE --448.292552:16.040337:-900.000000 --414.972552:13.540337:-900.000000 +-473.665266:3.535214:-900.000000 +-440.345266:1.035214:-900.000000 PORT Orientation:"H" FIN_BOX @@ -637,7 +629,7 @@ Replace:"1" PORT Search:"true" FIN_BOX -CONNECTIONS:146 +CONNECTIONS:145 CONNECTION Box08:Widget:widget:widget NumberOfControlPoints:0 @@ -732,12 +724,6 @@ CONNECTION Box49:Out:Box39:S NumberOfControlPoints:0 CONNECTION -Box49:Widget:Box52:Widget4 -NumberOfControlPoints:0 -CONNECTION -Box52:Widget:Box44:Widget3 -NumberOfControlPoints:0 -CONNECTION Box50:Out:Box58:Active NumberOfControlPoints:0 CONNECTION @@ -759,9 +745,6 @@ CONNECTION Box54:Widget:Box56:Widget4 NumberOfControlPoints:0 CONNECTION -Box56:Widget:Box52:Widget6 -NumberOfControlPoints:0 -CONNECTION Box58:Base:Box57:In NumberOfControlPoints:0 CONNECTION @@ -993,9 +976,6 @@ CONNECTION Box104:Widget:Box108:Widget4 NumberOfControlPoints:0 CONNECTION -Box108:Widget:Box52:Widget2 -NumberOfControlPoints:0 -CONNECTION Box35:Out:Box106:Image NumberOfControlPoints:0 CONNECTION @@ -1076,4 +1056,13 @@ NumberOfControlPoints:0 CONNECTION Box117:Box_ConcatStrings:ExportIsActive_concatstring_tool:ExportIsActive_concatstring_tool NumberOfControlPoints:0 +CONNECTION +Box108:Widget:Box44:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box49:Widget:Box44:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box56:Widget:Box44:Widget3 +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs index 55f6a0e..3c787ce 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs @@ -95,9 +95,6 @@ new wx:Slider Box49 new wx:CheckBox Box50 set Box50.Title "Active" -new wx:LayoutLine Box52 - set Box52.Orientation "V" - new creaVtk:PlaneWidget Box58 set Box58.ReactiveType "1" set Box58.Representation "1" @@ -254,8 +251,6 @@ connect Box37.widget Box79.Widget7 connect Box40.Widget Box81.Widget2 connect Box37.boxchange Box11.BoxExecute connect Box49.Out Box39.S -connect Box49.Widget Box52.Widget4 -connect Box52.Widget Box44.Widget3 connect Box50.Out Box58.Active connect Box50.BoxChange Box59.In2 connect Box59.BoxChange Box58.BoxExecute @@ -263,7 +258,6 @@ connect Box96.vtkRenderer Box58.Renderer connect Box35.Out Box58.In connect Box53.Widget Box56.Widget2 connect Box54.Widget Box56.Widget4 -connect Box56.Widget Box52.Widget6 connect Box58.Base Box57.In connect Box58.Base Box60.In connect Box53.BoxChange Box57.BoxExecute @@ -341,7 +335,6 @@ connect Box107.Out Box106.ColorType connect Box62.MeshTemp Box106.Mesh connect Box50.Widget Box108.Widget2 connect Box104.Widget Box108.Widget4 -connect Box108.Widget Box52.Widget2 connect Box35.Out Box106.Image connect Box104.BoxChange Box109.In1 connect Box110.BoxChange Box106.BoxExecute @@ -368,6 +361,9 @@ connect Box117.Out Box119.In connect Box119.Out Box118.In1 connect Box50.Out Box118.In2 connect Box118.Out Box39.Active +connect Box108.Widget Box44.Widget1 +connect Box49.Widget Box44.Widget2 +connect Box56.Widget Box44.Widget3 # 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 0efada9..7dd2ded 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:72 +BOXES:74 BOX creaMaracasVisu:ShowNPoints:showNpoints ISEXEC:FALSE @@ -316,8 +316,8 @@ FIN_BOX BOX creaMaracasVisu:PolyDataToActor_Widget:Box37 ISEXEC:FALSE --62.803645:-79.746907:-900.000000 --39.783645:-82.246907:-900.000000 +-62.578581:-80.422098:-900.000000 +-39.558581:-82.922098:-900.000000 PORT color:"0 1 1" FIN_BOX @@ -526,8 +526,8 @@ FIN_BOX BOX std:MagicBox:Box94 ISEXEC:FALSE --67.076676:-63.786058:-900.000000 --45.476676:-66.286058:-900.000000 +-72.590737:-64.348717:-900.000000 +-50.990737:-66.848717:-900.000000 FIN_BOX BOX creaVtk:PolyDataNormals:Box95 @@ -540,8 +540,8 @@ FIN_BOX BOX creaVtk:LinearExtrusionFilter:Box96 ISEXEC:FALSE -127.147426:-29.984265:-900.000000 -149.657426:-32.484265:-900.000000 +126.330445:-29.439611:-900.000000 +148.840445:-31.939611:-900.000000 FIN_BOX BOX wx:SpinCtrl:Box97 @@ -617,7 +617,7 @@ BOX creaMaracasVisu:wxVtkBaseView_Info:Box105 ISEXEC:FALSE -238.523609:87.781768:-900.000000 --215.798609:85.281768:-900.000000 +-211.243609:85.281768:-900.000000 FIN_BOX BOX wx:LayoutTab:Box106 @@ -636,8 +636,8 @@ FIN_BOX BOX creaVtk:MeshReduction_DecimatePro:Box108 ISEXEC:FALSE -140.776435:-37.674681:-900.000000 -164.381435:-40.174681:-900.000000 +188.914331:-33.175838:-900.000000 +212.519331:-35.675838:-900.000000 PORT TargetReduction:"0.8" FIN_BOX @@ -650,8 +650,8 @@ FIN_BOX BOX creaVtk:MeshReduction_QuadricDecimation:Box110 ISEXEC:FALSE -172.642730:-37.135675:-900.000000 -196.907730:-39.635675:-900.000000 +177.255951:-37.465191:-900.000000 +201.520951:-39.965191:-900.000000 PORT TargetReduction:"0.5" FIN_BOX @@ -681,7 +681,19 @@ ISEXEC:FALSE -270.706221:65.761298:-900.000000 -247.946221:63.261298:-900.000000 FIN_BOX -CONNECTIONS:150 +BOX +creaVtk:PolyDataNormals:Box115 +ISEXEC:FALSE +-89.132147:-69.742776:-900.000000 +-66.727147:-72.242776:-900.000000 +FIN_BOX +BOX +creaVtk:PolyDataNormals:Box116 +ISEXEC:FALSE +124.746890:-37.687211:-900.000000 +147.151890:-40.187211:-900.000000 +FIN_BOX +CONNECTIONS:152 CONNECTION Box06:LstContourPointsX:Box04:LstX NumberOfControlPoints:0 @@ -836,9 +848,6 @@ CONNECTION Box46:Out:Box45:MeshManagerModel NumberOfControlPoints:0 CONNECTION -Box77:Out:Box45:Mesh -NumberOfControlPoints:0 -CONNECTION Box49:OutString:Box06:NbPoints NumberOfControlPoints:0 CONNECTION @@ -983,9 +992,6 @@ CONNECTION Box92:MeshManagerModel:Box93:MeshManagerModel NumberOfControlPoints:0 CONNECTION -Box77:Out:Box93:Mesh -NumberOfControlPoints:0 -CONNECTION Box77:BoxChange:Box93:BoxExecute NumberOfControlPoints:0 CONNECTION @@ -1115,9 +1121,6 @@ CONNECTION Box48:widget:Box38:Widget8 NumberOfControlPoints:0 CONNECTION -Box96:Out:Box109:In -NumberOfControlPoints:0 -CONNECTION Box58:Out:Box111:StringVector NumberOfControlPoints:0 CONNECTION @@ -1132,4 +1135,19 @@ NumberOfControlPoints:0 CONNECTION Box114:Out:Box60:Type NumberOfControlPoints:0 +CONNECTION +Box77:Out:Box115:In +NumberOfControlPoints:0 +CONNECTION +Box115:Out:Box45:Mesh +NumberOfControlPoints:0 +CONNECTION +Box96:Out:Box116:In +NumberOfControlPoints:0 +CONNECTION +Box116:Out:Box109:In +NumberOfControlPoints:0 +CONNECTION +Box115:Out:Box93:Mesh +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs index 62ff7d3..a5423ae 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs @@ -250,6 +250,10 @@ new std:VectorFilterString Box112 new std:ConcatStrings Box114 +new creaVtk:PolyDataNormals Box115 + +new creaVtk:PolyDataNormals Box116 + connect Box06.LstContourPointsX Box04.LstX connect showNpoints.lstIndexs Box06.LstIndexsIn @@ -296,7 +300,6 @@ connect Box79.Widget Box40.Widget2 connect Box78.Widget Box44.Widget2 connect Box80.Widget Box44.Widget5 connect Box46.Out Box45.MeshManagerModel -connect Box77.Out Box45.Mesh connect Box49.OutString Box06.NbPoints connect Box42.BoxChange Box51.BoxExecute connect Box45.BoxChange Box51.In2 @@ -336,7 +339,6 @@ connect Box49.Widget Box50.Widget2 connect Box34.Widget Box50.Widget4 connect Box57.BoxChange Box08.BoxExecute connect Box92.MeshManagerModel Box93.MeshManagerModel -connect Box77.Out Box93.Mesh connect Box77.BoxChange Box93.BoxExecute connect Box92.MeshBase Box72._polydata connect Box92.MeshBase Box37.polydata @@ -380,12 +382,16 @@ connect Box96.Out Box110.In connect Box72._widget Box79.Widget3 connect Box98.widget Box102.Widget8 connect Box48.widget Box38.Widget8 -connect Box96.Out Box109.In connect Box58.Out Box111.StringVector connect Box111.Out Box57.In connect Box57.Out Box112.sk1 connect Box112.Out1 Box114.In1 connect Box114.Out Box60.Type +connect Box77.Out Box115.In +connect Box115.Out Box45.Mesh +connect Box96.Out Box116.In +connect Box116.Out Box109.In +connect Box115.Out Box93.Mesh # 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 73e7786..b3de03f 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg @@ -72,12 +72,12 @@ COMPLEX_PORT meshmanagermodel -150.374274:130.740991:-900.000000 FIN_COMPLEX_PORT -BOXES:56 +BOXES:57 BOX creaMaracasVisu:ShowNPoints:showNpoints ISEXEC:FALSE 24.787568:83.025910:-900.000000 -46.637568:80.525910:-900.000000 +61.627568:80.525910:-900.000000 PORT Radio:"1" PORT @@ -95,7 +95,7 @@ BOX creaMaracasVisu:ManualContourModel_Box:Box06 ISEXEC:FALSE 29.075845:30.364799:-900.000000 -52.285845:27.864799:-900.000000 +53.595845:27.864799:-900.000000 PORT DoubleContour:"1" PORT @@ -109,7 +109,7 @@ BOX wx:LayoutLine:Box08 ISEXEC:FALSE -182.125107:-147.642582:-900.000000 -33.320000:-150.142582:-900.000000 +-148.805107:-150.142582:-900.000000 FIN_BOX BOX vtk:UpdateRender:Box11 @@ -123,7 +123,7 @@ BOX creaMaracasVisu:DrawAxisTree3D:Box30 ISEXEC:FALSE 66.011927:-0.645212:-900.000000 -88.191927:-3.145212:-900.000000 +94.051927:-3.145212:-900.000000 PORT Colour:"0 0 1" PORT @@ -139,7 +139,7 @@ BOX creaMaracasVisu:ManualContourModel_Box:Box29 ISEXEC:FALSE 76.240145:29.637449:-900.000000 -99.450145:27.137449:-900.000000 +100.760145:27.137449:-900.000000 PORT NbPoints:"40" PORT @@ -151,7 +151,7 @@ BOX creaMaracasVisu:wxPopupMenu:Box57 ISEXEC:FALSE -291.724262:77.620511:-900.000000 -17.480000:75.120511:-900.000000 +-269.659262:75.120511:-900.000000 PORT WithCtrlKey:"true" FIN_BOX @@ -159,7 +159,7 @@ BOX std:AddStringToVector:Box58 ISEXEC:FALSE -304.297403:100.641432:-900.000000 -24.520000:98.141432:-900.000000 +-279.777403:98.141432:-900.000000 PORT In0:"+ Add point" PORT @@ -183,13 +183,13 @@ BOX creaMaracasVisu:ShowNPoints_Tools:Box60 ISEXEC:FALSE -271.997629:60.063100:-900.000000 -12.200000:57.563100:-900.000000 +-249.562629:57.563100:-900.000000 FIN_BOX BOX std:StringSelect:Box61 ISEXEC:FALSE -269.579256:64.985526:-900.000000 -24.520000:62.485526:-900.000000 +-245.059256:62.485526:-900.000000 PORT In0:"5" PORT @@ -213,21 +213,21 @@ BOX vtk:ImageVtkProperties:Box68 ISEXEC:FALSE -111.766259:110.196821:-900.000000 -16.720000:107.696821:-900.000000 +-89.231259:107.696821:-900.000000 FIN_BOX BOX std:VectorFilterDouble:Box70 ISEXEC:FALSE 49.750242:60.953814:-900.000000 -72.180242:58.453814:-900.000000 +76.030242:58.453814:-900.000000 PORT Type:"11" FIN_BOX BOX creaVtk:BooleanOperationPolyDataFilter:Box77 ISEXEC:FALSE --85.973628:-27.668512:-900.000000 -12.200000:-30.168512:-900.000000 +-85.849843:-22.221970:-900.000000 +-62.119843:-24.721970:-900.000000 PORT BoxProcessMode:"Manual" PORT @@ -237,7 +237,7 @@ BOX wx:ComboBox:Box78 ISEXEC:FALSE -153.877713:-5.775167:-900.000000 -26.280000:-8.275167:-900.000000 +-127.597713:-8.275167:-900.000000 PORT In:"Union Intersection Difference" FIN_BOX @@ -245,7 +245,7 @@ BOX wx:LayoutLine:Box79 ISEXEC:FALSE -144.841026:-82.628158:-900.000000 -33.320000:-85.128158:-900.000000 +-111.521026:-85.128158:-900.000000 PORT Orientation:"H" PORT @@ -255,7 +255,7 @@ BOX wx:CommandButton:Box80 ISEXEC:FALSE -107.184095:21.801731:-900.000000 -21.000000:19.301731:-900.000000 +-84.909095:19.301731:-900.000000 PORT Label:"Run" FIN_BOX @@ -263,7 +263,7 @@ BOX std:MagicBox:Box66 ISEXEC:FALSE -148.055989:80.219744:-900.000000 -8.680000:77.719744:-900.000000 +-126.455989:77.719744:-900.000000 FIN_BOX BOX std:MagicBox:Box67 @@ -287,7 +287,7 @@ BOX wx:Slider:Box34 ISEXEC:FALSE -198.941120:-3.426364:-900.000000 -29.800000:-5.926364:-900.000000 +-169.141120:-5.926364:-900.000000 PORT In:"50" PORT @@ -305,7 +305,7 @@ BOX std:Div:Box36 ISEXEC:FALSE -190.788172:-9.261990:-900.000000 -8.680000:-11.761990:-900.000000 +-169.863172:-11.761990:-900.000000 PORT In2:"100" FIN_BOX @@ -313,7 +313,7 @@ BOX creaMaracasVisu:PolyDataToActor_Widget:Box37 ISEXEC:FALSE -67.388857:-39.476785:-900.000000 -10.440000:-41.976785:-900.000000 +-44.368857:-41.976785:-900.000000 PORT color:"0 1 1" FIN_BOX @@ -321,7 +321,7 @@ BOX wx:LayoutLine:Box38 ISEXEC:FALSE -190.854929:-82.522396:-900.000000 -33.320000:-85.022396:-900.000000 +-157.534929:-85.022396:-900.000000 PORT Orientation:"H" PORT @@ -331,19 +331,19 @@ BOX wx:LayoutTab:Box39 ISEXEC:FALSE -195.888488:-89.508403:-900.000000 -33.320000:-92.008403:-900.000000 +-162.568488:-92.008403:-900.000000 FIN_BOX BOX wx:LayoutTab:Box40 ISEXEC:FALSE -148.825313:-89.038628:-900.000000 -33.320000:-91.538628:-900.000000 +-115.505313:-91.538628:-900.000000 FIN_BOX BOX wx:CommandButton:Box42 ISEXEC:FALSE -91.903796:13.441695:-900.000000 -21.000000:10.941695:-900.000000 +-69.628796:10.941695:-900.000000 PORT Label:"Apply (Magenta->To Red)" FIN_BOX @@ -351,7 +351,7 @@ BOX wx:CommandButton:Box43 ISEXEC:FALSE -85.356515:8.083838:-900.000000 -21.000000:5.583838:-900.000000 +-63.081515:5.583838:-900.000000 PORT Label:"Reset Tool" FIN_BOX @@ -359,7 +359,7 @@ BOX wx:LayoutLine:Box44 ISEXEC:FALSE -154.036190:-43.432527:-900.000000 -33.320000:-45.932527:-900.000000 +-120.716190:-45.932527:-900.000000 PORT Orientation:"V" PORT @@ -368,8 +368,8 @@ FIN_BOX BOX creaVtk:MeshManager_tool:Box45 ISEXEC:FALSE --91.573378:-134.495402:-900.000000 -10.440000:-136.995402:-900.000000 +-90.848443:-133.408000:-900.000000 +-68.348443:-135.908000:-900.000000 PORT Tool:"30" FIN_BOX @@ -377,13 +377,13 @@ BOX std:MagicBox:Box46 ISEXEC:FALSE -137.131256:113.921532:-900.000000 -8.680000:111.421532:-900.000000 +-115.531256:111.421532:-900.000000 FIN_BOX BOX wx:ComboBox:Box49 ISEXEC:FALSE -182.639251:-13.479145:-900.000000 -26.280000:-15.979145:-900.000000 +-156.359251:-15.979145:-900.000000 PORT In:"25 50 100 150" PORT @@ -395,7 +395,7 @@ BOX wx:LayoutLine:Box50 ISEXEC:FALSE -57.295971:-56.374591:-900.000000 -33.320000:-58.874591:-900.000000 +-23.975971:-58.874591:-900.000000 PORT Orientation:"V" PORT @@ -405,13 +405,13 @@ BOX std:MultipleInputs:Box51 ISEXEC:FALSE -92.949669:-148.627142:-900.000000 -21.000000:-151.127142:-900.000000 +-70.979669:-151.127142:-900.000000 FIN_BOX BOX creaMaracasVisu:ShowNPoints_Tools:Box52 ISEXEC:FALSE -48.321002:-133.648902:-900.000000 -12.200000:-136.148902:-900.000000 +-25.886002:-136.148902:-900.000000 PORT Type:"120" FIN_BOX @@ -419,19 +419,19 @@ BOX std:MultipleInputs:Box53 ISEXEC:FALSE -96.292390:-13.293248:-900.000000 -21.000000:-15.793248:-900.000000 +-74.322390:-15.793248:-900.000000 FIN_BOX BOX std:MultipleInputs:Box55 ISEXEC:FALSE --55.260572:-155.987226:-900.000000 -21.000000:-158.487226:-900.000000 +-54.535637:-149.462814:-900.000000 +-32.565637:-151.962814:-900.000000 FIN_BOX BOX creaMaracasVisu:MeshContours_Widget:Box62 ISEXEC:FALSE -228.707140:-3.136982:-900.000000 -13.960000:-5.636982:-900.000000 +-205.912140:-5.636982:-900.000000 PORT colorMesh:"1 1 0" FIN_BOX @@ -477,7 +477,7 @@ BOX wx:LayoutLine:Box81 ISEXEC:FALSE -184.734921:-96.564525:-900.000000 -33.320000:-99.064525:-900.000000 +-151.414921:-99.064525:-900.000000 PORT WinTitle:"Step 1. Surface" FIN_BOX @@ -485,59 +485,65 @@ BOX wx:LayoutTab:Box82 ISEXEC:FALSE -142.286608:-51.350487:-900.000000 -33.320000:-53.850487:-900.000000 +-108.966608:-53.850487:-900.000000 FIN_BOX BOX wx:OutputText:Box84 ISEXEC:FALSE -127.611417:-38.148449:-900.000000 -19.240000:-40.648449:-900.000000 +-105.941417:-40.648449:-900.000000 FIN_BOX BOX wx:LayoutTab:Box86 ISEXEC:FALSE -57.013911:-62.286670:-900.000000 -33.320000:-64.786670:-900.000000 +-23.693911:-64.786670:-900.000000 FIN_BOX BOX wx:OutputText:Box87 ISEXEC:FALSE -35.032220:-44.152050:-900.000000 -19.240000:-46.652050:-900.000000 +-13.362220:-46.652050:-900.000000 FIN_BOX BOX wx:OutputText:Box88 ISEXEC:FALSE -31.367033:-49.235762:-900.000000 -19.240000:-51.735762:-900.000000 +-9.697033:-51.735762:-900.000000 FIN_BOX BOX creaVtk:MeshManager:Box92 ISEXEC:FALSE -56.608588:-81.789032:-900.000000 -9.680000:-84.289032:-900.000000 +-34.578588:-84.289032:-900.000000 FIN_BOX BOX creaVtk:MeshManager_tool:Box93 ISEXEC:FALSE -61.627153:-92.643884:-900.000000 -10.440000:-95.143884:-900.000000 +-39.127153:-95.143884:-900.000000 PORT Tool:"35" FIN_BOX BOX std:MagicBox:Box94 ISEXEC:FALSE --48.337114:-27.303720:-900.000000 -8.680000:-29.803720:-900.000000 +-70.989776:-33.864327:-900.000000 +-49.389776:-36.364327:-900.000000 FIN_BOX BOX creaMaracasVisu:wxVtkBaseView_Info:Box96 ISEXEC:FALSE -157.021318:90.558496:-900.000000 -18.480000:88.058496:-900.000000 +-129.741318:88.058496:-900.000000 FIN_BOX -CONNECTIONS:121 +BOX +creaVtk:PolyDataNormals:Box97 +ISEXEC:FALSE +-88.026860:-72.332654:-900.000000 +-65.731860:-74.832654:-900.000000 +FIN_BOX +CONNECTIONS:122 CONNECTION Box06:LstContourPointsX:Box04:LstX NumberOfControlPoints:0 @@ -704,9 +710,6 @@ CONNECTION Box46:Out:Box45:MeshManagerModel NumberOfControlPoints:0 CONNECTION -Box77:Out:Box45:Mesh -NumberOfControlPoints:0 -CONNECTION Box49:OutString:Box06:NbPoints NumberOfControlPoints:0 CONNECTION @@ -860,9 +863,6 @@ CONNECTION Box92:MeshManagerModel:Box93:MeshManagerModel NumberOfControlPoints:0 CONNECTION -Box77:Out:Box93:Mesh -NumberOfControlPoints:0 -CONNECTION Box77:BoxChange:Box93:BoxExecute NumberOfControlPoints:0 CONNECTION @@ -901,4 +901,13 @@ NumberOfControlPoints:0 CONNECTION Box48:widget:Box38:Widget8 NumberOfControlPoints:0 +CONNECTION +Box77:Out:Box97:In +NumberOfControlPoints:0 +CONNECTION +Box97:Out:Box45:Mesh +NumberOfControlPoints:0 +CONNECTION +Box97:Out:Box93:Mesh +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs index b47594f..3e319d9 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs @@ -194,6 +194,8 @@ new std:MagicBox Box94 new creaMaracasVisu:wxVtkBaseView_Info Box96 +new creaVtk:PolyDataNormals Box97 + connect Box06.LstContourPointsX Box04.LstX connect showNpoints.lstIndexs Box06.LstIndexsIn @@ -244,7 +246,6 @@ connect Box79.Widget Box40.Widget2 connect Box78.Widget Box44.Widget2 connect Box80.Widget Box44.Widget5 connect Box46.Out Box45.MeshManagerModel -connect Box77.Out Box45.Mesh connect Box49.OutString Box06.NbPoints connect Box42.BoxChange Box51.BoxExecute connect Box45.BoxChange Box51.In2 @@ -287,7 +288,6 @@ connect Box49.Widget Box50.Widget2 connect Box34.Widget Box50.Widget4 connect Box57.BoxChange Box08.BoxExecute connect Box92.MeshManagerModel Box93.MeshManagerModel -connect Box77.Out Box93.Mesh connect Box77.BoxChange Box93.BoxExecute connect Box92.MeshBase Box72._polydata connect Box92.MeshBase Box37.polydata @@ -301,6 +301,9 @@ connect Box71.Out Box96.wxVtkBaseView connect Box96.vtkRenderer Box66.In connect Box37.widget Box79.Widget7 connect Box48.widget Box38.Widget8 +connect Box77.Out Box97.In +connect Box97.Out Box45.Mesh +connect Box97.Out Box93.Mesh # Complex input ports input point showNpoints.In " " diff --git a/bbtk/src/bbmaracasvisuShowNPoints.cxx b/bbtk/src/bbmaracasvisuShowNPoints.cxx index 6f6e591..5177493 100644 --- a/bbtk/src/bbmaracasvisuShowNPoints.cxx +++ b/bbtk/src/bbmaracasvisuShowNPoints.cxx @@ -110,12 +110,11 @@ void ShowNPoints::Process() mwxwidget->SetColour( bbGetInputColour() ); mwxwidget->SetOpacity( bbGetInputOpacity() ); mwxwidget->SetRadio( bbGetInputRadio() ); - + if ( mwxwidget->GetModelShowNPoints()->GetFirstTime()==false ) { mwxwidget->DetectCollectionActive(); } - if ( mwxwidget->GetModelShowNPoints()->GetFirstTime()==true ) { mwxwidget->GetModelShowNPoints()->SetFirstTime(false); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.cxx index 1fedfc2..d3c1c9e 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ModelShowNPoints.cxx @@ -413,7 +413,7 @@ void ModelShowNPoints::InversLstPoints() dTmp = lstPointsX[i]; lstPointsX[i] = lstPointsX[i2]; lstPointsX[i2] = dTmp; dTmp = lstPointsY[i]; lstPointsY[i] = lstPointsY[i2]; lstPointsY[i2] = dTmp; dTmp = lstPointsZ[i]; lstPointsZ[i] = lstPointsZ[i2]; lstPointsZ[i2] = dTmp; - sTmp = lstLabels[i]; lstLabels[i] = lstLabels[i2]; lstLabels[i2] = dTmp; + sTmp = lstLabels[i]; lstLabels[i] = lstLabels[i2]; lstLabels[i2] = sTmp; } // for i } -- 2.47.1