Download as
Browse Code »

Commit 9765ba5a8700864bc0e8012832d385392b9697e6

Authored by Carlos Picanco
1 parent 30142fec
Exists in master

runner: add feedback for point type on load experiment

Showing 2 changed files with 106 additions and 105 deletions   Show diff stats
experiment_runner/form_matrixgame.lfm
  Diff comments   View file @9765ba5
1 1 object FormMatrixGame: TFormMatrixGame
2   - Left = 54
3   - Height = 626
4   - Top = 66
5   - Width = 1167
6   - HorzScrollBar.Page = 1167
  2 + Left = 57
  3 + Height = 608
  4 + Top = 65
  5 + Width = 1149
  6 + HorzScrollBar.Page = 1149
7 7 VertScrollBar.Page = 542
8 8 AutoScroll = True
9 9 Caption = 'Matrix'
10   - ClientHeight = 616
11   - ClientWidth = 1167
  10 + ClientHeight = 591
  11 + ClientWidth = 1149
12 12 Font.Name = 'Monospace'
13 13 OnActivate = FormActivate
14 14 LCLVersion = '1.6.2.0'
... ... @@ -16,24 +16,23 @@ object FormMatrixGame: TFormMatrixGame
16 16 AnchorSideLeft.Control = GBIndividualAB
17 17 AnchorSideTop.Control = GBIndividualAB
18 18 Left = 800
19   - Height = 122
  19 + Height = 131
20 20 Top = 8
21   - Width = 170
  21 + Width = 162
22 22 AutoSize = True
23 23 Caption = 'Pontuação Individual'
24 24 ChildSizing.LeftRightSpacing = 35
25 25 ChildSizing.TopBottomSpacing = 45
26 26 ChildSizing.Layout = cclLeftToRightThenTopToBottom
27 27 ChildSizing.ControlsPerLine = 1
28   - ClientHeight = 105
29   - ClientWidth = 166
  28 + ClientHeight = 108
  29 + ClientWidth = 158
30 30 TabOrder = 7
31   - Visible = False
32 31 object LabelIndCount: TLabel
33 32 Left = 35
34   - Height = 15
  33 + Height = 18
35 34 Top = 45
36   - Width = 96
  35 + Width = 88
37 36 Align = alClient
38 37 Alignment = taCenter
39 38 AutoSize = False
... ... @@ -71,9 +70,9 @@ object FormMatrixGame: TFormMatrixGame
71 70 end
72 71 object GBIndividualAB: TGroupBox
73 72 Left = 800
74   - Height = 122
  73 + Height = 135
75 74 Top = 8
76   - Width = 170
  75 + Width = 162
77 76 AutoSize = True
78 77 Caption = 'Pontuação Individual'
79 78 ChildSizing.LeftRightSpacing = 10
... ... @@ -83,14 +82,14 @@ object FormMatrixGame: TFormMatrixGame
83 82 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
84 83 ChildSizing.Layout = cclLeftToRightThenTopToBottom
85 84 ChildSizing.ControlsPerLine = 2
86   - ClientHeight = 105
87   - ClientWidth = 166
  85 + ClientHeight = 112
  86 + ClientWidth = 158
88 87 TabOrder = 1
89 88 object LabelIndA: TLabel
90 89 Left = 10
91   - Height = 15
  90 + Height = 19
92 91 Top = 30
93   - Width = 63
  92 + Width = 59
94 93 Alignment = taCenter
95 94 AutoSize = False
96 95 Caption = 'A'
... ... @@ -103,10 +102,10 @@ object FormMatrixGame: TFormMatrixGame
103 102 Transparent = False
104 103 end
105 104 object LabelIndB: TLabel
106   - Left = 93
107   - Height = 15
  105 + Left = 89
  106 + Height = 19
108 107 Top = 30
109   - Width = 63
  108 + Width = 59
110 109 Alignment = taCenter
111 110 AutoSize = False
112 111 Caption = 'B'
... ... @@ -120,9 +119,9 @@ object FormMatrixGame: TFormMatrixGame
120 119 end
121 120 object LabelIndACount: TLabel
122 121 Left = 10
123   - Height = 15
124   - Top = 60
125   - Width = 63
  122 + Height = 18
  123 + Top = 64
  124 + Width = 59
126 125 Alignment = taCenter
127 126 AutoSize = False
128 127 Caption = '0'
... ... @@ -131,10 +130,10 @@ object FormMatrixGame: TFormMatrixGame
131 130 Transparent = False
132 131 end
133 132 object LabelIndBCount: TLabel
134   - Left = 93
135   - Height = 15
136   - Top = 60
137   - Width = 63
  133 + Left = 89
  134 + Height = 18
  135 + Top = 64
  136 + Width = 59
138 137 Alignment = taCenter
139 138 AutoSize = False
140 139 Caption = '0'
... ... @@ -144,28 +143,29 @@ object FormMatrixGame: TFormMatrixGame
144 143 end
145 144 end
146 145 object GBGrupo: TGroupBox
147   - AnchorSideLeft.Control = GBIndividualAB
  146 + AnchorSideLeft.Control = StringGridMatrix
