Download as
Browse Code »

Commit 245c44cb123b60f9b60f6e6fe50aa9e1c5dc5876

Authored by Carlos Picanco
1 parent 15518a42
Exists in master

designer: add chat and change compilaion rule

Showing 4 changed files with 26 additions and 21 deletions   Show diff stats
experiment_designer/experiment_designer.lpi
  Diff comments   View file @245c44c
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 <Title Value="experiment_designer"/> 9 <Title Value="experiment_designer"/>
10 <ResourceType Value="res"/> 10 <ResourceType Value="res"/>
11 <UseXPManifest Value="True"/> 11 <UseXPManifest Value="True"/>
  12 + <Icon Value="0"/>
12 </General> 13 </General>
13 <i18n> 14 <i18n>
14 <EnableI18N LFM="False"/> 15 <EnableI18N LFM="False"/>
@@ -29,18 +30,11 @@ @@ -29,18 +30,11 @@
29 <OtherUnitFiles Value="../experiment_runner/units"/> 30 <OtherUnitFiles Value="../experiment_runner/units"/>
30 <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/> 31 <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
31 </SearchPaths> 32 </SearchPaths>
32 - <CodeGeneration>  
33 - <SmartLinkUnit Value="True"/>  
34 - <Optimizations>  
35 - <OptimizationLevel Value="3"/>  
36 - </Optimizations>  
37 - </CodeGeneration>  
38 <Linking> 33 <Linking>
39 <Debugging> 34 <Debugging>
40 <GenerateDebugInfo Value="False"/> 35 <GenerateDebugInfo Value="False"/>
41 <StripSymbols Value="True"/> 36 <StripSymbols Value="True"/>
42 </Debugging> 37 </Debugging>
43 - <LinkSmart Value="True"/>  
44 <Options> 38 <Options>
45 <Win32> 39 <Win32>
46 <GraphicApplication Value="True"/> 40 <GraphicApplication Value="True"/>
@@ -83,15 +77,11 @@ @@ -83,15 +77,11 @@
83 <OtherUnitFiles Value="../experiment_runner/units"/> 77 <OtherUnitFiles Value="../experiment_runner/units"/>
84 <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/> 78 <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
85 </SearchPaths> 79 </SearchPaths>
86 - <CodeGeneration>  
87 - <SmartLinkUnit Value="True"/>  
88 - </CodeGeneration>  
89 <Linking> 80 <Linking>
90 <Debugging> 81 <Debugging>
91 <GenerateDebugInfo Value="False"/> 82 <GenerateDebugInfo Value="False"/>
92 <StripSymbols Value="True"/> 83 <StripSymbols Value="True"/>
93 </Debugging> 84 </Debugging>
94 - <LinkSmart Value="True"/>  
95 <Options> 85 <Options>
96 <Win32> 86 <Win32>
97 <GraphicApplication Value="True"/> 87 <GraphicApplication Value="True"/>
experiment_designer/form_main.lfm
  Diff comments   View file @245c44c
@@ -18,7 +18,7 @@ object FormDesigner: TFormDesigner @@ -18,7 +18,7 @@ object FormDesigner: TFormDesigner
18 LCLVersion = '1.6.2.0' 18 LCLVersion = '1.6.2.0'
19 object PageControl: TPageControl 19 object PageControl: TPageControl
20 Left = 0 20 Left = 0
21 - Height = 744 21 + Height = 765
22 Top = 0 22 Top = 0
23 Width = 643 23 Width = 643
24 ActivePage = TabSheetExperiment 24 ActivePage = TabSheetExperiment
@@ -32,7 +32,7 @@ object FormDesigner: TFormDesigner @@ -32,7 +32,7 @@ object FormDesigner: TFormDesigner
32 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize 32 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
33 ChildSizing.Layout = cclLeftToRightThenTopToBottom 33 ChildSizing.Layout = cclLeftToRightThenTopToBottom
34 ChildSizing.ControlsPerLine = 1 34 ChildSizing.ControlsPerLine = 1
35 - ClientHeight = 711 35 + ClientHeight = 732
36 ClientWidth = 637 36 ClientWidth = 637
37 object GBConditions: TGroupBox 37 object GBConditions: TGroupBox
38 Left = 0 38 Left = 0
@@ -111,7 +111,7 @@ object FormDesigner: TFormDesigner @@ -111,7 +111,7 @@ object FormDesigner: TFormDesigner
111 end 111 end
112 object CGGlobal: TCheckGroup 112 object CGGlobal: TCheckGroup
113 Left = 0 113 Left = 0
114 - Height = 113 114 + Height = 134
115 Hint = 'Aplicáveis ao longo de todo o experimento' 115 Hint = 'Aplicáveis ao longo de todo o experimento'
116 Top = 376 116 Top = 376
117 Width = 637 117 Width = 637
@@ -125,24 +125,26 @@ object FormDesigner: TFormDesigner @@ -125,24 +125,26 @@ object FormDesigner: TFormDesigner
125 ChildSizing.ShrinkVertical = crsScaleChilds 125 ChildSizing.ShrinkVertical = crsScaleChilds
126 ChildSizing.Layout = cclLeftToRightThenTopToBottom 126 ChildSizing.Layout = cclLeftToRightThenTopToBottom
127 ChildSizing.ControlsPerLine = 1 127 ChildSizing.ControlsPerLine = 1
128 - ClientHeight = 96 128 + ClientHeight = 117
129 ClientWidth = 633 129 ClientWidth = 633
130 Items.Strings = ( 130 Items.Strings = (
131 'Enviar histórico do bate-papo a novos participantes' 131 'Enviar histórico do bate-papo a novos participantes'
132 'Gerar participantes automaticamente' 132 'Gerar participantes automaticamente'
133 'Habilitar matrix para o pesquisador jogar' 133 'Habilitar matrix para o pesquisador jogar'
134 'Habilitar bate-papo para o pesquisador' 134 'Habilitar bate-papo para o pesquisador'
  135 + 'Habilitar bate-papo'
135 ) 136 )
  137 + OnClick = CGGlobalClick
