@@ -31,23 +31,64 @@ public class ControlFrame extends PApplet {
3131 background (0 );
3232 List l = java.util. Arrays . asList(photoSets);
3333 cp5 = new ControlP5 (this );
34-
35- cp5 . addBang( " reload " )
36- .setLabel( " REload " ) . setPosition( 20 , 60 ) . setSize( 40 , 20 ) ;
37-
34+
35+ int y = 0 ;
36+ y += 20 ;
37+
3838 cp5. addToggle(" PLAY" )
3939 .plugTo(parent, " play" )
40- .setPosition(20 , 20 ). setSize(w- 40 , 20 );
40+ .setPosition(20 , y). setSize(w/ 2 - 25 , 20 );
41+
42+ cp5. addBang(" reload" )
43+ .setLabel(" REload" ). setPosition(w/ 2 , y). setSize(w/ 2 - 25 , 20 );
44+
45+
46+ y+= 50 ;
4147
48+ cp5. addToggle(" PauseFlip" )
49+ .plugTo(parent, " pauseFlip" )
50+ .setLabel(" No Flip" )
51+ .setPosition(20 , y). setSize(40 , 20 );
52+ cp5. addBang(" nextImage" )
53+ .setLabel(" next image" )
54+ .setPosition(w/ 2 , y)
55+ .setSize(w/ 2 - 25 , 20 );
56+
57+
58+
59+ y+= 50 ;
60+
4261 cp5. addToggle(" Wrap" )
4362 .plugTo(parent, " wrap" )
4463 .setState(true )
45- .setPosition(w/ 2 , 60 ). setSize(40 , 20 );
64+ .setPosition(w/ 2 , y). setSize(w/ 3 , 20 );
65+ cp5. addToggle(" Sort Flip" )
66+ .plugTo(parent, " logic" )
67+ .setPosition(20 , y). setSize(w/ 3 , 20 )
68+ .setMode(ControlP5 . SWITCH );
69+
70+
71+
72+ y+= 60 ;
73+ text (" Mode" , 20 , y);
74+ y+= 10 ;
75+ cp5. addRadioButton(" changeMode" )
76+ .setPosition(20 , y). setSize(30 , 20 )
77+ .setColorLabel(color (255 ))
78+ .setItemsPerRow(3 )
79+ .setSpacingColumn(30 )
4680
47- text (" Sort Matrix" , 20 , 120 );
81+ .addItem(" A" , 0 ). addItem(" B" , 1 ). addItem(" C" , 2 )
82+ .addItem(" D" , 3 ). addItem(" E" , 4 ). addItem(" F" , 5 )
83+ .activate(2 )
84+ ;
85+ y+= 60 ;
86+
87+ text (" Sort Matrix" , 20 , y);
88+ y+= 10 ;
4889 cp5. addCheckBox(" sortMatrix" )
4990 .setLabel(" mode" )
50- .setPosition(20 , 130 ). setSize(40 , 20 )
91+ .setPosition(20 , y ). setSize(40 , 20 )
5192 .setColorLabel(color (255 ))
5293 .setItemsPerRow(3 )
5394 .setSpacingColumn(10 )
@@ -56,66 +97,44 @@ public class ControlFrame extends PApplet {
5697 .addItem(" 4" , 0 ). addItem(" 5" , 0 ). addItem(" 6" , 0 )
5798 .addItem(" 7" , 0 ). addItem(" 8" , 0 ). addItem(" 9" , 0 )
5899 ;
59-
60- text (" Mode" , 20 , 220 );
61- cp5. addRadioButton(" changeMode" )
62- .setPosition(20 , 230 ). setSize(15 , 15 )
63- .setColorLabel(color (255 ))
64- .setItemsPerRow(6 )
65- .setSpacingColumn(15 )
66-
67- .addItem(" A" , 0 ). addItem(" B" , 1 ). addItem(" C" , 2 )
68- .addItem(" D" , 3 ). addItem(" E" , 4 ). addItem(" F" , 5 )
69- .activate(2 )
70- ;
71-
100+ y+= 90 ;
101+
72102 cp5. addRange(" range" )
73103 .setBroadcast(false )
74- .setPosition(20 , 270 )
104+ .setPosition(20 , y )
75105 .setSize(w- 60 , 20 )
76106 .setHandleSize(10 )
77107 .setRange(0 , 255 )
78- .setRangeValues(50 , 100 )
108+ .setRangeValues(20 , 150 )
79109 .setBroadcast(true )
80110 ;
81-
82- cp5. addToggle(" Sort Flip" )
83- .plugTo(parent, " logic" )
84- .setPosition(20 , 300 ). setSize(60 , 20 )
85- .setMode(ControlP5 . SWITCH );
86-
111+
112+
113+ y+= 50 ;
87114 cp5. addSlider(" FRate" )
88115 .plugTo(parent, " frameRate" )
89116 .setRange(0.5 , 40 )
90117 .setValue(25 )
91- .setPosition(20 , 360 )
118+ .setPosition(20 , y )
92119 .setSize(w- 60 , 20 )
93120 ;
94121
95- cp5. addBang(" nextImage" )
96- .setLabel(" next image" )
97- .setPosition(w/ 2 , 410 )
98- .setSize(w/ 3 , 20 );
99-
100- cp5. addToggle(" PauseFlip" )
101- .plugTo(parent, " pauseFlip" )
102- .setLabel(" No Flip" )
103- .setPosition(20 , 410 ). setSize(w/ 3 , 20 );
104-
105-
122+ y+= 30 ;
106123 cp5. addSlider(" flipTime" )
107124 .plugTo(parent, " flipSpeed" )
108125 .setRange(2 , 200 )
109126 .setValue(30 )
110- .setPosition(20 , 460 )
111- .setSize(w- 100 , 20 )
112- ;
113-
127+ .setPosition(20 , y)
128+ .setSize(w/ 2 , 20 )
129+ ;
130+
131+
114132
133+ y+= 60 ;
115134 Group g3 = cp5. addGroup(" g3" )
116135 .setLabel(" Albums" )
117- .setPosition(20 , 520 )
118- .setSize(160 , 100 )
136+ .setPosition(20 , y )
137+ .setSize(w - 40 , 100 )
119138 .setBackgroundColor(color (50 ))
120139 ;
121140
0 commit comments