Download as
Browse Code »

Commit af8139a31a823f4be9abd2dfec6a8f37d2db1a21

Authored by Carlos Picanco
2 parents 0a855478 fc1e14da
Exists in master

fix conflicts

Showing 4 changed files with 101 additions and 76 deletions   Show diff stats
experiment_designer/experiment_designer.lpr
  Diff comments   View file @af8139a
  1 +{
  2 + Stimulus Control
  3 + Copyright (C) 2014-2016 Carlos Rafael Fernandes Picanço, Universidade Federal do Pará.
  4 +
  5 + The present file is distributed under the terms of the GNU General Public License (GPL v3.0).
  6 +
  7 + You should have received a copy of the GNU General Public License
  8 + along with this program. If not, see <http://www.gnu.org/licenses/>.
  9 +}
1 10 program experiment_designer;
2 11  
3 12 {$mode objfpc}{$H+}
... ...
experiment_designer/form_main.lfm
  Diff comments   View file @af8139a
... ... @@ -3,12 +3,12 @@ object FormDesigner: TFormDesigner
3 3 Height = 635
4 4 Top = 44
5 5 Width = 656
6   - HorzScrollBar.Page = 387
7   - VertScrollBar.Page = 520
  6 + HorzScrollBar.Page = 315
  7 + VertScrollBar.Page = 615
8 8 AutoScroll = True
9 9 Caption = 'Planejar Experimento'
10   - ClientHeight = 616
11   - ClientWidth = 656
  10 + ClientHeight = 615
  11 + ClientWidth = 639
12 12 Menu = MainMenu1
13 13 OnActivate = FormActivate
14 14 OnCreate = FormCreate
... ... @@ -18,10 +18,10 @@ object FormDesigner: TFormDesigner
18 18 LCLVersion = '1.6.2.0'
19 19 object PageControl: TPageControl
20 20 Left = 0
21   - Height = 616
  21 + Height = 726
22 22 Top = 0
23   - Width = 656
24   - ActivePage = TabSheetContingencies
  23 + Width = 639
  24 + ActivePage = TabSheetExperiment
25 25 Align = alClient
26 26 TabIndex = 2
27 27 TabOrder = 0
... ... @@ -32,54 +32,54 @@ object FormDesigner: TFormDesigner
32 32 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
33 33 ChildSizing.Layout = cclLeftToRightThenTopToBottom
34 34 ChildSizing.ControlsPerLine = 1
35   - ClientHeight = 583
36   - ClientWidth = 650
  35 + ClientHeight = 698
  36 + ClientWidth = 631
37 37 object LabelResearcherName: TLabel
38 38 Left = 0
39 39 Height = 15
40 40 Top = 10
41   - Width = 640
  41 + Width = 631
42 42 Caption = 'Nome do Pesquisador'
43 43 ParentColor = False
44 44 end
45 45 object EditResearcherName: TEdit
46 46 Left = 0
47   - Height = 25
  47 + Height = 23
48 48 Hint = 'Uma pasta será criada com o seu nome. Os seus experimentos serão salvos dentro dela.'
49 49 Top = 30
50   - Width = 640
  50 + Width = 631
51 51 TabOrder = 0
52 52 end
53 53 object LabelExperimentName: TLabel
54 54 Left = 0
55 55 Height = 15
56   - Top = 60
57   - Width = 640
  56 + Top = 58
  57 + Width = 631
58 58 Caption = 'Nome do Experimento'
59 59 ParentColor = False
60 60 end
61 61 object EditExperimentName: TEdit
62 62 Left = 0
63   - Height = 25
  63 + Height = 23
64 64 Hint = 'Uma pasta será criada com o nome do experimento. Os dados desse experimento serão salvos dentro dela.'
65   - Top = 80
66   - Width = 640
  65 + Top = 78
  66 + Width = 631
67 67 TabOrder = 1
68 68 end
69 69 object GBExperimentAim: TGroupBox
70 70 Left = 0
71   - Height = 159
72   - Top = 110
73   - Width = 640
  71 + Height = 162
  72 + Top = 106
  73 + Width = 631
74 74 Caption = 'Objetivo do Experimento'
75 75 ClientHeight = 142
76   - ClientWidth = 636
  76 + ClientWidth = 627
77 77 TabOrder = 2
78 78 object MemoExperimentAim: TMemo
79 79 Left = 0
80 80 Height = 142
81 81 Top = 0
82   - Width = 636
  82 + Width = 627
