From d484b946746576227a542ccff6324e1491d801a3 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Fri, 25 Oct 2019 17:45:26 +0200 Subject: [PATCH] #3316 creaVtk Feature New Normal - VoiMPR box --- .../bbs/boxes/VoiMPR-Interface.bbg | 56 +++++-------------- .../bbs/boxes/VoiMPR-Interface.bbs | 16 ++---- bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Widget.bbg | 15 ++--- bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Widget.bbs | 1 - 4 files changed, 21 insertions(+), 67 deletions(-) diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Interface.bbg b/bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Interface.bbg index e247a78..6b12b16 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Interface.bbg +++ b/bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Interface.bbg @@ -13,11 +13,11 @@ PACKAGENAME:creaVtk COMPLEXOUTPUTS:5 COMPLEX_PORT widget --194.857295:-108.744190:-900.000000 +-326.521643:-101.189678:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT voi -116.850695:-134.317313:-900.000000 +-52.226473:-123.165415:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT boxchange @@ -31,7 +31,7 @@ COMPLEX_PORT boxchangeRender 2.545632:-132.673333:-900.000000 FIN_COMPLEX_PORT -COMPLEXINPUTS:3 +COMPLEXINPUTS:2 COMPLEX_PORT Image -165.967032:312.412587:-900.000000 @@ -40,11 +40,7 @@ COMPLEX_PORT Execute 120.347352:309.716369:-900.000000 FIN_COMPLEX_PORT -COMPLEX_PORT -wxvtkbaseview --113.324460:312.838326:-900.000000 -FIN_COMPLEX_PORT -BOXES:23 +BOXES:21 BOX creaMaracasVisu:SliderMinMax:Box03 ISEXEC:FALSE @@ -54,6 +50,10 @@ PORT InMax:"500" PORT InMin:"0" +PORT +ShowActual:"false" +PORT +WinClose:"false" FIN_BOX BOX creaMaracasVisu:SliderMinMax:Box04 @@ -64,6 +64,8 @@ PORT InMax:"500" PORT InMin:"0" +PORT +ShowActual:"false" FIN_BOX BOX creaMaracasVisu:SliderMinMax:Box05 @@ -74,6 +76,8 @@ PORT InMax:"500" PORT InMin:"0" +PORT +ShowActual:"false" FIN_BOX BOX std:MultipleInputs:Box06 @@ -156,22 +160,6 @@ PORT I:"2" FIN_BOX BOX -creaMaracasVisu:SetPosition:Box35 -ISEXEC:FALSE --79.954071:-54.580452:-900.000000 --43.404071:-64.580452:-900.000000 -FIN_BOX -BOX -std:ConcatStrings:Box36 -ISEXEC:FALSE --131.390576:12.543783:-900.000000 --91.665576:2.543783:-900.000000 -PORT -In2:" " -PORT -In4:" " -FIN_BOX -BOX std:MultipleInputs:Box40 ISEXEC:FALSE 219.080593:-45.709082:-900.000000 @@ -231,7 +219,7 @@ ISEXEC:FALSE PORT WinTitle:"Z" FIN_BOX -CONNECTIONS:43 +CONNECTIONS:37 CONNECTION Box03:BoxChange:Box06:In1 NumberOfControlPoints:0 @@ -287,12 +275,6 @@ CONNECTION Box34:Out:Box05:InMax NumberOfControlPoints:0 CONNECTION -Box36:Out:Box35:Point -NumberOfControlPoints:0 -CONNECTION -Box06:BoxChange:Box35:BoxExecute -NumberOfControlPoints:0 -CONNECTION Box06:BoxChange:Box40:In1 NumberOfControlPoints:0 CONNECTION @@ -311,9 +293,6 @@ CONNECTION Execute:Execute:Box40:In2 NumberOfControlPoints:0 CONNECTION -wxvtkbaseview:wxvtkbaseview:Box35:wxVtkBaseView -NumberOfControlPoints:0 -CONNECTION Box40:BoxChange:boxchange:boxchange NumberOfControlPoints:0 CONNECTION @@ -326,15 +305,6 @@ CONNECTION Box09:Out:voi:voi NumberOfControlPoints:0 CONNECTION -Box03:OutActual:Box36:In1 -NumberOfControlPoints:0 -CONNECTION -Box04:OutActual:Box36:In3 -NumberOfControlPoints:0 -CONNECTION -Box05:OutActual:Box36:In5 -NumberOfControlPoints:0 -CONNECTION Box22:Widget:Box21:Widget1 NumberOfControlPoints:0 CONNECTION diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Interface.bbs b/bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Interface.bbs index c4dcb0c..c989555 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Interface.bbs +++ b/bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Interface.bbs @@ -20,14 +20,18 @@ category "" new creaMaracasVisu:SliderMinMax Box03 set Box03.InMax "500" set Box03.InMin "0" + set Box03.ShowActual "false" + set Box03.WinClose "false" new creaMaracasVisu:SliderMinMax Box04 set Box04.InMax "500" set Box04.InMin "0" + set Box04.ShowActual "false" new creaMaracasVisu:SliderMinMax Box05 set Box05.InMax "500" set Box05.InMin "0" + set Box05.ShowActual "false" new std:MultipleInputs Box06 @@ -59,12 +63,6 @@ new std:GetVectorIntElement Box33 new std:GetVectorIntElement Box34 set Box34.I "2" -new creaMaracasVisu:SetPosition Box35 - -new std:ConcatStrings Box36 - set Box36.In2 " " - set Box36.In4 " " - new std:MultipleInputs Box40 new wx:CheckBox Box42 @@ -106,14 +104,9 @@ connect Box30.Size Box34.In connect Box32.Out Box03.InMax connect Box33.Out Box04.InMax connect Box34.Out Box05.InMax -connect Box36.Out Box35.Point -connect Box06.BoxChange Box35.BoxExecute connect Box06.BoxChange Box40.In1 connect Box42.Widget Box11.Widget1 connect Box42.BoxChange Box06.In4 -connect Box03.OutActual Box36.In1 -connect Box04.OutActual Box36.In3 -connect Box05.OutActual Box36.In5 connect Box22.Widget Box21.Widget1 connect Box03.Widget Box22.Widget1 connect Box21.Widget Box11.Widget3 @@ -127,7 +120,6 @@ connect Box05.Widget Box26.Widget1 # Complex input ports input Image Box31.In " " input Execute Box40.In2 " " -input wxvtkbaseview Box35.wxVtkBaseView " " # Complex output ports output widget Box11.Widget " " diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Widget.bbg b/bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Widget.bbg index 40766f3..fde6a72 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Widget.bbg +++ b/bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Widget.bbg @@ -31,7 +31,7 @@ COMPLEX_PORT size 182.155431:-324.218825:-900.000000 FIN_COMPLEX_PORT -COMPLEXINPUTS:7 +COMPLEXINPUTS:6 COMPLEX_PORT execute 202.846948:77.379235:-900.000000 @@ -45,10 +45,6 @@ Point -10.598806:80.481110:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT -wxVtkBaseView -236.114210:75.192161:-900.000000 -FIN_COMPLEX_PORT -COMPLEX_PORT RenderXY 14.170076:78.107701:-900.000000 FIN_COMPLEX_PORT @@ -202,8 +198,8 @@ FIN_BOX BOX std:GetVectorIntElement:Box22 ISEXEC:FALSE -344.628676:-134.708616:-900.000000 -391.078676:-144.708616:-900.000000 +358.601996:-135.005921:-900.000000 +405.051996:-145.005921:-900.000000 PORT I:"5" FIN_BOX @@ -219,14 +215,11 @@ ISEXEC:FALSE -87.393532:-45.289394:-900.000000 -42.043532:-55.289394:-900.000000 FIN_BOX -CONNECTIONS:45 +CONNECTIONS:44 CONNECTION execute:execute:Box01:Execute NumberOfControlPoints:0 CONNECTION -wxVtkBaseView:wxVtkBaseView:Box01:wxvtkbaseview -NumberOfControlPoints:0 -CONNECTION Box01:active:Box02:Active NumberOfControlPoints:0 CONNECTION diff --git a/bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Widget.bbs b/bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Widget.bbs index 4ae5616..caed524 100644 --- a/bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Widget.bbs +++ b/bbtk_creaVtk_PKG/bbs/boxes/VoiMPR-Widget.bbs @@ -111,7 +111,6 @@ connect Box24.Spacing Box02.Spacing # Complex input ports input execute Box01.Execute " " -input wxVtkBaseView Box01.wxvtkbaseview " " input RenderXY Box04.In " " input RenderXZ Box05.In " " input RenderYZ Box06.In " " -- 2.45.1