Merge pull request #182 from lab-neuro-comp/Fix_Bugs

181/Fixing severall bugs

CONTRIBUTING.md

@@ -66,3 +66,39 @@ You can run tests using visual studio default configurations.
 
 Please send a [GitHub Pull Request to TestPlatform](https://github.com/lab-neuro-comp/Test-Platform/pull/new/master) stating what you've done. 
 The Pull Request will only be accepted if the contribution works in all cultures (en-US and pt-BR).
+
+
+# Deployment
+
+
+
+For this project deployment, follow the steps below (You need  WinRAR to be installed in your computer)
+
+
+
+1. Change localization to specific culture that will be released. Don't forget to also change version in AssemblyInfo.cs (Inside Properties)
+
+
+![enter image description here](https://github.com/lab-neuro-comp/Test-Platform/blob/master/images/main_culture.png?raw=true)
+
+
+
+2. Go to project properties and click on the left menu on publish, changing application files accordingly to culture being published. Then, click on the Publish Wizard
+
+
+
+![enter image description here](https://github.com/lab-neuro-comp/Test-Platform/blob/master/images/publish_projects.png?raw=true)
+
+
+
+3. Right click on the folder created after published,  and click to add to file (using WinRAR).
+
+
+4. Use WinRAR advanced SFX options to create an executable of the compressed files
+
+
+![enter image description here](https://github.com/lab-neuro-comp/Test-Platform/blob/master/images/sfx_shortcut.png?raw=true)
+
+
+
+![enter image description here](https://github.com/lab-neuro-comp/Test-Platform/blob/master/images/sfx_text.png?raw=true)

StroopTest/Controllers/ExpositionController.cs

@@ -208,5 +208,27 @@ public static void BeginExperimentTest(string programName, string participantNam
             }
 
         }
+
+        public static void formSecondScreen(Form form)
+        {
+            Screen[] sc;
+            sc = Screen.AllScreens;
+            if (sc.Count<Screen>() > 1)
+            {
+                foreach (Screen s in sc)
+                {
+                    if (!s.Primary)
+                    {
+                        form.WindowState = FormWindowState.Maximized;
+                        form.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+                        form.Bounds = s.Bounds;
+                        form.MaximizeBox = true;
+                    }
+                }
+            }
+
+        }
+
+
     }
 }

StroopTest/Models/General/StrList.cs

@@ -152,11 +152,12 @@ public bool saveContent(bool shouldSave)
             {
                 string listDestination = Global.testFilesPath + Global.listFolderName + ListName + Type + "/";
                 Directory.CreateDirectory(listDestination);
+                int i = 0;
                 foreach (string content in listContent)
                 {
                     try
                     {
-                        File.Copy(content, listDestination + Path.GetFileName(content), true);
+                        File.Copy(content, listDestination + i + Path.GetFileName(content), true);
 
                     }
                     catch
@@ -165,6 +166,7 @@ public bool saveContent(bool shouldSave)
                         CultureInfo currentCulture = System.Threading.Thread.CurrentThread.CurrentUICulture;
                         MessageBox.Show(LocRM.GetString("fileNotFound", currentCulture) + "\n" + content);
                     }
+                    i++;
                 }
                 return true;
             }

StroopTest/Models/Tests/Reaction/ReactionProgram.cs

@@ -422,7 +422,7 @@ public string StimuluShape
 
             set
             {
-                if (!value || value && numberPositions == 0)
+                if (!value || value && numberPositions == 1)
                 {
                     expandImage = value;
                 }

StroopTest/Properties/AssemblyInfo.cs

@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.0")]
-[assembly: AssemblyFileVersion("3.0")]
+[assembly: AssemblyVersion("3.1")]
+[assembly: AssemblyFileVersion("3.1")]
 

StroopTest/TestPlatform.csproj

@@ -17,7 +17,7 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <HockeyAppResourceId>4e4db72659e84ec1ab96ac2196fa1559</HockeyAppResourceId>
-    <PublishUrl>C:\Users\fabio\Desktop\UnB\Iniciação Científica\en-US\</PublishUrl>
+    <PublishUrl>C:\Users\fabio\Desktop\UnB\Iniciação Científica\pt-BR\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
@@ -36,7 +36,7 @@
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>3.0.0.0</ApplicationVersion>
+    <ApplicationVersion>3.1.0.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -532,7 +532,6 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Views\MatchingPages\FormMatchConfig.resx">
       <DependentUpon>FormMatchConfig.cs</DependentUpon>
-      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\MatchingPages\MatchingExposition.resx">
       <DependentUpon>MatchingExposition.cs</DependentUpon>
@@ -736,8 +735,6 @@
     <None Include="Resources\bell.wav" />
     <None Include="Resources\error.wav" />
     <None Include="Resources\hit.wav" />
-    <None Include="Resources\helpToolTipMatrixImage.bmp" />
-    <None Include="Resources\helpPagesImages\positionMap.png" />
     <Content Include="Resources\icons\circle.png" />
     <Content Include="Resources\icons\cross.png" />
     <Content Include="Resources\icons\helpButton.png" />
@@ -803,7 +800,7 @@
       <Group>en-US</Group>
       <TargetPath>
       </TargetPath>
-      <PublishState>Include</PublishState>
+      <PublishState>Exclude</PublishState>
       <IncludeHash>True</IncludeHash>
       <FileType>Satellite</FileType>
     </PublishFile>
@@ -812,7 +809,7 @@
       <Group>pt-BR</Group>
       <TargetPath>
       </TargetPath>
-      <PublishState>Exclude</PublishState>
+      <PublishState>Include</PublishState>
       <IncludeHash>True</IncludeHash>
       <FileType>Satellite</FileType>
     </PublishFile>

StroopTest/Views/ListsPages/FormImgConfig.cs

@@ -41,8 +41,6 @@ public FormImgConfig(string imgListEdit)
 
         private void openImgList()
         {
-            try
-            {
                 FormDefine defineFilePath = defineFilePath = new FormDefine(LocRM.GetString("imageList", currentCulture), Global.testFilesPath + Global.listFolderName, "dir","_image",true, false);
                 var result = defineFilePath.ShowDialog();
 
@@ -55,17 +53,13 @@ private void openImgList()
                         isListNameValid = false;
                         return;
                     }
-                    imgListNameTextBox.Text = listName.Remove(listName.Length - 6); // removes the _img identification from file while editing (when its saved it is always added again)
+                    imgListNameTextBox.Text = listName; // removes the _img identification from file while editing (when its saved it is always added again)
                     imageList = new StrList(listName, IMAGE);
                     string[] filePaths = imageList.ListContent.ToArray();
                     readImagesIntoDGV(filePaths, imgPathDataGridView);                  
 
                 }
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message);
-            }
+
         }
 
         private void btnOpen_Click(object sender, EventArgs e)