136 OnItemClick = CGGlobalItemClick 138 OnItemClick = CGGlobalItemClick
137 TabOrder = 3 139 TabOrder = 3
138 Data = { 140 Data = {
139 - 0400000002030202 141 + 050000000202020202
140 } 142 }
141 end 143 end
142 object RGPoints: TRadioGroup 144 object RGPoints: TRadioGroup
143 Left = 0 145 Left = 0
144 Height = 59 146 Height = 59
145 - Top = 494 147 + Top = 515
146 Width = 637 148 Width = 637
147 AutoFill = True 149 AutoFill = True
148 Caption = 'Tipo de pontuação Individual' 150 Caption = 'Tipo de pontuação Individual'
@@ -166,7 +168,7 @@ object FormDesigner: TFormDesigner @@ -166,7 +168,7 @@ object FormDesigner: TFormDesigner
166 object GBMatrix: TGroupBox 168 object GBMatrix: TGroupBox
167 Left = 0 169 Left = 0
168 Height = 143 170 Height = 143
169 - Top = 558 171 + Top = 579
170 Width = 637 172 Width = 637
171 Caption = 'Tipo da Matrix' 173 Caption = 'Tipo da Matrix'
172 ChildSizing.LeftRightSpacing = 5 174 ChildSizing.LeftRightSpacing = 5
@@ -247,7 +249,7 @@ object FormDesigner: TFormDesigner @@ -247,7 +249,7 @@ object FormDesigner: TFormDesigner
247 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize 249 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
248 ChildSizing.Layout = cclLeftToRightThenTopToBottom 250 ChildSizing.Layout = cclLeftToRightThenTopToBottom
249 ChildSizing.ControlsPerLine = 1 251 ChildSizing.ControlsPerLine = 1
250 - ClientHeight = 711 252 + ClientHeight = 732
251 ClientWidth = 637 253 ClientWidth = 637
252 object ComboCurrentCondition: TComboBox 254 object ComboCurrentCondition: TComboBox
253 Left = 0 255 Left = 0
@@ -652,7 +654,7 @@ object FormDesigner: TFormDesigner @@ -652,7 +654,7 @@ object FormDesigner: TFormDesigner
652 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize 654 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
653 ChildSizing.Layout = cclLeftToRightThenTopToBottom 655 ChildSizing.Layout = cclLeftToRightThenTopToBottom
654 ChildSizing.ControlsPerLine = 1 656 ChildSizing.ControlsPerLine = 1
655 - ClientHeight = 711 657 + ClientHeight = 732
656 ClientWidth = 637 658 ClientWidth = 637
657 Enabled = False 659 Enabled = False
658 object RGContingencyType: TRadioGroup 660 object RGContingencyType: TRadioGroup
experiment_designer/form_main.pas
  Diff comments   View file @245c44c
@@ -134,6 +134,7 @@ type @@ -134,6 +134,7 @@ type
134 procedure BtnReorderCondClick(Sender: TObject); 134 procedure BtnReorderCondClick(Sender: TObject);
135 procedure BtnReorderContingencyClick(Sender: TObject); 135 procedure BtnReorderContingencyClick(Sender: TObject);
136 procedure ButtonPreviewMessageClick(Sender: TObject); 136 procedure ButtonPreviewMessageClick(Sender: TObject);
  137 + procedure CGGlobalClick(Sender: TObject);
