- Normalize scripts

- Show that Sizer Orientation doesn't work the right way

diff --git a/packages/wx/bbs/appli/testSizerInSizer.bbs b/packages/wx/bbs/appli/testSizerInSizer.bbs
index 3a3eed7d175f1a946d5cd1db8d524ba81ab60999..e158b046df297c1013af6e908246b7172b2ca4c4 100644 (file)
--- a/packages/wx/bbs/appli/testSizerInSizer.bbs
+++ b/packages/wx/bbs/appli/testSizerInSizer.bbs
@@ -1,77 +1,91 @@
-description "Simple test of  wx::Sizer widgets"
+description "Simple test of wx::Sizer widgets"
 author "jean-pierre.roux@creatis.univ-lyon1.fr"
 category "test"
 
 load std
 load wx
 
+
+#----- I N T E R F A C E  -------------------------------------
+
+
 new Sizer main
-#set main.Orientation 1
+ set main.Orientation H
 
 new Sizer up
 set up.Orientation 0
 
 new Sizer down
-set down.Orientation 1
+  set down.Orientation 1
+  new Slider sDown
+      set sDown.Title "sDown"
+  connect sDown.Widget   down.Widget1
+  new RadioButton rb
+    set rb.Title "Rad But"
+    set rb.In0 "Choix 1"
+    set rb.In1 "Choix 2"
+    set rb.In2 "Choix 3"
+    set rb.In3 "Choix 4"
+    set rb.In 1
+   connect rb.Widget down.Widget2
 
-new Sizer upRight
-set upRight.Orientation 0
-
-new Sizer upLeft
 
 connect up.Widget   main.Widget1
 connect down.Widget main.Widget2
 
-connect upLeft.Widget  up.Widget1
-connect upRight.Widget up.Widget2
-
-# -- todo : add it, again later
-# --        (when RadioButton exists again)
-
-new RadioButton rb
-set rb.Title "Rad But"
-set rb.In0 "Choix 1"
-set rb.In1 "Choix 2"
-set rb.In2 "Choix 3"
-set rb.In3 "Choix 4"
-set rb.In 1
-
-
-new Slider sUpLeft
-new Slider sDown
-
-new Slider s1
-set s1.Orientation 1
-set s1.Title "s1"
-new Slider s2
-set s2.Orientation 1
-set s2.Title "s2"
-new Slider s3
-set s3.Orientation 1
-set s3.Title "s3"
-new Slider s4
-set s4.Orientation 1
-set s4.Title "s4"
-
-connect s1.Widget upRight.Widget1 
-connect s2.Widget upRight.Widget2 
-connect s3.Widget upRight.Widget3 
-connect s4.Widget upRight.Widget4 
-
-connect sUpLeft.Widget upLeft.Widget1
-connect rb.Widget      down.Widget2
-connect sDown.Widget   down.Widget1
-
-#graph
+
+  new Sizer upLeft
+    #set upLeft.Proportion 80
+    new Slider sUpLeft1
+      set sUpLeft1.Title "sUpLeft1"
+    connect sUpLeft1.Widget upLeft.Widget1
+    new Slider sUpLeft2
+      set sUpLeft2.Title "sUpLeft2"
+    connect sUpLeft2.Widget upLeft.Widget2
+  connect upLeft.Widget up.Widget1
+
+
+  new Sizer upRight
+    set upRight.Orientation 0
+    new Slider s1
+    set s1.Orientation 1
+    set s1.Title "s1"
+    new Slider s2
+    set s2.Orientation 1
+    set s2.Title "s2"
+    new Slider s3
+    set s3.Orientation 1
+    set s3.Title "s3"
+    new Slider s4
+    set s4.Orientation 1
+    set s4.Title "s4"
+    connect s1.Widget upRight.Widget1 
+    connect s2.Widget upRight.Widget2 
+    connect s3.Widget upRight.Widget3 
+    connect s4.Widget upRight.Widget4 
+  connect upRight.Widget up.Widget2
+
+#------p i p e l i n e---------------------------------------
+#...
+#------------------------------------------------------------
+
+
+//graph
 #set main.WinDialog 1
 exec main
 
+
 set s1.BoxProcessMode 1
 
-print rb=$rb.Out$\n
+
+//print rb=$rb.Out$\n
+
+/*
 print s1=$s1.Out$\n
 print s2=$s2.Out$\n
 print s3=$s3.Out$\n
 print s4=$s4.Out$\n
 print sUpLeft=$sUpLeft.Out$\n
 print sDown=$sDown.Out$\n
+*/
+

diff --git a/packages/wx/bbs/appli/testSizerOrientation.bbs b/packages/wx/bbs/appli/testSizerOrientation.bbs
new file mode 100644 (file)
index 0000000..2eb0a1e
--- /dev/null
+++ b/packages/wx/bbs/appli/testSizerOrientation.bbs
@@ -0,0 +1,31 @@
+description "Simple test of wx::Sizer widgets"
+author "jean-pierre.roux@creatis.univ-lyon1.fr"
+category "test"
+
+load std
+load wx
+
+
+new Sizer main
+ set main.Orientation H
+new Sizer Sizer2
+
+new Slider s1
+   set s1.Title "SliderUp"
+new Slider s2
+   set s2.Title "SliderDownLeft"
+new Slider s3
+   set s3.Title "SliderDownRight"
+
+connect s1.Widget     main.Widget1 
+connect Sizer2.Widget main.Widget2 
+
+set Sizer2.Orientation V
+connect s2.Widget Sizer2.Widget1 
+connect s3.Widget Sizer2.Widget2
+
+print s1=$s1.Out$\n
+print s2=$s2.Out$\n
+print s3=$s3.Out$\n
+
+exec main