StroopTest/Views/ListsPages/FormImgConfig.resx

@@ -297,12 +297,27 @@
   <metadata name="fileNameColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <data name="fileNameColumn.HeaderText" xml:space="preserve">
+    <value>Nome do Arquivo</value>
+  </data>
+  <data name="fileNameColumn.Width" type="System.Int32, mscorlib">
+    <value>120</value>
+  </data>
   <metadata name="thumbnailColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <data name="thumbnailColumn.HeaderText" xml:space="preserve">
+    <value>Imagem</value>
+  </data>
+  <data name="thumbnailColumn.Width" type="System.Int32, mscorlib">
+    <value>120</value>
+  </data>
   <metadata name="filePathColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <data name="filePathColumn.HeaderText" xml:space="preserve">
+    <value>Localização</value>
+  </data>
   <data name="imgPathDataGridView.Location" type="System.Drawing.Point, System.Drawing">
     <value>25, 357</value>
   </data>
@@ -327,30 +342,6 @@
   <data name="&gt;&gt;imgPathDataGridView.ZOrder" xml:space="preserve">
     <value>11</value>
   </data>
-  <metadata name="fileNameColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <data name="fileNameColumn.HeaderText" xml:space="preserve">
-    <value>Nome do Arquivo</value>
-  </data>
-  <data name="fileNameColumn.Width" type="System.Int32, mscorlib">
-    <value>120</value>
-  </data>
-  <metadata name="thumbnailColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <data name="thumbnailColumn.HeaderText" xml:space="preserve">
-    <value>Imagem</value>
-  </data>
-  <data name="thumbnailColumn.Width" type="System.Int32, mscorlib">
-    <value>120</value>
-  </data>
-  <metadata name="filePathColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <data name="filePathColumn.HeaderText" xml:space="preserve">
-    <value>Localização</value>
-  </data>
   <data name="moveUpButton.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left</value>
   </data>
