Merge pull request #201 from lab-neuro-comp/175/randomMatching

Added random DMTS/DMTS
lab-neuro-comp · Jun 4, 2018 · 7782ae5 · 7782ae5
2 parents 850a920 + c2c2240
commit 7782ae5
Show file tree

Hide file tree

Showing 10 changed files with 1,309 additions and 639 deletions.
diff --git a/StroopTest/Resources/Localizations/LocalizedResources.en-US.resx b/StroopTest/Resources/Localizations/LocalizedResources.en-US.resx
@@ -2854,4 +2854,10 @@ user to the stimulus or if there is no reaction to the stimulus(ms)&lt;/td&gt;
   <data name="shouldSelectReason" xml:space="preserve">
     <value>You should select a valid reason.</value>
   </data>
+  <data name="alternatingDMTS_DNMTS" xml:space="preserve">
+    <value>DMTS/DNMTS(Alternating)</value>
+  </data>
+  <data name="randomDMTS_DNMTS" xml:space="preserve">
+    <value>DMTS/DNMTS(Random)</value>
+  </data>
 </root>
diff --git a/StroopTest/Resources/Localizations/LocalizedResources.es-ES.resx b/StroopTest/Resources/Localizations/LocalizedResources.es-ES.resx
@@ -348,4 +348,10 @@ https://github.com/lab-neuro-comp/Test-Platform
   <data name="cannotRecoverFilesByMotive" xml:space="preserve">
     <value>Debe crear o recuperar las siguientes listas antes de recuperar el programa "</value>
   </data>
+  <data name="alternatingDMTS_DNMTS" xml:space="preserve">
+    <value>DMTS/DNMTS(Alterno)</value>
+  </data>
+  <data name="randomDMTS_DNMTS" xml:space="preserve">
+    <value>DMTS/DNMTS(Aleatorio)</value>
+  </data>
 </root>
diff --git a/StroopTest/Resources/Localizations/LocalizedResources.pt-BR.resx b/StroopTest/Resources/Localizations/LocalizedResources.pt-BR.resx
@@ -2837,4 +2837,10 @@ https://github.com/lab-neuro-comp/Test-Platform</value>
   <data name="shouldSelectReason" xml:space="preserve">
     <value>Um motivo válido deve ser selecionado.</value>
   </data>
+  <data name="alternatingDMTS_DNMTS" xml:space="preserve">
+    <value>DMTS/DNMTS(Alternado)</value>
+  </data>
+  <data name="randomDMTS_DNMTS" xml:space="preserve">
+    <value>DMTS/DNMTS(Aleatorio)</value>
+  </data>
 </root>
diff --git a/StroopTest/Views/MatchingPages/FormMatchConfig.Designer.cs b/StroopTest/Views/MatchingPages/FormMatchConfig.Designer.cs
diff --git a/StroopTest/Views/MatchingPages/FormMatchConfig.cs b/StroopTest/Views/MatchingPages/FormMatchConfig.cs
@@ -106,17 +106,21 @@ private void editProgram()
             feedbackAudioResponse.Checked = editProgram.FeedbackAudioResponse;
             expositonAudioResponse.Checked = editProgram.ExpositionAudioResponse;
             randomModelStimulusTime.Checked = editProgram.RandomIntervalModelStimulus;
-            switch (editProgram.getExpositionType())
+            if (editProgram.getExpositionType() == "DMTS")
             {
-                case "DMTS":
-                    this.expositionType.SelectedIndex = 0;
-                    break;
-                case "DNMTS":
-                    this.expositionType.SelectedIndex = 1;
-                    break;
-                case "DMTS/DNMTS":
-                    this.expositionType.SelectedIndex = 2;
-                    break;
+                this.expositionType.SelectedIndex = 0;
+            }
+            else if (editProgram.getExpositionType() == "DNMTS")
+            {
+                this.expositionType.SelectedIndex = 1;
+            }
+            else if (editProgram.getExpositionType() == LocRM.GetString("alternatingDMTS_DNMTS", currentCulture))
+            {
+                this.expositionType.SelectedIndex = 2;
+            }
+            else
+            {
+                this.expositionType.SelectedIndex = 3;
             }
 
             // reads program instructions to instruction box if there are any