137 procedure CGGlobalItemClick(Sender: TObject; Index: integer); 138 procedure CGGlobalItemClick(Sender: TObject; Index: integer);
138 procedure CheckBoxImutableMessageChange(Sender: TObject); 139 procedure CheckBoxImutableMessageChange(Sender: TObject);
139 procedure ChkMatrixTypeClick(Sender: TObject); 140 procedure ChkMatrixTypeClick(Sender: TObject);
@@ -1052,6 +1053,8 @@ begin @@ -1052,6 +1053,8 @@ begin
1052 WriteBool(SEC_EXPERIMENT, KEY_GEN_PLAYER_AS_NEEDED, CGGlobal.Checked[1]); 1053 WriteBool(SEC_EXPERIMENT, KEY_GEN_PLAYER_AS_NEEDED, CGGlobal.Checked[1]);
1053 WriteBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANPLAY, CGGlobal.Checked[2]); 1054 WriteBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANPLAY, CGGlobal.Checked[2]);
1054 WriteBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANCHAT, CGGlobal.Checked[3]); 1055 WriteBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANCHAT, CGGlobal.Checked[3]);
  1056 + WriteBool(SEC_EXPERIMENT, KEY_CHAT_FOR_PLAYERS, CGGlobal.Checked[4]);
  1057 +
1055 case RGPoints.ItemIndex of 1058 case RGPoints.ItemIndex of
1056 0: WriteBool(SEC_EXPERIMENT, KEY_POINTS_TYPE, True); 1059 0: WriteBool(SEC_EXPERIMENT, KEY_POINTS_TYPE, True);
1057 1: WriteBool(SEC_EXPERIMENT, KEY_POINTS_TYPE, False); 1060 1: WriteBool(SEC_EXPERIMENT, KEY_POINTS_TYPE, False);
@@ -1071,6 +1074,8 @@ begin @@ -1071,6 +1074,8 @@ begin
1071 CGGlobal.Checked[1] := ReadBool(SEC_EXPERIMENT, KEY_GEN_PLAYER_AS_NEEDED, False); 1074 CGGlobal.Checked[1] := ReadBool(SEC_EXPERIMENT, KEY_GEN_PLAYER_AS_NEEDED, False);
1072 CGGlobal.Checked[2] := ReadBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANPLAY, False); 1075 CGGlobal.Checked[2] := ReadBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANPLAY, False);
1073 CGGlobal.Checked[3] := ReadBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANCHAT, False); 1076 CGGlobal.Checked[3] := ReadBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANCHAT, False);
  1077 + CGGlobal.Checked[4] := ReadBool(SEC_EXPERIMENT, KEY_CHAT_FOR_PLAYERS, False);
  1078 +
1074 if ReadBool(SEC_EXPERIMENT, KEY_POINTS_TYPE, True) then 1079 if ReadBool(SEC_EXPERIMENT, KEY_POINTS_TYPE, True) then
1075 RGPoints.ItemIndex := 0 1080 RGPoints.ItemIndex := 0
1076 else 1081 else
@@ -1891,6 +1896,11 @@ begin @@ -1891,6 +1896,11 @@ begin
1891 CreateMessage(i); 1896 CreateMessage(i);
1892 end; 1897 end;
1893 1898
  1899 +procedure TFormDesigner.CGGlobalClick(Sender: TObject);
  1900 +begin
  1901 +
  1902 +end;
  1903 +
1894 procedure TFormDesigner.CGGlobalItemClick(Sender: TObject; Index: integer); 1904 procedure TFormDesigner.CGGlobalItemClick(Sender: TObject; Index: integer);
1895 begin 1905 begin
1896 if not FLoading then 1906 if not FLoading then
@@ -1908,6 +1918,9 @@ begin @@ -1908,6 +1918,9 @@ begin
1908 1918
1909 if Index = 3 then 1919 if Index = 3 then
1910 WriteBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANCHAT, CGGlobal.Checked[Index]); 1920 WriteBool(SEC_EXPERIMENT, KEY_RESEARCHER_CANCHAT, CGGlobal.Checked[Index]);
  1921 +
  1922 + if Index = 4 then
  1923 + WriteBool(SEC_EXPERIMENT, KEY_CHAT_FOR_PLAYERS, CGGlobal.Checked[Index]);
1911 end; 1924 end;
1912 end; 1925 end;
1913 1926
experiment_designer/lib/x86_64-linux/experiment_designer.compiled
  Diff comments   View file @245c44c
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <CONFIG> 2 <CONFIG>
3 <Compiler Value="/usr/bin/fpc" Date="1449313866"/> 3 <Compiler Value="/usr/bin/fpc" Date="1449313866"/>
4 - <Params Value=" -MObjFPC -Scghi -CX -Cg -O3 -Xs -XX -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/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"/>
5 </CONFIG> 5 </CONFIG>