Merge pull request #170 from lab-neuro-comp/ResultLists

159/Result lists

Author: gabrielalbino

StroopTest/Models/General/StrList.cs

@@ -275,11 +275,10 @@ static internal string[] readListFile(string filepath)
 
         public static string outPutItemName(string path)
         {
-            string lastFolderName = Path.GetFileName(Path.GetDirectoryName(path));
             string fileName = Path.GetFileName(path);
-            string name = lastFolderName + "/" + fileName;
-            return name;
+            return fileName;
         }
 
+
     }
 }

StroopTest/Models/Tests/Matching/MatchingTest.cs

@@ -133,8 +133,9 @@ public void setProgramInUse(string path, string prgName)
             }
         }
 
-        public void writeLineOutput(long attemptIntervalTime, long stimuluIntervalTime, long modelReactTime, long stimuluReactTime, int currentExposition, long modelExpositionAccumulative, long stimuluExpositionAccumulative, string modelFirstposition, string modelSecondPosition, string testType, string match, string model, string[] stimulus, string stimuluPosition
-            , string stimuluType, string modelColor, string clickedStimuluColor)
+        public void writeLineOutput(long attemptIntervalTime, long stimuluIntervalTime, long modelReactTime, long stimuluReactTime, int currentExposition, 
+            long modelExpositionAccumulative, long stimuluExpositionAccumulative, string modelFirstposition, string modelSecondPosition, string testType, string match, 
+            string model, string currentList, string[] stimulus, string stimuluPosition, string stimuluType, string modelColor, string clickedStimuluColor)
         {
             string text = ProgramInUse.ProgramName + "\t" +
                         participantName + "\t" +
@@ -150,6 +151,7 @@ public void writeLineOutput(long attemptIntervalTime, long stimuluIntervalTime,
                         currentExposition + "\t" +
                         testType + "\t" +
                         stimuluType + "\t" +
+                        currentList + "\t" +
                         modelFirstposition + "\t" +
                         model + "\t" +
                         modelColor + "\t" +

StroopTest/Models/Tests/Reaction/ReactionTest.cs

@@ -168,21 +168,23 @@ private string expositionTypeOutput()
             }
         }
 
-        public void writeLineOutput(long intervalTime, long intervalShouldBe, long reactTime, int currentExposition, long expositionAccumulative, string[] currentStimuli, string position, bool beeped, string currentColor)
+        public void writeLineOutput(long intervalTime, long intervalShouldBe, long reactTime, int currentExposition, long expositionAccumulative, 
+                                    string[] currentLists, string[] currentStimuli, string position, bool beeped, string currentColor)
         {
             /* This variable keeps data from an exposition to only one stimulus, being them:
              * programa\tparticipante\tdata\thorarioInicial\thorarioExposicao\ttr(ms)\tintervalo(ms)\tintervaloestimado(ms)\texposicaoTempo(ms)\texposicao(ms)\tsequencia\tpos\trespostaUsuario\ttipoEstimulo\tEstimulo\tCordoEstimulo\tBeep
              * program\tparticipant\tdate\tInitialTime\texpositionTime\treactionTime(ms)\tInterval(ms)\testimatedInterval(ms)\texpositionDuration(ms)\texposition(ms)\tsenquency\tpos\tuserResponse\tstimulusType\tstimulus\tstimulusColor\tBeep
              * program  name    participant     name    date    hour    exposition hour    hit time(ms) interval(ms)  interval should be(ms)  
-             * exposition accumulative timeexposition time(ms)  number of sequency  position on screen  user response   type of stimulus    stimulus1 stimulus2   
+             * exposition accumulative timeexposition time(ms)  number of sequency  position on screen  user response   type of stimulus  stimulus1List stimulus1 
+             * stimulus2List stimulus2   
              * stimulus color */
             var text = ProgramInUse.ProgramName + "\t" + participantName + "\t" + initialTime.Day + "/" +
                        initialTime.Month + "/" + initialTime.Year + "\t" + initialTime.Hour + ":" + initialTime.Minute +
                        ":" + initialTime.Second + ":" + initialTime.Millisecond.ToString() + "\t" + ExpositionTime.Hour + ":" + ExpositionTime.Minute +
                        ":" + ExpositionTime.Second + ":" + ExpositionTime.Millisecond.ToString() + "\t" + reactTime.ToString() +
                         "\t" + intervalTime.ToString() + "\t" + intervalShouldBe.ToString() + "\t" + expositionAccumulative + "\t" +
                         ProgramInUse.ExpositionTime +  "\t" + currentExposition + "\t" + position + "\t" +  CurrentResponse  + "\t"+ expositionTypeOutput() + "\t" +
-                        currentStimuli[0] + "\t" + currentStimuli[1] + "\t" + currentColor + "\t" + beeped.ToString();
+                        currentLists[0] + "\t"  + currentStimuli[0] + "\t"+ currentLists[1] + "\t" + currentStimuli[1] + "\t" + currentColor + "\t" + beeped.ToString();
              Output.Add(text); 
 
         }

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

