fix list ou of bounds error

cpicanco · Aug 24, 2017 · dd44185 · dd44185
1 parent b018228
commit dd44185
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/lib/x86_64-linux-gtk2/stimulus_control.compiled b/lib/x86_64-linux-gtk2/stimulus_control.compiled
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <Compiler Value="/usr/bin/fpc" Date="1501925148"/>
-  <Params Value=" -Tlinux -Px86_64 -MObjFPC -Scaghi -Cg -CirotR -g -gl -gh -Xg -l -vewnhilbq -Fi/home/rafael/git/stimulus_control/lib/x86_64-linux-gtk2 -Fl/usr/lib/gcc/x86_64-linux-gnu/4.9 -Fu/home/rafael/git/stimulus_control/src/forms -Fu/home/rafael/git/stimulus_control/src/units -Fu/home/rafael/git/stimulus_control/dependency/bass -Fu/home/rafael/git/stimulus_control/dependency/synaser -Fu/home/rafael/git/stimulus_control/dependency/msgpack-delphi -Fu/home/rafael/git/stimulus_control/dependency/delphizmq -Fu/home/rafael/git/stimulus_control/src/prototypes -Fu/home/rafael/.lazarus/lib/IDEIntf/units/x86_64-linux/gtk2 -Fu/home/rafael/.lazarus/lib/LazControls/lib/i386-win32/win32 -Fu/home/rafael/.lazarus/lib/units/i386-win32/win32 -Fu/home/rafael/.lazarus/lib/LCLBase/units/i386-win32 -Fu/home/rafael/.lazarus/lib/LazUtils/lib/i386-win32 -Fu/home/rafael/.lazarus/lib/units/i386-win32 -Fu/home/rafael/git/stimulus_control/ -FU/home/rafael/git/stimulus_control/lib/x86_64-linux-gtk2/ -ostimulus_control_linux_64bits.bin -dLCL -dLCLgtk2 -dUseCThreads -dZMQ_STATIC_LINK stimulus_control.lpr"/>
+  <Params Value=" -Tlinux -Px86_64 -MObjFPC -Scaghi -Cg -CirotR -g -gl -Xg -l -vewnhilbq -Fi/home/rafael/git/stimulus_control/lib/x86_64-linux-gtk2 -Fl/usr/lib/gcc/x86_64-linux-gnu/4.9 -Fu/home/rafael/git/stimulus_control/src/forms -Fu/home/rafael/git/stimulus_control/src/units -Fu/home/rafael/git/stimulus_control/dependency/bass -Fu/home/rafael/git/stimulus_control/dependency/synaser -Fu/home/rafael/git/stimulus_control/dependency/msgpack-delphi -Fu/home/rafael/git/stimulus_control/dependency/delphizmq -Fu/home/rafael/git/stimulus_control/src/prototypes -Fu/home/rafael/.lazarus/lib/IDEIntf/units/x86_64-linux/gtk2 -Fu/usr/share/lazarus/1.8.0RC4/components/lazcontrols/lib/x86_64-linux/gtk2 -Fu/usr/share/lazarus/1.8.0RC4/lcl/units/x86_64-linux/gtk2 -Fu/usr/share/lazarus/1.8.0RC4/lcl/units/x86_64-linux -Fu/usr/share/lazarus/1.8.0RC4/components/lazutils/lib/x86_64-linux -Fu/usr/share/lazarus/1.8.0RC4/packager/units/x86_64-linux -Fu/home/rafael/git/stimulus_control/ -FU/home/rafael/git/stimulus_control/lib/x86_64-linux-gtk2/ -ostimulus_control_linux_64bits.bin -dLCL -dLCLgtk2 -dUseCThreads -dZMQ_STATIC_LINK stimulus_control.lpr"/>
 </CONFIG>
diff --git a/src/forms/userconfigs.lfm b/src/forms/userconfigs.lfm
@@ -3,8 +3,8 @@ object FormUserConfig: TFormUserConfig
   Height = 506
   Top = 146
   Width = 752
-  HorzScrollBar.Page = 494
-  VertScrollBar.Page = 231
+  HorzScrollBar.Page = 533
+  VertScrollBar.Page = 221
   AutoScroll = True
   Caption = 'Configurar Sessão'
   ClientHeight = 506
