diff options
Diffstat (limited to 'grapher')
| -rw-r--r-- | grapher/Form1.Designer.cs | 34 | ||||
| -rw-r--r-- | grapher/Form1.cs | 22 | ||||
| -rw-r--r-- | grapher/Models/AccelGUI.cs | 20 | ||||
| -rw-r--r-- | grapher/Models/AccelGUIFactory.cs | 11 | ||||
| -rw-r--r-- | grapher/Models/Devices/DeviceIDItem.cs | 73 | ||||
| -rw-r--r-- | grapher/Models/Devices/DeviceIDManager.cs | 86 | ||||
| -rw-r--r-- | grapher/Models/Mouse/MouseData.cs | 17 | ||||
| -rw-r--r-- | grapher/Models/Mouse/MouseWatcher.cs | 33 | ||||
| -rw-r--r-- | grapher/Models/Mouse/PointData.cs | 13 | ||||
| -rw-r--r-- | grapher/Models/Serialized/RawAccelSettings.cs | 3 | ||||
| -rw-r--r-- | grapher/Models/Serialized/SettingsManager.cs | 8 | ||||
| -rw-r--r-- | grapher/grapher.csproj | 3 |
12 files changed, 256 insertions, 67 deletions
diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs index 6fd9478..b375de1 100644 --- a/grapher/Form1.Designer.cs +++ b/grapher/Form1.Designer.cs @@ -161,6 +161,8 @@ namespace grapher this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.wholeVectorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.byVectorComponentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AutoWriteMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.UseSpecificDeviceMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.chartsPanel = new System.Windows.Forms.Panel(); this.GainChartY = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.VelocityChartY = new System.Windows.Forms.DataVisualization.Charting.Chart(); @@ -168,7 +170,6 @@ namespace grapher this.GainChart = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.VelocityChart = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.AccelerationChart = new System.Windows.Forms.DataVisualization.Charting.Chart(); - this.AutoWriteMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.optionsPanel.SuspendLayout(); this.menuStrip1.SuspendLayout(); this.chartsPanel.SuspendLayout(); @@ -260,7 +261,6 @@ namespace grapher this.optionsPanel.Name = "optionsPanel"; this.optionsPanel.Size = new System.Drawing.Size(483, 956); this.optionsPanel.TabIndex = 34; - this.optionsPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.optionsPanel_Paint); // // toggleButton // @@ -956,7 +956,8 @@ namespace grapher this.capStyleToolStripMenuItem, this.offsetStyleToolStripMenuItem, this.toolStripMenuItem1, - this.AutoWriteMenuItem}); + this.AutoWriteMenuItem, + this.UseSpecificDeviceMenuItem}); this.advancedToolStripMenuItem.Name = "advancedToolStripMenuItem"; this.advancedToolStripMenuItem.Size = new System.Drawing.Size(72, 20); this.advancedToolStripMenuItem.Text = "Advanced"; @@ -1029,6 +1030,21 @@ namespace grapher this.byVectorComponentToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.byVectorComponentToolStripMenuItem.Text = "By Component"; // + // AutoWriteMenuItem + // + this.AutoWriteMenuItem.Checked = true; + this.AutoWriteMenuItem.CheckOnClick = true; + this.AutoWriteMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; + this.AutoWriteMenuItem.Name = "AutoWriteMenuItem"; + this.AutoWriteMenuItem.Size = new System.Drawing.Size(210, 22); + this.AutoWriteMenuItem.Text = "Apply Settings On Startup"; + // + // UseSpecificDeviceMenuItem + // + this.UseSpecificDeviceMenuItem.Name = "UseSpecificDeviceMenuItem"; + this.UseSpecificDeviceMenuItem.Size = new System.Drawing.Size(210, 22); + this.UseSpecificDeviceMenuItem.Text = "Use Specific Device"; + // // chartsPanel // this.chartsPanel.AutoScroll = true; @@ -1281,15 +1297,6 @@ namespace grapher title6.Text = "Sensitivity"; this.AccelerationChart.Titles.Add(title6); // - // AutoWriteMenuItem - // - this.AutoWriteMenuItem.Checked = true; - this.AutoWriteMenuItem.CheckOnClick = true; - this.AutoWriteMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; - this.AutoWriteMenuItem.Name = "AutoWriteMenuItem"; - this.AutoWriteMenuItem.Size = new System.Drawing.Size(210, 22); - this.AutoWriteMenuItem.Text = "Apply Settings On Startup"; - // // RawAcceleration // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1300,8 +1307,6 @@ namespace grapher this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "RawAcceleration"; this.Text = "Raw Accel"; - this.Load += new System.EventHandler(this.Form1_Load); - this.Paint += new System.Windows.Forms.PaintEventHandler(this.RawAcceleration_Paint); this.optionsPanel.ResumeLayout(false); this.optionsPanel.PerformLayout(); this.menuStrip1.ResumeLayout(false); @@ -1418,6 +1423,7 @@ namespace grapher private System.Windows.Forms.DataVisualization.Charting.Chart VelocityChart; private System.Windows.Forms.DataVisualization.Charting.Chart AccelerationChart; private System.Windows.Forms.ToolStripMenuItem AutoWriteMenuItem; + private System.Windows.Forms.ToolStripMenuItem UseSpecificDeviceMenuItem; } } diff --git a/grapher/Form1.cs b/grapher/Form1.cs index 0c12b86..afa7a50 100644 --- a/grapher/Form1.cs +++ b/grapher/Form1.cs @@ -71,6 +71,7 @@ namespace grapher gainOffsetToolStripMenuItem, legacyOffsetToolStripMenuItem, AutoWriteMenuItem, + UseSpecificDeviceMenuItem, ScaleMenuItem, DPITextBox, PollRateTextBox, @@ -154,19 +155,18 @@ namespace grapher protected override void WndProc(ref Message m) { - if (m.Msg == 0x00ff) + if (m.Msg == 0x00ff) // WM_INPUT { AccelGUI.MouseWatcher.ReadMouseMove(m); } + else if (m.Msg == 0x00fe) // WM_INPUT_DEVICE_CHANGE + { + AccelGUI.UpdateInputManagers(); + } base.WndProc(ref m); } - private void Form1_Load(object sender, EventArgs e) - { - - } - public void ResetAutoScroll() { chartsPanel.AutoScrollPosition = Constants.Origin; @@ -186,16 +186,6 @@ namespace grapher }; } - private void RawAcceleration_Paint(object sender, PaintEventArgs e) - { - //AccelGUI.AccelCharts.DrawLastMovement(); - } - #endregion Method - - private void optionsPanel_Paint(object sender, PaintEventArgs e) - { - - } } } diff --git a/grapher/Models/AccelGUI.cs b/grapher/Models/AccelGUI.cs index c6a2dcc..81b3e13 100644 --- a/grapher/Models/AccelGUI.cs +++ b/grapher/Models/AccelGUI.cs @@ -1,4 +1,5 @@ using grapher.Models.Calculations; +using grapher.Models.Devices; using grapher.Models.Mouse; using grapher.Models.Options; using grapher.Models.Serialized; @@ -23,7 +24,8 @@ namespace grapher Button writeButton, ButtonBase toggleButton, MouseWatcher mouseWatcher, - ToolStripMenuItem scaleMenuItem) + ToolStripMenuItem scaleMenuItem, + DeviceIDManager deviceIDManager) { AccelForm = accelForm; AccelCalculator = accelCalculator; @@ -36,6 +38,7 @@ namespace grapher DefaultButtonFont = WriteButton.Font; SmallButtonFont = new Font(WriteButton.Font.Name, WriteButton.Font.Size * Constants.SmallButtonSizeFactor); MouseWatcher = mouseWatcher; + DeviceIDManager = deviceIDManager; ScaleMenuItem.Click += new System.EventHandler(OnScaleMenuItemClick); WriteButton.Click += new System.EventHandler(OnWriteButtonClick); @@ -95,6 +98,10 @@ namespace grapher public ToolStripMenuItem ScaleMenuItem { get; } + public DeviceIDManager DeviceIDManager { get; } + + public Action UpdateInputManagers { get; private set; } + private Timer ChartRefresh { get; } private Font SmallButtonFont { get; } @@ -141,7 +148,8 @@ namespace grapher modes = ApplyOptions.GetModes(), args = newArgs, minimumTime = driverSettings.minimumTime, - directionalMultipliers = driverSettings.directionalMultipliers + directionalMultipliers = driverSettings.directionalMultipliers, + deviceID = DeviceIDManager.ID, }; ButtonDelay(WriteButton); @@ -162,6 +170,14 @@ namespace grapher { UpdateShownActiveValues(args); UpdateGraph(args); + + UpdateInputManagers = () => + { + MouseWatcher.UpdateHandles(args.deviceID); + DeviceIDManager.Update(args.deviceID); + }; + + UpdateInputManagers(); } public void UpdateGraph(DriverSettings args) diff --git a/grapher/Models/AccelGUIFactory.cs b/grapher/Models/AccelGUIFactory.cs index 901a1b5..0669bf5 100644 --- a/grapher/Models/AccelGUIFactory.cs +++ b/grapher/Models/AccelGUIFactory.cs @@ -1,4 +1,5 @@ using grapher.Models.Calculations; +using grapher.Models.Devices; using grapher.Models.Mouse; using grapher.Models.Options; using grapher.Models.Serialized; @@ -34,6 +35,7 @@ namespace grapher.Models ToolStripMenuItem gainOffsetToolStripMenuItem, ToolStripMenuItem legacyOffsetToolStripMenuItem, ToolStripMenuItem autoWriteMenuItem, + ToolStripMenuItem useSpecificDeviceMenuItem, ToolStripMenuItem scaleMenuItem, ToolStripTextBox dpiTextBox, ToolStripTextBox pollRateTextBox, @@ -324,16 +326,20 @@ namespace grapher.Models lockXYLabel, accelCharts); + var deviceIdManager = new DeviceIDManager(useSpecificDeviceMenuItem); + var settings = new SettingsManager( activeAccel, accelCalculator.DPI, accelCalculator.PollRate, autoWriteMenuItem, showLastMouseMoveMenuItem, - showVelocityGainToolStripMenuItem); + showVelocityGainToolStripMenuItem, + deviceIdManager); var mouseWatcher = new MouseWatcher(form, mouseLabel, accelCharts, settings); + return new AccelGUI( form, accelCalculator, @@ -343,7 +349,8 @@ namespace grapher.Models writeButton, toggleButton, mouseWatcher, - scaleMenuItem); + scaleMenuItem, + deviceIdManager); } #endregion Methods diff --git a/grapher/Models/Devices/DeviceIDItem.cs b/grapher/Models/Devices/DeviceIDItem.cs new file mode 100644 index 0000000..63c2761 --- /dev/null +++ b/grapher/Models/Devices/DeviceIDItem.cs @@ -0,0 +1,73 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace grapher.Models.Devices +{ + public class DeviceIDItem + { + public DeviceIDItem(string name, string id, DeviceIDManager manager) + { + Name = name; + ID = id; + Manager = manager; + DeviceIDMenuItem = new ToolStripMenuItem(); + DeviceIDMenuItem.Checked = false; + DeviceIDMenuItem.Text = MenuItemText(); + DeviceIDMenuItem.Click += OnClicked; + manager.DeviceIDsMenuItem.DropDownItems.Add(DeviceIDMenuItem); + } + + private ToolStripMenuItem DeviceIDMenuItem { get; } + + public string Name { get; } + + public string ID { get; } + + private DeviceIDManager Manager { get; } + + public void SetActivated() + { + DeviceIDMenuItem.Checked = true; + } + + public void SetDeactivated() + { + DeviceIDMenuItem.Checked = false; + } + + private string MenuItemText() => string.IsNullOrEmpty(ID) ? $"{Name}" : $"{Name}: {ID}"; + + private string DisconnectedText() => $"Disconnected: {ID}"; + + public void SetDisconnected() + { + DeviceIDMenuItem.ForeColor = Color.DarkGray; + DeviceIDMenuItem.Text = DisconnectedText(); + } + + public void OnClicked(object sender, EventArgs e) + { + Manager.SetActive(this); + } + + public override bool Equals(object obj) + { + return obj is DeviceIDItem item && + Name == item.Name && + ID == item.ID; + } + + public override int GetHashCode() + { + int hashCode = -1692744877; + hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(Name); + hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(ID); + return hashCode; + } + } +} diff --git a/grapher/Models/Devices/DeviceIDManager.cs b/grapher/Models/Devices/DeviceIDManager.cs new file mode 100644 index 0000000..c50cda8 --- /dev/null +++ b/grapher/Models/Devices/DeviceIDManager.cs @@ -0,0 +1,86 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Management; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace grapher.Models.Devices +{ + public class DeviceIDManager + { + public DeviceIDManager(ToolStripMenuItem deviceIDs) + { + DeviceIDsMenuItem = deviceIDs; + DeviceIDsMenuItem.Checked = false; + } + + public ToolStripMenuItem DeviceIDsMenuItem { get; } + + public string ID { get => SelectedDeviceID.ID; } + + public DeviceIDItem SelectedDeviceID { get; private set; } + + public Dictionary<string, DeviceIDItem> DeviceIDs { get; private set; } + + public static IEnumerable<(string, string)> GetDeviceIDs(string PNPClass = "Mouse") + { + ManagementObjectSearcher searcher = new ManagementObjectSearcher(new SelectQuery("Win32_PnPEntity")); + + foreach (ManagementObject obj in searcher.Get()) + { + if (obj["PNPClass"] != null && obj["PNPClass"].ToString().Equals(PNPClass) && obj["DeviceID"] != null) + { + string name = obj["Name"].ToString(); + + string devInstanceID = obj["DeviceID"].ToString(); + string devID = devInstanceID.Remove(devInstanceID.LastIndexOf('\\')); + + yield return (name, devID); + } + } + } + + public void SetActive(DeviceIDItem deviceIDItem) + { + if (SelectedDeviceID != null) + { + SelectedDeviceID.SetDeactivated(); + } + + SelectedDeviceID = deviceIDItem; + SelectedDeviceID.SetActivated(); + } + + public void Update(string devID) + { + DeviceIDsMenuItem.DropDownItems.Clear(); + + bool found = string.IsNullOrEmpty(devID); + + var anyDevice = new DeviceIDItem("Any", string.Empty, this); + + if (found) SetActive(anyDevice); + + foreach (var device in GetDeviceIDs().Distinct()) + { + var deviceItem = new DeviceIDItem(device.Item1, device.Item2, this); + if (!found && deviceItem.ID.Equals(devID)) + { + SetActive(deviceItem); + found = true; + } + } + + if (!found) + { + var deviceItem = new DeviceIDItem(string.Empty, devID, this); + deviceItem.SetDisconnected(); + SetActive(deviceItem); + } + } + + } +} diff --git a/grapher/Models/Mouse/MouseData.cs b/grapher/Models/Mouse/MouseData.cs index e59a969..5944fe4 100644 --- a/grapher/Models/Mouse/MouseData.cs +++ b/grapher/Models/Mouse/MouseData.cs @@ -8,7 +8,6 @@ namespace grapher.Models.Mouse public MouseData() { - Lock = new Object(); X = 0; Y = 0; } @@ -17,18 +16,13 @@ namespace grapher.Models.Mouse #region Properties - public Object Lock { get; } - private int X { get; set; } private int Y { get; set; } public void Set(int x, int y) { - lock (Lock) - { - X = x; - Y = y; - } + X = x; + Y = y; } #endregion Properties @@ -37,11 +31,8 @@ namespace grapher.Models.Mouse public void Get(out int x, out int y) { - lock (Lock) - { - x = X; - y = Y; - } + x = X; + y = Y; } #endregion Methods diff --git a/grapher/Models/Mouse/MouseWatcher.cs b/grapher/Models/Mouse/MouseWatcher.cs index cbfc119..151a2a2 100644 --- a/grapher/Models/Mouse/MouseWatcher.cs +++ b/grapher/Models/Mouse/MouseWatcher.cs @@ -1,5 +1,6 @@ using grapher.Models.Serialized; using System; +using System.Collections.Generic; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -397,7 +398,11 @@ namespace grapher.Models.Mouse /// <summary>If set, the application-defined keyboard device hotkeys are not handled. However, the system hotkeys; for example, ALT+TAB and CTRL+ALT+DEL, are still handled. By default, all keyboard hotkeys are handled. NoHotKeys can be specified even if NoLegacy is not specified and WindowHandle is NULL.</summary> NoHotKeys = 0x00000200, /// <summary>If set, application keys are handled. NoLegacy must be specified. Keyboard only.</summary> - AppKeys = 0x00000400 + AppKeys = 0x00000400, + /// <summary>If set, this enables the caller to receive input in the background only if the foreground application does not process it. In other words, if the foreground application is not registered for raw input, then the background application that is registered will receive the input.</summary> + ExInputSink = 0x00001000, + /// <summary>If set, this enables the caller to receive WM_INPUT_DEVICE_CHANGE notifications for device arrival and device removal.</summary> + DevNotify = 0x00002000 } /// <summary>Value type for raw input devices.</summary> @@ -685,12 +690,13 @@ namespace grapher.Models.Mouse AccelCharts = accelCharts; SettingsManager = setMngr; MouseData = new MouseData(); + DeviceHandles = new List<IntPtr>(); RAWINPUTDEVICE device = new RAWINPUTDEVICE(); device.WindowHandle = ContainingForm.Handle; device.UsagePage = HIDUsagePage.Generic; device.Usage = HIDUsage.Mouse; - device.Flags = RawInputDeviceFlags.InputSink; + device.Flags = RawInputDeviceFlags.InputSink | RawInputDeviceFlags.DevNotify; RAWINPUTDEVICE[] devices = new RAWINPUTDEVICE[1]; devices[0] = device; @@ -711,6 +717,10 @@ namespace grapher.Models.Mouse private MouseData MouseData { get; } + private List<IntPtr> DeviceHandles { get; } + + private bool AnyDevice { get; set; } + private double PollTime { get => 1000 / SettingsManager.PollRateField.Data; @@ -720,6 +730,16 @@ namespace grapher.Models.Mouse #region Methods + public void UpdateHandles(string devID) + { + DeviceHandles.Clear(); + AnyDevice = string.IsNullOrEmpty(devID); + if (!AnyDevice) + { + RawInputInterop.AddHandlesFromID(devID, DeviceHandles); + } + } + public void UpdateLastMove() { MouseData.Get(out var x, out var y); @@ -728,15 +748,14 @@ namespace grapher.Models.Mouse public void ReadMouseMove(Message message) { - RawInput rawInput = new RawInput(); - int outSize = 0; + RawInput rawInput; int size = Marshal.SizeOf(typeof(RawInput)); - - outSize = GetRawInputData((IntPtr)message.LParam, RawInputCommand.Input, out rawInput, ref size, Marshal.SizeOf(typeof(RAWINPUTHEADER))); + _ = GetRawInputData(message.LParam, RawInputCommand.Input, out rawInput, ref size, Marshal.SizeOf(typeof(RAWINPUTHEADER))); bool relative = !rawInput.Data.Mouse.Flags.HasFlag(RawMouseFlags.MoveAbsolute); + bool deviceMatch = AnyDevice || DeviceHandles.Contains(rawInput.Header.Device); - if (relative && (rawInput.Data.Mouse.LastX != 0 || rawInput.Data.Mouse.LastY != 0)) + if (relative && deviceMatch && (rawInput.Data.Mouse.LastX != 0 || rawInput.Data.Mouse.LastY != 0)) { double x = rawInput.Data.Mouse.LastX; double y = rawInput.Data.Mouse.LastY; diff --git a/grapher/Models/Mouse/PointData.cs b/grapher/Models/Mouse/PointData.cs index e3f44ea..87bfc62 100644 --- a/grapher/Models/Mouse/PointData.cs +++ b/grapher/Models/Mouse/PointData.cs @@ -8,7 +8,6 @@ namespace grapher.Models.Mouse public PointData() { - Lock = new Object(); X = new double[] { 0.01 }; Y = new double[] { 0.01 }; } @@ -17,18 +16,13 @@ namespace grapher.Models.Mouse #region Properties - public Object Lock { get; } - private double[] X { get; set; } private double[] Y { get; set; } public void Set(double x, double y) { - lock(Lock) - { - X[0] = x; - Y[0] = y; - } + X[0] = x; + Y[0] = y; } #endregion Properties @@ -37,11 +31,8 @@ namespace grapher.Models.Mouse public void Get(out double[] x, out double[] y) { - lock(Lock) - { x = X; y = Y; - } } #endregion Methods diff --git a/grapher/Models/Serialized/RawAccelSettings.cs b/grapher/Models/Serialized/RawAccelSettings.cs index dcaf864..f4fb1e2 100644 --- a/grapher/Models/Serialized/RawAccelSettings.cs +++ b/grapher/Models/Serialized/RawAccelSettings.cs @@ -125,7 +125,8 @@ namespace grapher.Models.Serialized bool wholeOrNoY = accelSettings.combineMagnitudes || accelSettings.modes.y == AccelMode.noaccel; - return accelSettings.sensitivity.x == 1 && + return string.IsNullOrEmpty(accelSettings.deviceID) && + accelSettings.sensitivity.x == 1 && accelSettings.sensitivity.y == 1 && accelSettings.directionalMultipliers.x <= 0 && accelSettings.directionalMultipliers.y <= 0 && diff --git a/grapher/Models/Serialized/SettingsManager.cs b/grapher/Models/Serialized/SettingsManager.cs index 41ebcb5..40652dd 100644 --- a/grapher/Models/Serialized/SettingsManager.cs +++ b/grapher/Models/Serialized/SettingsManager.cs @@ -3,6 +3,8 @@ using System; using System.Windows.Forms; using System.Threading; using System.Text; +using System.Drawing; +using grapher.Models.Devices; namespace grapher.Models.Serialized { @@ -16,7 +18,8 @@ namespace grapher.Models.Serialized Field pollRateField, ToolStripMenuItem autoWrite, ToolStripMenuItem showLastMouseMove, - ToolStripMenuItem showVelocityAndGain) + ToolStripMenuItem showVelocityAndGain, + DeviceIDManager deviceIDManager) { ActiveAccel = activeAccel; DpiField = dpiField; @@ -24,6 +27,7 @@ namespace grapher.Models.Serialized AutoWriteMenuItem = autoWrite; ShowLastMouseMoveMenuItem = showLastMouseMove; ShowVelocityAndGainMoveMenuItem = showVelocityAndGain; + DeviceIDManager = deviceIDManager; } #endregion Constructors @@ -38,6 +42,8 @@ namespace grapher.Models.Serialized public Field PollRateField { get; private set; } + public DeviceIDManager DeviceIDManager { get; } + private ToolStripMenuItem AutoWriteMenuItem { get; set; } private ToolStripMenuItem ShowLastMouseMoveMenuItem { get; set; } diff --git a/grapher/grapher.csproj b/grapher/grapher.csproj index f6bdcb9..2788cca 100644 --- a/grapher/grapher.csproj +++ b/grapher/grapher.csproj @@ -59,6 +59,7 @@ </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> + <Reference Include="System.Management" /> <Reference Include="System.Windows.Forms.DataVisualization" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Data.DataSetExtensions" /> @@ -92,6 +93,8 @@ <Compile Include="Models\Charts\EstimatedPoints.cs" /> <Compile Include="Models\Charts\ChartState\XYOneGraphState.cs" /> <Compile Include="Models\Charts\ChartState\XYTwoGraphState.cs" /> + <Compile Include="Models\Devices\DeviceIDItem.cs" /> + <Compile Include="Models\Devices\DeviceIDManager.cs" /> <Compile Include="Models\Mouse\MouseData.cs" /> <Compile Include="Models\Mouse\MouseWatcher.cs" /> <Compile Include="Models\Mouse\PointData.cs" /> |