From: davila Date: Mon, 20 Oct 2014 13:30:16 +0000 (+0200) Subject: #2467 BBTK Bug New Normal - TransformWidget - change of transformation order and... X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0aa49410fc182f0c3a5cbec359d30ca65a26a180;p=bbtk.git #2467 BBTK Bug New Normal - TransformWidget - change of transformation order and add init values --- diff --git a/packages/vtk/bbs/boxes/TransformWidget.bbg b/packages/vtk/bbs/boxes/TransformWidget.bbg index 6127e6f..6917440 100644 --- a/packages/vtk/bbs/boxes/TransformWidget.bbg +++ b/packages/vtk/bbs/boxes/TransformWidget.bbg @@ -13,7 +13,7 @@ PACKAGENAME:vtk COMPLEXOUTPUTS:3 COMPLEX_PORT Transform --91.972612:-170.022477:-900.000000 +-86.671048:-194.538089:-900.000000 FIN_COMPLEX_PORT COMPLEX_PORT Window @@ -21,25 +21,37 @@ Window FIN_COMPLEX_PORT COMPLEX_PORT BoxChange --190.649216:-158.865916:-900.000000 +-161.933838:-200.282326:-900.000000 FIN_COMPLEX_PORT -COMPLEXINPUTS:1 +COMPLEXINPUTS:4 COMPLEX_PORT TitleWindow 36.138665:171.471207:-900.000000 FIN_COMPLEX_PORT -BOXES:29 +COMPLEX_PORT +translateXYZ +68.651996:254.746226:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +rotateXYZ +441.011999:258.204497:-900.000000 +FIN_COMPLEX_PORT +COMPLEX_PORT +scaleXYZ +248.316029:251.841995:-900.000000 +FIN_COMPLEX_PORT +BOXES:53 BOX wx:LayoutTab:Box00 ISEXEC:FALSE 14.507537:-147.233687:-900.000000 -72.067537:-157.233687:-900.000000 +60.082537:-157.233687:-900.000000 FIN_BOX BOX wx:LayoutLine:Box01 ISEXEC:FALSE -41.534584:-108.537426:-900.000000 -16.025416:-118.537426:-900.000000 +4.040416:-118.537426:-900.000000 PORT WinTitle:"Rotation" FIN_BOX @@ -47,7 +59,7 @@ BOX wx:Slider:Box03 ISEXEC:FALSE -197.665356:146.434686:-900.000000 --146.265356:136.434686:-900.000000 +-158.227070:136.434686:-900.000000 PORT ChangeResolution:"true" PORT @@ -65,7 +77,7 @@ BOX wx:Slider:Box04 ISEXEC:FALSE -153.996282:129.813557:-900.000000 --102.596282:119.813557:-900.000000 +-121.221282:119.813557:-900.000000 PORT ChangeResolution:"true" PORT @@ -83,7 +95,7 @@ BOX wx:Slider:Box05 ISEXEC:FALSE -68.019168:146.959188:-900.000000 --16.619168:136.959188:-900.000000 +-35.244168:136.959188:-900.000000 PORT ChangeResolution:"true" PORT @@ -101,7 +113,7 @@ BOX wx:LayoutLine:Box06 ISEXEC:FALSE 23.720064:-108.213700:-900.000000 -81.280064:-118.213700:-900.000000 +69.295064:-118.213700:-900.000000 PORT WinTitle:"Translate" FIN_BOX @@ -109,7 +121,7 @@ BOX wx:Slider:Box07 ISEXEC:FALSE -11.514057:86.479654:-900.000000 -39.885943:76.479654:-900.000000 +21.260943:76.479654:-900.000000 PORT ChangeResolution:"true" PORT @@ -127,7 +139,7 @@ BOX wx:Slider:Box08 ISEXEC:FALSE 6.385006:71.964258:-900.000000 -57.785006:61.964258:-900.000000 +39.160006:61.964258:-900.000000 PORT ChangeResolution:"true" PORT @@ -163,7 +175,7 @@ BOX wx:LayoutLine:Box10 ISEXEC:FALSE 101.086854:-111.014230:-900.000000 -158.646854:-121.014230:-900.000000 +146.661854:-121.014230:-900.000000 PORT WinTitle:"Scale" FIN_BOX @@ -171,7 +183,7 @@ BOX wx:Slider:Box11 ISEXEC:FALSE 70.956408:111.372736:-900.000000 -122.356408:101.372736:-900.000000 +103.731408:101.372736:-900.000000 PORT ChangeResolution:"true" PORT @@ -191,7 +203,7 @@ BOX wx:Slider:Box12 ISEXEC:FALSE 88.855471:96.857340:-900.000000 -140.255471:86.857340:-900.000000 +121.630471:86.857340:-900.000000 PORT ChangeResolution:"true" PORT @@ -211,7 +223,7 @@ BOX wx:Slider:Box13 ISEXEC:FALSE 102.852794:83.842614:-900.000000 -154.252794:73.842614:-900.000000 +135.627794:73.842614:-900.000000 PORT ChangeResolution:"true" PORT @@ -230,14 +242,14 @@ FIN_BOX BOX vtk:Transform:Box14 ISEXEC:FALSE --142.765044:-108.141609:-900.000000 --97.190044:-118.141609:-900.000000 +-185.285891:-60.198977:-900.000000 +-139.710891:-70.198977:-900.000000 FIN_BOX BOX std:ConcatStrings:Box15 ISEXEC:FALSE --223.525177:80.984845:-900.000000 --177.950177:70.984845:-900.000000 +-224.132618:19.025896:-900.000000 +-178.557618:9.025896:-900.000000 PORT In2:" " PORT @@ -246,8 +258,8 @@ FIN_BOX BOX std:ConcatStrings:Box16 ISEXEC:FALSE --3.619251:-23.648681:-900.000000 -41.955749:-33.648681:-900.000000 +-17.310626:-17.010438:-900.000000 +28.264374:-27.010438:-900.000000 PORT In2:" " PORT @@ -274,18 +286,8 @@ FIN_BOX BOX std:MultipleInputs:Box20 ISEXEC:FALSE --164.607981:-67.717573:-900.000000 --119.032981:-77.717573:-900.000000 -FIN_BOX -BOX -std:ConcatStrings:Box21 -ISEXEC:FALSE -59.120818:-60.175869:-900.000000 -104.695818:-70.175869:-900.000000 -PORT -In2:" " -PORT -In4:" " +-93.740342:-66.389873:-900.000000 +-48.165342:-76.389873:-900.000000 FIN_BOX BOX std:Div:Box22 @@ -314,8 +316,8 @@ FIN_BOX BOX vtk:Transform:Box28 ISEXEC:FALSE --235.026591:62.160050:-900.000000 --189.451591:52.160050:-900.000000 +-148.880458:-89.700120:-900.000000 +-103.305458:-99.700120:-900.000000 FIN_BOX BOX std:ConcatStrings:Box29 @@ -330,8 +332,8 @@ FIN_BOX BOX vtk:Transform:Box30 ISEXEC:FALSE --152.702546:51.609048:-900.000000 --107.127546:41.609048:-900.000000 +-123.434950:-110.743279:-900.000000 +-77.859950:-120.743279:-900.000000 FIN_BOX BOX std:ConcatStrings:Box31 @@ -346,10 +348,200 @@ FIN_BOX BOX vtk:Transform:Box32 ISEXEC:FALSE --116.001331:8.470310:-900.000000 --70.426331:-1.529690:-900.000000 +-101.643642:-136.763234:-900.000000 +-56.068642:-146.763234:-900.000000 +FIN_BOX +BOX +vtk:Transform:Box33 +ISEXEC:FALSE +-57.372385:-165.579870:-900.000000 +-11.797385:-175.579870:-900.000000 +FIN_BOX +BOX +vtk:Transform:Box34 +ISEXEC:FALSE +-227.533440:-90.367558:-900.000000 +-181.958440:-100.367558:-900.000000 +FIN_BOX +BOX +std:Add:Box35 +ISEXEC:FALSE +-36.599414:55.930863:-900.000000 +-3.824414:45.930863:-900.000000 +FIN_BOX +BOX +std:GetVectorDoubleElement:Box36 +ISEXEC:FALSE +-10.046444:206.535990:-900.000000 +61.128556:196.535990:-900.000000 +PORT +ErrorValue:"0" +PORT +I:"0" +FIN_BOX +BOX +std:Add:Box40 +ISEXEC:FALSE +-5.812270:34.856738:-900.000000 +26.962730:24.856738:-900.000000 +FIN_BOX +BOX +std:GetVectorDoubleElement:Box41 +ISEXEC:FALSE +9.953556:190.025656:-900.000000 +81.128556:180.025656:-900.000000 +PORT +ErrorValue:"0" +PORT +I:"1" +FIN_BOX +BOX +std:Add:Box42 +ISEXEC:FALSE +54.017185:38.261131:-900.000000 +86.792185:28.261131:-900.000000 +FIN_BOX +BOX +std:GetVectorDoubleElement:Box43 +ISEXEC:FALSE +89.282849:193.844940:-900.000000 +160.457849:183.844940:-900.000000 +PORT +ErrorValue:"0" +PORT +I:"2" +FIN_BOX +BOX +std:Add:Box44 +ISEXEC:FALSE +27.134598:18.846567:-900.000000 +59.909598:8.846567:-900.000000 +FIN_BOX +BOX +std:ConcatStrings:Box45 +ISEXEC:FALSE +173.209228:-127.700838:-900.000000 +218.784228:-137.700838:-900.000000 +PORT +In2:" " +PORT +In4:" " +FIN_BOX +BOX +std:GetVectorDoubleElement:Box47 +ISEXEC:FALSE +170.930937:214.089285:-900.000000 +242.105937:204.089285:-900.000000 +PORT +ErrorValue:"1" +PORT +I:"0" +FIN_BOX +BOX +std:GetVectorDoubleElement:Box49 +ISEXEC:FALSE +190.930937:197.578952:-900.000000 +262.105937:187.578952:-900.000000 +PORT +ErrorValue:"1" +PORT +I:"1" +FIN_BOX +BOX +std:GetVectorDoubleElement:Box50 +ISEXEC:FALSE +269.883057:204.038445:-900.000000 +341.058057:194.038445:-900.000000 +PORT +ErrorValue:"1" +PORT +I:"2" +FIN_BOX +BOX +std:MagicBox:Box52 +ISEXEC:FALSE +284.940458:225.620937:-900.000000 +330.515458:215.620937:-900.000000 +FIN_BOX +BOX +std:MagicBox:Box53 +ISEXEC:FALSE +68.367796:235.993191:-900.000000 +113.942796:225.993191:-900.000000 +FIN_BOX +BOX +std:Add:Box55 +ISEXEC:FALSE +-246.170786:89.536993:-900.000000 +-210.461013:79.536993:-900.000000 +FIN_BOX +BOX +std:GetVectorDoubleElement:Box56 +ISEXEC:FALSE +352.631646:218.052851:-900.000000 +423.806646:208.052851:-900.000000 +PORT +ErrorValue:"0" +PORT +I:"0" +FIN_BOX +BOX +std:Add:Box57 +ISEXEC:FALSE +-126.518930:100.460189:-900.000000 +-93.743930:90.460189:-900.000000 +FIN_BOX +BOX +std:GetVectorDoubleElement:Box58 +ISEXEC:FALSE +372.631646:201.542518:-900.000000 +443.806646:191.542518:-900.000000 +PORT +ErrorValue:"0" +PORT +I:"1" +FIN_BOX +BOX +std:GetVectorDoubleElement:Box59 +ISEXEC:FALSE +451.960938:205.361801:-900.000000 +523.135938:195.361801:-900.000000 +PORT +ErrorValue:"0" +PORT +I:"2" +FIN_BOX +BOX +std:Add:Box60 +ISEXEC:FALSE +-80.748185:83.318499:-900.000000 +-47.973185:73.318499:-900.000000 +FIN_BOX +BOX +std:MagicBox:Box61 +ISEXEC:FALSE +466.641166:229.584503:-900.000000 +512.216166:219.584503:-900.000000 +FIN_BOX +BOX +std:Mul:Box62 +ISEXEC:FALSE +153.861143:-55.638859:-900.000000 +186.636143:-65.638859:-900.000000 FIN_BOX -CONNECTIONS:49 +BOX +std:Mul:Box63 +ISEXEC:FALSE +173.106797:-83.539814:-900.000000 +205.881797:-93.539814:-900.000000 +FIN_BOX +BOX +std:Mul:Box64 +ISEXEC:FALSE +198.010045:-103.520138:-900.000000 +230.785045:-113.520138:-900.000000 +FIN_BOX +CONNECTIONS:80 CONNECTION Box01:Widget:Box00:Widget1 NumberOfControlPoints:0 @@ -390,15 +582,6 @@ CONNECTION Box16:Out:Box14:Translate NumberOfControlPoints:0 CONNECTION -Box07:Out:Box16:In1 -NumberOfControlPoints:0 -CONNECTION -Box08:Out:Box16:In3 -NumberOfControlPoints:0 -CONNECTION -Box09:Out:Box16:In5 -NumberOfControlPoints:0 -CONNECTION Box03:BoxChange:Box17:In1 NumberOfControlPoints:0 CONNECTION @@ -435,66 +618,168 @@ CONNECTION Box19:BoxChange:Box20:In3 NumberOfControlPoints:0 CONNECTION -Box20:BoxChange:Box14:BoxExecute +Box00:Widget:Window:Window NumberOfControlPoints:0 CONNECTION -Box14:Out:Transform:Transform +Box11:Out:Box22:In1 NumberOfControlPoints:0 CONNECTION -Box00:Widget:Window:Window +Box12:Out:Box23:In1 NumberOfControlPoints:0 CONNECTION -Box11:Out:Box22:In1 +Box13:Out:Box24:In1 NumberOfControlPoints:0 CONNECTION -Box22:Out:Box21:In1 +Box15:Out:Box28:RotateWXYZ NumberOfControlPoints:0 CONNECTION -Box12:Out:Box23:In1 +Box29:Out:Box30:RotateWXYZ NumberOfControlPoints:0 CONNECTION -Box13:Out:Box24:In1 +Box31:Out:Box32:RotateWXYZ NumberOfControlPoints:0 CONNECTION -Box23:Out:Box21:In3 +Box28:Out:Box30:In NumberOfControlPoints:0 CONNECTION -Box24:Out:Box21:In5 +Box30:Out:Box32:In NumberOfControlPoints:0 CONNECTION -Box21:Out:Box14:Scale +TitleWindow:TitleWindow:Box00:WinTitle NumberOfControlPoints:0 CONNECTION -Box14:BoxChange:BoxChange:BoxChange +Box14:Out:Box28:In NumberOfControlPoints:0 CONNECTION -Box03:Out:Box15:In1 +Box20:BoxChange:Box33:BoxExecute NumberOfControlPoints:0 CONNECTION -Box15:Out:Box28:RotateWXYZ +Box32:Out:Box33:In NumberOfControlPoints:0 CONNECTION -Box29:Out:Box30:RotateWXYZ +Box33:Out:Transform:Transform NumberOfControlPoints:0 CONNECTION -Box04:Out:Box29:In1 +Box33:BoxChange:BoxChange:BoxChange NumberOfControlPoints:0 CONNECTION -Box31:Out:Box32:RotateWXYZ +Box36:Out:Box35:In2 NumberOfControlPoints:0 CONNECTION -Box05:Out:Box31:In1 +Box07:Out:Box35:In1 NumberOfControlPoints:0 CONNECTION -Box28:Out:Box30:In +Box35:Out:Box16:In1 NumberOfControlPoints:0 CONNECTION -Box30:Out:Box32:In +Box41:Out:Box40:In2 NumberOfControlPoints:0 CONNECTION -Box32:Out:Box14:In +Box08:Out:Box40:In1 NumberOfControlPoints:0 CONNECTION -TitleWindow:TitleWindow:Box00:WinTitle +Box40:Out:Box16:In3 +NumberOfControlPoints:0 +CONNECTION +Box43:Out:Box44:In2 +NumberOfControlPoints:0 +CONNECTION +Box09:Out:Box44:In1 +NumberOfControlPoints:0 +CONNECTION +Box44:Out:Box16:In5 +NumberOfControlPoints:0 +CONNECTION +Box45:Out:Box33:Scale +NumberOfControlPoints:0 +CONNECTION +scaleXYZ:scaleXYZ:Box52:In +NumberOfControlPoints:0 +CONNECTION +Box52:Out:Box50:In +NumberOfControlPoints:0 +CONNECTION +Box52:Out:Box47:In +NumberOfControlPoints:0 +CONNECTION +Box52:Out:Box49:In +NumberOfControlPoints:0 +CONNECTION +Box53:Out:Box43:In +NumberOfControlPoints:0 +CONNECTION +Box53:Out:Box36:In +NumberOfControlPoints:0 +CONNECTION +Box53:Out:Box41:In +NumberOfControlPoints:0 +CONNECTION +translateXYZ:translateXYZ:Box53:In +NumberOfControlPoints:0 +CONNECTION +Box56:Out:Box55:In2 +NumberOfControlPoints:0 +CONNECTION +Box58:Out:Box57:In2 +NumberOfControlPoints:0 +CONNECTION +Box59:Out:Box60:In2 +NumberOfControlPoints:0 +CONNECTION +Box61:Out:Box59:In +NumberOfControlPoints:0 +CONNECTION +Box61:Out:Box56:In +NumberOfControlPoints:0 +CONNECTION +Box61:Out:Box58:In +NumberOfControlPoints:0 +CONNECTION +rotateXYZ:rotateXYZ:Box61:In +NumberOfControlPoints:0 +CONNECTION +Box03:Out:Box55:In1 +NumberOfControlPoints:0 +CONNECTION +Box55:Out:Box15:In1 +NumberOfControlPoints:0 +CONNECTION +Box04:Out:Box57:In1 +NumberOfControlPoints:0 +CONNECTION +Box57:Out:Box29:In1 +NumberOfControlPoints:0 +CONNECTION +Box05:Out:Box60:In1 +NumberOfControlPoints:0 +CONNECTION +Box60:Out:Box31:In1 +NumberOfControlPoints:0 +CONNECTION +Box22:Out:Box62:In1 +NumberOfControlPoints:0 +CONNECTION +Box23:Out:Box63:In1 +NumberOfControlPoints:0 +CONNECTION +Box24:Out:Box64:In1 +NumberOfControlPoints:0 +CONNECTION +Box62:Out:Box45:In1 +NumberOfControlPoints:0 +CONNECTION +Box63:Out:Box45:In3 +NumberOfControlPoints:0 +CONNECTION +Box64:Out:Box45:In5 +NumberOfControlPoints:0 +CONNECTION +Box47:Out:Box62:In2 +NumberOfControlPoints:0 +CONNECTION +Box49:Out:Box63:In2 +NumberOfControlPoints:0 +CONNECTION +Box50:Out:Box64:In2 NumberOfControlPoints:0 APP_END diff --git a/packages/vtk/bbs/boxes/TransformWidget.bbs b/packages/vtk/bbs/boxes/TransformWidget.bbs index 42da296..22ad694 100644 --- a/packages/vtk/bbs/boxes/TransformWidget.bbs +++ b/packages/vtk/bbs/boxes/TransformWidget.bbs @@ -120,10 +120,6 @@ new MultipleInputs Box19 new MultipleInputs Box20 -new ConcatStrings Box21 - set Box21.In2 " " - set Box21.In4 " " - new Div Box22 set Box22.In2 "100" @@ -147,6 +143,76 @@ new ConcatStrings Box31 new Transform Box32 +new Transform Box33 + +new Transform Box34 + +new Add Box35 + +new GetVectorDoubleElement Box36 + set Box36.ErrorValue "0" + set Box36.I "0" + +new Add Box40 + +new GetVectorDoubleElement Box41 + set Box41.ErrorValue "0" + set Box41.I "1" + +new Add Box42 + +new GetVectorDoubleElement Box43 + set Box43.ErrorValue "0" + set Box43.I "2" + +new Add Box44 + +new ConcatStrings Box45 + set Box45.In2 " " + set Box45.In4 " " + +new GetVectorDoubleElement Box47 + set Box47.ErrorValue "1" + set Box47.I "0" + +new GetVectorDoubleElement Box49 + set Box49.ErrorValue "1" + set Box49.I "1" + +new GetVectorDoubleElement Box50 + set Box50.ErrorValue "1" + set Box50.I "2" + +new MagicBox Box52 + +new MagicBox Box53 + +new Add Box55 + +new GetVectorDoubleElement Box56 + set Box56.ErrorValue "0" + set Box56.I "0" + +new Add Box57 + +new GetVectorDoubleElement Box58 + set Box58.ErrorValue "0" + set Box58.I "1" + +new GetVectorDoubleElement Box59 + set Box59.ErrorValue "0" + set Box59.I "2" + +new Add Box60 + +new MagicBox Box61 + +new Mul Box62 + +new Mul Box63 + +new Mul Box64 + connect Box01.Widget Box00.Widget1 connect Box05.Widget Box01.Widget3 @@ -161,9 +227,6 @@ connect Box11.Widget Box10.Widget1 connect Box06.Widget Box00.Widget2 connect Box10.Widget Box00.Widget3 connect Box16.Out Box14.Translate -connect Box07.Out Box16.In1 -connect Box08.Out Box16.In3 -connect Box09.Out Box16.In5 connect Box03.BoxChange Box17.In1 connect Box04.BoxChange Box17.In2 connect Box05.BoxChange Box17.In3 @@ -176,31 +239,65 @@ connect Box13.BoxChange Box19.In3 connect Box17.BoxChange Box20.In1 connect Box18.BoxChange Box20.In2 connect Box19.BoxChange Box20.In3 -connect Box20.BoxChange Box14.BoxExecute connect Box11.Out Box22.In1 -connect Box22.Out Box21.In1 connect Box12.Out Box23.In1 connect Box13.Out Box24.In1 -connect Box23.Out Box21.In3 -connect Box24.Out Box21.In5 -connect Box21.Out Box14.Scale -connect Box03.Out Box15.In1 connect Box15.Out Box28.RotateWXYZ connect Box29.Out Box30.RotateWXYZ -connect Box04.Out Box29.In1 connect Box31.Out Box32.RotateWXYZ -connect Box05.Out Box31.In1 connect Box28.Out Box30.In connect Box30.Out Box32.In -connect Box32.Out Box14.In +connect Box14.Out Box28.In +connect Box20.BoxChange Box33.BoxExecute +connect Box32.Out Box33.In +connect Box36.Out Box35.In2 +connect Box07.Out Box35.In1 +connect Box35.Out Box16.In1 +connect Box41.Out Box40.In2 +connect Box08.Out Box40.In1 +connect Box40.Out Box16.In3 +connect Box43.Out Box44.In2 +connect Box09.Out Box44.In1 +connect Box44.Out Box16.In5 +connect Box45.Out Box33.Scale +connect Box52.Out Box50.In +connect Box52.Out Box47.In +connect Box52.Out Box49.In +connect Box53.Out Box43.In +connect Box53.Out Box36.In +connect Box53.Out Box41.In +connect Box56.Out Box55.In2 +connect Box58.Out Box57.In2 +connect Box59.Out Box60.In2 +connect Box61.Out Box59.In +connect Box61.Out Box56.In +connect Box61.Out Box58.In +connect Box03.Out Box55.In1 +connect Box55.Out Box15.In1 +connect Box04.Out Box57.In1 +connect Box57.Out Box29.In1 +connect Box05.Out Box60.In1 +connect Box60.Out Box31.In1 +connect Box22.Out Box62.In1 +connect Box23.Out Box63.In1 +connect Box24.Out Box64.In1 +connect Box62.Out Box45.In1 +connect Box63.Out Box45.In3 +connect Box64.Out Box45.In5 +connect Box47.Out Box62.In2 +connect Box49.Out Box63.In2 +connect Box50.Out Box64.In2 # Complex input ports input TitleWindow Box00.WinTitle " " +input scaleXYZ Box52.In " " +input translateXYZ Box53.In " " +input rotateXYZ Box61.In " " # Complex output ports -output Transform Box14.Out " " output Window Box00.Widget " " -output BoxChange Box14.BoxChange " " +output Transform Box33.Out " " +output BoxChange Box33.BoxChange " " message