@@ -625,7 +616,7 @@
     <value>True</value>
   </data>
   <data name="numberFiles.Location" type="System.Drawing.Point, System.Drawing">
-    <value>133, 351</value>
+    <value>133, 337</value>
   </data>
   <data name="numberFiles.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>4, 0, 4, 0</value>

StroopTest/Views/MatchingPages/MatchingExposition.cs

@@ -138,11 +138,14 @@ public MatchingExposition(string prgName, string participantName, char mark)
             this.FormBorderStyle = FormBorderStyle.None;
             this.MaximizeBox = true;
             this.StartPosition = FormStartPosition.Manual;
+            ExpositionController.formSecondScreen(this);
+
             InitializeComponent();
             startTime = hour + "_" + minutes + "_" + seconds;
             executingTest.ParticipantName = participantName;
             executingTest.setProgramInUse(path + "/prg/", prgName);
             executingTest.Mark = mark;
+
             stimuluControls = new List<Control>();
             outputFile = outputDataPath + executingTest.ParticipantName + "_" + executingTest.ProgramInUse.ProgramName + ".txt";
             startExposition();

StroopTest/Views/ReactionPages/FormReactExposition.cs

@@ -75,6 +75,7 @@ public FormReactExposition(string prgName, string participantName, char mark)
             this.FormBorderStyle = FormBorderStyle.None;
             this.MaximizeBox = true;
             this.StartPosition = FormStartPosition.Manual;
+            ExpositionController.formSecondScreen(this);
             InitializeComponent();
             startTime = hour + "_" + minutes + "_" + seconds;
             executingTest.ParticipantName = participantName;
@@ -715,14 +716,15 @@ private void expositionBW_RunWorkerCompleted(object sender, RunWorkerCompletedEv
 
         private void intervalBW_DoWork(object sender, DoWorkEventArgs e)
         {
-            ExpositionController.makingFixPoint(executingTest.ProgramInUse.FixPoint, executingTest.ProgramInUse.FixPointColor,
-                this);
+
 
             executingTest.InitialTime = DateTime.Now;
             accumulativeStopWatch.Start();
 
             for (int counter = 0; counter < executingTest.ProgramInUse.NumExpositions && !cancelExposition; counter++)
             {
+                ExpositionController.makingFixPoint(executingTest.ProgramInUse.FixPoint, executingTest.ProgramInUse.FixPointColor,
+                this);
                 currentExposition = counter;
                 //preparing execution
                 expositionBackground();
@@ -832,7 +834,7 @@ private Point randomScreenThreePositions(Size size)
         /* creates a x and y vector on center of the screen */
         private Point centerShapePosition(Size size)
         {
-            currentPosition = 0;
+            currentPosition = 2;
             StimulusPosition stimulusPosition = new StimulusPosition(ClientSize, size);
             Point newPoint = stimulusPosition.threePointsPosition(currentPosition);
             currentPositionOutput = stimulusPosition.CurrentPosition;
@@ -1023,11 +1025,11 @@ private Point[] createTrianglePoints()
         private void intervalBW_ProgressChanged(object sender, ProgressChangedEventArgs e)
         {
 
-            if (exposing)
+            if (exposing && !cancelExposition)
             {
                 this.Controls.Add((Control)e.UserState);
             }
-            else
+            else if (!cancelExposition)
             {
                 this.Controls.Remove((Control)e.UserState);
             }