@@ -1622,7 +1622,7 @@ object FormUserConfig: TFormUserConfig
   ParentBiDiMode = False
   Position = poScreenCenter
   SessionProperties = 'btnFillCondition.Caption;btnRandomize.Caption;cbDrawTrialGroup.Checked;cbShowRepetitions.Checked;chkDrawTrialGroup.Checked;chkPlayOnSecondMonitor.Checked;chkPupilClient.Checked;chkShowRepetitions.Checked;ColorButtonBloc.ButtonColor;ComboBoxBlocCounter.ItemIndex;ComboBoxBlocCounter.Text;ComboBoxFillTargetColumn.ItemIndex;ComboBoxFillTargetColumn.Text;ComboBoxGridType.ItemIndex;ComboBoxGridType.Text;ComboBoxRandomize.ItemIndex;ComboBoxRandomize.Text;ComboBoxSessionType.ItemIndex;ComboBoxSessionType.Text;EditBlocChainingPath.Text;EditBlocName.Text;EditParticipant.Text;EditSessionName.Text;EditTargetSession.Text;edtContent.Text;edtTarget.Text;edtTrialGroup.Text;Height;HorzScrollBar;leFillValue.Text;leParticipant.Text;leSessionName.Text;Memo1.Lines;OpenDialog1.InitialDir;OpenPictureDialog1.InitialDir;pgRodar.TabIndex;piAxes.Checked;piBlocChaining.Checked;piExpectedResponse.Checked;piFillAll.Checked;piFillEven.Checked;piFillOdd.Checked;piFPE.Checked;piGo_NoGo.Checked;piMatrix.Checked;piMTS.Checked;piTrialGroup.Checked;piTrials.Checked;piTrialsWithConstraints.Checked;Position;SaveDialog1.InitialDir;seBlocCrtConsecutiveHit.Value;seBlocCrtHitPorcentage.Value;seBlocITI.Value;seBlocksCount.Value;seBlocMaxCorrection.Value;seBlocMaxRepetition.Value;seBlocVirtualTrial.Value;seCount.Value;SelectDirectoryDialog1.InitialDir;seTrialGroup.Value;StringGrid1.ColCount;StringGrid1.Columns;StringGrid1.RowCount;StringGrid1.VisibleColCount;StringGrid1.VisibleRowCount;VertScrollBar;Width;WindowState;ComboBoxLanguage.Text;ComboBoxLanguage.Items;ComboBoxLanguage.ItemIndex'
-  LCLVersion = '1.8.0.3'
+  LCLVersion = '1.8.0.4'
   object btnRun: TButton
     Left = 8
     Height = 25
@@ -1647,10 +1647,10 @@ object FormUserConfig: TFormUserConfig
     Height = 468
     Top = 0
     Width = 754
-    ActivePage = tbVersion
+    ActivePage = tbGeneral
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Bottom = 40
-    TabIndex = 6
+    TabIndex = 0
     TabOrder = 2
     object tbGeneral: TTabSheet
       Caption = 'Geral'
@@ -1720,19 +1720,23 @@ object FormUserConfig: TFormUserConfig
       end
       object LabelLanguage: TLabel
         Left = 74
-        Height = 27
+        Height = 23
         Top = 100
         Width = 127
         Caption = 'Idioma'
         ParentColor = False
       end
       object ComboBoxLanguage: TComboBox
         Left = 275
-        Height = 27
+        Height = 23
         Top = 100
         Width = 400
         Constraints.MinWidth = 400
         ItemHeight = 0
+        Items.Strings = (
+          'en'
+          'pt-br'
+        )
         OnChange = ComboBoxLanguageChange
         Style = csDropDownList
         TabOrder = 3

diff --git a/stimulus_control.lpi b/stimulus_control.lpi
@@ -58,7 +58,6 @@
           </CodeGeneration>
           <Linking>
             <Debugging>
-              <UseHeaptrc Value="True"/>
               <UseExternalDbgSyms Value="True"/>
             </Debugging>
             <Options>
@@ -73,10 +72,9 @@
             </Verbosity>
             <CustomOptions Value="-dUseCThreads
 -dZMQ_STATIC_LINK"/>
-            <OtherDefines Count="3">
-              <Define0 Value="UseCThreads"/>
-              <Define1 Value="DEBUG"/>
-              <Define2 Value="ZMQ_STATIC_LINK"/>
+            <OtherDefines Count="2">
+              <Define0 Value="NO_LIBZMQ"/>
+              <Define1 Value="UseCThreads"/>
             </OtherDefines>
           </Other>
         </CompilerOptions>