Download as
Browse Code »

Commit 59f13fb3de6d37f5fe79fb262f0e399cdd66e47b

Authored by Carlos Picanco
1 parent e82ba1f9
Exists in master

designer: fix question control 

-fixes #3
Showing 3 changed files with 187 additions and 177 deletions   Show diff stats
experiment_designer/form_main.lfm
  Diff comments   View file @59f13fb
... ... @@ -3,12 +3,12 @@ object FormDesigner: TFormDesigner
3 3 Height = 656
4 4 Top = 29
5 5 Width = 653
6   - HorzScrollBar.Page = 315
7   - VertScrollBar.Page = 636
  6 + HorzScrollBar.Page = 521
  7 + VertScrollBar.Page = 637
8 8 AutoScroll = True
9 9 Caption = 'Planejar Experimento'
10   - ClientHeight = 636
11   - ClientWidth = 636
  10 + ClientHeight = 637
  11 + ClientWidth = 643
12 12 Menu = MainMenu1
13 13 OnActivate = FormActivate
14 14 OnCreate = FormCreate
... ... @@ -18,12 +18,12 @@ object FormDesigner: TFormDesigner
18 18 LCLVersion = '1.6.2.0'
19 19 object PageControl: TPageControl
20 20 Left = 0
21   - Height = 745
  21 + Height = 793
22 22 Top = 0
23   - Width = 636
24   - ActivePage = TabSheetExperiment
  23 + Width = 643
  24 + ActivePage = TabSheetConditions
25 25 Align = alClient
26   - TabIndex = 0
  26 + TabIndex = 1
27 27 TabOrder = 0
28 28 object TabSheetExperiment: TTabSheet
29 29 Caption = 'Experimento'
... ... @@ -32,76 +32,77 @@ object FormDesigner: TFormDesigner
32 32 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
33 33 ChildSizing.Layout = cclLeftToRightThenTopToBottom
34 34 ChildSizing.ControlsPerLine = 1
35   - ClientHeight = 717
36   - ClientWidth = 628
  35 + ClientHeight = 760
  36 + ClientWidth = 637
37 37 object GBConditions: TGroupBox
38 38 Left = 0
39   - Height = 100
  39 + Height = 97
40 40 Top = 10
41   - Width = 628
  41 + Width = 637
42 42 Caption = 'Condições'
43 43 ClientHeight = 80
44   - ClientWidth = 624
  44 + ClientWidth = 633
45 45 TabOrder = 5
46 46 object ListBoxConditions: TListBox
47 47 Left = 0
48 48 Height = 80
49 49 Top = 0
50   - Width = 624
  50 + Width = 633
51 51 Anchors = [akTop, akLeft, akRight]
52 52 ItemHeight = 0
53 53 ScrollWidth = 631
54 54 TabOrder = 0
  55 + TopIndex = -1
55 56 end
56 57 end
57 58 object LabelResearcherName: TLabel
58 59 Left = 0
59 60 Height = 15
60   - Top = 115
61   - Width = 628
  61 + Top = 112
  62 + Width = 637
62 63 Caption = 'Nome do Pesquisador'
63 64 ParentColor = False
64 65 end
65 66 object EditResearcherName: TEdit
66 67 Left = 0
67   - Height = 23
  68 + Height = 25
68 69 Hint = 'Uma pasta será criada com o seu nome. Os seus experimentos serão salvos dentro dela.'
69   - Top = 135
70   - Width = 628
  70 + Top = 132
  71 + Width = 637
71 72 OnEditingDone = EditExperimentEditingDone
72 73 TabOrder = 0
73 74 end
74 75 object LabelExperimentName: TLabel
75 76 Left = 0
76 77 Height = 15
77   - Top = 163
78   - Width = 628
  78 + Top = 162
  79 + Width = 637
79 80 Caption = 'Nome do Experimento'
80 81 ParentColor = False
81 82 end
82 83 object EditExperimentName: TEdit
83 84 Left = 0
84   - Height = 23
  85 + Height = 25
85 86 Hint = 'Uma pasta será criada com o nome do experimento. Os dados desse experimento serão salvos dentro dela.'
86   - Top = 183
87   - Width = 628
  87 + Top = 182
  88 + Width = 637
88 89 OnEditingDone = EditExperimentEditingDone
89 90 TabOrder = 1
90 91 end
91 92 object GBExperimentAim: TGroupBox
92 93 Left = 0
93   - Height = 162
94   - Top = 211
95   - Width = 628
  94 + Height = 159
  95 + Top = 212
  96 + Width = 637
