From 8e679a4b6c9074a7717470ba3e1d11cfae5eb8ba Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Tue, 4 Oct 2022 14:25:18 +0200 Subject: [PATCH] #3490 MeshManager --- bbtk/bbs/appli/exampleMesh_Application.bbg | 198 ++++++++++++++++++ bbtk/bbs/appli/exampleMesh_Application.bbs | 112 ++++++++++ bbtk/bbs/boxes/Mesh_Application.bbg | 122 ++--------- bbtk/bbs/boxes/Mesh_Application.bbs | 45 +--- bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg | 93 ++++---- bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs | 1 + bbtk/src/bbcreaMaracasVisuSetPosition.cxx | 1 - ...creaMaracasVisuwxVtkBaseView_info_tool.cxx | 6 +- 8 files changed, 382 insertions(+), 196 deletions(-) create mode 100644 bbtk/bbs/appli/exampleMesh_Application.bbg create mode 100644 bbtk/bbs/appli/exampleMesh_Application.bbs diff --git a/bbtk/bbs/appli/exampleMesh_Application.bbg b/bbtk/bbs/appli/exampleMesh_Application.bbg new file mode 100644 index 0000000..e9937e1 --- /dev/null +++ b/bbtk/bbs/appli/exampleMesh_Application.bbg @@ -0,0 +1,198 @@ +# ---------------------------------- +# - BBTKGEditor v 1.5 BBG BlackBox Diagram file +# - /Users/davila/Creatis/C22/creatools_source/creaMaracasVisu/bbtk/bbs/appli/exampleMesh_Application.bbg +# ---------------------------------- + +APP_START +CATEGORY: +DESCRIPTION:Description ?? +AUTHOR:Author ?? +COMPLEXBOX:FALSE +COMPLEXINPUTS:0 +BOXES:17 +BOX +creaMaracasVisu:Mesh_Application:Box00 +ISEXEC:FALSE +4.656833:10.912478:-900.000000 +27.031833:8.412478:-900.000000 +FIN_BOX +BOX +creaMaracasVisu:ViewerNV:Box03 +ISEXEC:FALSE +9.478674:20.973125:-900.000000 +48.078674:18.473125:-900.000000 +FIN_BOX +BOX +vtk:vtkImageDataPointerRelay:Box05 +ISEXEC:FALSE +3.515673:30.662232:-900.000000 +26.725673:28.162232:-900.000000 +FIN_BOX +BOX +wx:LayoutSplit:Box06 +ISEXEC:FALSE +8.221194:-28.275584:-900.000000 +30.981194:-30.775584:-900.000000 +PORT +Orientation:"H" +PORT +Proportion:"25" +FIN_BOX +BOX +creaVtk:OutputWindow:Box07 +ISEXEC:TRUE +-21.729484:-37.432405:-900.000000 +0.325516:-39.932405:-900.000000 +FIN_BOX +BOX +wx:LayoutTab:Box08 +ISEXEC:FALSE +-24.252799:-4.621856:-900.000000 +9.067201:-7.121856:-900.000000 +FIN_BOX +BOX +vtk:MetaImageReader:Box09 +ISEXEC:FALSE +24.202546:51.431646:-900.000000 +46.662546:48.931646:-900.000000 +PORT +In:"/Users/davila/CreatisWork-C11/tmpJCR/results/Experimental-XXXXX2/LA099-VT-B/images/Expi-B.mhd" +FIN_BOX +BOX +creaVtk:StlReader:Box10 +ISEXEC:FALSE +-57.649601:51.015138:-900.000000 +-36.109601:48.515138:-900.000000 +PORT +FileName:"/Users/davila/CreatisWork-C11/tmpJCR/results/Experimental-XXXXX2/LA099-VT-B/segmentation03/Expi-B.mhd-MaskDeepLearning-2.stl" +FIN_BOX +BOX +creaVtk:PolyDataNormals:Box11 +ISEXEC:FALSE +-28.805019:31.029328:-900.000000 +-6.510019:28.529328:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box12 +ISEXEC:TRUE +4.395867:-36.870336:-900.000000 +37.715867:-39.370336:-900.000000 +FIN_BOX +BOX +wx:LayoutLine:Box13 +ISEXEC:FALSE +-15.010745:2.386191:-900.000000 +18.309255:-0.113809:-900.000000 +PORT +WinTitle:"Mesh tools" +FIN_BOX +BOX +wx:LayoutLine:Box15 +ISEXEC:FALSE +-81.726560:3.333141:-900.000000 +-48.406560:0.833141:-900.000000 +PORT +WinTitle:"Save" +FIN_BOX +BOX +wx:CommandButton:Box16 +ISEXEC:FALSE +-81.127885:22.139569:-900.000000 +-58.852885:19.639569:-900.000000 +PORT +Label:"Save and Exit" +FIN_BOX +BOX +std:MultipleInputs:Box17 +ISEXEC:FALSE +-75.542935:10.969671:-900.000000 +-53.572935:8.469671:-900.000000 +FIN_BOX +BOX +std:Exit:Box18 +ISEXEC:FALSE +-58.123212:15.889745:-900.000000 +-37.173212:13.389745:-900.000000 +FIN_BOX +BOX +vtk:LoadHola:Box19 +ISEXEC:FALSE +-5.199169:56.846040:-900.000000 +16.350831:54.346040:-900.000000 +FIN_BOX +BOX +vtk:MarchingCubes:Box20 +ISEXEC:FALSE +-22.751867:50.463241:-900.000000 +-0.576867:47.963241:-900.000000 +PORT +Value:"2500" +FIN_BOX +CONNECTIONS:22 +CONNECTION +Box05:Out:Box00:ImageIn +NumberOfControlPoints:0 +CONNECTION +Box05:Out:Box03:In +NumberOfControlPoints:0 +CONNECTION +Box03:BoxChange:Box00:BoxChange_ViewerNV +NumberOfControlPoints:0 +CONNECTION +Box03:Point:Box00:PointIn +NumberOfControlPoints:0 +CONNECTION +Box03:Renderer1:Box00:Render3D +NumberOfControlPoints:0 +CONNECTION +Box03:wxVtkBaseView1:Box00:wxvtkbaseview1_In +NumberOfControlPoints:0 +CONNECTION +Box03:wxVtkBaseView2:Box00:wxvtkbaseview2_In +NumberOfControlPoints:0 +CONNECTION +Box03:wxVtkBaseView3:Box00:wxvtkbaseview3_In +NumberOfControlPoints:0 +CONNECTION +Box03:wxVtkBaseView4:Box00:wxvtkbaseview4_In +NumberOfControlPoints:0 +CONNECTION +Box03:Widget:Box06:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box11:Out:Box00:MeshIn +NumberOfControlPoints:0 +CONNECTION +Box06:Widget:Box12:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box08:Widget:Box06:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box00:WidgetOut:Box13:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box13:Widget:Box08:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box15:Widget:Box08:Widget2 +NumberOfControlPoints:0 +CONNECTION +Box16:Widget:Box15:Widget1 +NumberOfControlPoints:0 +CONNECTION +Box16:BoxChange:Box17:BoxExecute +NumberOfControlPoints:0 +CONNECTION +Box18:BoxChange:Box17:In9 +NumberOfControlPoints:0 +CONNECTION +Box19:Out:Box05:In +NumberOfControlPoints:0 +CONNECTION +Box19:Out:Box20:In +NumberOfControlPoints:0 +CONNECTION +Box20:Out:Box11:In +NumberOfControlPoints:0 +APP_END diff --git a/bbtk/bbs/appli/exampleMesh_Application.bbs b/bbtk/bbs/appli/exampleMesh_Application.bbs new file mode 100644 index 0000000..541e76a --- /dev/null +++ b/bbtk/bbs/appli/exampleMesh_Application.bbs @@ -0,0 +1,112 @@ +# ---------------------------------- +# - BBTKGEditor v 1.5 BBS BlackBox Script +# - /Users/davila/Creatis/C22/creatools_source/creaMaracasVisu/bbtk/bbs/appli/exampleMesh_Application.bbs +# ---------------------------------- + +# BBTK GEditor Script +# ---------------------- + +include std +include itkvtk +include creaMaracasVisu +include vtk +include wx +include creaVtk +include std + +author "Author ??" +description "Description ??" +category "" + +new creaMaracasVisu:Mesh_Application Box00 + +new creaMaracasVisu:ViewerNV Box03 + +new vtk:vtkImageDataPointerRelay Box05 + +new wx:LayoutSplit Box06 + set Box06.Orientation "H" + set Box06.Proportion "25" + +new creaVtk:OutputWindow Box07 + +new wx:LayoutTab Box08 + +new vtk:MetaImageReader Box09 + set Box09.In "/Users/davila/CreatisWork-C11/tmpJCR/results/Experimental-XXXXX2/LA099-VT-B/images/Expi-B.mhd" + +new creaVtk:StlReader Box10 + set Box10.FileName "/Users/davila/CreatisWork-C11/tmpJCR/results/Experimental-XXXXX2/LA099-VT-B/segmentation03/Expi-B.mhd-MaskDeepLearning-2.stl" + +new creaVtk:PolyDataNormals Box11 + +new wx:LayoutLine Box12 + +new wx:LayoutLine Box13 + set Box13.WinTitle "Mesh tools" + +new wx:LayoutLine Box15 + set Box15.WinTitle "Save" + +new wx:CommandButton Box16 + set Box16.Label "Save and Exit" + +new std:MultipleInputs Box17 + +new std:Exit Box18 + +new vtk:LoadHola Box19 + +new vtk:MarchingCubes Box20 + set Box20.Value "2500" + + +connect Box05.Out Box00.ImageIn + +connect Box05.Out Box03.In + +connect Box03.BoxChange Box00.BoxChange_ViewerNV + +connect Box03.Point Box00.PointIn + +connect Box03.Renderer1 Box00.Render3D + +connect Box03.wxVtkBaseView1 Box00.wxvtkbaseview1_In + +connect Box03.wxVtkBaseView2 Box00.wxvtkbaseview2_In + +connect Box03.wxVtkBaseView3 Box00.wxvtkbaseview3_In + +connect Box03.wxVtkBaseView4 Box00.wxvtkbaseview4_In + +connect Box03.Widget Box06.Widget2 + +connect Box11.Out Box00.MeshIn + +connect Box06.Widget Box12.Widget1 + +connect Box08.Widget Box06.Widget1 + +connect Box00.WidgetOut Box13.Widget1 + +connect Box13.Widget Box08.Widget1 + +connect Box15.Widget Box08.Widget2 + +connect Box16.Widget Box15.Widget1 + +connect Box16.BoxChange Box17.BoxExecute + +connect Box18.BoxChange Box17.In9 + +connect Box19.Out Box05.In + +connect Box19.Out Box20.In + +connect Box20.Out Box11.In + + + +# Complex input ports +exec Box07 +exec Box12 diff --git a/bbtk/bbs/boxes/Mesh_Application.bbg b/bbtk/bbs/boxes/Mesh_Application.bbg index 3c4dd76..a4618a4 100644 --- a/bbtk/bbs/boxes/Mesh_Application.bbg +++ b/bbtk/bbs/boxes/Mesh_Application.bbg @@ -56,19 +56,7 @@ COMPLEX_PORT wxvtkbaseview4_In 206.922345:93.364879:-900.000000 FIN_COMPLEX_PORT -BOXES:59 -BOX -vtk:MetaImageReader:Box05 -ISEXEC:FALSE --167.017777:85.507933:-900.000000 --144.557777:83.007933:-900.000000 -FIN_BOX -BOX -creaVtk:StlReader:Box06 -ISEXEC:FALSE --194.190858:85.694980:-900.000000 --172.650858:83.194980:-900.000000 -FIN_BOX +BOXES:49 BOX creaMaracasVisu:ImageChangeInformation:Box07 ISEXEC:FALSE @@ -130,20 +118,12 @@ FIN_BOX BOX creaMaracasVisu:MeshContours_Widget:Box17 ISEXEC:FALSE --71.108426:-10.591734:-900.000000 --48.313426:-13.091734:-900.000000 +-67.813268:-29.868406:-900.000000 +-45.018268:-32.368406:-900.000000 PORT colorMesh:"1 0 0" FIN_BOX BOX -creaVtk:MeshReduction_DecimatePro:Box18 -ISEXEC:FALSE --192.987277:76.324902:-900.000000 --169.492277:73.824902:-900.000000 -PORT -TargetReduction:"0.8" -FIN_BOX -BOX wx:LayoutTab:Box20 ISEXEC:FALSE -97.190069:-143.295975:-900.000000 @@ -272,26 +252,6 @@ ISEXEC:FALSE -174.921265:-126.206763:-900.000000 FIN_BOX BOX -wx:CommandButton:Box35 -ISEXEC:FALSE --263.866543:-78.333803:-900.000000 --241.591543:-80.833803:-900.000000 -PORT -Label:"Save and Exit" -FIN_BOX -BOX -std:MultipleInputs:Box36 -ISEXEC:FALSE --268.608555:-99.412808:-900.000000 --246.638555:-101.912808:-900.000000 -FIN_BOX -BOX -std:Exit:Box37 -ISEXEC:FALSE --250.875860:-91.704097:-900.000000 --229.925860:-94.204097:-900.000000 -FIN_BOX -BOX creaMaracasVisu:Mesh_tool_ApplyPatch:Box38 ISEXEC:FALSE 32.150859:-6.156547:-900.000000 @@ -314,34 +274,6 @@ ISEXEC:FALSE 43.022712:-66.727148:-900.000000 FIN_BOX BOX -std:ConcatStrings:Box41 -ISEXEC:FALSE --172.708359:101.773175:-900.000000 --149.948359:99.273175:-900.000000 -PORT -In1:"1" -FIN_BOX -BOX -std:StringSelect:Box42 -ISEXEC:FALSE --192.440554:93.252178:-900.000000 --167.920554:90.752178:-900.000000 -PORT -In0:"/Users/davila/CreatisWork-C11/tmpJCR/results/Experimental-XXXXX/AP098-VT-B-B/segmentation03/Expi-B.mhd-MaskDeepLearning.stl" -PORT -In1:"/Users/davila/CreatisWork-C11/tmpJCR/results/Experimental-XXXXX2/LA099-VT-B/segmentation03/Expi-B.mhd-MaskDeepLearning-2.stl" -FIN_BOX -BOX -std:StringSelect:Box44 -ISEXEC:FALSE --165.281377:92.758206:-900.000000 --140.761377:90.258206:-900.000000 -PORT -In0:"/Users/davila/CreatisWork-C11/tmpJCR/results/Experimental-XXXXX/AP098-VT-B-B/images/Expi-B.mhd" -PORT -In1:"/Users/davila/CreatisWork-C11/tmpJCR/results/Experimental-XXXXX2/LA099-VT-B/images/Expi-B.mhd" -FIN_BOX -BOX creaMaracasVisu:Mesh_tool_ApplyByImage:Box46 ISEXEC:FALSE 64.137604:-5.148169:-900.000000 @@ -472,16 +404,6 @@ ISEXEC:FALSE -98.332686:-97.082809:-900.000000 FIN_BOX BOX -creaVtk:StlWriter:Box62 -ISEXEC:FALSE --194.307258:70.879842:-900.000000 --172.917258:68.379842:-900.000000 -PORT -Ascii:"false" -PORT -FileName:"/Users/davila/CreatisWork-C11/tmpJCR/results/Experimental-XXXXX2/LA099-VT-B/segmentation03/Expi-B.mhd-MaskDeepLearning-2.stl" -FIN_BOX -BOX std:MagicBox:Box63 ISEXEC:FALSE 58.021240:79.902351:-900.000000 @@ -523,7 +445,7 @@ ISEXEC:FALSE 200.941581:77.753594:-900.000000 222.541581:75.253594:-900.000000 FIN_BOX -CONNECTIONS:129 +CONNECTIONS:125 CONNECTION Box08:MeshBase:Box15:polydata NumberOfControlPoints:0 @@ -621,12 +543,6 @@ CONNECTION Box27:Widget:Box34:Widget2 NumberOfControlPoints:0 CONNECTION -Box35:BoxChange:Box36:BoxExecute -NumberOfControlPoints:0 -CONNECTION -Box37:BoxChange:Box36:In9 -NumberOfControlPoints:0 -CONNECTION Box34:Widget:Box22:Widget2 NumberOfControlPoints:0 CONNECTION @@ -672,18 +588,6 @@ CONNECTION Box22:Widget:Box20:Widget2 NumberOfControlPoints:0 CONNECTION -Box42:Out:Box06:FileName -NumberOfControlPoints:0 -CONNECTION -Box41:Out:Box42:In -NumberOfControlPoints:0 -CONNECTION -Box41:Out:Box44:In -NumberOfControlPoints:0 -CONNECTION -Box44:Out:Box05:In -NumberOfControlPoints:0 -CONNECTION Box46:widget:Box12:Widget7 NumberOfControlPoints:0 CONNECTION @@ -759,9 +663,6 @@ CONNECTION Box12:BoxChange:Box57:BoxExecute NumberOfControlPoints:0 CONNECTION -Box35:Widget:Box34:Widget8 -NumberOfControlPoints:0 -CONNECTION Box53:Widget:Box34:Widget6 NumberOfControlPoints:0 CONNECTION @@ -786,9 +687,6 @@ CONNECTION Box54:Out:Box59:Active NumberOfControlPoints:0 CONNECTION -Box18:Out:Box62:In -NumberOfControlPoints:0 -CONNECTION MeshIn:MeshIn:Box56:In NumberOfControlPoints:0 CONNECTION @@ -911,4 +809,16 @@ NumberOfControlPoints:0 CONNECTION Box08:MeshBase:MeshOut:MeshOut NumberOfControlPoints:0 +CONNECTION +Box69:Out:Box38:wxvtkbaseview4 +NumberOfControlPoints:0 +CONNECTION +Box69:Out:Box46:wxvtkbaseview4 +NumberOfControlPoints:0 +CONNECTION +Box69:Out:Box47:wxvtkbaseview4 +NumberOfControlPoints:0 +CONNECTION +Box69:Out:Box17:_wxvtkbaseview2D3 +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_Application.bbs b/bbtk/bbs/boxes/Mesh_Application.bbs index 4d0a3ee..400b018 100644 --- a/bbtk/bbs/boxes/Mesh_Application.bbs +++ b/bbtk/bbs/boxes/Mesh_Application.bbs @@ -5,11 +5,11 @@ include std include itkvtk -include vtk -include creaVtk include creaMaracasVisu +include creaVtk include wx include std +include vtk define Mesh_Application creaMaracasVisu @@ -18,10 +18,6 @@ description "Description ??" category "" -new vtk:MetaImageReader Box05 - -new creaVtk:StlReader Box06 - new creaMaracasVisu:ImageChangeInformation Box07 new creaVtk:MeshManager Box08 @@ -46,9 +42,6 @@ new wx:LayoutLine Box14 new creaMaracasVisu:MeshContours_Widget Box17 set Box17.colorMesh "1 0 0" -new creaVtk:MeshReduction_DecimatePro Box18 - set Box18.TargetReduction "0.8" - new wx:LayoutTab Box20 new wx:LayoutLine Box22 @@ -99,13 +92,6 @@ new std:GetVectorDoubleElement Box33 new wx:LayoutLine Box34 -new wx:CommandButton Box35 - set Box35.Label "Save and Exit" - -new std:MultipleInputs Box36 - -new std:Exit Box37 - new creaMaracasVisu:Mesh_tool_ApplyPatch Box38 set Box38.title "Patch" @@ -114,17 +100,6 @@ new std:GetVectorStringElement Box39 new creaMaracasVisu:InteractorStyleMaracas_Model Box40 -new std:ConcatStrings Box41 - set Box41.In1 "1" - -new std:StringSelect Box42 - set Box42.In0 "/Users/davila/CreatisWork-C11/tmpJCR/results/Experimental-XXXXX/AP098-VT-B-B/segmentation03/Expi-B.mhd-MaskDeepLearning.stl" - set Box42.In1 "/Users/davila/CreatisWork-C11/tmpJCR/results/Experimental-XXXXX2/LA099-VT-B/segmentation03/Expi-B.mhd-MaskDeepLearning-2.stl" - -new std:StringSelect Box44 - set Box44.In0 "/Users/davila/CreatisWork-C11/tmpJCR/results/Experimental-XXXXX/AP098-VT-B-B/images/Expi-B.mhd" - set Box44.In1 "/Users/davila/CreatisWork-C11/tmpJCR/results/Experimental-XXXXX2/LA099-VT-B/images/Expi-B.mhd" - new creaMaracasVisu:Mesh_tool_ApplyByImage Box46 set Box46.title "By Image" @@ -174,10 +149,6 @@ new std:MathOperationVector Box60 new vtk:ImageVtkProperties Box61 -new creaVtk:StlWriter Box62 - set Box62.Ascii "false" - set Box62.FileName "/Users/davila/CreatisWork-C11/tmpJCR/results/Experimental-XXXXX2/LA099-VT-B/segmentation03/Expi-B.mhd-MaskDeepLearning-2.stl" - new std:MagicBox Box63 new std:MagicBox Box64 @@ -225,8 +196,6 @@ connect Box32.Out Box26.ColorLevel connect Box28.BoxChange Box31.BoxExecute connect Box31.BoxChange Box26.BoxExecute connect Box27.Widget Box34.Widget2 -connect Box35.BoxChange Box36.BoxExecute -connect Box37.BoxChange Box36.In9 connect Box34.Widget Box22.Widget2 connect Box07.Out Box38.image connect Box08.MeshTemp Box38.mesh @@ -242,10 +211,6 @@ connect Box38.interactorStyleMaracas4 Box40.InteractorStyleMaracas4 connect Box17._widget Box22.Widget4 connect Box15.widget Box22.Widget6 connect Box22.Widget Box20.Widget2 -connect Box42.Out Box06.FileName -connect Box41.Out Box42.In -connect Box41.Out Box44.In -connect Box44.Out Box05.In connect Box46.widget Box12.Widget7 connect Box07.Out Box46.image connect Box08.MeshTemp Box46.mesh @@ -271,7 +236,6 @@ connect Box47.ExportIsActive_concatstring_tool Box57.Box_ConcatString connect Box23.Out Box58.In connect Box58.Out Box57.In1 connect Box12.BoxChange Box57.BoxExecute -connect Box35.Widget Box34.Widget8 connect Box53.Widget Box34.Widget6 connect Box54.Widget Box34.Widget4 connect Box48.BoxChange Box59.BoxExecute @@ -280,7 +244,6 @@ connect Box48.Center Box60.In0 connect Box07.Out Box61.In connect Box61.Spacing Box60.In1 connect Box54.Out Box59.Active -connect Box18.Out Box62.In connect Box63.BoxChange Box28.In4 connect Box63.BoxChange Box17._execute connect Box63.BoxChange Box10.boxChange @@ -311,6 +274,10 @@ connect Box68.Out Box46.wxvtkbaseview3 connect Box68.Out Box38.wxvtkbaseview3 connect Box68.Out Box10.wxvtkbaseview3 connect Box69.Out Box10.wxvtkbaseview4 +connect Box69.Out Box38.wxvtkbaseview4 +connect Box69.Out Box46.wxvtkbaseview4 +connect Box69.Out Box47.wxvtkbaseview4 +connect Box69.Out Box17._wxvtkbaseview2D3 # Complex input ports input MeshIn Box56.In " " diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg index 3980d2f..291f96d 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbg @@ -110,8 +110,8 @@ FIN_BOX BOX creaMaracasVisu:PolyDataToActor_Widget:Box37 ISEXEC:FALSE --201.313723:-44.146096:-900.000000 --178.293723:-46.646096:-900.000000 +-204.608881:-41.015696:-900.000000 +-181.588881:-43.515696:-900.000000 PORT color:"0 1 1" FIN_BOX @@ -140,8 +140,8 @@ FIN_BOX BOX wx:LayoutLine:Box44 ISEXEC:FALSE --454.960003:-36.610889:-900.000000 --421.640003:-39.110889:-900.000000 +-470.941518:-32.162426:-900.000000 +-437.621518:-34.662426:-900.000000 PORT Orientation:"V" PORT @@ -236,8 +236,8 @@ FIN_BOX BOX creaVtk:MeshDeformation:Box39 ISEXEC:FALSE --394.721222:-55.910522:-900.000000 --372.376222:-58.410522:-900.000000 +-393.073643:-51.132543:-900.000000 +-370.728643:-53.632543:-900.000000 PORT TypeIn:"1" FIN_BOX @@ -262,16 +262,16 @@ FIN_BOX BOX wx:CheckBox:Box50 ISEXEC:FALSE --406.669986:180.478025:-900.000000 --385.039986:177.978025:-900.000000 +-394.807418:132.862997:-900.000000 +-373.177418:130.362997:-900.000000 PORT Title:"Active" FIN_BOX BOX creaVtk:PlaneWidget:Box58 ISEXEC:FALSE --260.210750:-38.996691:-900.000000 --238.365750:-41.496691:-900.000000 +-295.468937:-16.589619:-900.000000 +-273.623937:-19.089619:-900.000000 PORT ReactiveType:"1" PORT @@ -312,8 +312,8 @@ FIN_BOX BOX creaVtk:PlaneWidget_Base:Box57 ISEXEC:FALSE --364.490632:-56.647270:-900.000000 --342.080632:-59.147270:-900.000000 +-363.831600:-51.704534:-900.000000 +-341.421600:-54.204534:-900.000000 PORT Param:"-1" PORT @@ -322,8 +322,8 @@ FIN_BOX BOX creaVtk:PlaneWidget_Base:Box60 ISEXEC:FALSE --335.352802:-56.464099:-900.000000 --312.942802:-58.964099:-900.000000 +-335.517560:-51.686120:-900.000000 +-313.107560:-54.186120:-900.000000 PORT Param:"1" PORT @@ -358,8 +358,8 @@ FIN_BOX BOX creaMaracasVisu:wxVtkBaseView_Info:Box76 ISEXEC:FALSE --254.280207:102.066880:-900.000000 --227.000207:99.566880:-900.000000 +-259.552459:91.687133:-900.000000 +-232.272459:89.187133:-900.000000 PORT InteractionType:"6" FIN_BOX @@ -386,14 +386,14 @@ FIN_BOX BOX std:SharedMemory:Box86 ISEXEC:FALSE --304.400175:37.381370:-900.000000 --281.640175:34.881370:-900.000000 +-303.246870:36.722338:-900.000000 +-280.486870:34.222338:-900.000000 FIN_BOX BOX std:SharedMemory:Box87 ISEXEC:FALSE --296.647358:30.371625:-900.000000 --273.887358:27.871625:-900.000000 +-297.141632:30.701141:-900.000000 +-274.381632:28.201141:-900.000000 FIN_BOX BOX std:MathOperationVector:Box88 @@ -428,38 +428,38 @@ FIN_BOX BOX creaVtk:PointPicker:Box92 ISEXEC:FALSE --291.530772:54.654433:-900.000000 --269.835772:52.154433:-900.000000 +-284.610941:53.006854:-900.000000 +-262.915941:50.506854:-900.000000 PORT TypeEvent:"2" FIN_BOX BOX std:ConcatStrings_tool:Box94 ISEXEC:FALSE --211.636401:-8.094416:-900.000000 --189.196401:-10.594416:-900.000000 +-215.261074:-7.270627:-900.000000 +-192.821074:-9.770627:-900.000000 PORT Type:"1" FIN_BOX BOX std:ConcatStrings:Box95 ISEXEC:FALSE --206.264131:3.945366:-900.000000 --183.504131:1.445366:-900.000000 +-206.264131:11.029955:-900.000000 +-183.504131:8.529955:-900.000000 FIN_BOX BOX std:ConcatStrings_tool:Box97 ISEXEC:FALSE --182.930739:-29.463287:-900.000000 --160.490739:-31.963287:-900.000000 +-183.589771:-31.275624:-900.000000 +-161.149771:-33.775624:-900.000000 PORT Type:"1" FIN_BOX BOX std:ConcatStrings:Box98 ISEXEC:FALSE --180.830927:-5.858673:-900.000000 --158.070927:-8.358673:-900.000000 +-176.876738:24.951051:-900.000000 +-154.116738:22.451051:-900.000000 FIN_BOX BOX std:ConcatStrings_tool:Box99 @@ -480,30 +480,30 @@ FIN_BOX BOX std:ConcatStrings_tool:Box101 ISEXEC:FALSE --269.803077:16.559989:-900.000000 --247.253077:14.059989:-900.000000 +-257.610994:18.866599:-900.000000 +-235.060994:16.366599:-900.000000 PORT Type:"1" FIN_BOX BOX std:ConcatStrings:Box102 ISEXEC:FALSE --273.826091:24.923356:-900.000000 --251.066091:22.423356:-900.000000 +-269.871902:28.383272:-900.000000 +-247.111902:25.883272:-900.000000 FIN_BOX BOX std:ConcatStrings_tool:Box103 ISEXEC:FALSE --278.542388:10.986088:-900.000000 --255.992388:8.486088:-900.000000 +-279.201420:10.986088:-900.000000 +-256.651420:8.486088:-900.000000 PORT Type:"1" FIN_BOX BOX wx:RadioButton:Box104 ISEXEC:FALSE --382.995141:90.878663:-900.000000 --346.155141:88.378663:-900.000000 +-401.448024:96.315673:-900.000000 +-364.608024:93.815673:-900.000000 PORT In0:"Magenta" PORT @@ -560,16 +560,16 @@ FIN_BOX BOX std:GetVectorDoubleElement:Box111 ISEXEC:FALSE --472.591566:42.496696:-900.000000 --449.356566:39.996696:-900.000000 +-470.779229:42.331938:-900.000000 +-447.544229:39.831938:-900.000000 PORT I:"0" FIN_BOX BOX std:GetVectorDoubleElement:Box112 ISEXEC:FALSE --498.823250:42.130977:-900.000000 --475.588250:39.630977:-900.000000 +-499.976555:42.295735:-900.000000 +-476.741555:39.795735:-900.000000 PORT I:"1" FIN_BOX @@ -584,8 +584,8 @@ FIN_BOX BOX creaMaracasVisu:wxVtkBaseView_info_tool:Box114 ISEXEC:FALSE --323.206961:81.948245:-900.000000 --300.016961:79.448245:-900.000000 +-319.417530:85.078645:-900.000000 +-296.227530:82.578645:-900.000000 PORT Type:"1" FIN_BOX @@ -629,7 +629,7 @@ Replace:"1" PORT Search:"true" FIN_BOX -CONNECTIONS:145 +CONNECTIONS:146 CONNECTION Box08:Widget:widget:widget NumberOfControlPoints:0 @@ -1065,4 +1065,7 @@ NumberOfControlPoints:0 CONNECTION Box56:Widget:Box44:Widget3 NumberOfControlPoints:0 +CONNECTION +Box37:vtkprop3D:Box92:Prop3D +NumberOfControlPoints:0 APP_END diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs index 3c787ce..4f3607b 100644 --- a/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs +++ b/bbtk/bbs/boxes/Mesh_tool_ApplyDeformation.bbs @@ -364,6 +364,7 @@ connect Box118.Out Box39.Active connect Box108.Widget Box44.Widget1 connect Box49.Widget Box44.Widget2 connect Box56.Widget Box44.Widget3 +connect Box37.vtkprop3D Box92.Prop3D # Complex input ports input mesh Box67.In " " diff --git a/bbtk/src/bbcreaMaracasVisuSetPosition.cxx b/bbtk/src/bbcreaMaracasVisuSetPosition.cxx index a0a8365..6e7bd99 100644 --- a/bbtk/src/bbcreaMaracasVisuSetPosition.cxx +++ b/bbtk/src/bbcreaMaracasVisuSetPosition.cxx @@ -39,7 +39,6 @@ void SetPosition::Process() vtkMPRBaseData* vtkmprbasedata = (vtkMPRBaseData*) (bbGetInputwxVtkBaseView()->GetVtkBaseData()); if (bbGetInputPoint().size()==3) { - printf("EED SetPosition::Process boxName=%s x,y,z=%d %d %d\n" , bbGetFullName().c_str() , bbGetInputPoint()[0] , bbGetInputPoint()[1] , bbGetInputPoint()[2] ); vtkmprbasedata->SetX( bbGetInputPoint()[0] ); vtkmprbasedata->SetY( bbGetInputPoint()[1] ); vtkmprbasedata->SetZ( bbGetInputPoint()[2] ); diff --git a/bbtk/src/bbcreaMaracasVisuwxVtkBaseView_info_tool.cxx b/bbtk/src/bbcreaMaracasVisuwxVtkBaseView_info_tool.cxx index d990e6f..ebe747e 100644 --- a/bbtk/src/bbcreaMaracasVisuwxVtkBaseView_info_tool.cxx +++ b/bbtk/src/bbcreaMaracasVisuwxVtkBaseView_info_tool.cxx @@ -29,22 +29,18 @@ void wxVtkBaseView_info_tool::Process() // bbSetOutputOut( bbGetInputIn() ); // std::cout << "Output value = " <SetwxVtkBaseViewOutputs( bbGetInputwxVtkBaseView() ); bbGetInputBox_wxVtkBaseView_Info()->bbSignalOutputModification(); - } + } // if _Info } // if Type 0:nothing if (bbGetInputType()==1) { - printf("EED wxVtkBaseView_info_tool::Process type 1\n"); if (firsttime==true) { firsttime=false; -- 2.47.1