83 83 Align = alCustom
84 84 Anchors = [akTop, akLeft, akRight]
85 85 TabOrder = 0
... ... @@ -87,10 +87,10 @@ object FormDesigner: TFormDesigner
87 87 end
88 88 object CGGlobal: TCheckGroup
89 89 Left = 0
90   - Height = 113
  90 + Height = 108
91 91 Hint = 'Aplicáveis ao longo de todo o experimento'
92   - Top = 274
93   - Width = 640
  92 + Top = 273
  93 + Width = 631
94 94 AutoFill = True
95 95 Caption = 'Configurações globais'
96 96 ChildSizing.LeftRightSpacing = 6
... ... @@ -101,8 +101,8 @@ object FormDesigner: TFormDesigner
101 101 ChildSizing.ShrinkVertical = crsScaleChilds
102 102 ChildSizing.Layout = cclLeftToRightThenTopToBottom
103 103 ChildSizing.ControlsPerLine = 1
104   - ClientHeight = 96
105   - ClientWidth = 636
  104 + ClientHeight = 88
  105 + ClientWidth = 627
106 106 Items.Strings = (
107 107 'Enviar histórico do bate-papo a novos participantes'
108 108 'Gerar participantes automaticamente'
... ... @@ -116,9 +116,9 @@ object FormDesigner: TFormDesigner
116 116 end
117 117 object RGPoints: TRadioGroup
118 118 Left = 0
119   - Height = 59
120   - Top = 392
121   - Width = 640
  119 + Height = 58
  120 + Top = 386
  121 + Width = 631
122 122 AutoFill = True
123 123 Caption = 'Tipo de pontuação'
124 124 ChildSizing.LeftRightSpacing = 6
... ... @@ -128,8 +128,8 @@ object FormDesigner: TFormDesigner
128 128 ChildSizing.ShrinkVertical = crsScaleChilds
129 129 ChildSizing.Layout = cclLeftToRightThenTopToBottom
130 130 ChildSizing.ControlsPerLine = 1
131   - ClientHeight = 42
132   - ClientWidth = 636
  131 + ClientHeight = 38
  132 + ClientWidth = 627
133 133 ItemIndex = 0
134 134 Items.Strings = (
135 135 'A e B'
... ... @@ -140,21 +140,21 @@ object FormDesigner: TFormDesigner
140 140 end
141 141 object GBMatrix: TGroupBox
142 142 Left = 0
143   - Height = 143
144   - Top = 456
145   - Width = 640
  143 + Height = 134
  144 + Top = 449
  145 + Width = 631
146 146 Caption = 'Tipo da Matrix'
147 147 ChildSizing.LeftRightSpacing = 5
148 148 ChildSizing.Layout = cclLeftToRightThenTopToBottom
149 149 ChildSizing.ControlsPerLine = 1
150   - ClientHeight = 126
151   - ClientWidth = 636
  150 + ClientHeight = 114
  151 + ClientWidth = 627
152 152 TabOrder = 6
153 153 object ChkColors: TCheckBox
154 154 Left = 5
155   - Height = 21
  155 + Height = 19
156 156 Top = 0
157   - Width = 239
  157 + Width = 215
158 158 Caption = '5 cores'
159 159 Checked = True
160 160 Enabled = False
... ... @@ -163,9 +163,9 @@ object FormDesigner: TFormDesigner
163 163 end
164 164 object ChkRows: TCheckBox
165 165 Left = 5
166   - Height = 21
167   - Top = 21
168   - Width = 239
  166 + Height = 19
  167 + Top = 19
  168 + Width = 215
169 169 Caption = '10 linhas'
170 170 Checked = True
171 171 Enabled = False
... ... @@ -174,35 +174,35 @@ object FormDesigner: TFormDesigner
174 174 end
175 175 object ChkCols: TCheckBox
176 176 Left = 5
177   - Height = 21
178   - Top = 42
179   - Width = 239
  177 + Height = 19
  178 + Top = 38
  179 + Width = 215
180 180 Caption = '10 colunas'
181 181 TabOrder = 2
182 182 end
183 183 object ChkDots: TCheckBox
184 184 Left = 5
185   - Height = 21
186   - Top = 63
187   - Width = 239
  185 + Height = 19
  186 + Top = 57
  187 + Width = 215
188 188 Caption = 'Com Círculos Preechidos'
189 189 OnChange = ChkDotsChange
190 190 TabOrder = 3
191 191 end
192 192 object ChkCleanDots: TCheckBox
193 193 Left = 5
194   - Height = 21
195   - Top = 84
196   - Width = 239
  194 + Height = 19
  195 + Top = 76
  196 + Width = 215
197 197 Caption = 'Com Círculos Vazados'
198 198 OnChange = ChkCleanDotsChange
199 199 TabOrder = 4
200 200 end
201 201 object ChkDotsCleanDots: TCheckBox
202 202 Left = 5
203   - Height = 21
204   - Top = 105
205   - Width = 239
  203 + Height = 19
  204 + Top = 95
  205 + Width = 215
206 206 Caption = 'Com Círculos Vazados e Preenchidos'
207 207 OnChange = ChkDotsCleanDotsChange
208 208 TabOrder = 5
... ... @@ -210,23 +210,22 @@ object FormDesigner: TFormDesigner
210 210 end
211 211 object GBConditions: TGroupBox
212 212 Left = 0
213   - Height = 97
214   - Top = 604
215   - Width = 640
  213 + Height = 100
  214 + Top = 588
  215 + Width = 631
216 216 Caption = 'Condições'
217 217 ClientHeight = 80
218   - ClientWidth = 636
  218 + ClientWidth = 627
219 219 TabOrder = 5
220 220 object ListBoxConditions: TListBox
221 221 Left = 0
222 222 Height = 80
223 223 Top = 0
224   - Width = 636
  224 + Width = 627
225 225 Anchors = [akTop, akLeft, akRight]
226 226 ItemHeight = 0
227 227 ScrollWidth = 634
228 228 TabOrder = 0
229   - TopIndex = -1
230 229 end
231 230 end
232 231 end
... ... @@ -241,10 +240,10 @@ object FormDesigner: TFormDesigner
241 240 ClientWidth = 650
242 241 object ComboCurrentCondition: TComboBox
243 242 Left = 0
244   - Height = 27
  243 + Height = 23
245 244 Top = 10
246 245 Width = 640
247   - ItemHeight = 0
  246 + ItemHeight = 15
248 247 OnChange = ComboCurrentConditionChange
249 248 Style = csDropDownList
250 249 TabOrder = 0
... ... @@ -372,7 +371,7 @@ object FormDesigner: TFormDesigner
372 371 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
373 372 ChildSizing.Layout = cclLeftToRightThenTopToBottom
374 373 ChildSizing.ControlsPerLine = 1
375   - ClientHeight = 147
  374 + ClientHeight = 144
376 375 ClientWidth = 636
377 376 TabOrder = 5
378 377 object CheckBoxShouldAskQuestion: TCheckBox
... ... @@ -417,7 +416,7 @@ object FormDesigner: TFormDesigner
417 416 ChildSizing.ShrinkVertical = crsScaleChilds
418 417 ChildSizing.Layout = cclLeftToRightThenTopToBottom
419 418 ChildSizing.ControlsPerLine = 1
420   - ClientHeight = 54
  419 + ClientHeight = 51
421 420 ClientWidth = 532
422 421 Items.Strings = (
423 422 'Reverter consequências das metacontingências e contingências'
... ... @@ -445,7 +444,7 @@ object FormDesigner: TFormDesigner
445 444 ChildSizing.ShrinkVertical = crsScaleChilds
446 445 ChildSizing.Layout = cclLeftToRightThenTopToBottom
447 446 ChildSizing.ControlsPerLine = 1
448   - ClientHeight = 63
  447 + ClientHeight = 60
449 448 ClientWidth = 636
450 449 ItemIndex = 2
451 450 Items.Strings = (
... ... @@ -467,7 +466,7 @@ object FormDesigner: TFormDesigner
467 466 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
468 467 ChildSizing.Layout = cclLeftToRightThenTopToBottom
469 468 ChildSizing.ControlsPerLine = 1
470   - ClientHeight = 92
  469 + ClientHeight = 89
471 470 ClientWidth = 636
472 471 TabOrder = 7
473 472 object LabelEndCriteriaAbsCycles: TLabel
... ... @@ -497,7 +496,7 @@ object FormDesigner: TFormDesigner
497 496 ChildSizing.HorizontalSpacing = 5
498 497 ChildSizing.Layout = cclLeftToRightThenTopToBottom
499 498 ChildSizing.ControlsPerLine = 4
500   - ClientHeight = 25
  499 + ClientHeight = 22
501 500 ClientWidth = 532
502 501 TabOrder = 1
503 502 object SpinEditEndCriteriaInterlockingPorcentage: TSpinEdit
... ... @@ -548,7 +547,7 @@ object FormDesigner: TFormDesigner
548 547 Top = 641
549 548 Width = 640
550 549 Caption = 'Contingências e Metacontingências'
551   - ClientHeight = 80
  550 + ClientHeight = 77
552 551 ClientWidth = 636
553 552 TabOrder = 8
554 553 object ListBoxContingencies: TListBox
... ... @@ -560,7 +559,6 @@ object FormDesigner: TFormDesigner
560 559 ItemHeight = 0
561 560 ScrollWidth = 634
562 561 TabOrder = 0
563   - TopIndex = -1
564 562 end
565 563 end
566 564 end
... ... @@ -588,7 +586,7 @@ object FormDesigner: TFormDesigner
588 586 ChildSizing.ShrinkVertical = crsScaleChilds
589 587 ChildSizing.Layout = cclLeftToRightThenTopToBottom
590 588 ChildSizing.ControlsPerLine = 1
591   - ClientHeight = 42
  589 + ClientHeight = 39
592 590 ClientWidth = 646
593 591 Items.Strings = (
594 592 'Contingências Operantes'
... ... @@ -599,10 +597,10 @@ object FormDesigner: TFormDesigner
599 597 end
600 598 object ComboCurrentContingency: TComboBox
601 599 Left = 0
602   - Height = 27
  600 + Height = 23
603 601 Top = 74
604 602 Width = 650
605   - ItemHeight = 0
  603 + ItemHeight = 15
606 604 OnChange = ComboCurrentContingencyChange
607 605 Style = csDropDownList
608 606 TabOrder = 0
... ... @@ -678,7 +676,7 @@ object FormDesigner: TFormDesigner
678 676 ChildSizing.ShrinkVertical = crsScaleChilds
679 677 ChildSizing.Layout = cclLeftToRightThenTopToBottom
680 678 ChildSizing.ControlsPerLine = 1
681   - ClientHeight = 105
  679 + ClientHeight = 102
682 680 ClientWidth = 646
683 681 ItemIndex = 0
684 682 Items.Strings = (
... ... @@ -757,7 +755,7 @@ object FormDesigner: TFormDesigner
757 755 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
758 756 ChildSizing.Layout = cclTopToBottomThenLeftToRight
759 757 ChildSizing.ControlsPerLine = 2
760   - ClientHeight = 42
  758 + ClientHeight = 39
761 759 ClientWidth = 646
762 760 TabOrder = 6
763 761 Visible = False
... ... @@ -771,10 +769,10 @@ object FormDesigner: TFormDesigner
771 769 end
772 770 object CBPointsType: TComboBox
773 771 Left = 0
774   - Height = 27
  772 + Height = 23
775 773 Top = 15
776 774 Width = 154
777   - ItemHeight = 0
  775 + ItemHeight = 15
778 776 OnChange = ConsequenceStyleChange
779 777 Style = csDropDownList
780 778 TabOrder = 4
... ...
experiment_designer/form_main.pas
  Diff comments   View file @af8139a
  1 +{
  2 + Stimulus Control
  3 + Copyright (C) 2014-2016 Carlos Rafael Fernandes Picanço, Universidade Federal do Pará.
  4 +
  5 + The present file is distributed under the terms of the GNU General Public License (GPL v3.0).
  6 +
  7 + You should have received a copy of the GNU General Public License
  8 + along with this program. If not, see <http://www.gnu.org/licenses/>.
  9 +}
1 10 unit form_main;
2 11  
3 12 {$mode objfpc}{$H+}
... ...
units/game_actors_helpers.pas
  Diff comments   View file @af8139a
  1 +{
  2 + Stimulus Control
  3 + Copyright (C) 2014-2016 Carlos Rafael Fernandes Picanço, Universidade Federal do Pará.
  4 +
  5 + The present file is distributed under the terms of the GNU General Public License (GPL v3.0).
  6 +
  7 + You should have received a copy of the GNU General Public License
  8 + along with this program. If not, see <http://www.gnu.org/licenses/>.
  9 +}
1 10 unit game_actors_helpers;
2 11  
3 12 {$mode objfpc}{$H+}
... ...