96 97 Caption = 'Objetivo do Experimento'
97 98 ClientHeight = 142
98   - ClientWidth = 624
  99 + ClientWidth = 633
99 100 TabOrder = 2
100 101 object MemoExperimentAim: TMemo
101 102 Left = 0
102 103 Height = 142
103 104 Top = 0
104   - Width = 624
  105 + Width = 633
105 106 Align = alCustom
106 107 Anchors = [akTop, akLeft, akRight]
107 108 OnEditingDone = EditExperimentEditingDone
... ... @@ -110,10 +111,10 @@ object FormDesigner: TFormDesigner
110 111 end
111 112 object CGGlobal: TCheckGroup
112 113 Left = 0
113   - Height = 127
  114 + Height = 134
114 115 Hint = 'Aplicáveis ao longo de todo o experimento'
115   - Top = 378
116   - Width = 628
  116 + Top = 376
  117 + Width = 637
117 118 AutoFill = True
118 119 Caption = 'Configurações globais'
119 120 ChildSizing.LeftRightSpacing = 6
... ... @@ -124,8 +125,8 @@ object FormDesigner: TFormDesigner
124 125 ChildSizing.ShrinkVertical = crsScaleChilds
125 126 ChildSizing.Layout = cclLeftToRightThenTopToBottom
126 127 ChildSizing.ControlsPerLine = 1
127   - ClientHeight = 107
128   - ClientWidth = 624
  128 + ClientHeight = 117
  129 + ClientWidth = 633