@@ -1068,7 +1068,7 @@ To upgrade, the new version installation file must be run in the same folder as
     <value>wasn't written\n\n</value>
   </data>
   <data name="reactionTestHeader" xml:space="preserve">
-    <value>program\tparticipant\tdate\tInitial Time\tExposition time\tReactionTime(ms)\tInterval(ms)\tEstimated Interval(ms)\tExposition Duration(ms)\tExposition(ms)\tsenquency\tpos\tUser response\tStimulus1\tStimulus2 Type\tstimulus\tStimulus Color\tBeep</value>
+    <value>program\tparticipant\tdate\tInitial Time\tExposition time\tReactionTime(ms)\tInterval(ms)\tEstimated Interval(ms)\tExposition Duration(ms)\tExposition(ms)\tsenquency\tpos\tUser response\tList1\tStimulus1\tList2\tStimulus2 Type\tstimulus\tStimulus Color\tBeep</value>
   </data>
   <data name="responseTypeError" xml:space="preserve">
     <value>Selected response type is invalid. Valid options are: spacebar or key arrows.</value>
@@ -2375,7 +2375,7 @@ user to the stimulus or if there is no reaction to the stimulus(ms)&lt;/td&gt;
     <value>choose a image list</value>
   </data>
   <data name="matchingTestHeader" xml:space="preserve">
-    <value>Program\tParticipant\tDate\tInitial Time\tExposition Time\tModel Reaction Time(ms)\tStimulu Reaction Time(ms)\tInterval between attempts(ms)\tInterval(ms)\tModel Exposition(ms)\tStimulu Exposition(ms)\tSenquency\tTest Type\tStimulus Type\tModel first position\tModel\tModel color\t2nd Stimulu\t3rd Stimulu\t4th Stimulu\t5th Stumulu\t6th Stimulu\t7th Stimulu\t8th Stimulu\tModel second position\tClicked Stimulu\tClicked Stimulu Color\tClicked Stimulu Position\tMatch</value>
+    <value>Program\tParticipant\tDate\tInitial Time\tExposition Time\tModel Reaction Time(ms)\tStimulu Reaction Time(ms)\tInterval between attempts(ms)\tInterval(ms)\tModel Exposition(ms)\tStimulu Exposition(ms)\tSenquency\tTest Type\tStimulus Type\tList\tModel first position\tModel\tModel color\t2nd Stimulu\t3rd Stimulu\t4th Stimulu\t5th Stumulu\t6th Stimulu\t7th Stimulu\t8th Stimulu\tModel second position\tClicked Stimulu\tClicked Stimulu Color\tClicked Stimulu Position\tMatch</value>
   </data>
   <data name="CannotBeEmpty" xml:space="preserve">
     <value>This field should be filled</value>

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

@@ -1298,7 +1298,7 @@ https://github.com/lab-neuro-comp/Test-Platform</value>
     <value>não foi escrito\n\n</value>
   </data>
   <data name="reactionTestHeader" xml:space="preserve">
-    <value>Programa\tParticipante\tData\tHorario inicial\tHorario exposicao\tTR(ms)\tIntervalo(ms)\tIntervalo estimado(ms)\tExposicao tempo(ms)\tExposicao(ms)\tSequencia\tPos\tResposta usuario\tTipo estimulo\tEstimulo1\tEstimulo2\tCor do estimulo\tBeep</value>
+    <value>Programa\tParticipante\tData\tHorário inicial\tHorário exposição\tTR(ms)\tIntervalo(ms)\tIntervalo estimado(ms)\tExposição tempo(ms)\tExposicao(ms)\tSequência\tPosição\tResposta usuário\tTipo estímulo\tLista1\tEstímulo1\tLista2\tEstímulo2\tCor do estímulo\tBeep</value>
   </data>
   <data name="responseTypeError" xml:space="preserve">
     <value>Tipo de resposta selecionado inválido. As opções válidas são: barra de espaço ou setas.</value>
