From d7fcb26fd0f4a38b3f8fa52f4030065295812fa7 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Sat, 22 Oct 2022 10:56:50 +0200 Subject: [PATCH] #3490 MeshManager --- bbtk/bbs/boxes/Mesh_Application.bbg | 54 ++++++------ bbtk/bbs/boxes/Mesh_Application.bbs | 1 + bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg | 54 ++++++------ bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs | 1 + bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg | 82 ++++++++++--------- bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs | 3 +- bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg | 40 ++++----- bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs | 3 +- bbtk/bbs/boxes/PolyDataToActor_Widget.bbg | 13 ++- bbtk/bbs/boxes/PolyDataToActor_Widget.bbs | 1 + .../bbcreaMaracasVisuShowNPoints_Tools.cxx | 17 ++-- .../wxWindows/widgets/WidgetShowNPoints.cxx | 2 +- 12 files changed, 143 insertions(+), 128 deletions(-) diff --git a/bbtk/bbs/boxes/Mesh_Application.bbg b/bbtk/bbs/boxes/Mesh_Application.bbg index a4618a4..4e5070b 100644 --- a/bbtk/bbs/boxes/Mesh_Application.bbg +++ b/bbtk/bbs/boxes/Mesh_Application.bbg @@ -61,13 +61,13 @@ BOX creaMaracasVisu:ImageChangeInformation:Box07 ISEXEC:FALSE -17.999545:79.197539:-900.000000 -5.150455:76.697539:-900.000000 +10.440000:76.697539:-900.000000 FIN_BOX BOX creaVtk:MeshManager:Box08 ISEXEC:FALSE -56.340123:64.695194:-900.000000 --34.310123:62.195194:-900.000000 +9.680000:62.195194:-900.000000 FIN_BOX BOX creaMaracasVisu:PolyDataToActor_Widget:Box15 @@ -77,6 +77,8 @@ ISEXEC:FALSE PORT color:"1 0.7 0.7" PORT +meshOpacity:"100" +PORT scalarvisibility:"true" FIN_BOX BOX @@ -91,7 +93,7 @@ BOX wx:LayoutSplit:Box11 ISEXEC:FALSE -96.149542:-151.649281:-900.000000 --73.389542:-154.149281:-900.000000 +22.760000:-154.149281:-900.000000 PORT Proportion:"5" FIN_BOX @@ -99,7 +101,7 @@ BOX wx:LayoutTab:Box12 ISEXEC:FALSE -1.524229:-28.130070:-900.000000 -31.795771:-30.630070:-900.000000 +33.320000:-30.630070:-900.000000 FIN_BOX BOX creaMaracasVisu:SetPositionPointPicker:Box13 @@ -111,7 +113,7 @@ BOX wx:LayoutLine:Box14 ISEXEC:FALSE -34.558347:-6.679515:-900.000000 --1.238347:-9.179515:-900.000000 +33.320000:-9.179515:-900.000000 PORT WinTitle:"Nothing" FIN_BOX @@ -119,7 +121,7 @@ BOX creaMaracasVisu:MeshContours_Widget:Box17 ISEXEC:FALSE -67.813268:-29.868406:-900.000000 --45.018268:-32.368406:-900.000000 +13.960000:-32.368406:-900.000000 PORT colorMesh:"1 0 0" FIN_BOX @@ -127,13 +129,13 @@ BOX wx:LayoutTab:Box20 ISEXEC:FALSE -97.190069:-143.295975:-900.000000 --63.870069:-145.795975:-900.000000 +33.320000:-145.795975:-900.000000 FIN_BOX BOX wx:LayoutLine:Box22 ISEXEC:FALSE -100.046840:-134.742726:-900.000000 --66.726840:-137.242726:-900.000000 +33.320000:-137.242726:-900.000000 PORT Orientation:"H" PORT @@ -143,7 +145,7 @@ BOX std:StringSelect:Box23 ISEXEC:FALSE -0.033273:-37.759625:-900.000000 -24.486727:-40.259625:-900.000000 +24.520000:-40.259625:-900.000000 PORT In0:"false false false false false" PORT @@ -169,7 +171,7 @@ BOX std:GetVectorStringElement:Box24 ISEXEC:FALSE -19.379724:-47.920386:-900.000000 -3.575276:-50.420386:-900.000000 +10.440000:-50.420386:-900.000000 PORT I:"1" FIN_BOX @@ -177,7 +179,7 @@ BOX creaMaracasVisu:InteractorStyleMaracas_Model:Box25 ISEXEC:FALSE -51.175905:-64.745553:-900.000000 --27.570905:-67.245553:-900.000000 +13.960000:-67.245553:-900.000000 FIN_BOX BOX vtk:SurfaceTexture:Box26 @@ -189,7 +191,7 @@ BOX wx:RadioButton:Box27 ISEXEC:FALSE -138.054594:54.648057:-900.000000 --101.214594:52.148057:-900.000000 +36.840000:52.148057:-900.000000 PORT In0:"Red" PORT @@ -219,7 +221,7 @@ BOX std:Add:Box30 ISEXEC:FALSE -133.940296:18.182303:-900.000000 --112.905296:15.682303:-900.000000 +8.680000:15.682303:-900.000000 PORT In2:"-1" FIN_BOX @@ -227,13 +229,13 @@ BOX creaMaracasVisu:wxVtkBaseView_Info:Box31 ISEXEC:FALSE -111.518153:35.023891:-900.000000 --84.238153:32.523891:-900.000000 +27.280000:32.523891:-900.000000 FIN_BOX BOX std:GetVectorDoubleElement:Box32 ISEXEC:FALSE -185.764370:25.475119:-900.000000 --162.639370:22.975119:-900.000000 +10.440000:22.975119:-900.000000 PORT I:"1" FIN_BOX @@ -241,7 +243,7 @@ BOX std:GetVectorDoubleElement:Box33 ISEXEC:FALSE -154.849811:22.322554:-900.000000 --131.724811:19.822554:-900.000000 +10.440000:19.822554:-900.000000 PORT I:"0" FIN_BOX @@ -249,7 +251,7 @@ BOX wx:LayoutLine:Box34 ISEXEC:FALSE -208.241265:-123.706763:-900.000000 --174.921265:-126.206763:-900.000000 +33.320000:-126.206763:-900.000000 FIN_BOX BOX creaMaracasVisu:Mesh_tool_ApplyPatch:Box38 @@ -293,7 +295,7 @@ BOX creaVtk:PlaneWidget:Box48 ISEXEC:FALSE -140.485334:-56.870762:-900.000000 --118.640334:-59.370762:-900.000000 +19.240000:-59.370762:-900.000000 PORT ReactiveType:"0" PORT @@ -305,7 +307,7 @@ BOX creaVtk:PlaneWidget_Base:Box49 ISEXEC:FALSE -167.015215:-83.458714:-900.000000 --144.605215:-85.958714:-900.000000 +10.440000:-85.958714:-900.000000 PORT Param:"-1" PORT @@ -315,7 +317,7 @@ BOX creaVtk:PlaneWidget_Base:Box50 ISEXEC:FALSE -133.284010:-83.257409:-900.000000 --110.874010:-85.757409:-900.000000 +10.440000:-85.757409:-900.000000 PORT Param:"1" PORT @@ -341,7 +343,7 @@ BOX wx:LayoutLine:Box53 ISEXEC:FALSE -190.138796:-112.361388:-900.000000 --156.818796:-114.861388:-900.000000 +33.320000:-114.861388:-900.000000 PORT Orientation:"H" FIN_BOX @@ -349,7 +351,7 @@ BOX wx:CheckBox:Box54 ISEXEC:FALSE -211.761741:-50.048031:-900.000000 --190.131741:-52.548031:-900.000000 +21.000000:-52.548031:-900.000000 PORT In:"false" PORT @@ -365,7 +367,7 @@ BOX creaVtk:PolyDataNormals:Box56 ISEXEC:FALSE -51.845091:77.243197:-900.000000 --29.550091:74.743197:-900.000000 +12.200000:74.743197:-900.000000 FIN_BOX BOX std:ConcatStrings_tool:Box57 @@ -387,13 +389,13 @@ BOX creaMaracasVisu:SetPosition:Box59 ISEXEC:FALSE -141.049598:-108.060523:-900.000000 --119.389598:-110.560523:-900.000000 +12.200000:-110.560523:-900.000000 FIN_BOX BOX std:MathOperationVector:Box60 ISEXEC:FALSE -130.510540:-100.660654:-900.000000 --105.990540:-103.160654:-900.000000 +24.520000:-103.160654:-900.000000 PORT Type:"3" FIN_BOX @@ -401,7 +403,7 @@ BOX vtk:ImageVtkProperties:Box61 ISEXEC:FALSE -120.867686:-94.582809:-900.000000 --98.332686:-97.082809:-900.000000 +16.720000:-97.082809:-900.000000 FIN_BOX BOX std:MagicBox:Box63 diff --git a/bbtk/bbs/boxes/Mesh_Application.bbs b/bbtk/bbs/boxes/Mesh_Application.bbs index 400b018..e51a5e0 100644 --- a/bbtk/bbs/boxes/Mesh_Application.bbs +++ b/bbtk/bbs/boxes/Mesh_Application.bbs @@ -24,6 +24,7 @@ new creaVtk:MeshManager Box08 new creaMaracasVisu:PolyDataToActor_Widget Box15 set Box15.color "1 0.7 0.7" + set Box15.meshOpacity "100" set Box15.scalarvisibility "true" new creaMaracasVisu:Mesh_tool_ApplySurface Box10 diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg index 5c72634..b454d21 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbg @@ -57,7 +57,7 @@ BOX wx:LayoutLine:Box08 ISEXEC:FALSE -191.490538:-129.735971:-900.000000 --158.170538:-132.235971:-900.000000 +33.320000:-132.235971:-900.000000 FIN_BOX BOX vtk:UpdateRender:Box11 @@ -71,13 +71,13 @@ BOX vtk:ImageVtkProperties:Box68 ISEXEC:FALSE -262.018178:-23.411381:-900.000000 --239.483178:-25.911381:-900.000000 +16.720000:-25.911381:-900.000000 FIN_BOX BOX wx:LayoutLine:Box79 ISEXEC:FALSE -142.444548:-98.205267:-900.000000 --109.124548:-100.705267:-900.000000 +33.320000:-100.705267:-900.000000 PORT Orientation:"H" PORT @@ -87,7 +87,7 @@ BOX wx:CommandButton:Box80 ISEXEC:FALSE -101.602098:27.184371:-900.000000 --79.327098:24.684371:-900.000000 +21.000000:24.684371:-900.000000 PORT Label:"Run" FIN_BOX @@ -101,13 +101,13 @@ BOX std:MagicBox:Box67 ISEXEC:FALSE -67.526006:124.007723:-900.000000 --45.926006:121.507723:-900.000000 +8.680000:121.507723:-900.000000 FIN_BOX BOX vtk:vtkImageDataPointerRelay:Box35 ISEXEC:FALSE -107.091396:123.633118:-900.000000 --83.881396:121.133118:-900.000000 +6.920000:121.133118:-900.000000 FIN_BOX BOX creaMaracasVisu:PolyDataToActor_Widget:Box37 @@ -116,6 +116,8 @@ ISEXEC:FALSE -13.276182:-82.217323:-900.000000 PORT color:"0 1 1" +PORT +meshOpacity:"100" FIN_BOX BOX wx:LayoutTab:Box40 @@ -127,7 +129,7 @@ BOX wx:CommandButton:Box42 ISEXEC:FALSE -91.903796:13.441695:-900.000000 --69.628796:10.941695:-900.000000 +21.000000:10.941695:-900.000000 PORT Label:"Apply (Magenta->To Red)" FIN_BOX @@ -135,7 +137,7 @@ BOX wx:CommandButton:Box43 ISEXEC:FALSE -80.312782:7.645253:-900.000000 --58.037782:5.145253:-900.000000 +21.000000:5.145253:-900.000000 PORT Label:"Reset Tool" FIN_BOX @@ -143,7 +145,7 @@ BOX wx:LayoutLine:Box44 ISEXEC:FALSE -122.128535:-44.031647:-900.000000 --88.808535:-46.531647:-900.000000 +33.320000:-46.531647:-900.000000 PORT Orientation:"V" PORT @@ -153,7 +155,7 @@ BOX creaVtk:MeshManager_tool:Box45 ISEXEC:FALSE -88.859950:-132.940417:-900.000000 --66.359950:-135.440417:-900.000000 +10.440000:-135.440417:-900.000000 PORT Tool:"30" FIN_BOX @@ -161,13 +163,13 @@ BOX std:MagicBox:Box46 ISEXEC:FALSE -139.784698:124.004612:-900.000000 --118.184698:121.504612:-900.000000 +8.680000:121.504612:-900.000000 FIN_BOX BOX std:MultipleInputs:Box51 ISEXEC:FALSE -92.949669:-148.627142:-900.000000 --70.979669:-151.127142:-900.000000 +21.000000:-151.127142:-900.000000 FIN_BOX BOX std:MagicBox:Box63 @@ -179,25 +181,25 @@ BOX std:MagicBox:Box64 ISEXEC:FALSE -243.113826:124.330340:-900.000000 --221.513826:121.830340:-900.000000 +8.680000:121.830340:-900.000000 FIN_BOX BOX std:MagicBox:Box65 ISEXEC:FALSE -220.296210:124.504415:-900.000000 --198.696210:122.004415:-900.000000 +8.680000:122.004415:-900.000000 FIN_BOX BOX std:MagicBox:Box69 ISEXEC:FALSE -197.793508:124.678490:-900.000000 --176.193508:122.178490:-900.000000 +8.680000:122.178490:-900.000000 FIN_BOX BOX std:MagicBox:Box71 ISEXEC:FALSE -273.359367:124.504415:-900.000000 --251.759367:122.004415:-900.000000 +8.680000:122.004415:-900.000000 FIN_BOX BOX creaMaracasVisu:MeshContours_Widget:Box72 @@ -219,19 +221,19 @@ BOX wx:LayoutTab:Box82 ISEXEC:FALSE -123.564121:-52.398946:-900.000000 --90.244121:-54.898946:-900.000000 +33.320000:-54.898946:-900.000000 FIN_BOX BOX wx:OutputText:Box84 ISEXEC:FALSE -90.166444:-34.853291:-900.000000 --68.496444:-37.353291:-900.000000 +19.240000:-37.353291:-900.000000 FIN_BOX BOX creaVtk:MeshManager:Box92 ISEXEC:FALSE -180.315243:-41.937258:-900.000000 --158.285243:-44.437258:-900.000000 +9.680000:-44.437258:-900.000000 FIN_BOX BOX creaVtk:MeshManager_tool:Box93 @@ -245,19 +247,19 @@ BOX creaMaracasVisu:wxVtkBaseView_Info:Box96 ISEXEC:FALSE -6.504018:23.833007:-900.000000 -20.775982:21.333007:-900.000000 +27.280000:21.333007:-900.000000 FIN_BOX BOX creaVtk:PolyDataToImageData:Box97 ISEXEC:FALSE -251.393014:-39.330447:-900.000000 --228.593014:-41.830447:-900.000000 +10.440000:-41.830447:-900.000000 FIN_BOX BOX vtk:CreateImage:Box98 ISEXEC:FALSE -259.705405:-31.233561:-900.000000 --237.775405:-33.733561:-900.000000 +12.200000:-33.733561:-900.000000 PORT OutputFormat:"VTK_UNSIGNED_CHAR" FIN_BOX @@ -265,7 +267,7 @@ BOX vtk:ImageGaussianSmooth:Box99 ISEXEC:FALSE -255.182927:-47.291143:-900.000000 --232.287927:-49.791143:-900.000000 +12.200000:-49.791143:-900.000000 PORT StdDevX:"1" PORT @@ -277,7 +279,7 @@ BOX vtk:MarchingCubes:Box100 ISEXEC:FALSE -251.360924:-55.324497:-900.000000 --229.075924:-57.824497:-900.000000 +13.960000:-57.824497:-900.000000 PORT BoxProcessMode:"Manual" PORT @@ -295,7 +297,7 @@ BOX creaVtk:MeshManager_tool:Box47 ISEXEC:FALSE -60.096172:-132.552191:-900.000000 --37.596172:-135.052191:-900.000000 +10.440000:-135.052191:-900.000000 PORT Tool:"35" FIN_BOX @@ -303,7 +305,7 @@ BOX creaVtk:MeshManager_tool:Box48 ISEXEC:FALSE -31.571613:-131.892967:-900.000000 --9.071613:-134.392967:-900.000000 +10.440000:-134.392967:-900.000000 PORT Tool:"35" FIN_BOX diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs index 297299f..cc79488 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyByImage.bbs @@ -40,6 +40,7 @@ new vtk:vtkImageDataPointerRelay Box35 new creaMaracasVisu:PolyDataToActor_Widget Box37 set Box37.color "0 1 1" + set Box37.meshOpacity "100" new wx:LayoutTab Box40 diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg index 7dd2ded..78e7791 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbg @@ -77,9 +77,9 @@ BOX creaMaracasVisu:ShowNPoints:showNpoints ISEXEC:FALSE 24.787568:83.025910:-900.000000 -61.627568:80.525910:-900.000000 +46.637568:80.525910:-900.000000 PORT -Radio:"1" +Radio:"2" PORT Type:"4" PORT @@ -95,7 +95,7 @@ BOX creaMaracasVisu:ManualContourModel_Box:Box06 ISEXEC:FALSE 29.075845:30.364799:-900.000000 -53.595845:27.864799:-900.000000 +52.285845:27.864799:-900.000000 PORT DoubleContour:"1" PORT @@ -123,7 +123,7 @@ BOX creaMaracasVisu:DrawAxisTree3D:Box30 ISEXEC:FALSE 53.253812:0.984257:-900.000000 -81.293812:-1.515743:-900.000000 +75.433812:-1.515743:-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 -100.760145:27.137449:-900.000000 +99.450145:27.137449:-900.000000 PORT NbPoints:"40" PORT @@ -151,7 +151,7 @@ BOX creaMaracasVisu:wxPopupMenu:Box57 ISEXEC:FALSE -291.724262:77.620511:-900.000000 --269.659262:75.120511:-900.000000 +17.480000: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 --279.777403:98.141432:-900.000000 +24.520000:98.141432:-900.000000 PORT In0:"+ Add point" PORT @@ -185,13 +185,13 @@ BOX creaMaracasVisu:ShowNPoints_Tools:Box60 ISEXEC:FALSE -271.997629:60.063100:-900.000000 --249.562629:57.563100:-900.000000 +12.200000:57.563100:-900.000000 FIN_BOX BOX std:StringSelect:Box61 ISEXEC:FALSE -331.944913:69.352894:-900.000000 --307.424913:66.852894:-900.000000 +24.520000:66.852894:-900.000000 PORT In0:"5" PORT @@ -217,13 +217,13 @@ BOX vtk:ImageVtkProperties:Box68 ISEXEC:FALSE -111.766259:110.196821:-900.000000 --89.231259:107.696821:-900.000000 +16.720000:107.696821:-900.000000 FIN_BOX BOX std:VectorFilterDouble:Box70 ISEXEC:FALSE 49.750242:60.953814:-900.000000 -76.030242:58.453814:-900.000000 +72.180242:58.453814:-900.000000 PORT Type:"11" FIN_BOX @@ -241,7 +241,7 @@ BOX wx:ComboBox:Box78 ISEXEC:FALSE -153.505707:-32.466606:-900.000000 --127.225707:-34.966606:-900.000000 +26.280000:-34.966606:-900.000000 PORT In:"Union Intersection Difference" FIN_BOX @@ -259,7 +259,7 @@ BOX wx:CommandButton:Box80 ISEXEC:FALSE -107.307880:18.830890:-900.000000 --85.032880:16.330890:-900.000000 +21.000000:16.330890:-900.000000 PORT Label:"Run" FIN_BOX @@ -267,13 +267,13 @@ BOX std:MagicBox:Box66 ISEXEC:FALSE -56.713712:80.848585:-900.000000 --35.113712:78.348585:-900.000000 +8.680000:78.348585:-900.000000 FIN_BOX BOX std:MagicBox:Box67 ISEXEC:FALSE -67.526006:124.007723:-900.000000 --45.926006:121.507723:-900.000000 +8.680000:121.507723:-900.000000 FIN_BOX BOX creaMaracasVisu:PolyDataToActor_Widget:Box48 @@ -285,13 +285,13 @@ BOX vtk:vtkImageDataPointerRelay:Box35 ISEXEC:FALSE -107.091396:123.633118:-900.000000 --83.881396:121.133118:-900.000000 +6.920000:121.133118:-900.000000 FIN_BOX BOX wx:Slider:Box34 ISEXEC:FALSE -191.390233:59.951574:-900.000000 --161.590233:57.451574:-900.000000 +29.800000:57.451574:-900.000000 PORT In:"50" PORT @@ -309,7 +309,7 @@ BOX std:Div:Box36 ISEXEC:FALSE -183.237285:54.115948:-900.000000 --162.312285:51.615948:-900.000000 +8.680000:51.615948:-900.000000 PORT In2:"100" FIN_BOX @@ -320,6 +320,8 @@ ISEXEC:FALSE -39.558581:-82.922098:-900.000000 PORT color:"0 1 1" +PORT +meshOpacity:"100" FIN_BOX BOX wx:LayoutLine:Box38 @@ -347,7 +349,7 @@ BOX wx:CommandButton:Box42 ISEXEC:FALSE -91.903796:13.441695:-900.000000 --69.628796:10.941695:-900.000000 +21.000000:10.941695:-900.000000 PORT Label:"Apply (Magenta->To Red)" FIN_BOX @@ -355,7 +357,7 @@ BOX wx:CommandButton:Box43 ISEXEC:FALSE -85.356515:8.083838:-900.000000 --63.081515:5.583838:-900.000000 +21.000000:5.583838:-900.000000 PORT Label:"Reset Tool" FIN_BOX @@ -381,13 +383,13 @@ BOX std:MagicBox:Box46 ISEXEC:FALSE -137.131256:113.921532:-900.000000 --115.531256:111.421532:-900.000000 +8.680000:111.421532:-900.000000 FIN_BOX BOX wx:ComboBox:Box49 ISEXEC:FALSE -175.088364:49.898793:-900.000000 --148.808364:47.398793:-900.000000 +26.280000:47.398793:-900.000000 PORT In:"25 50 100 150" PORT @@ -415,7 +417,7 @@ BOX creaMaracasVisu:ShowNPoints_Tools:Box52 ISEXEC:FALSE -48.321002:-133.648902:-900.000000 --25.886002:-136.148902:-900.000000 +12.200000:-136.148902:-900.000000 PORT Type:"120" FIN_BOX @@ -423,7 +425,7 @@ BOX std:MultipleInputs:Box53 ISEXEC:FALSE -96.292390:-13.293248:-900.000000 --74.322390:-15.793248:-900.000000 +21.000000:-15.793248:-900.000000 FIN_BOX BOX std:MultipleInputs:Box55 @@ -449,25 +451,25 @@ BOX std:MagicBox:Box64 ISEXEC:FALSE -243.113826:124.330340:-900.000000 --221.513826:121.830340:-900.000000 +8.680000:121.830340:-900.000000 FIN_BOX BOX std:MagicBox:Box65 ISEXEC:FALSE -220.296210:124.504415:-900.000000 --198.696210:122.004415:-900.000000 +8.680000:122.004415:-900.000000 FIN_BOX BOX std:MagicBox:Box69 ISEXEC:FALSE -197.793508:124.678490:-900.000000 --176.193508:122.178490:-900.000000 +8.680000:122.178490:-900.000000 FIN_BOX BOX std:MagicBox:Box71 ISEXEC:FALSE -273.359367:124.504415:-900.000000 --251.759367:122.004415:-900.000000 +8.680000:122.004415:-900.000000 FIN_BOX BOX creaMaracasVisu:MeshContours_Widget:Box72 @@ -501,7 +503,7 @@ BOX wx:OutputText:Box87 ISEXEC:FALSE -35.032220:-44.152050:-900.000000 --13.362220:-46.652050:-900.000000 +19.240000:-46.652050:-900.000000 FIN_BOX BOX wx:OutputText:Box88 @@ -513,13 +515,13 @@ BOX creaVtk:MeshManager:Box92 ISEXEC:FALSE -48.235592:-73.814750:-900.000000 --26.205592:-76.314750:-900.000000 +9.680000:-76.314750:-900.000000 FIN_BOX BOX creaVtk:MeshManager_tool:Box93 ISEXEC:FALSE -61.627153:-92.643884:-900.000000 --39.127153:-95.143884:-900.000000 +10.440000:-95.143884:-900.000000 PORT Tool:"35" FIN_BOX @@ -547,7 +549,7 @@ BOX wx:SpinCtrl:Box97 ISEXEC:FALSE 61.957510:-28.253822:-900.000000 -86.477510:-30.753822:-900.000000 +83.317510:-30.753822:-900.000000 PORT Max:"50" PORT @@ -567,7 +569,7 @@ BOX wx:Slider:Box99 ISEXEC:FALSE 70.913562:-8.032501:-900.000000 -100.713562:-10.532501:-900.000000 +92.068562:-10.532501:-900.000000 PORT In:"100" PORT @@ -593,7 +595,7 @@ BOX wx:LayoutLine:Box101 ISEXEC:FALSE 75.262796:-54.319784:-900.000000 -108.582796:-56.819784:-900.000000 +97.032796:-56.819784:-900.000000 PORT Orientation:"V" FIN_BOX @@ -601,7 +603,7 @@ BOX wx:LayoutLine:Box102 ISEXEC:FALSE 82.113479:-63.996790:-900.000000 -115.433479:-66.496790:-900.000000 +103.883479:-66.496790:-900.000000 PORT Orientation:"H" PORT @@ -617,13 +619,13 @@ BOX creaMaracasVisu:wxVtkBaseView_Info:Box105 ISEXEC:FALSE -238.523609:87.781768:-900.000000 --211.243609:85.281768:-900.000000 +27.280000:85.281768:-900.000000 FIN_BOX BOX wx:LayoutTab:Box106 ISEXEC:FALSE 75.970731:-73.857697:-900.000000 -109.290731:-76.357697:-900.000000 +97.695731:-76.357697:-900.000000 FIN_BOX BOX creaMaracasVisu:MeshContours_Widget:Box107 @@ -659,7 +661,7 @@ BOX std:AddStringToVector:Box111 ISEXEC:FALSE -292.044479:93.098246:-900.000000 --267.524479:90.598246:-900.000000 +24.520000:90.598246:-900.000000 PORT In0:"Tool - Inverse Normals" FIN_BOX @@ -667,7 +669,7 @@ BOX std:VectorFilterString:Box112 ISEXEC:FALSE -275.952424:71.064509:-900.000000 --247.912424:68.564509:-900.000000 +28.040000:68.564509:-900.000000 PORT In0:"0 1 2 3 4 5 6 7 8 9 10 " PORT @@ -679,7 +681,7 @@ BOX std:ConcatStrings:Box114 ISEXEC:FALSE -270.706221:65.761298:-900.000000 --247.946221:63.261298:-900.000000 +22.760000:63.261298:-900.000000 FIN_BOX BOX creaVtk:PolyDataNormals:Box115 diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs index a5423ae..5c556b6 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyPatch.bbs @@ -19,7 +19,7 @@ description "Show N Points" category "demo" new creaMaracasVisu:ShowNPoints showNpoints - set showNpoints.Radio "1" + set showNpoints.Radio "2" set showNpoints.Type "4" set showNpoints.WinTitle "1.1 Splines" @@ -116,6 +116,7 @@ new std:Div Box36 new creaMaracasVisu:PolyDataToActor_Widget Box37 set Box37.color "0 1 1" + set Box37.meshOpacity "100" new wx:LayoutLine Box38 set Box38.Orientation "H" diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg index bc1e87e..5122a06 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg @@ -79,7 +79,7 @@ ISEXEC:FALSE 24.787568:83.025910:-900.000000 46.637568:80.525910:-900.000000 PORT -Radio:"1" +Radio:"2" PORT Type:"4" PORT @@ -151,7 +151,7 @@ BOX creaMaracasVisu:wxPopupMenu:Box57 ISEXEC:FALSE -291.724262:77.620511:-900.000000 --269.659262:75.120511:-900.000000 +17.480000: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 --279.777403:98.141432:-900.000000 +24.520000:98.141432:-900.000000 PORT In0:"+ Add point" PORT @@ -185,13 +185,13 @@ BOX creaMaracasVisu:ShowNPoints_Tools:Box60 ISEXEC:FALSE -271.997629:60.063100:-900.000000 --249.562629:57.563100:-900.000000 +12.200000:57.563100:-900.000000 FIN_BOX BOX std:StringSelect:Box61 ISEXEC:FALSE -269.755079:70.260206:-900.000000 --245.235079:67.760206:-900.000000 +24.520000:67.760206:-900.000000 PORT In0:"5" PORT @@ -259,7 +259,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 @@ -317,9 +317,11 @@ BOX creaMaracasVisu:PolyDataToActor_Widget:Box37 ISEXEC:FALSE -67.388857:-39.476785:-900.000000 -12.200000:-41.976785:-900.000000 +-44.368857:-41.976785:-900.000000 PORT color:"0 1 1" +PORT +meshOpacity:"100" FIN_BOX BOX wx:LayoutLine:Box38 @@ -363,7 +365,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 @@ -387,7 +389,7 @@ 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 @@ -423,7 +425,7 @@ 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 @@ -449,31 +451,31 @@ BOX std:MagicBox:Box64 ISEXEC:FALSE -243.113826:124.330340:-900.000000 --221.513826:121.830340:-900.000000 +8.680000:121.830340:-900.000000 FIN_BOX BOX std:MagicBox:Box65 ISEXEC:FALSE -220.296210:124.504415:-900.000000 --198.696210:122.004415:-900.000000 +8.680000:122.004415:-900.000000 FIN_BOX BOX std:MagicBox:Box69 ISEXEC:FALSE -197.793508:124.678490:-900.000000 --176.193508:122.178490:-900.000000 +8.680000:122.178490:-900.000000 FIN_BOX BOX std:MagicBox:Box71 ISEXEC:FALSE -273.359367:124.504415:-900.000000 --251.759367:122.004415:-900.000000 +8.680000:122.004415:-900.000000 FIN_BOX BOX creaMaracasVisu:MeshContours_Widget:Box72 ISEXEC:FALSE -180.819147:-56.018495:-900.000000 -13.960000:-58.518495:-900.000000 +-158.024147:-58.518495:-900.000000 PORT colorMesh:"0 1 1" FIN_BOX @@ -489,13 +491,13 @@ 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 @@ -507,7 +509,7 @@ 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 @@ -533,7 +535,7 @@ BOX std:MagicBox:Box94 ISEXEC:FALSE -70.989776:-33.864327:-900.000000 -8.680000:-36.364327:-900.000000 +-49.389776:-36.364327:-900.000000 FIN_BOX BOX creaMaracasVisu:wxVtkBaseView_Info:Box96 diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs index 0511975..079f9ba 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs @@ -19,7 +19,7 @@ description "Show N Points" category "demo" new creaMaracasVisu:ShowNPoints showNpoints - set showNpoints.Radio "1" + set showNpoints.Radio "2" set showNpoints.Type "4" set showNpoints.WinTitle "1.1 Splines" @@ -116,6 +116,7 @@ new std:Div Box36 new creaMaracasVisu:PolyDataToActor_Widget Box37 set Box37.color "0 1 1" + set Box37.meshOpacity "100" new wx:LayoutLine Box38 set Box38.Orientation "H" diff --git a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg index c11ccdb..a6c7359 100644 --- a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg +++ b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbg @@ -23,7 +23,7 @@ COMPLEX_PORT vtkprop3D 60.073531:-84.713710:-900.000000 FIN_COMPLEX_PORT -COMPLEXINPUTS:6 +COMPLEXINPUTS:7 COMPLEX_PORT render 67.330358:11.206273:-900.000000 @@ -38,7 +38,7 @@ color FIN_COMPLEX_PORT COMPLEX_PORT boxexecute --29.195546:6.611932:-900.000000 +-29.830735:10.105471:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT scalarvisibility @@ -48,6 +48,10 @@ COMPLEX_PORT active 16.755647:9.838178:-900.000000 FIN_COMPLEX_PORT +COMPLEX_PORT +meshOpacity +-5.769633:10.480618:-900.000000 +FIN_COMPLEX_PORT BOXES:8 BOX wx:LayoutLine:Box04 @@ -121,7 +125,7 @@ ISEXEC:FALSE -27.821638:-25.674906:-900.000000 -5.851638:-28.174906:-900.000000 FIN_BOX -CONNECTIONS:19 +CONNECTIONS:20 CONNECTION Box10:Out:Box11:Renderer NumberOfControlPoints:0 @@ -179,4 +183,7 @@ NumberOfControlPoints:0 CONNECTION active:active:Box09:Active NumberOfControlPoints:0 +CONNECTION +meshOpacity:meshOpacity:Box13:In +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs index 7b75044..a0b3399 100644 --- a/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs +++ b/bbtk/bbs/boxes/PolyDataToActor_Widget.bbs @@ -63,6 +63,7 @@ input color Box09.Colour " " input boxexecute Box08.In3 " " input scalarvisibility Box09.ScalarVisibility " " input active Box09.Active " " +input meshOpacity Box13.In " " # Complex output ports output widget Box04.Widget " " diff --git a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx index 02d1be8..65e9e5a 100644 --- a/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx +++ b/bbtk/src/bbcreaMaracasVisuShowNPoints_Tools.cxx @@ -134,7 +134,6 @@ void ShowNPoints_Tools::CreatePatch01() NearestPointToMesh(points, pointLocator, spc, p,pM); wsp->InsertPoint(pM[0] ,pM[1], pM[2],""); - wsp->SetOutputBox(); pointLocator->Delete(); @@ -199,7 +198,7 @@ void ShowNPoints_Tools::CreatePatch01() n2[0] = n2[0] + pM[0]; n2[1] = n2[1] + pM[1]; n2[2] = n2[2] + pM[2]; - + wsp->GetCollectionPoint(2,0, pM); vtkMath::Subtract(pM,pC,pM1); wsp->GetCollectionPoint(0,0, pM); @@ -208,25 +207,21 @@ void ShowNPoints_Tools::CreatePatch01() n2[0] = n2[0] + pM[0]; n2[1] = n2[1] + pM[1]; n2[2] = n2[2] + pM[2]; - + n2[0] = n2[0] / 4; n2[1] = n2[1] / 4; n2[2] = n2[2] / 4; - // 3. Calcular el angulo entre V1 y V2 double angle = vtkMath::AngleBetweenVectors(n1,n2) * 180 / vtkMath::Pi(); - - printf("EED ShowNPoints_Tools::CreatePatch01 n1 %f %f %f\n", n1[0] , n1[1] , n1[2] ); - printf("EED ShowNPoints_Tools::CreatePatch01 n2 %f %f %f\n", n2[0] , n2[1] , n2[2] ); - printf("EED ShowNPoints_Tools::CreatePatch01 angle %f\n", angle); - - // 4. Si el angulo es major de 90 Invertir las normales de la superficie actual - if (angle>90) +// 4. Si el angulo es major de 90 Invertir las normales de la superficie actual + if (angle<90) { wsp->InvertLstPoints_(); } // if angle + // --- Finish --- + wsp->SetOutputBox(); wsp->UndoRedo_SaveCollection(); } else { printf("EED ShowNPoints_Tools::CreatePatch01 Warning patch not apply. Need juste one group with four points\n"); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx index 8963b78..5eb4406 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx @@ -1442,13 +1442,13 @@ void WidgetShowNPoints::InvertLstPoints_() lstModelShowNPoints[size-1-i] = tmpModel; } // for iM */ - SetOutputBox(); } //------------------------------------------------------------------------ void WidgetShowNPoints::OnInvertLstPoints_() { InvertLstPoints_(); + SetOutputBox(); UndoRedo_SaveCollection(); } -- 2.47.1