diff --git a/packages/wx/bbs/appli/testSplitInSplit.bbs b/packages/wx/bbs/appli/testSplitInSplit.bbs
index b9575e141c15588f86c3cb94a7d96848439f0eba..5485f3ebbc0c5fc6fb5da032acd8d2fd81f4333b 100644 (file)
--- a/packages/wx/bbs/appli/testSplitInSplit.bbs
+++ b/packages/wx/bbs/appli/testSplitInSplit.bbs
@@ -1,4 +1,4 @@
-description "Simple test of wx::Sizer widgets"
+description "Simple test of wx::Split widgets"
 author "jean-pierre.roux@creatis.univ-lyon1.fr"
 category "test"
 
@@ -10,17 +10,18 @@ load wx
 
 
 new Split main
- set main.Orientation H
+ set main.Orientation V
 
-new Sizer up
-set up.Orientation 0
+new Split up
+set up.Orientation H
 
-new Sizer down
-  set down.Orientation 1
+new Split down
+  set down.Orientation V
   new Slider sDown
+      set sDown.Title "sDown"
   connect sDown.Widget   down.Widget1
   new RadioButton rb
-    set rb.Title "Rad But"
+    set rb.Title "Rad But Down"
     set rb.In0 "Choix 1"
     set rb.In1 "Choix 2"
     set rb.In2 "Choix 3"
@@ -34,27 +35,29 @@ connect down.Widget main.Widget2
 
 
   new Split upLeft
-    #set upLeft.Proportion 80
-    new Slider eed
-    connect eed.Widget upLeft.Widget1
-    new Slider sUpLeft
-    connect sUpLeft.Widget upLeft.Widget2
+    set upLeft.Proportion 80
+    new Slider sUpLeft1
+      set sUpLeft1.Title "sUpLeft1"
+    connect sUpLeft1.Widget upLeft.Widget1
+    new Slider sUpLeft2
+      set sUpLeft2.Title "sUpLeft2"
+    connect sUpLeft2.Widget upLeft.Widget2
   connect upLeft.Widget up.Widget1
 
 
   new Sizer upRight
-    set upRight.Orientation 0
+    set upRight.Orientation H
     new Slider s1
-    set s1.Orientation 1
+    set s1.Orientation V
     set s1.Title "s1"
     new Slider s2
-    set s2.Orientation 1
+    set s2.Orientation V
     set s2.Title "s2"
     new Slider s3
-    set s3.Orientation 1
+    set s3.Orientation V
     set s3.Title "s3"
     new Slider s4
-    set s4.Orientation 1
+    set s4.Orientation V
     set s4.Title "s4"
     connect s1.Widget upRight.Widget1 
     connect s2.Widget upRight.Widget2 
@@ -67,18 +70,22 @@ connect down.Widget main.Widget2
 #------------------------------------------------------------
 
 
-graph
+//graph
 #set main.WinDialog 1
 exec main
 
+
 set s1.BoxProcessMode 1
 
-print rb=$rb.Out$\n
+
+//print rb=$rb.Out$\n
+
+/*
 print s1=$s1.Out$\n
 print s2=$s2.Out$\n
 print s3=$s3.Out$\n
 print s4=$s4.Out$\n
 print sUpLeft=$sUpLeft.Out$\n
 print sDown=$sDown.Out$\n
-
+*/
 

diff --git a/packages/wx/bbs/appli/testSplitOrientation.bbs b/packages/wx/bbs/appli/testSplitOrientation.bbs
index 1956c64fd46c34643abe4f8f0b05f118f62789d3..ca0c491407c7df5c0c197950b45de9efa8e0dbdf 100644 (file)
--- a/packages/wx/bbs/appli/testSplitOrientation.bbs
+++ b/packages/wx/bbs/appli/testSplitOrientation.bbs
@@ -5,26 +5,26 @@ category "test"
 load std
 load wx
 
+new Split main
+ set main.Orientation H
+new Split split2
+
 new Slider s1
+   set s1.Title "SliderUp"
 new Slider s2
+   set s2.Title "SliderDownLeft"
 new Slider s3
+   set s3.Title "SliderDownRight"
 
-new Split split1
-new Split split2
-
-connect s1.Widget     split1.Widget1 
-connect split2.Widget split1.Widget2 
+connect s1.Widget     main.Widget1 
+connect split2.Widget main.Widget2 
 
-set split2.Orientation 1
+set split2.Orientation V
 connect s2.Widget split2.Widget1 
 connect s3.Widget split2.Widget2
 
-#set s1.BoxProcessMode 2
-#set s2.BoxProcessMode 2
-
-#set split1.WinDialog true
-
 print s1=$s1.Out$\n
 print s2=$s2.Out$\n
 print s3=$s3.Out$\n
 
+exec main