148 147 AnchorSideLeft.Side = asrBottom
149   - AnchorSideTop.Control = GBIndividualAB
150   - Left = 980
151   - Height = 122
  148 + AnchorSideTop.Control = StringGridMatrix
  149 + Left = 969
  150 + Height = 131
152 151 Top = 8
153   - Width = 170
  152 + Width = 171
154 153 AutoSize = True
155   - BorderSpacing.Left = 10
  154 + BorderSpacing.Left = 260
  155 + BorderSpacing.Top = 8
156 156 Caption = ' Pontuação do Grupo '
157 157 ChildSizing.LeftRightSpacing = 35
158 158 ChildSizing.TopBottomSpacing = 45
159 159 ChildSizing.Layout = cclLeftToRightThenTopToBottom
160 160 ChildSizing.ControlsPerLine = 1
161   - ClientHeight = 105
162   - ClientWidth = 166
  161 + ClientHeight = 108
  162 + ClientWidth = 167
163 163 TabOrder = 2
164 164 object LabelGroupCount: TLabel
165 165 Left = 35
166   - Height = 15
  166 + Height = 18
167 167 Top = 45
168   - Width = 96
  168 + Width = 97
169 169 Align = alClient
170 170 Alignment = taCenter
171 171 AutoSize = False
... ... @@ -183,9 +183,9 @@ object FormMatrixGame: TFormMatrixGame
183 183 AnchorSideBottom.Control = Owner
184 184 AnchorSideBottom.Side = asrBottom
185 185 Left = 0
186   - Height = 17
187   - Top = 599
188   - Width = 1632
  186 + Height = 22
  187 + Top = 569
  188 + Width = 1622
189 189 Anchors = [akLeft, akRight, akBottom]
190 190 AutoSize = True
191 191 Caption = 'Escolhas na última jogada'
... ... @@ -200,21 +200,21 @@ object FormMatrixGame: TFormMatrixGame
200 200 AnchorSideLeft.Control = GBGrupo
201 201 AnchorSideLeft.Side = asrBottom
202 202 AnchorSideTop.Control = GBGrupo
203   - Left = 1160
  203 + Left = 1150
204 204 Height = 486
205 205 Top = 8
206 206 Width = 472
207 207 BorderSpacing.Left = 10
208 208 Caption = 'Pesquisador'
209   - ClientHeight = 469
  209 + ClientHeight = 463
210 210 ClientWidth = 468
211 211 TabOrder = 4
212 212 Visible = False
213 213 object GBExperiment: TGroupBox
214 214 Left = 16
215   - Height = 197
  215 + Height = 221
216 216 Top = 60
217   - Width = 228
  217 + Width = 220
218 218 AutoSize = True
219 219 Caption = 'Experimento'
220 220 ChildSizing.LeftRightSpacing = 10
... ... @@ -224,102 +224,102 @@ object FormMatrixGame: TFormMatrixGame
224 224 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
225 225 ChildSizing.Layout = cclLeftToRightThenTopToBottom
226 226 ChildSizing.ControlsPerLine = 2
227   - ClientHeight = 180
228   - ClientWidth = 224
  227 + ClientHeight = 198
  228 + ClientWidth = 216
229 229 TabOrder = 0
230 230 object LabelExpCond: TLabel
231 231 Left = 10
232   - Height = 15
  232 + Height = 18
233 233 Top = 20
234   - Width = 168
  234 + Width = 154
235 235 Caption = 'Condição:'
236 236 ParentColor = False
237 237 end
238 238 object LabelExpCountCondition: TLabel
239   - Left = 198
240   - Height = 15
  239 + Left = 184
  240 + Height = 18
241 241 Top = 20
242   - Width = 16
  242 + Width = 22
243 243 Caption = 'NA'
244 244 ParentColor = False
245 245 end
246 246 object LabelExpGen: TLabel
247 247 Left = 10
248   - Height = 15
249   - Top = 45
250   - Width = 168
  248 + Height = 18
  249 + Top = 48
  250 + Width = 154
251 251 Caption = 'Geração:'
252 252 ParentColor = False
253 253 end
254 254 object LabelExpCountGeneration: TLabel
255   - Left = 198
256   - Height = 15
257   - Top = 45
258   - Width = 16
  255 + Left = 184
  256 + Height = 18
  257 + Top = 48
  258 + Width = 22
259 259 Caption = 'NA'
260 260 ParentColor = False
261 261 end
262 262 object LabelExpCycle: TLabel
263 263 Left = 10
264   - Height = 15
265   - Top = 70
266   - Width = 168
  264 + Height = 18
  265 + Top = 76
  266 + Width = 154
267 267 Caption = 'Ciclo:'
268 268 ParentColor = False
269 269 end
270 270 object LabelExpCountCycle: TLabel
271   - Left = 198
272   - Height = 15
273   - Top = 70
274   - Width = 16
  271 + Left = 184
  272 + Height = 18
  273 + Top = 76
  274 + Width = 22
