Skip to content

Commit 7782ae5

Browse files
fabiola-mfabiola-m
authored
Merge pull request #201 from lab-neuro-comp/175/randomMatching
Added random DMTS/DMTS
2 parents 850a920 + c2c2240 commit 7782ae5

10 files changed

+1309
-639
lines changed

‎StroopTest/Resources/Localizations/LocalizedResources.en-US.resx

+6
Original file line numberDiff line numberDiff line change
@@ -2854,4 +2854,10 @@ user to the stimulus or if there is no reaction to the stimulus(ms)</td>
28542854
<data name="shouldSelectReason" xml:space="preserve">
28552855
<value>You should select a valid reason.</value>
28562856
</data>
2857+
<data name="alternatingDMTS_DNMTS" xml:space="preserve">
2858+
<value>DMTS/DNMTS(Alternating)</value>
2859+
</data>
2860+
<data name="randomDMTS_DNMTS" xml:space="preserve">
2861+
<value>DMTS/DNMTS(Random)</value>
2862+
</data>
28572863
</root>

‎StroopTest/Resources/Localizations/LocalizedResources.es-ES.resx

+6
Original file line numberDiff line numberDiff line change
@@ -348,4 +348,10 @@ https://github.com/lab-neuro-comp/Test-Platform
348348
<data name="cannotRecoverFilesByMotive" xml:space="preserve">
349349
<value>Debe crear o recuperar las siguientes listas antes de recuperar el programa "</value>
350350
</data>
351+
<data name="alternatingDMTS_DNMTS" xml:space="preserve">
352+
<value>DMTS/DNMTS(Alterno)</value>
353+
</data>
354+
<data name="randomDMTS_DNMTS" xml:space="preserve">
355+
<value>DMTS/DNMTS(Aleatorio)</value>
356+
</data>
351357
</root>

‎StroopTest/Resources/Localizations/LocalizedResources.pt-BR.resx

+6
Original file line numberDiff line numberDiff line change
@@ -2837,4 +2837,10 @@ https://github.com/lab-neuro-comp/Test-Platform</value>
28372837
<data name="shouldSelectReason" xml:space="preserve">
28382838
<value>Um motivo válido deve ser selecionado.</value>
28392839
</data>
2840+
<data name="alternatingDMTS_DNMTS" xml:space="preserve">
2841+
<value>DMTS/DNMTS(Alternado)</value>
2842+
</data>
2843+
<data name="randomDMTS_DNMTS" xml:space="preserve">
2844+
<value>DMTS/DNMTS(Aleatorio)</value>
2845+
</data>
28402846
</root>

‎StroopTest/Views/MatchingPages/FormMatchConfig.Designer.cs

+6-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎StroopTest/Views/MatchingPages/FormMatchConfig.cs

+17-13
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,21 @@ private void editProgram()
106106
feedbackAudioResponse.Checked = editProgram.FeedbackAudioResponse;
107107
expositonAudioResponse.Checked = editProgram.ExpositionAudioResponse;
108108
randomModelStimulusTime.Checked = editProgram.RandomIntervalModelStimulus;
109-
switch (editProgram.getExpositionType())
109+
if (editProgram.getExpositionType() == "DMTS")
110110
{
111-
case "DMTS":
112-
this.expositionType.SelectedIndex = 0;
113-
break;
114-
case "DNMTS":
115-
this.expositionType.SelectedIndex = 1;
116-
break;
117-
case "DMTS/DNMTS":
118-
this.expositionType.SelectedIndex = 2;
119-
break;
111+
this.expositionType.SelectedIndex = 0;
112+
}
113+
else if (editProgram.getExpositionType() == "DNMTS")
114+
{
115+
this.expositionType.SelectedIndex = 1;
116+
}
117+
else if (editProgram.getExpositionType() == LocRM.GetString("alternatingDMTS_DNMTS", currentCulture))
118+
{
119+
this.expositionType.SelectedIndex = 2;
120+
}
121+
else
122+
{
123+
this.expositionType.SelectedIndex = 3;
120124
}
121125

122126
// reads program instructions to instruction box if there are any
@@ -297,7 +301,7 @@ private void expositionType_Validating(object sender, CancelEventArgs e)
297301