@@ -2356,7 +2356,7 @@ https://github.com/lab-neuro-comp/Test-Platform</value>
     <value>Selecione uma lista de imagens</value>
   </data>
   <data name="matchingTestHeader" xml:space="preserve">
-    <value>Programa\tParticipante\tData\tHorario Inicial\tTempo de Exposição\tReação do modelo(ms)\tReação do estimulo(ms)\tIntervalo das tentativas(ms)\tIntervalo(ms)\tExposição do modelo(ms)\tExposição do estímulo(ms)\tSenquencia\tTipo de Teste\tTipo de estimulo\tPrimeira posição do modelo\tModelo\tCor do modelo\tEstimulo 2\tEstimulo 3\tEstimulo 4\tEstimulo 5\tEstimulo 6\tEstimulo 7\tEstimulo 8\tSegunda posição do modelo\tNome do estimulo clicado\tCor do estimulo clicado\tPosição do estimulo clicado\tIgual</value>
+    <value>Programa\tParticipante\tData\tHorario Inicial\tTempo de Exposição\tReação do modelo(ms)\tReação do estimulo(ms)\tIntervalo das tentativas(ms)\tIntervalo(ms)\tExposição do modelo(ms)\tExposição do estímulo(ms)\tSenquencia\tTipo de Teste\tTipo de estimulo\tLista\tPrimeira posição do modelo\tModelo\tCor do modelo\tEstimulo 2\tEstimulo 3\tEstimulo 4\tEstimulo 5\tEstimulo 6\tEstimulo 7\tEstimulo 8\tSegunda posição do modelo\tNome do estimulo clicado\tCor do estimulo clicado\tPosição do estimulo clicado\tIgual</value>
   </data>
   <data name="CannotBeEmpty" xml:space="preserve">
     <value>Esse campo deve ser preenchido</value>

StroopTest/Views/MatchingPages/FormMatchConfig.resx

@@ -953,7 +953,7 @@
   <data name="feedbackAudioResponse.TabIndex" type="System.Int32, mscorlib">
     <value>25</value>
   </data>
-  <data name="feedbackAudioResponse.Text" xml:space="preserve">
+  <data name="feedbackAudioResponse.Text_Duplicate[1]" xml:space="preserve">
     <value>Acerto / Erro</value>
   </data>
   <data name="&gt;&gt;feedbackAudioResponse.Name" xml:space="preserve">
@@ -980,7 +980,7 @@
   <data name="expositonAudioResponse.TabIndex" type="System.Int32, mscorlib">
     <value>24</value>
   </data>
-  <data name="expositonAudioResponse.Text" xml:space="preserve">
+  <data name="expositonAudioResponse.Text_Duplicate[1]" xml:space="preserve">
     <value>Exposição</value>
   </data>
   <data name="&gt;&gt;expositonAudioResponse.Name" xml:space="preserve">
@@ -1409,7 +1409,7 @@
   <data name="DMTSBackground.TabIndex" type="System.Int32, mscorlib">
     <value>21</value>
   </data>
-  <data name="DMTSBackground.Text" xml:space="preserve">
+  <data name="DMTSBackground.Text_Duplicate[1]" xml:space="preserve">
     <value>escolher</value>
   </data>
   <data name="&gt;&gt;DMTSBackground.Name" xml:space="preserve">
@@ -1439,7 +1439,7 @@
   <data name="DNMTSBackgroundLabel.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
-  <data name="DNMTSBackgroundLabel.Text" xml:space="preserve">
+  <data name="DNMTSBackgroundLabel.Text_Duplicate[1]" xml:space="preserve">
     <value>Fundo do DNMTS:</value>
   </data>
   <data name="&gt;&gt;DNMTSBackgroundLabel.Name" xml:space="preserve">
@@ -1472,7 +1472,7 @@
   <data name="DMTSBackgroundLabel.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
-  <data name="DMTSBackgroundLabel.Text" xml:space="preserve">
+  <data name="DMTSBackgroundLabel.Text_Duplicate[1]" xml:space="preserve">
     <value>Fundo do DMTS:</value>
   </data>
   <data name="&gt;&gt;DMTSBackgroundLabel.Name" xml:space="preserve">
