Merge pull request #22 from nadavWeisler/Fix-two-sides-stimulus-bug

fix bug
nadavWeisler · Oct 9, 2021 · b993ca6 · b993ca6
2 parents 3a2413b + c2d2d2b
commit b993ca6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 40 deletions.
diff --git a/BrmsGenerator/BrmsResearcherTests.csproj b/BrmsGenerator/BrmsResearcherTests.csproj
diff --git a/BrmsGenerator/UnitTest1.cs b/BrmsGenerator/UnitTest1.cs
diff --git a/PopUp_Researcher.sln b/PopUp_Researcher.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.30406.217
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrmsGeneratorResearcher", "PopUp_Researcher\BrmsGeneratorResearcher.csproj", "{D1127653-C1B4-453B-9534-FEF116259479}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BrmsGenerator", "BrmsGenerator\BrmsGenerator.csproj", "{BEB3965D-DCB8-483F-95FD-3A55025AA912}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -17,10 +15,6 @@ Global
 		{D1127653-C1B4-453B-9534-FEF116259479}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D1127653-C1B4-453B-9534-FEF116259479}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D1127653-C1B4-453B-9534-FEF116259479}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BEB3965D-DCB8-483F-95FD-3A55025AA912}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BEB3965D-DCB8-483F-95FD-3A55025AA912}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BEB3965D-DCB8-483F-95FD-3A55025AA912}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BEB3965D-DCB8-483F-95FD-3A55025AA912}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/PopUp_Researcher/BrmsForm.cs b/PopUp_Researcher/BrmsForm.cs
@@ -162,7 +162,12 @@ private void AddButton_Click(object sender, EventArgs e)
                 newBrms.StimulusDictionary[tag.Text] = Helper.GetStimulusByOneTag(tag.Text);
             }
 
-
+            foreach (ListViewItem tag in secondTagsListView.SelectedItems)
+            {
+                newBrms.StimulusDictionary[tag.Text] = Helper.GetStimulusByOneTag(tag.Text);
+            }
+
+
             newBrms.brms_type = "mix";
             newBrms.trial_type = this.rmsRadioButton.Checked ? "RMS" :
                 this.MaskedControlRadioButton.Checked ? "Masked" : "UNMASK";

diff --git a/PopUp_Researcher/BrmsResearcher.csproj → ...Researcher/BrmsGeneratorResearcher.csproj b/PopUp_Researcher/BrmsResearcher.csproj → ...Researcher/BrmsGeneratorResearcher.csproj
@@ -24,7 +24,7 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ProductName>BrmsGenerator</ProductName>
+    <ProductName>BrmsGeneratorResearcher</ProductName>
     <PublisherName>Nadav Weisler</PublisherName>
     <ApplicationRevision>5</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
@@ -64,7 +64,7 @@
     <GenerateManifests>true</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <SignManifests>true</SignManifests>
+    <SignManifests>false</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>
@@ -342,7 +342,6 @@
       <DependentUpon>SurveyForm.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="packages.config" />
-    <None Include="PopUp_Researcher_TemporaryKey.pfx" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>