Fixed 'Sensor 10' header text having three spaces; Anchored Post Proc…

…essing buttons; Fixed Post Processing closing actions (moved to dedicated handler)
sroske · Apr 21, 2013 · a3df6ae · a3df6ae
1 parent 75bec80
commit a3df6ae
Show file tree

Hide file tree

Showing 13 changed files with 336 additions and 328 deletions.
diff --git a/Spintronics/Spintronics.suo b/Spintronics/Spintronics.suo
diff --git a/Spintronics/Spintronics/GUI.cs b/Spintronics/Spintronics/GUI.cs
@@ -1061,7 +1061,7 @@ private void createRunFiles()
 				{
 					if (i == 15)
 						continue;
-					if (i < 10)
+					if (i < 9)
 					{
 						dataFile1.Write("Sensor   " + (i + 1) + "\t");
 						dataFile2.Write("Sensor   " + (i + 1) + "\t");

diff --git a/Spintronics/Spintronics/PostProcessingResults.Designer.cs b/Spintronics/Spintronics/PostProcessingResults.Designer.cs
diff --git a/Spintronics/Spintronics/PostProcessingResults.cs b/Spintronics/Spintronics/PostProcessingResults.cs
@@ -169,7 +169,7 @@ private void appendAndSaveButton_Click(object sender, EventArgs e)
 					{
 						if (i == 15)
 							continue;
-						if(i < 10)
+						if(i < 9)
 							postProcessingFile.Write("Sensor   " + (i + 1) + "\t");
 						else
 							postProcessingFile.Write("Sensor  " + (i + 1) + "\t");
@@ -200,6 +200,11 @@ private void appendAndSaveButton_Click(object sender, EventArgs e)
 		}
 
 		private void closeButton_Click(object sender, EventArgs e)
+		{
+			this.Close();
+		}
+
+		private void PostProcessingResults_FormClosed(object sender, EventArgs e)
 		{
 			if (!hasSaved)
 			{

diff --git a/Spintronics/Spintronics/bin/Debug/Spintronics.exe b/Spintronics/Spintronics/bin/Debug/Spintronics.exe
diff --git a/Spintronics/Spintronics/bin/Debug/Spintronics.pdb b/Spintronics/Spintronics/bin/Debug/Spintronics.pdb
diff --git a/Spintronics/Spintronics/bin/Debug/config.ini b/Spintronics/Spintronics/bin/Debug/config.ini
@@ -16,6 +16,6 @@ CoilFrequency:50
 CoilDcOffset:0
 CoilDcOffsetUnit:V
 MeasurementPeriod:1
-SampleAverageCount:2
-DiffusionCount:2
+SampleAverageCount:10
+DiffusionCount:10
 PostProcessingFiles:2
diff --git a/Spintronics/Spintronics/bin/Release/Spintronics.exe b/Spintronics/Spintronics/bin/Release/Spintronics.exe
diff --git a/Spintronics/Spintronics/bin/Release/Spintronics.pdb b/Spintronics/Spintronics/bin/Release/Spintronics.pdb
diff --git a/Spintronics/Spintronics/obj/x86/Debug/Spintronics.exe b/Spintronics/Spintronics/obj/x86/Debug/Spintronics.exe
diff --git a/Spintronics/Spintronics/obj/x86/Debug/Spintronics.pdb b/Spintronics/Spintronics/obj/x86/Debug/Spintronics.pdb
diff --git a/Spintronics/Spintronics/obj/x86/Release/Spintronics.exe b/Spintronics/Spintronics/obj/x86/Release/Spintronics.exe
diff --git a/Spintronics/Spintronics/obj/x86/Release/Spintronics.pdb b/Spintronics/Spintronics/obj/x86/Release/Spintronics.pdb