@@ -1751,7 +1751,7 @@
   <data name="timeGroupBox.TabIndex" type="System.Int32, mscorlib">
     <value>86</value>
   </data>
-  <data name="timeGroupBox.Text" xml:space="preserve">
+  <data name="timeGroupBox.Text_Duplicate[1]" xml:space="preserve">
     <value>Tempo</value>
   </data>
   <data name="&gt;&gt;timeGroupBox.Name" xml:space="preserve">
@@ -1775,7 +1775,7 @@
   <data name="modelExpositionLabel.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
-  <data name="modelExpositionLabel.Text" xml:space="preserve">
+  <data name="modelExpositionLabel.Text_Duplicate[1]" xml:space="preserve">
     <value>Exposição do modelo (ms):</value>
   </data>
   <data name="&gt;&gt;modelExpositionLabel.Name" xml:space="preserve">
@@ -2027,7 +2027,7 @@
   <data name="listGroupBox.TabIndex" type="System.Int32, mscorlib">
     <value>13</value>
   </data>
-  <data name="listGroupBox.Text" xml:space="preserve">
+  <data name="listGroupBox.Text_Duplicate[1]" xml:space="preserve">
     <value>Listas</value>
   </data>
   <data name="&gt;&gt;listGroupBox.Name" xml:space="preserve">
@@ -2069,7 +2069,7 @@
   <data name="wordLabel.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
   </data>
-  <data name="wordLabel.Text" xml:space="preserve">
+  <data name="wordLabel.Text_Duplicate[1]" xml:space="preserve">
     <value>Palavras:</value>
   </data>
   <data name="&gt;&gt;wordLabel.Name" xml:space="preserve">
@@ -2495,7 +2495,7 @@
   <data name="expositionGroupBox.TabIndex" type="System.Int32, mscorlib">
     <value>85</value>
   </data>
-  <data name="expositionGroupBox.Text" xml:space="preserve">
+  <data name="expositionGroupBox.Text_Duplicate[1]" xml:space="preserve">
     <value>Exposição</value>
   </data>
   <data name="&gt;&gt;expositionGroupBox.Name" xml:space="preserve">
@@ -2543,7 +2543,7 @@
   <data name="programNameLabel.TabIndex" type="System.Int32, mscorlib">
     <value>83</value>
   </data>
-  <data name="programNameLabel.Text" xml:space="preserve">
+  <data name="programNameLabel.Text_Duplicate[1]" xml:space="preserve">
     <value>Nome do programa:</value>
   </data>
   <data name="&gt;&gt;programNameLabel.Name" xml:space="preserve">
@@ -2636,7 +2636,7 @@
   <data name="instructionsLabel.TabIndex" type="System.Int32, mscorlib">
     <value>71</value>
   </data>
-  <data name="instructionsLabel.Text" xml:space="preserve">
+  <data name="instructionsLabel.Text_Duplicate[1]" xml:space="preserve">
     <value>Instruções:</value>
   </data>
   <data name="&gt;&gt;instructionsLabel.Name" xml:space="preserve">

StroopTest/Views/MatchingPages/MatchingExposition.cs