275 275 Caption = 'NA'
276 276 ParentColor = False
277 277 end
278 278 object LabelExpTurn: TLabel
279 279 Left = 10
280   - Height = 15
281   - Top = 95
282   - Width = 168
  280 + Height = 18
  281 + Top = 104
  282 + Width = 154
283 283 Caption = 'Turno:'
284 284 ParentColor = False
285 285 end
286 286 object LabelExpCountTurn: TLabel
287   - Left = 198
288   - Height = 15
289   - Top = 95
290   - Width = 16
  287 + Left = 184
  288 + Height = 18
  289 + Top = 104
  290 + Width = 22
291 291 Caption = 'NA'
292 292 ParentColor = False
293 293 end
294 294 object LabelExpInterlocks: TLabel
295 295 Left = 10
296   - Height = 15
297   - Top = 120
298   - Width = 168
  296 + Height = 18
  297 + Top = 132
  298 + Width = 154
299 299 Caption = 'Entrelaçamentos:'
300 300 ParentColor = False
301 301 end
302 302 object LabelExpCountInterlocks: TLabel
303   - Left = 198
304   - Height = 15
305   - Top = 120
306   - Width = 16
  303 + Left = 184
  304 + Height = 18
  305 + Top = 132
  306 + Width = 22
307 307 Caption = 'NA'
308 308 ParentColor = False
309 309 end
310 310 object LabelExpTInterlocks: TLabel
311 311 Left = 10
312   - Height = 15
313   - Top = 145
314   - Width = 168
  312 + Height = 18
  313 + Top = 160
  314 + Width = 154
315 315 Caption = 'Entrelaçamentos Alvo:'
316 316 ParentColor = False
317 317 end
318 318 object LabelExpCountTInterlocks: TLabel
319   - Left = 198
320   - Height = 15
321   - Top = 145
322   - Width = 16
  319 + Left = 184
  320 + Height = 18
  321 + Top = 160
  322 + Width = 22
323 323 Caption = 'NA'
324 324 ParentColor = False
325 325 end
... ... @@ -365,26 +365,25 @@ object FormMatrixGame: TFormMatrixGame
365 365 Visible = False
366 366 end
367 367 object ChatPanel: TPanel
368   - AnchorSideLeft.Control = GBIndividualAB
369   - AnchorSideTop.Control = GBIndividualAB
  368 + AnchorSideLeft.Side = asrBottom
  369 + AnchorSideTop.Control = GBGrupo
370 370 AnchorSideTop.Side = asrBottom
371   - AnchorSideRight.Control = GBGrupo
372 371 AnchorSideRight.Side = asrBottom
373 372 Left = 800
374   - Height = 354
375   - Top = 140
376   - Width = 350
377   - Anchors = [akTop, akLeft, akRight]
  373 + Height = 351
  374 + Top = 149
  375 + Width = 340
  376 + BorderSpacing.Left = 120
378 377 BorderSpacing.Top = 10
379   - ClientHeight = 354
380   - ClientWidth = 350
  378 + ClientHeight = 351
  379 + ClientWidth = 340
381 380 TabOrder = 6
382 381 object ChatMemoRecv: TMemo
383 382 AnchorSideBottom.Control = ChatSplitter
384 383 Left = 6
385   - Height = 221
  384 + Height = 219
386 385 Top = 6
387   - Width = 338
  386 + Width = 328
388 387 Align = alTop
389 388 Anchors = [akTop, akLeft, akRight, akBottom]
390 389 BorderSpacing.Left = 5
... ... @@ -404,8 +403,8 @@ object FormMatrixGame: TFormMatrixGame
404 403 Cursor = crVSplit
405 404 Left = 0
406 405 Height = 5
407   - Top = 232
408   - Width = 348
  406 + Top = 230
  407 + Width = 338
409 408 Align = alNone
410 409 Anchors = [akLeft, akRight]
411 410 ResizeAnchor = akTop
... ... @@ -414,9 +413,9 @@ object FormMatrixGame: TFormMatrixGame
414 413 AnchorSideTop.Control = ChatSplitter
415 414 AnchorSideTop.Side = asrBottom
416 415 Left = 6
417   - Height = 106
418   - Top = 242
419   - Width = 338
  416 + Height = 105
  417 + Top = 240
  418 + Width = 328
420 419 Align = alBottom
421 420 Anchors = [akTop, akLeft, akRight, akBottom]
422 421 BorderSpacing.Around = 5
... ...
experiment_runner/form_matrixgame.pas
  Diff comments   View file @9765ba5
... ... @@ -353,6 +353,8 @@ begin
353 353 if not FGameControl.Experiment.LoadFromFile(OpenDialog.FileName) then
354 354 Exit;
355 355 FGameControl.SetMatrix;
  356 + GBIndividualAB.Visible:= FGameControl.Experiment.ABPoints;
  357 + GBIndividual.Visible := not FGameControl.Experiment.ABPoints;
356 358 ButtonExpStart.Enabled := False;
357 359 ButtonExpStart.Caption := CAPTION_RUNNING;
358 360 ButtonExpCancel.Enabled := not ButtonExpStart.Enabled;
... ...