129 130 Items.Strings = (
130 131 'Enviar histórico do bate-papo a novos participantes'
131 132 'Gerar participantes automaticamente'
... ... @@ -142,9 +143,9 @@ object FormDesigner: TFormDesigner
142 143 end
143 144 object RGPoints: TRadioGroup
144 145 Left = 0
145   - Height = 58
146   - Top = 510
147   - Width = 628
  146 + Height = 59
  147 + Top = 515
  148 + Width = 637
148 149 AutoFill = True
149 150 Caption = 'Tipo de pontuação Individual'
150 151 ChildSizing.LeftRightSpacing = 6
... ... @@ -154,8 +155,8 @@ object FormDesigner: TFormDesigner
154 155 ChildSizing.ShrinkVertical = crsScaleChilds
155 156 ChildSizing.Layout = cclLeftToRightThenTopToBottom
156 157 ChildSizing.ControlsPerLine = 1
157   - ClientHeight = 38
158   - ClientWidth = 624
  158 + ClientHeight = 42
  159 + ClientWidth = 633
159 160 ItemIndex = 0
160 161 Items.Strings = (
161 162 'A e B'
... ... @@ -166,21 +167,21 @@ object FormDesigner: TFormDesigner
166 167 end
167 168 object GBMatrix: TGroupBox
168 169 Left = 0
169   - Height = 134
170   - Top = 573
171   - Width = 628
  170 + Height = 143
  171 + Top = 579
  172 + Width = 637
172 173 Caption = 'Tipo da Matrix'
173 174 ChildSizing.LeftRightSpacing = 5
174 175 ChildSizing.Layout = cclLeftToRightThenTopToBottom
175 176 ChildSizing.ControlsPerLine = 1
176   - ClientHeight = 114
177   - ClientWidth = 624
  177 + ClientHeight = 126
  178 + ClientWidth = 633
178 179 TabOrder = 6
179 180 object ChkColors: TCheckBox
180 181 Left = 5
181   - Height = 19
  182 + Height = 21
182 183 Top = 0
183   - Width = 215
  184 + Width = 239
184 185 Caption = '5 cores'
185 186 Checked = True
186 187 Enabled = False
... ... @@ -190,9 +191,9 @@ object FormDesigner: TFormDesigner
190 191 end
191 192 object ChkRows: TCheckBox
192 193 Left = 5
193   - Height = 19
194   - Top = 19
195   - Width = 215
  194 + Height = 21
  195 + Top = 21
  196 + Width = 239
196 197 Caption = '10 linhas'
197 198 Checked = True
198 199 Enabled = False
... ... @@ -202,18 +203,18 @@ object FormDesigner: TFormDesigner
202 203 end
203 204 object ChkCols: TCheckBox
204 205 Left = 5
205   - Height = 19
206   - Top = 38
207   - Width = 215
  206 + Height = 21
  207 + Top = 42
  208 + Width = 239
208 209 Caption = '10 colunas'
209 210 OnClick = ChkMatrixTypeClick
210 211 TabOrder = 2
211 212 end
212 213 object ChkDots: TCheckBox
213 214 Left = 5
214   - Height = 19
215   - Top = 57
216   - Width = 215
  215 + Height = 21
  216 + Top = 63
  217 + Width = 239
217 218 Caption = 'Com Círculos Preechidos'
218 219 OnChange = ChkDotsChange
219 220 OnClick = ChkMatrixTypeClick
... ... @@ -221,9 +222,9 @@ object FormDesigner: TFormDesigner
221 222 end
222 223 object ChkCleanDots: TCheckBox
223 224 Left = 5
224   - Height = 19
225   - Top = 76
226   - Width = 215
  225 + Height = 21
  226 + Top = 84
  227 + Width = 239
227 228 Caption = 'Com Círculos Vazados'
228 229 OnChange = ChkCleanDotsChange
229 230 OnClick = ChkMatrixTypeClick
... ... @@ -231,9 +232,9 @@ object FormDesigner: TFormDesigner
231 232 end
232 233 object ChkDotsCleanDots: TCheckBox
233 234 Left = 5
234   - Height = 19
235   - Top = 95
236   - Width = 215
  235 + Height = 21
  236 + Top = 105
  237 + Width = 239
237 238 Caption = 'Com Círculos Vazados e Preenchidos'
238 239 OnChange = ChkDotsCleanDotsChange
239 240 OnClick = ChkMatrixTypeClick
... ... @@ -248,14 +249,14 @@ object FormDesigner: TFormDesigner
248 249 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
249 250 ChildSizing.Layout = cclLeftToRightThenTopToBottom
250 251 ChildSizing.ControlsPerLine = 1
251   - ClientHeight = 751
252   - ClientWidth = 628
  252 + ClientHeight = 760
  253 + ClientWidth = 637
253 254 object ComboCurrentCondition: TComboBox
254 255 Left = 0
255   - Height = 23
  256 + Height = 27
256 257 Top = 10
257   - Width = 628
258   - ItemHeight = 15
  258 + Width = 637
  259 + ItemHeight = 0
259 260 OnChange = ComboCurrentConditionChange
260 261 Style = csDropDownList
261 262 TabOrder = 0
... ... @@ -263,40 +264,40 @@ object FormDesigner: TFormDesigner
263 264 object PanelConditionButtons: TPanel
264 265 Left = 0
265 266 Height = 26
266   - Top = 38
267   - Width = 628
  267 + Top = 42
  268 + Width = 637
268 269 ChildSizing.LeftRightSpacing = 25
269 270 ChildSizing.HorizontalSpacing = 50
270 271 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
271 272 ChildSizing.Layout = cclLeftToRightThenTopToBottom
272 273 ChildSizing.ControlsPerLine = 3
273 274 ClientHeight = 26
274   - ClientWidth = 628
  275 + ClientWidth = 637
275 276 TabOrder = 1
276 277 object BtnAppendCond: TButton
277 278 Left = 25
278 279 Height = 25
279 280 Hint = 'Selecione contingências na lista abaixo se deseja inclui-las na condição a ser adicionada.'
280 281 Top = 0
281   - Width = 160
  282 + Width = 161
282 283 Caption = 'Adicionar'
283 284 OnClick = BtnAppendCondClick
284 285 TabOrder = 0
285 286 end
286 287 object BtnRemoveCond: TButton
287   - Left = 235
  288 + Left = 236
288 289 Height = 25
289 290 Top = 0
290   - Width = 156
  291 + Width = 158
291 292 Caption = 'Remover'
292 293 OnClick = BtnRemoveCondClick
293 294 TabOrder = 1
294 295 end
295 296 object BtnReorderCond: TButton
296   - Left = 441
  297 + Left = 444
297 298 Height = 25
298 299 Top = 0
299   - Width = 162
  300 + Width = 168
300 301 Caption = 'Reordenar'
301 302 OnClick = BtnReorderCondClick
302 303 TabOrder = 2
... ... @@ -305,56 +306,57 @@ object FormDesigner: TFormDesigner
305 306 end
306 307 object GBContingencies: TGroupBox
307 308 Left = 0
308   - Height = 100
309   - Top = 69
310   - Width = 628
  309 + Height = 97
  310 + Top = 73
  311 + Width = 637
311 312 Caption = 'Contingências e Metacontingências da Condição Selecionada'
312 313 ClientHeight = 80
313   - ClientWidth = 624
  314 + ClientWidth = 633
314 315 TabOrder = 8
315 316 object ListBoxContingencies: TListBox
316 317 Left = 0
317 318 Height = 80
318 319 Hint = 'CTRL+Clique para selecionar múltiplas contingências.'
319 320 Top = 0
320   - Width = 624
  321 + Width = 633
321 322 Anchors = [akTop, akLeft, akRight]
322 323 ItemHeight = 0
323 324 MultiSelect = True
324   - ScrollWidth = 643
  325 + ScrollWidth = 631
325 326 TabOrder = 0
  327 + TopIndex = -1
326 328 end
327 329 end
328 330 object LabelConditionName: TLabel
329 331 Left = 0
330 332 Height = 15
331 333 Hint = 'Nome da condição no relatório.'
332   - Top = 174
333   - Width = 628
  334 + Top = 175
  335 + Width = 637
334 336 Caption = 'Nome da Condição'
335 337 ParentColor = False
336 338 end
337 339 object EditConditionName: TEdit
338 340 Left = 0
339   - Height = 23
340   - Top = 194
341   - Width = 628
  341 + Height = 25
  342 + Top = 195
  343 + Width = 637
342 344 OnEditingDone = EditConditionNameEditingDone
343 345 TabOrder = 2
344 346 end
345 347 object LabelTurnValue: TLabel
346 348 Left = 0
347 349 Height = 15
348   - Top = 222
349   - Width = 628
  350 + Top = 225
  351 + Width = 637
350 352 Caption = 'Número de Jogadores / Turnos'
351 353 ParentColor = False
352 354 end
353 355 object SpinEditTurnValue: TSpinEdit
354 356 Left = 0
355   - Height = 23
356   - Top = 242
357   - Width = 628
  357 + Height = 25
  358 + Top = 245
  359 + Width = 637
358 360 MaxValue = 5
359 361 MinValue = 2
360 362 OnEditingDone = SpinEditTurnValueEditingDone
... ... @@ -363,70 +365,70 @@ object FormDesigner: TFormDesigner
363 365 end
364 366 object GroupBox1: TGroupBox
365 367 Left = 0
366   - Height = 58
367   - Top = 270
368   - Width = 628
  368 + Height = 57
  369 + Top = 275
  370 + Width = 637
369 371 Caption = 'Somar pontos ao iniciar condição'
370 372 ChildSizing.LeftRightSpacing = 50
371 373 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
372 374 ChildSizing.Layout = cclTopToBottomThenLeftToRight
373 375 ChildSizing.ControlsPerLine = 2
374   - ClientHeight = 38
375   - ClientWidth = 624
  376 + ClientHeight = 40
  377 + ClientWidth = 633
376 378 TabOrder = 9
377 379 object LabelPA: TLabel
378 380 Left = 50
379 381 Height = 15
380 382 Top = 0
381   - Width = 131
  383 + Width = 132
382 384 Caption = 'A'
383 385 ParentColor = False
384 386 end
385 387 object SpinEditOnConditionBeginA: TSpinEdit
386 388 Left = 50
387   - Height = 23
  389 + Height = 25
388 390 Top = 15
389   - Width = 131
  391 + Width = 132
390 392 MaxValue = 0
391 393 OnEditingDone = SpinEditOnConditionBeginAEditingDone
392 394 TabOrder = 0
393 395 end
394 396 object LabelPB: TLabel
395   - Left = 181
  397 + Left = 182
396 398 Height = 15
397 399 Top = 0
398   - Width = 131
  400 + Width = 132
399 401 Caption = 'B'
400 402 ParentColor = False
401 403 end
402 404 object SpinEditOnConditionBeginB: TSpinEdit
403   - Left = 181
404   - Height = 23
  405 + Left = 182
  406 + Height = 25
405 407 Top = 15
406   - Width = 131
  408 + Width = 132
407 409 MaxValue = 0
408 410 OnEditingDone = SpinEditOnConditionBeginAEditingDone
409 411 TabOrder = 1
410 412 end
411 413 object LabelPI: TLabel
412   - Left = 312
  414 + Left = 314
413 415 Height = 15
414 416 Top = 0
415   - Width = 133
  417 + Width = 140
416 418 Caption = 'Individual'
417 419 ParentColor = False
418 420 end
419 421 object SpinEditOnConditionBeginI: TSpinEdit
420   - Left = 312
421   - Height = 23
  422 + Left = 314
  423 + Height = 25
422 424 Top = 15
423   - Width = 133
  425 + Width = 140
424 426 MaxValue = 0
425 427 OnEditingDone = SpinEditOnConditionBeginAEditingDone
426 428 TabOrder = 2
427 429 end
428 430 object LabelPG: TLabel
429   - Left = 445
  431 + Left = 454
430 432 Height = 15
431 433 Top = 0
432 434 Width = 129
... ... @@ -434,8 +436,8 @@ object FormDesigner: TFormDesigner
434 436 ParentColor = False
435 437 end
436 438 object SpinEditOnConditionBeginG: TSpinEdit
437   - Left = 445
438   - Height = 23
  439 + Left = 454
  440 + Height = 25
439 441 Top = 15
440 442 Width = 129
441 443 MaxValue = 0
... ... @@ -446,16 +448,16 @@ object FormDesigner: TFormDesigner
446 448 object LabelCyclesValue: TLabel
447 449 Left = 0
448 450 Height = 15
449   - Top = 333
450   - Width = 628
  451 + Top = 337
  452 + Width = 637
451 453 Caption = 'Ciclos para mudança de geração / linhagem'
452 454 ParentColor = False
453 455 end
454 456 object SpinEditCyclesValue: TSpinEdit
455 457 Left = 0
456   - Height = 23
457   - Top = 353
458   - Width = 628
  458 + Height = 25
  459 + Top = 357
  460 + Width = 637
459 461 MaxValue = 1000
460 462 MinValue = 1
461 463 OnEditingDone = SpinEditCyclesValueEditingDone
... ... @@ -464,23 +466,23 @@ object FormDesigner: TFormDesigner
464 466 end
465 467 object GBQuestion: TGroupBox
466 468 Left = 0
467   - Height = 162
468   - Top = 381
469   - Width = 628
  469 + Height = 164
  470 + Top = 387
  471 + Width = 637
470 472 Caption = 'Apresentar pergunta ao final do ciclo'
471 473 ChildSizing.LeftRightSpacing = 50
472 474 ChildSizing.VerticalSpacing = 5
473 475 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
474 476 ChildSizing.Layout = cclLeftToRightThenTopToBottom
475 477 ChildSizing.ControlsPerLine = 1
476   - ClientHeight = 142
477   - ClientWidth = 624
  478 + ClientHeight = 147
  479 + ClientWidth = 633
478 480 TabOrder = 5
479 481 object CheckBoxShouldAskQuestion: TCheckBox
480 482 Left = 50
481   - Height = 19
  483 + Height = 21
482 484 Top = 0
483   - Width = 524
  485 + Width = 533
484 486 Caption = 'Não'
485 487 OnChange = CheckBoxShouldAskQuestionChange
486 488 TabOrder = 0
... ... @@ -488,17 +490,18 @@ object FormDesigner: TFormDesigner
488 490 object LabelQuestion: TLabel
489 491 Left = 50
490 492 Height = 15
491   - Top = 24
492   - Width = 524
  493 + Top = 26
  494 + Width = 533
493 495 Caption = 'Texto da Pergunta'
494 496 ParentColor = False
495 497 Visible = False
496 498 end
497 499 object EditQuestion: TEdit
498 500 Left = 50
499   - Height = 23
500   - Top = 44
501   - Width = 524
  501 + Height = 25
  502 + Hint = 'Clique duas vezes para gerar uma pergunta padrão.'
  503 + Top = 46
  504 + Width = 533
502 505 OnDblClick = EditQuestionDblClick
503 506 OnEditingDone = EditQuestionEditingDone
504 507 TabOrder = 1
... ... @@ -506,9 +509,9 @@ object FormDesigner: TFormDesigner
506 509 end
507 510 object CGQuestion: TCheckGroup
508 511 Left = 50
509   - Height = 70
510   - Top = 72
511   - Width = 524
  512 + Height = 71
  513 + Top = 76
  514 + Width = 533
512 515 AutoFill = True
513 516 Caption = 'O que deve acontecer quando todos responderem sim?'
514 517 ChildSizing.LeftRightSpacing = 6
... ... @@ -519,8 +522,8 @@ object FormDesigner: TFormDesigner
519 522 ChildSizing.ShrinkVertical = crsScaleChilds
520 523 ChildSizing.Layout = cclLeftToRightThenTopToBottom
521 524 ChildSizing.ControlsPerLine = 1
522   - ClientHeight = 50
523   - ClientWidth = 520
  525 + ClientHeight = 54
  526 + ClientWidth = 529
524 527 Items.Strings = (
525 528 'Reverter consequências das metacontingências e contingências'
526 529 'Inverter pontos A e B quando pontos B forem consequências'
... ... @@ -535,9 +538,9 @@ object FormDesigner: TFormDesigner
535 538 end
536 539 object RGEndCriteriaStyle: TRadioGroup
537 540 Left = 0
538   - Height = 77
539   - Top = 548
540   - Width = 628
  541 + Height = 80
  542 + Top = 556
  543 + Width = 637
541 544 AutoFill = True
542 545 Caption = 'Critério de finalização da condição'
543 546 ChildSizing.LeftRightSpacing = 6
... ... @@ -547,8 +550,8 @@ object FormDesigner: TFormDesigner
547 550 ChildSizing.ShrinkVertical = crsScaleChilds
548 551 ChildSizing.Layout = cclLeftToRightThenTopToBottom
549 552 ChildSizing.ControlsPerLine = 1
550   - ClientHeight = 57
551   - ClientWidth = 624
  553 + ClientHeight = 63
  554 + ClientWidth = 633
552 555 ItemIndex = 2
553 556 Items.Strings = (
554 557 'Finalizar após um número de ciclos'
... ... @@ -560,31 +563,31 @@ object FormDesigner: TFormDesigner
560 563 end
561 564 object GBEndCriteria: TGroupBox
562 565 Left = 0
563   - Height = 111
564   - Top = 630
565   - Width = 628
  566 + Height = 109
  567 + Top = 641
  568 + Width = 637
566 569 Caption = 'Valores do critério de finalização da condição'
567 570 ChildSizing.LeftRightSpacing = 50
568 571 ChildSizing.VerticalSpacing = 5
569 572 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
570 573 ChildSizing.Layout = cclLeftToRightThenTopToBottom
571 574 ChildSizing.ControlsPerLine = 1
572   - ClientHeight = 91
573   - ClientWidth = 624
  575 + ClientHeight = 92
  576 + ClientWidth = 633
574 577 TabOrder = 7
575 578 object LabelEndCriteriaAbsCycles: TLabel
576 579 Left = 50
577 580 Height = 15
578 581 Top = 0
579   - Width = 524
  582 + Width = 533
580 583 Caption = 'Número de ciclos'
581 584 ParentColor = False
582 585 end
583 586 object SpinEditEndCriteriaAbsCycles: TSpinEdit
584 587 Left = 50
585   - Height = 23
  588 + Height = 25
586 589 Top = 20
587   - Width = 524
  590 + Width = 533
588 591 MaxValue = 1000
589 592 OnEditingDone = SpinEditEndCriteriaAbsCyclesEditingDone
590 593 TabOrder = 0
... ... @@ -592,19 +595,19 @@ object FormDesigner: TFormDesigner
592 595 end
593 596 object GBEndCriteriaLastCycles: TGroupBox
594 597 Left = 50
595   - Height = 43
596   - Top = 48
597   - Width = 524
  598 + Height = 42
  599 + Top = 50
  600 + Width = 533
598 601 Caption = 'Porcentagem de entrelaçamentos'
599 602 ChildSizing.HorizontalSpacing = 5
600 603 ChildSizing.Layout = cclLeftToRightThenTopToBottom
601 604 ChildSizing.ControlsPerLine = 4
602   - ClientHeight = 23
603   - ClientWidth = 520
  605 + ClientHeight = 25
  606 + ClientWidth = 529
604 607 TabOrder = 1
605 608 object SpinEditEndCriteriaInterlockingPorcentage: TSpinEdit
606 609 Left = 0
607   - Height = 23
  610 + Height = 25
608 611 Top = 0
609 612 Width = 50
610 613 OnEditingDone = SpinEditEndCriteriaInterlockingEditingDone
... ... @@ -613,17 +616,17 @@ object FormDesigner: TFormDesigner
613 616 end
614 617 object LabelEndCriteriaInt: TLabel
615 618 Left = 55
616   - Height = 23
  619 + Height = 25
617 620 Top = 0
618   - Width = 185
  621 + Width = 206
619 622 Alignment = taCenter
620 623 Caption = '% de entrelaçamentos nos últimos '
621 624 Layout = tlCenter
622 625 ParentColor = False
623 626 end
624 627 object SpinEditEndCriteriaLastCycles: TSpinEdit
625   - Left = 245
626   - Height = 23
  628 + Left = 266
  629 + Height = 25
627 630 Top = 0
628 631 Width = 50
629 632 MaxValue = 1000
... ... @@ -633,10 +636,10 @@ object FormDesigner: TFormDesigner
633 636 Value = 10
634 637 end
635 638 object LabelEndCriteriaLastCycles: TLabel
636   - Left = 300
637   - Height = 23
  639 + Left = 321
  640 + Height = 25
638 641 Top = 0
639   - Width = 33
  642 + Width = 35
640 643 Alignment = taCenter
641 644 Caption = 'ciclos.'
642 645 Layout = tlCenter
... ... @@ -652,8 +655,8 @@ object FormDesigner: TFormDesigner
652 655 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
653 656 ChildSizing.Layout = cclLeftToRightThenTopToBottom
654 657 ChildSizing.ControlsPerLine = 1
655   - ClientHeight = 762
656   - ClientWidth = 628
  658 + ClientHeight = 760
  659 + ClientWidth = 637
657 660 Enabled = False
658 661 object RGContingencyType: TRadioGroup
659 662 Left = 0
... ... @@ -669,7 +672,7 @@ object FormDesigner: TFormDesigner
669 672 ChildSizing.ShrinkVertical = crsScaleChilds
670 673 ChildSizing.Layout = cclLeftToRightThenTopToBottom
671 674 ChildSizing.ControlsPerLine = 1
672   - ClientHeight = 38
  675 + ClientHeight = 41
673 676 ClientWidth = 624
674 677 Items.Strings = (
675 678 'Contingências Operantes'
... ... @@ -683,7 +686,7 @@ object FormDesigner: TFormDesigner
683 686 Height = 23
684 687 Top = 73
685 688 Width = 628
686   - ItemHeight = 15
  689 + ItemHeight = 0
687 690 OnChange = ComboCurrentContingencyChange
688 691 Style = csDropDownList
689 692 TabOrder = 0
... ... @@ -760,7 +763,7 @@ object FormDesigner: TFormDesigner
760 763 ChildSizing.ShrinkVertical = crsScaleChilds
761 764 ChildSizing.Layout = cclLeftToRightThenTopToBottom
762 765 ChildSizing.ControlsPerLine = 1
763   - ClientHeight = 95
  766 + ClientHeight = 98
764 767 ClientWidth = 624
765 768 ItemIndex = 0
766 769 Items.Strings = (
... ... @@ -839,7 +842,7 @@ object FormDesigner: TFormDesigner
839 842 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
840 843 ChildSizing.Layout = cclLeftToRightThenTopToBottom
841 844 ChildSizing.ControlsPerLine = 2
842   - ClientHeight = 324
  845 + ClientHeight = 327
843 846 ClientWidth = 624
844 847 TabOrder = 6
845 848 Visible = False
... ... @@ -873,7 +876,7 @@ object FormDesigner: TFormDesigner
873 876 Height = 23
874 877 Top = 15
875 878 Width = 230
876   - ItemHeight = 15
  879 + ItemHeight = 0
877 880 OnChange = ConsequenceStyleChange
878 881 Style = csDropDownList
879 882 TabOrder = 1
... ... @@ -892,7 +895,7 @@ object FormDesigner: TFormDesigner
892 895 ChildSizing.ShrinkVertical = crsScaleChilds
893 896 ChildSizing.Layout = cclLeftToRightThenTopToBottom
894 897 ChildSizing.ControlsPerLine = 1
895   - ClientHeight = 57
  898 + ClientHeight = 60
896 899 ClientWidth = 390
897 900 ItemIndex = 0
898 901 Items.Strings = (
... ...
experiment_designer/form_main.pas
  Diff comments   View file @59f13fb
... ... @@ -1333,14 +1333,14 @@ begin
1333 1333 SpinEditTurnValue.Value := ReadInteger(ASection, KEY_TURN_VALUE, 2);
1334 1334 SpinEditCyclesValue.Value := ReadInteger(ASection, KEY_CYCLES_VALUE, 2);
1335 1335  
1336   - CheckBoxShouldAskQuestion.Checked := False;
1337 1336 if ValueExists(ASection, KEY_PROMPT_STYLE) and ValueExists(ASection, KEY_PROMPT_MESSAGE) then
1338   - begin
1339   - EditQuestion.Text := ReadString(ASection, KEY_PROMPT_MESSAGE, '');
1340   - SetCGQuestion(ReadString(ASection, KEY_PROMPT_STYLE, ''));
1341   - if (EditQuestion.Text <> '') or (ReadString(ASection, KEY_PROMPT_STYLE, '') <> '') then
1342   - CheckBoxShouldAskQuestion.Checked := True;
1343   - end;
  1337 + begin
  1338 + EditQuestion.Text := ReadString(ASection, KEY_PROMPT_MESSAGE, '');
  1339 + SetCGQuestion(ReadString(ASection, KEY_PROMPT_STYLE, ''));
  1340 + if (EditQuestion.Text <> '') or (ReadString(ASection, KEY_PROMPT_STYLE, '') <> '') then
  1341 + CheckBoxShouldAskQuestion.Checked := True;
  1342 + end
  1343 + else CheckBoxShouldAskQuestion.Checked := False;
1344 1344 LabelQuestion.Visible:= CheckBoxShouldAskQuestion.Checked;
1345 1345 SpinEditOnConditionBeginA.Value := ReadInteger(ASection, KEY_POINTS_ONSTART_A, 0);
1346 1346 SpinEditOnConditionBeginB.Value := ReadInteger(ASection, KEY_POINTS_ONSTART_B, 0);
... ... @@ -1459,6 +1459,13 @@ begin
1459 1459 TCheckBox(Sender).Caption := 'Sim';
1460 1460 CGQuestion.Checked[0] := True;
1461 1461 CGQuestion.Checked[1] := True;
  1462 + with FExperiment do
  1463 + if ComboCurrentCondition.ItemIndex <> -1 then
  1464 + begin
  1465 + LS := SEC_CONDITION+IntToStr(ComboCurrentCondition.ItemIndex+1);
  1466 + WriteString(LS, KEY_PROMPT_MESSAGE, EditQuestion.Text);
  1467 + WriteString(LS, KEY_PROMPT_STYLE, GetPromptQuestionStringFromCGQuestion);
  1468 + end;
1462 1469 end
1463 1470 else
1464 1471 begin
... ... @@ -1468,8 +1475,8 @@ begin
1468 1475 begin
1469 1476 LS := SEC_CONDITION+IntToStr(ComboCurrentCondition.ItemIndex+1);
1470 1477 EditQuestion.Text:='';
1471   - WriteString(LS, KEY_PROMPT_MESSAGE, '');
1472   - WriteString(LS, KEY_PROMPT_STYLE, '');
  1478 + DeleteKey(LS, KEY_PROMPT_MESSAGE);
  1479 + DeleteKey(LS, KEY_PROMPT_STYLE);
1473 1480 end;
1474 1481 CGQuestion.Checked[0] := False;
1475 1482 CGQuestion.Checked[1] := False;
... ...
experiment_designer/lib/x86_64-linux/experiment_designer.compiled
  Diff comments   View file @59f13fb
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <CONFIG>
3 3 <Compiler Value="/usr/bin/fpc" Date="1449313866"/>
4   - <Params Value=" -MObjFPC -Scghi -Cg -O1 -Xs -l -vewnhibq -Fi/home/rafael/git/sc_split/experiment_designer/lib/x86_64-linux -Fl/opt/gnome/lib -Fu/home/rafael/git/sc_split/experiment_runner/units -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux/gtk2 -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux -Fu/usr/share/lazarus/1.6.2/components/lazutils/lib/x86_64-linux -Fu/usr/share/lazarus/1.6.2/packager/units/x86_64-linux -Fu/home/rafael/git/sc_split/experiment_designer/ -FU/home/rafael/git/sc_split/experiment_designer/lib/x86_64-linux/ -dLCL -dLCLgtk2 experiment_designer.lpr"/>
  4 + <Params Value=" -MObjFPC -Scghi -Cg -O1 -Xs -l -vewnhibq -Fi/home/rafael/git/free-mtrix/experiment_designer/lib/x86_64-linux -Fl/opt/gnome/lib -Fu/home/rafael/git/free-mtrix/experiment_runner/units -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux/gtk2 -Fu/usr/share/lazarus/1.6.2/lcl/units/x86_64-linux -Fu/usr/share/lazarus/1.6.2/components/lazutils/lib/x86_64-linux -Fu/usr/share/lazarus/1.6.2/packager/units/x86_64-linux -Fu/home/rafael/git/free-mtrix/experiment_designer/ -FU/home/rafael/git/free-mtrix/experiment_designer/lib/x86_64-linux/ -dLCL -dLCLgtk2 experiment_designer.lpr"/>
5 5 </CONFIG>
... ...