@@ -921,15 +921,15 @@ private void expositionBW_RunWorkerCompleted(object sender, RunWorkerCompletedEv
                     stimulus.Remove(this.matchingGroups.ElementAt(groupCounter - 1).getModelName());
                     for (int count = 0; count < stimulus.Count; count++)
                     {
-                        stimulus[count] = currentList + "/" + Path.GetFileNameWithoutExtension(stimulus[count]);
+                        stimulus[count] = Path.GetFileNameWithoutExtension(stimulus[count]);
                     }
                     while (stimulus.Count <= 7)
                     {
                         stimulus.Add("-");
                     }
                     if ((e.Cancelled == true) && !intervalCancelled) /* user clicked after stimulus is shown*/
                     {
-                        stimulus[7] = currentList + "/" + Path.GetFileNameWithoutExtension(this.matchingGroups.ElementAt(groupCounter - 1).getControlName(objectClicked, stimuluType));
+                        stimulus[7] = Path.GetFileNameWithoutExtension(this.matchingGroups.ElementAt(groupCounter - 1).getControlName(objectClicked, stimuluType));
                         executingTest.writeLineOutput(
                             attemptIntervalTime,
                             intervalElapsedTime,
@@ -942,7 +942,8 @@ private void expositionBW_RunWorkerCompleted(object sender, RunWorkerCompletedEv
                             modelSecondPosition,
                             currentExpositionType,
                             (this.matchingGroups.ElementAt(groupCounter - 1).getControlName(objectClicked, stimuluType) == this.matchingGroups.ElementAt(groupCounter - 1).getModelName()).ToString(),
-                            currentList + "/" + Path.GetFileNameWithoutExtension(this.matchingGroups.ElementAt(groupCounter - 1).getModelName()),
+                            Path.GetFileNameWithoutExtension(this.matchingGroups.ElementAt(groupCounter - 1).getModelName()),
+                            currentList,
                             stimulus.ToArray(),
                             stimuluPosition.getStimulusPositionMap(objectClicked.Location, size),
                             getStimuluType(),
@@ -982,6 +983,7 @@ private void expositionBW_RunWorkerCompleted(object sender, RunWorkerCompletedEv
                             currentExpositionType,
                             "-",
                             this.matchingGroups.ElementAt(groupCounter - 1).getModelName(),
+                            currentList,
                             stimulus.ToArray(),
                             "-",
                             getStimuluType(),

StroopTest/Views/ReactionPages/FormReactExposition.cs

@@ -56,6 +56,7 @@ public partial class FormReactExposition : Form
 
         private bool exposing = false;
         private string[] currentStimuli = {"-", "-" };
+        private string[] currentLists = { "-", "-" };
         private int currentPosition;
         private string currentPositionOutput;
         private bool currentBeep = false;
@@ -455,6 +456,8 @@ private void drawWord()
             wordLabel = ExpositionController.InitializeWordLabel(executingTest.ProgramInUse.FontSize, wordsList[wordCounter], colorsList[colorCounter], screenPosition);
 
             currentStimuli[0] = wordsList[wordCounter];
+            currentLists[0] = executingTest.ProgramInUse.getWordListFile().ListName;
+
             currentColor = colorsList[colorCounter];
             wordCounter++;
 
@@ -477,6 +480,8 @@ private void drawImage()
             imgPictureBox.Location = screenPosition;
 
             currentStimuli[0] = StrList.outPutItemName(imagesList[imageCounter]);
+            currentLists[0] = executingTest.ProgramInUse.getImageListFile().ListName;
+
             imageCounter++;            
             if(imageCounter == imagesList.Length)
             {
@@ -489,6 +494,8 @@ private void playAudio()
         {
             string currentAudio = audioList[audioCounter];
             currentStimuli[1] = StrList.outPutItemName(currentAudio);
+            currentLists[1] = executingTest.ProgramInUse.getAudioListFile().ListName;
+
             Player.SoundLocation = currentAudio;
             audioCounter++;
             if (audioCounter == audioList.Length)
@@ -685,21 +692,21 @@ private void expositionBW_RunWorkerCompleted(object sender, RunWorkerCompletedEv
             {
                 /* user clicked after stimulus is shown*/
                 executingTest.writeLineOutput(intervalElapsedTime, intervalShouldBe, hitStopWatch.ElapsedMilliseconds,
-                                              currentExposition + 1, expositionAccumulative, currentStimuli, currentPositionOutput, currentBeep, currentColor);
+                                              currentExposition + 1, expositionAccumulative, currentLists,currentStimuli, currentPositionOutput, currentBeep, currentColor);
             }
 
             else if ((e.Cancelled == true) && intervalCancelled)
             {
                 /* user clicked before stimulus is shown*/
                 executingTest.writeLineOutput(intervalElapsedTime, intervalShouldBe, intervalElapsedTime - intervalShouldBe,
-                                              currentExposition + 1, expositionAccumulative, currentStimuli, currentPositionOutput, currentBeep, currentColor);
+                                              currentExposition + 1, expositionAccumulative, currentLists, currentStimuli, currentPositionOutput, currentBeep, currentColor);
             }
             else
             {
                 /* user missed stimulus */
                 executingTest.CurrentResponse = "NA";
-                executingTest.writeLineOutput(intervalElapsedTime, intervalShouldBe, 0, currentExposition + 1, expositionAccumulative, currentStimuli, currentPositionOutput,
-                                                currentBeep, currentColor);
+                executingTest.writeLineOutput(intervalElapsedTime, intervalShouldBe, 0, currentExposition + 1, expositionAccumulative, currentLists, currentStimuli, 
+                                                currentPositionOutput, currentBeep, currentColor);
                 hitStopWatch.Stop();
             }
             expositionBW.Dispose();