298302
private bool validExpositionType(out string errorMessage)
299303
{
300-
if(this.expositionType.SelectedIndex >= 0 && this.expositionType.SelectedIndex < 3)
304+
if(this.expositionType.SelectedIndex >= 0 && this.expositionType.SelectedIndex < 4)
301305
{
302306
errorMessage = "";
303307
return true;
@@ -318,7 +322,7 @@ private void expositionType_SelectedIndexChanged(object sender, EventArgs e)
318322
{
319323
this.errorProvider1.Clear();
320324
this.errorProvider2.Clear();
321-
if(this.expositionType.SelectedIndex > 2)
325+
if(this.expositionType.SelectedIndex > 3)
322326
{
323327
this.errorProvider1.SetError(this.expositionType, LocRM.GetString("unavailableExpo", currentCulture));
324328
}
@@ -348,7 +352,7 @@ private void expositionType_SelectedIndexChanged(object sender, EventArgs e)
348352
DNMTSBackgroundColor.Enabled = true;
349353
DNMTSBackground.Enabled = true;
350354
}
351-
else if (this.expositionType.SelectedIndex == 2)
355+
else if (this.expositionType.SelectedIndex == 2 || this.expositionType.SelectedIndex == 3)
352356
{
353357
DMTSBackgroundLabel.Enabled = true;
354358
DMTSColorPanel.Enabled = true;

‎StroopTest/Views/MatchingPages/FormMatchConfig.en-US.resx

+5-2
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
<value>DNMTS</value>
140140
</data>
141141
<data name="expositionType.Items2" xml:space="preserve">
142-
<value>DMTS/DNMTS</value>
142+
<value>DMTS/DNMTS(Alternating)</value>
143143
</data>
144144
<data name="expositionType.Items" xml:space="preserve">
145145
<value>DMTS</value>
@@ -160,7 +160,7 @@
160160
<value>Time</value>
161161
</data>
162162
<data name="expoSizeLabel.Text" xml:space="preserve">
163-
<value>Exposition size:</value>
163+
<value>Exposition size (cm):</value>
164164
</data>
165165
<data name="wordLabel.Text" xml:space="preserve">
166166
<value>Words:</value>
@@ -270,4 +270,7 @@
270270
<data name="audioResponseLabel.Text" xml:space="preserve">
271271
<value>Auditory feedback:</value>
272272
</data>
273+
<data name="expositionType.Items3" xml:space="preserve">
274+
<value>DMTS/DNMTS(Random)</value>
275+
</data>
273276
</root>

‎StroopTest/Views/MatchingPages/FormMatchConfig.es-ES.resx

+4-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
<value>DNMTS</value>
158158
</data>
159159
<data name="expositionType.Items2" xml:space="preserve">
160-
<value>DMTS/DNMTS</value>
160+
<value>DMTS/DNMTS(Alterno)</value>
161161
</data>
162162
<data name="expositionType.Items" xml:space="preserve">
163163
<value>DMTS</value>
@@ -270,4 +270,7 @@
270270
<data name="audioResponseLabel.Text" xml:space="preserve">
271271
<value>Respuesta auditiva:</value>
272272
</data>
273+
<data name="expositionType.Items3" xml:space="preserve">
274+
<value>DMTS/DNMTS(Aleatorio)</value>
275+
</data>
273276
</root>

‎StroopTest/Views/MatchingPages/FormMatchConfig.pt-BR.resx

+5-2
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
<value>Tempo</value>
140140
</data>
141141
<data name="expoSizeLabel.Text" xml:space="preserve">
142-
<value>Tamanho da exposição:</value>
142+
<value>Tamanho da exposição (cm):</value>
143143
</data>
144144
<data name="randomOrder.Text" xml:space="preserve">
145145
<value>Ordem aleatória</value>
@@ -166,7 +166,7 @@
166166
<value>DNMTS</value>
167167
</data>
168168
<data name="expositionType.Items2" xml:space="preserve">
169-
<value>DMTS/DNMTS</value>
169+
<value>DMTS/DNMTS(Alternado)</value>
170170
</data>
171171
<data name="expositionType.Items" xml:space="preserve">
172172
<value>DMTS</value>
@@ -270,4 +270,7 @@
270270
<data name="audioResponseLabel.Text" xml:space="preserve">
271271
<value>Resposta auditiva:</value>
272272
</data>
273+
<data name="expositionType.Items3" xml:space="preserve">
274+
<value>DMTS/DNMTS(Aleatorio)</value>
275+
</data>
273276
</root>

0 commit comments

Comments
 (0)