#2467 BBTK Bug New Normal - TransformWidget - change of transformation order and...

[bbtk.git] / packages / vtk / bbs / boxes / TransformWidget.bbs

diff --git a/packages/vtk/bbs/boxes/TransformWidget.bbs b/packages/vtk/bbs/boxes/TransformWidget.bbs
index 42da296bc095b6b22038f02e86af724d2a1d0738..22ad69461c85fa2b65479440b2ecc3e5f708b22a 100644 (file)
--- 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