Bug fixes and Performance fixes

DanielMcAssey · Dec 1, 2014 · 44533b4 · 44533b4
1 parent 95ba068
commit 44533b4
Show file tree

Hide file tree

Showing 8 changed files with 140 additions and 36 deletions.
diff --git a/src/MouseGraphView/frmGraph.Designer.cs b/src/MouseGraphView/frmGraph.Designer.cs
diff --git a/src/MouseGraphView/frmGraph.cs b/src/MouseGraphView/frmGraph.cs
@@ -13,6 +13,7 @@ namespace MouseGraphView
 {
 	public partial class frmGraph : Form
 	{
+		private bool IsPlaying = false;
 		private List<MouseData> PlotData;
 
 		public frmGraph(List<MouseData> _plotData)
@@ -24,21 +25,25 @@ public frmGraph(List<MouseData> _plotData)
 		private void frmGraph_Load(object sender, EventArgs e)
 		{
 			btnShowBoth.Enabled = false;
+
+			Rectangle primaryResolution = Screen.PrimaryScreen.Bounds;
+			chrtMousePos.ChartAreas[0].Axes[0].Maximum = primaryResolution.Width;
+			chrtMousePos.ChartAreas[0].Axes[1].Maximum = primaryResolution.Height;
 
 			DateTime lastTimeRecorded = PlotData[PlotData.Count-1].MouseRecordedTime;
 			List<MouseData> Last5Seconds = PlotData.Where(s => s.MouseRecordedTime >= lastTimeRecorded.AddSeconds(-5)).ToList<MouseData>();
 			List<MouseData> EverythingElse = PlotData.Where(s => s.MouseRecordedTime < lastTimeRecorded.AddSeconds(-5)).ToList<MouseData>();
 
 			for (int i = 0; i < EverythingElse.Count; i++)
-			{
 				chrtMousePos.Series[0].Points.AddXY(EverythingElse[i].MouseX, EverythingElse[i].MouseY);
-			}
 
 			for (int i = 0; i < Last5Seconds.Count; i++)
-			{
 				chrtMousePos.Series[1].Points.AddXY(Last5Seconds[i].MouseX, Last5Seconds[i].MouseY);
-			}
 
+			for(int i = 0; i < PlotData.Count; i++)
+			{
+				//TODO: Add Mouse Button States
+			}
 		}
 
 		private void btnShowBoth_Click(object sender, EventArgs e)
@@ -67,5 +72,27 @@ private void btnShowAllButRecent_Click(object sender, EventArgs e)
 			chrtMousePos.Series[0].Enabled = true;
 			chrtMousePos.Series[1].Enabled = false;
 		}
+
+		private void btnPlay_Click(object sender, EventArgs e)
+		{
+			if (IsPlaying)
+				StopChartAnimation();
+			else
+				PlayChartAnimation();
+		}
+
+		private void PlayChartAnimation()
+		{
+			IsPlaying = true;
+			btnPlay.Text = "Stop";
+		}
+
+		private void StopChartAnimation()
+		{
+			IsPlaying = false;
+			btnPlay.Text = "Play";
+
+
+		}
 	}
 }
diff --git a/src/MouseGraphView/frmMain.Designer.cs b/src/MouseGraphView/frmMain.Designer.cs
diff --git a/src/MouseGraphView/frmMain.cs b/src/MouseGraphView/frmMain.cs
@@ -49,7 +49,7 @@ private void UpdateListWorkerDoWork(object sender, DoWorkEventArgs e)
 				{
 					if (this.MouseMonitor.FMouseNewData) //Only new data
 					{
-						currentWorker.ReportProgress(0, this.MouseMonitor.GetLatestData());
+						currentWorker.ReportProgress(0, this.MouseMonitor.GetLastData());
 					}
 				}
 				else
@@ -71,6 +71,9 @@ private void btnStart_Click(object sender, EventArgs e)
 			btnStop.Enabled = true;
 			btnStart.Enabled = false;
 
+			//Reset mouse monitor
+			this.MouseMonitor.Clear();
+
 			int updatesPerSecond;
 			bool isNumeric = int.TryParse(txtUpdatesPerSecond.Text, out updatesPerSecond);
 			if (isNumeric && updatesPerSecond > 0)
@@ -101,7 +104,15 @@ private void btnStop_Click(object sender, EventArgs e)
 		private void btnGenerateGraph_Click(object sender, EventArgs e)
 		{
 			frmGraph graphWindow = new frmGraph(this.MouseMonitor.GetFullDataset());
+			graphWindow.FormClosed += frmGraphClose;
 			graphWindow.Show();
-		} 
+			btnGenerateGraph.Enabled = false;
+
+		}
+
+		private void frmGraphClose(object sender, EventArgs e)
+		{
+			btnGenerateGraph.Enabled = true;
+		}
 	}
 }
diff --git a/src/MouseGraphView/frmMain.resx b/src/MouseGraphView/frmMain.resx
@@ -126,13 +126,4 @@
   <metadata name="dgvColMouseY.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dgvColMouseTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dgvColMouseX.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dgvColMouseY.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>
diff --git a/src/MouseMon/MouseData.cs b/src/MouseMon/MouseData.cs
@@ -7,5 +7,6 @@ public struct MouseData
 		public int MouseX;
 		public int MouseY;
 		public DateTime MouseRecordedTime;
+		public MouseButtonState MouseButtonPressed;
 	}
 }
diff --git a/src/MouseMon/MouseInput.cs b/src/MouseMon/MouseInput.cs
@@ -5,6 +5,14 @@
 
 namespace MouseMon
 {
+	public enum MouseButtonState
+	{
+		None,
+		Left,
+		Middle,
+		Right
+	}
+
 	static class MouseInput
 	{
 		/// <summary>
@@ -49,5 +57,14 @@ public static POINT GetCursorPosition()
 
 			return lpPoint;
 		}
+
+		/// <summary>
+		/// Retrieves the mouse button state.
+		/// </summary>
+		/// <see>See MSDN documentation for further information.</see>
+		public static MouseButtonState GetMouseButtonState()
+		{
+			return MouseButtonState.None;
+		}
 	}
 }