diff --git a/Laminator-GUI/Laminator-GUI.v11.suo b/Laminator-GUI/Laminator-GUI.v11.suo index 15eb979..0be7a22 100644 Binary files a/Laminator-GUI/Laminator-GUI.v11.suo and b/Laminator-GUI/Laminator-GUI.v11.suo differ diff --git a/Laminator-GUI/Laminator-GUI/App.config b/Laminator-GUI/Laminator-GUI/App.config index 28c4514..9e013eb 100644 --- a/Laminator-GUI/Laminator-GUI/App.config +++ b/Laminator-GUI/Laminator-GUI/App.config @@ -19,8 +19,8 @@ COM7 - - + + 1000 diff --git a/Laminator-GUI/Laminator-GUI/Form1.cs b/Laminator-GUI/Laminator-GUI/Form1.cs index a3c1271..124628c 100644 --- a/Laminator-GUI/Laminator-GUI/Form1.cs +++ b/Laminator-GUI/Laminator-GUI/Form1.cs @@ -38,7 +38,7 @@ namespace Laminator_GUI InitializeComponent(); this.createButtons(); this.settings = new Settings(); - this.chart.ChartAreas[0].AxisX.Maximum = 500; + this.chart.ChartAreas[0].AxisX.Maximum = this.settings.Chart_Items; this.serialPort = new SerialPort(this.settings.Com_Port, 9600, Parity.None, 8, StopBits.One); this.serialPort.Open(); this.serialPort.Write("m" + this.settings.Default_Motor.PadLeft(2, '0') + "\n"); @@ -93,7 +93,7 @@ namespace Laminator_GUI this.hist.Enqueue(temp); this.hmotor.Enqueue(this.motorBool); this.hheat.Enqueue(this.heaterBool); - if (this.hist.Count > 500) + if (this.hist.Count > this.settings.Chart_Items) { this.hist.Dequeue(); this.hmotor.Dequeue(); diff --git a/Laminator-GUI/Laminator-GUI/Properties/Settings.Designer.cs b/Laminator-GUI/Laminator-GUI/Properties/Settings.Designer.cs index 446cfed..82c794e 100644 --- a/Laminator-GUI/Laminator-GUI/Properties/Settings.Designer.cs +++ b/Laminator-GUI/Laminator-GUI/Properties/Settings.Designer.cs @@ -61,13 +61,13 @@ namespace Laminator_GUI.Properties { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string Setting { + [global::System.Configuration.DefaultSettingValueAttribute("1000")] + public int Chart_Items { get { - return ((string)(this["Setting"])); + return ((int)(this["Chart_Items"])); } set { - this["Setting"] = value; + this["Chart_Items"] = value; } } } diff --git a/Laminator-GUI/Laminator-GUI/Properties/Settings.settings b/Laminator-GUI/Laminator-GUI/Properties/Settings.settings index b7b0e06..099dda3 100644 --- a/Laminator-GUI/Laminator-GUI/Properties/Settings.settings +++ b/Laminator-GUI/Laminator-GUI/Properties/Settings.settings @@ -2,14 +2,17 @@ - - COM8 - 32 10 + + COM7 + + + 1000 + \ No newline at end of file diff --git a/Laminator-GUI/Laminator-GUI/bin/x86/Release/Laminator-GUI.exe b/Laminator-GUI/Laminator-GUI/bin/x86/Release/Laminator-GUI.exe index b20a155..d75bb3e 100644 Binary files a/Laminator-GUI/Laminator-GUI/bin/x86/Release/Laminator-GUI.exe and b/Laminator-GUI/Laminator-GUI/bin/x86/Release/Laminator-GUI.exe differ diff --git a/Laminator-GUI/Laminator-GUI/bin/x86/Release/Laminator-GUI.exe.config b/Laminator-GUI/Laminator-GUI/bin/x86/Release/Laminator-GUI.exe.config index 28c4514..9e013eb 100644 --- a/Laminator-GUI/Laminator-GUI/bin/x86/Release/Laminator-GUI.exe.config +++ b/Laminator-GUI/Laminator-GUI/bin/x86/Release/Laminator-GUI.exe.config @@ -19,8 +19,8 @@ COM7 - - + + 1000 diff --git a/Laminator-GUI/Laminator-GUI/bin/x86/Release/Laminator-GUI.pdb b/Laminator-GUI/Laminator-GUI/bin/x86/Release/Laminator-GUI.pdb index 66839c1..757e2c3 100644 Binary files a/Laminator-GUI/Laminator-GUI/bin/x86/Release/Laminator-GUI.pdb and b/Laminator-GUI/Laminator-GUI/bin/x86/Release/Laminator-GUI.pdb differ diff --git a/Laminator-GUI/Laminator-GUI/bin/x86/Release/Laminator-GUI.vshost.exe.config b/Laminator-GUI/Laminator-GUI/bin/x86/Release/Laminator-GUI.vshost.exe.config index 28c4514..9e013eb 100644 --- a/Laminator-GUI/Laminator-GUI/bin/x86/Release/Laminator-GUI.vshost.exe.config +++ b/Laminator-GUI/Laminator-GUI/bin/x86/Release/Laminator-GUI.vshost.exe.config @@ -19,8 +19,8 @@ COM7 - - + + 1000 diff --git a/Laminator-GUI/Laminator-GUI/obj/x86/Release/Laminator-GUI.exe b/Laminator-GUI/Laminator-GUI/obj/x86/Release/Laminator-GUI.exe index b20a155..d75bb3e 100644 Binary files a/Laminator-GUI/Laminator-GUI/obj/x86/Release/Laminator-GUI.exe and b/Laminator-GUI/Laminator-GUI/obj/x86/Release/Laminator-GUI.exe differ diff --git a/Laminator-GUI/Laminator-GUI/obj/x86/Release/Laminator-GUI.pdb b/Laminator-GUI/Laminator-GUI/obj/x86/Release/Laminator-GUI.pdb index 66839c1..757e2c3 100644 Binary files a/Laminator-GUI/Laminator-GUI/obj/x86/Release/Laminator-GUI.pdb and b/Laminator-GUI/Laminator-GUI/obj/x86/Release/Laminator-GUI.pdb differ