@@ -297,7 +301,7 @@ private void expositionType_Validating(object sender, CancelEventArgs e)
 
         private bool validExpositionType(out string errorMessage)
         {
-            if(this.expositionType.SelectedIndex >= 0 && this.expositionType.SelectedIndex < 3)
+            if(this.expositionType.SelectedIndex >= 0 && this.expositionType.SelectedIndex < 4)
             {
                 errorMessage = "";
                 return true;
@@ -318,7 +322,7 @@ private void expositionType_SelectedIndexChanged(object sender, EventArgs e)
         {
             this.errorProvider1.Clear();
             this.errorProvider2.Clear();
-            if(this.expositionType.SelectedIndex > 2)
+            if(this.expositionType.SelectedIndex > 3)
             {
                 this.errorProvider1.SetError(this.expositionType, LocRM.GetString("unavailableExpo", currentCulture));
             }
@@ -348,7 +352,7 @@ private void expositionType_SelectedIndexChanged(object sender, EventArgs e)
                 DNMTSBackgroundColor.Enabled = true;
                 DNMTSBackground.Enabled = true;
             }
-            else if (this.expositionType.SelectedIndex == 2)
+            else if (this.expositionType.SelectedIndex == 2 || this.expositionType.SelectedIndex == 3)
             {
                 DMTSBackgroundLabel.Enabled = true;
                 DMTSColorPanel.Enabled = true;

diff --git a/StroopTest/Views/MatchingPages/FormMatchConfig.en-US.resx b/StroopTest/Views/MatchingPages/FormMatchConfig.en-US.resx
@@ -139,7 +139,7 @@
     <value>DNMTS</value>
   </data>
   <data name="expositionType.Items2" xml:space="preserve">
-    <value>DMTS/DNMTS</value>
+    <value>DMTS/DNMTS(Alternating)</value>
   </data>
   <data name="expositionType.Items" xml:space="preserve">
     <value>DMTS</value>
@@ -160,7 +160,7 @@
     <value>Time</value>
   </data>
   <data name="expoSizeLabel.Text" xml:space="preserve">
-    <value>Exposition size:</value>
+    <value>Exposition size (cm):</value>
   </data>
   <data name="wordLabel.Text" xml:space="preserve">
     <value>Words:</value>
@@ -270,4 +270,7 @@
   <data name="audioResponseLabel.Text" xml:space="preserve">
     <value>Auditory feedback:</value>
   </data>
+  <data name="expositionType.Items3" xml:space="preserve">
+    <value>DMTS/DNMTS(Random)</value>
+  </data>
 </root>
diff --git a/StroopTest/Views/MatchingPages/FormMatchConfig.es-ES.resx b/StroopTest/Views/MatchingPages/FormMatchConfig.es-ES.resx
@@ -157,7 +157,7 @@
     <value>DNMTS</value>
   </data>
   <data name="expositionType.Items2" xml:space="preserve">
-    <value>DMTS/DNMTS</value>
+    <value>DMTS/DNMTS(Alterno)</value>
   </data>
   <data name="expositionType.Items" xml:space="preserve">
     <value>DMTS</value>
@@ -270,4 +270,7 @@
   <data name="audioResponseLabel.Text" xml:space="preserve">
     <value>Respuesta auditiva:</value>
   </data>
+  <data name="expositionType.Items3" xml:space="preserve">
+    <value>DMTS/DNMTS(Aleatorio)</value>
+  </data>
 </root>
diff --git a/StroopTest/Views/MatchingPages/FormMatchConfig.pt-BR.resx b/StroopTest/Views/MatchingPages/FormMatchConfig.pt-BR.resx
@@ -139,7 +139,7 @@
     <value>Tempo</value>
   </data>
   <data name="expoSizeLabel.Text" xml:space="preserve">
-    <value>Tamanho da exposição:</value>
+    <value>Tamanho da exposição (cm):</value>
   </data>
   <data name="randomOrder.Text" xml:space="preserve">
     <value>Ordem aleatória</value>
@@ -166,7 +166,7 @@
     <value>DNMTS</value>
   </data>
   <data name="expositionType.Items2" xml:space="preserve">
-    <value>DMTS/DNMTS</value>
+    <value>DMTS/DNMTS(Alternado)</value>
   </data>
   <data name="expositionType.Items" xml:space="preserve">
     <value>DMTS</value>
@@ -270,4 +270,7 @@
   <data name="audioResponseLabel.Text" xml:space="preserve">
     <value>Resposta auditiva:</value>
   </data>
+  <data name="expositionType.Items3" xml:space="preserve">
+    <value>DMTS/DNMTS(Aleatorio)</value>
+  </data>
 </root>