diff --git a/experiment_designer/form_main.lfm b/experiment_designer/form_main.lfm index 2290e00..0c3ad4f 100644 --- a/experiment_designer/form_main.lfm +++ b/experiment_designer/form_main.lfm @@ -3,7 +3,7 @@ object FormDesigner: TFormDesigner Height = 656 Top = 29 Width = 653 - HorzScrollBar.Page = 521 + HorzScrollBar.Page = 346 VertScrollBar.Page = 637 AutoScroll = True Caption = 'Planejar Experimento' @@ -18,12 +18,12 @@ object FormDesigner: TFormDesigner LCLVersion = '1.6.2.0' object PageControl: TPageControl Left = 0 - Height = 793 + Height = 765 Top = 0 Width = 643 - ActivePage = TabSheetConditions + ActivePage = TabSheetExperiment Align = alClient - TabIndex = 1 + TabIndex = 0 TabOrder = 0 object TabSheetExperiment: TTabSheet Caption = 'Experimento' @@ -32,7 +32,7 @@ object FormDesigner: TFormDesigner ChildSizing.EnlargeHorizontal = crsHomogenousChildResize ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 760 + ClientHeight = 732 ClientWidth = 637 object GBConditions: TGroupBox Left = 0 @@ -249,7 +249,7 @@ object FormDesigner: TFormDesigner ChildSizing.EnlargeHorizontal = crsHomogenousChildResize ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 760 + ClientHeight = 732 ClientWidth = 637 object ComboCurrentCondition: TComboBox Left = 0 @@ -655,14 +655,14 @@ object FormDesigner: TFormDesigner ChildSizing.EnlargeHorizontal = crsHomogenousChildResize ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 760 + ClientHeight = 732 ClientWidth = 637 Enabled = False object RGContingencyType: TRadioGroup Left = 0 - Height = 58 + Height = 59 Top = 10 - Width = 628 + Width = 637 AutoFill = True Caption = 'Mostrar' ChildSizing.LeftRightSpacing = 6 @@ -672,8 +672,8 @@ object FormDesigner: TFormDesigner ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 41 - ClientWidth = 624 + ClientHeight = 42 + ClientWidth = 633 Items.Strings = ( 'Contingências Operantes' 'Metacontingências' @@ -683,9 +683,9 @@ object FormDesigner: TFormDesigner end object ComboCurrentContingency: TComboBox Left = 0 - Height = 23 - Top = 73 - Width = 628 + Height = 27 + Top = 74 + Width = 637 ItemHeight = 0 OnChange = ComboCurrentContingencyChange Style = csDropDownList @@ -694,39 +694,39 @@ object FormDesigner: TFormDesigner object PanelContingenciesButtons: TPanel Left = 0 Height = 26 - Top = 101 - Width = 628 + Top = 106 + Width = 637 ChildSizing.LeftRightSpacing = 25 ChildSizing.HorizontalSpacing = 50 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 3 ClientHeight = 26 - ClientWidth = 628 + ClientWidth = 637 TabOrder = 1 object BtnAppendContingency: TButton Left = 25 Height = 25 Top = 0 - Width = 160 + Width = 161 Caption = 'Adicionar' OnClick = BtnAppendContingencyClick TabOrder = 0 end object BtnRemoveContingency: TButton - Left = 235 + Left = 236 Height = 25 Top = 0 - Width = 156 + Width = 158 Caption = 'Remover' OnClick = BtnRemoveContingencyClick TabOrder = 1 end object BtnReorderContingency: TButton - Left = 441 + Left = 444 Height = 25 Top = 0 - Width = 162 + Width = 168 Caption = 'Reordenar' OnClick = BtnReorderContingencyClick TabOrder = 2 @@ -736,24 +736,24 @@ object FormDesigner: TFormDesigner object LabelContingencyName: TLabel Left = 0 Height = 15 - Top = 132 - Width = 628 + Top = 137 + Width = 637 Caption = 'Nome da contingência' ParentColor = False end object EditContingencyName: TEdit Left = 0 - Height = 23 - Top = 152 - Width = 628 + Height = 25 + Top = 157 + Width = 637 OnEditingDone = EditContingencyNameEditingDone TabOrder = 2 end object RGContingencyStyle: TRadioGroup Left = 0 - Height = 115 - Top = 180 - Width = 628 + Height = 122 + Top = 187 + Width = 637 AutoFill = True Caption = 'Estilo da Resposta' ChildSizing.LeftRightSpacing = 6 @@ -763,8 +763,8 @@ object FormDesigner: TFormDesigner ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 98 - ClientWidth = 624 + ClientHeight = 105 + ClientWidth = 633 ItemIndex = 0 Items.Strings = ( 'Extinção' @@ -780,8 +780,8 @@ object FormDesigner: TFormDesigner object LabelIf: TLabel Left = 0 Height = 15 - Top = 300 - Width = 628 + Top = 314 + Width = 637 Alignment = taCenter Caption = 'SE O PARTICIPANTE ESCOLHER' ParentColor = False @@ -789,9 +789,9 @@ object FormDesigner: TFormDesigner end object GBContingencyRows: TGroupBox Left = 0 - Height = 19 - Top = 320 - Width = 628 + Height = 17 + Top = 334 + Width = 637 Caption = 'Linhas' ChildSizing.LeftRightSpacing = 5 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize @@ -803,8 +803,8 @@ object FormDesigner: TFormDesigner object LabelOperator: TLabel Left = 0 Height = 15 - Top = 344 - Width = 628 + Top = 356 + Width = 637 Alignment = taCenter Caption = 'E' ParentColor = False @@ -812,9 +812,9 @@ object FormDesigner: TFormDesigner end object GBContingencyColors: TGroupBox Left = 0 - Height = 19 - Top = 364 - Width = 628 + Height = 17 + Top = 376 + Width = 637 Caption = 'Cores' ChildSizing.HorizontalSpacing = 5 ChildSizing.EnlargeHorizontal = crsHomogenousChildResize @@ -826,8 +826,8 @@ object FormDesigner: TFormDesigner object LabelThen: TLabel Left = 0 Height = 15 - Top = 388 - Width = 628 + Top = 398 + Width = 637 Alignment = taCenter Caption = 'ENTÃO' ParentColor = False @@ -835,47 +835,47 @@ object FormDesigner: TFormDesigner end object GBContingencyConsequence: TGroupBox Left = 0 - Height = 344 - Top = 408 - Width = 628 + Height = 364 + Top = 418 + Width = 637 Caption = 'Consequência' ChildSizing.EnlargeHorizontal = crsHomogenousChildResize ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 2 - ClientHeight = 327 - ClientWidth = 624 + ClientHeight = 347 + ClientWidth = 633 TabOrder = 6 Visible = False object LabelCsq1: TLabel Left = 0 Height = 15 Top = 0 - Width = 394 + Width = 409 Caption = 'Pontos' ParentColor = False end object LabelCsq2: TLabel - Left = 394 + Left = 409 Height = 15 Top = 0 - Width = 230 + Width = 224 Caption = 'do Tipo' ParentColor = False end object SpinEditContingencyPoints: TSpinEdit Left = 0 - Height = 23 + Height = 27 Top = 15 - Width = 394 + Width = 409 MaxValue = 0 OnEditingDone = ConsequenceStyleChange TabOrder = 0 end object CBPointsType: TComboBox - Left = 394 - Height = 23 + Left = 409 + Height = 27 Top = 15 - Width = 230 + Width = 224 ItemHeight = 0 OnChange = ConsequenceStyleChange Style = csDropDownList @@ -883,9 +883,9 @@ object FormDesigner: TFormDesigner end object RGBroadcastMessage: TRadioGroup Left = 0 - Height = 77 - Top = 38 - Width = 394 + Height = 80 + Top = 42 + Width = 409 AutoFill = True Caption = 'Apresentar mensagem de notificação' ChildSizing.LeftRightSpacing = 6 @@ -895,8 +895,8 @@ object FormDesigner: TFormDesigner ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 60 - ClientWidth = 390 + ClientHeight = 63 + ClientWidth = 405 ItemIndex = 0 Items.Strings = ( 'a todos os participantes' @@ -907,11 +907,11 @@ object FormDesigner: TFormDesigner TabOrder = 9 end object CheckBoxImutableMessage: TCheckBox - Left = 394 - Height = 77 + Left = 409 + Height = 80 Hint = 'Marque se deseja uma mensagem fixa; o programa não atualizará o texto da mensagem caso o valor da pontuação mude ao longo do experimento.' - Top = 38 - Width = 230 + Top = 42 + Width = 224 AutoSize = False Caption = 'imutável' OnChange = CheckBoxImutableMessageChange @@ -919,136 +919,136 @@ object FormDesigner: TFormDesigner end object LabelCsq3: TLabel Left = 0 - Height = 23 - Top = 115 - Width = 394 + Height = 25 + Top = 122 + Width = 409 Caption = 'Texto no início da mensagem' ParentColor = False end object EditMessPrefix: TEdit - Left = 394 - Height = 23 - Top = 115 - Width = 230 + Left = 409 + Height = 25 + Top = 122 + Width = 224 OnEditingDone = EditMessDone TabOrder = 2 Text = '$NICNAME' end object LabelCsq4: TLabel Left = 0 - Height = 23 - Top = 138 - Width = 394 + Height = 25 + Top = 147 + Width = 409 Caption = 'Prefixo ao perder pontos' ParentColor = False end object EditMessPrefixLoss: TEdit - Left = 394 - Height = 23 - Top = 138 - Width = 230 + Left = 409 + Height = 25 + Top = 147 + Width = 224 OnEditingDone = EditMessDone TabOrder = 3 Text = 'perdeu' end object LabelCsq5: TLabel Left = 0 - Height = 23 - Top = 161 - Width = 394 + Height = 25 + Top = 172 + Width = 409 Caption = 'Sufixo ao perder pontos (Singular)' ParentColor = False end object EditMessSufixLossSingular: TEdit - Left = 394 - Height = 23 - Top = 161 - Width = 230 + Left = 409 + Height = 25 + Top = 172 + Width = 224 OnEditingDone = EditMessDone TabOrder = 4 Text = 'ponto.' end object LabelCsq6: TLabel Left = 0 - Height = 23 - Top = 184 - Width = 394 + Height = 25 + Top = 197 + Width = 409 Caption = 'Sufixo ao perder pontos (Plural)' ParentColor = False end object EditMessSufixLossPlural: TEdit - Left = 394 - Height = 23 - Top = 184 - Width = 230 + Left = 409 + Height = 25 + Top = 197 + Width = 224 OnEditingDone = EditMessDone TabOrder = 5 Text = 'pontos.' end object LabelCsq7: TLabel Left = 0 - Height = 23 - Top = 207 - Width = 394 + Height = 25 + Top = 222 + Width = 409 Caption = 'Prefixo ao ganhar pontos' ParentColor = False end object EditMessPrefixEarn: TEdit - Left = 394 - Height = 23 - Top = 207 - Width = 230 + Left = 409 + Height = 25 + Top = 222 + Width = 224 OnEditingDone = EditMessDone TabOrder = 6 Text = 'ganhou' end object LabelCsq8: TLabel Left = 0 - Height = 23 - Top = 230 - Width = 394 + Height = 25 + Top = 247 + Width = 409 Caption = 'Sufixo ao ganhar pontos (Singular)' ParentColor = False end object EditMessSufixEarnSingular: TEdit - Left = 394 - Height = 23 - Top = 230 - Width = 230 + Left = 409 + Height = 25 + Top = 247 + Width = 224 OnEditingDone = EditMessDone TabOrder = 7 Text = 'ponto.' end object LabelCsq9: TLabel Left = 0 - Height = 23 - Top = 253 - Width = 394 + Height = 25 + Top = 272 + Width = 409 Caption = 'Sufixo ao ganhar pontos (Plural)' ParentColor = False end object EditMessSufixEarnPlural: TEdit - Left = 394 - Height = 23 - Top = 253 - Width = 230 + Left = 409 + Height = 25 + Top = 272 + Width = 224 OnEditingDone = EditMessDone TabOrder = 8 Text = 'pontos.' end object LabelCsq10: TLabel Left = 0 - Height = 23 - Top = 276 - Width = 394 + Height = 25 + Top = 297 + Width = 409 Caption = 'Sufixo 0 pontos' ParentColor = False end object EditMessSufixZero: TEdit - Left = 394 - Height = 23 - Top = 276 - Width = 230 + Left = 409 + Height = 25 + Top = 297 + Width = 224 OnEditingDone = EditMessDone TabOrder = 11 Text = 'não ganhou nem perdeu pontos.' @@ -1056,8 +1056,8 @@ object FormDesigner: TFormDesigner object ButtonPreviewMessage: TButton Left = 0 Height = 25 - Top = 299 - Width = 394 + Top = 322 + Width = 409 Caption = 'Ver como a mensagem pode ser apresentada' OnClick = ButtonPreviewMessageClick TabOrder = 12 diff --git a/experiment_designer/form_main.pas b/experiment_designer/form_main.pas index cac4e96..75bcdea 100644 --- a/experiment_designer/form_main.pas +++ b/experiment_designer/form_main.pas @@ -370,7 +370,8 @@ end; procedure TFormDesigner.RGContingencyStyleExit(Sender: TObject); begin - SaveContingency(ExtractDelimited(1,ComboCurrentCondition.Text,['|']),ExtractDelimited(1,ComboCurrentContingency.Text,['|'])); + if ComboCurrentContingency.ItemIndex <> -1 then + SaveContingency(ExtractDelimited(1,ComboCurrentCondition.Text,['|']),ExtractDelimited(1,ComboCurrentContingency.Text,['|'])); end; -- libgit2 0.21.2