20140508-181001

This commit is contained in:
BlubbFish 2014-05-08 16:10:03 +00:00
parent f853278bd7
commit f28c2349e4
11 changed files with 18 additions and 15 deletions

Binary file not shown.

View File

@ -19,8 +19,8 @@
<setting name="Com_Port" serializeAs="String"> <setting name="Com_Port" serializeAs="String">
<value>COM7</value> <value>COM7</value>
</setting> </setting>
<setting name="Setting" serializeAs="String"> <setting name="Chart_Items" serializeAs="String">
<value /> <value>1000</value>
</setting> </setting>
</Laminator_GUI.Properties.Settings> </Laminator_GUI.Properties.Settings>
</userSettings> </userSettings>

View File

@ -38,7 +38,7 @@ namespace Laminator_GUI
InitializeComponent(); InitializeComponent();
this.createButtons(); this.createButtons();
this.settings = new Settings(); 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 = new SerialPort(this.settings.Com_Port, 9600, Parity.None, 8, StopBits.One);
this.serialPort.Open(); this.serialPort.Open();
this.serialPort.Write("m" + this.settings.Default_Motor.PadLeft(2, '0') + "\n"); this.serialPort.Write("m" + this.settings.Default_Motor.PadLeft(2, '0') + "\n");
@ -93,7 +93,7 @@ namespace Laminator_GUI
this.hist.Enqueue(temp); this.hist.Enqueue(temp);
this.hmotor.Enqueue(this.motorBool); this.hmotor.Enqueue(this.motorBool);
this.hheat.Enqueue(this.heaterBool); this.hheat.Enqueue(this.heaterBool);
if (this.hist.Count > 500) if (this.hist.Count > this.settings.Chart_Items)
{ {
this.hist.Dequeue(); this.hist.Dequeue();
this.hmotor.Dequeue(); this.hmotor.Dequeue();

View File

@ -61,13 +61,13 @@ namespace Laminator_GUI.Properties {
[global::System.Configuration.UserScopedSettingAttribute()] [global::System.Configuration.UserScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")] [global::System.Configuration.DefaultSettingValueAttribute("1000")]
public string Setting { public int Chart_Items {
get { get {
return ((string)(this["Setting"])); return ((int)(this["Chart_Items"]));
} }
set { set {
this["Setting"] = value; this["Chart_Items"] = value;
} }
} }
} }

View File

@ -2,14 +2,17 @@
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Laminator_GUI.Properties" GeneratedClassName="Settings"> <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Laminator_GUI.Properties" GeneratedClassName="Settings">
<Profiles /> <Profiles />
<Settings> <Settings>
<Setting Name="Com_Port" Type="System.String" Scope="User">
<Value Profile="(Default)">COM8</Value>
</Setting>
<Setting Name="Default_Temp" Type="System.String" Scope="User"> <Setting Name="Default_Temp" Type="System.String" Scope="User">
<Value Profile="(Default)">32</Value> <Value Profile="(Default)">32</Value>
</Setting> </Setting>
<Setting Name="Default_Motor" Type="System.String" Scope="User"> <Setting Name="Default_Motor" Type="System.String" Scope="User">
<Value Profile="(Default)">10</Value> <Value Profile="(Default)">10</Value>
</Setting> </Setting>
<Setting Name="Com_Port" Type="System.String" Scope="User">
<Value Profile="(Default)">COM7</Value>
</Setting>
<Setting Name="Chart_Items" Type="System.Int32" Scope="User">
<Value Profile="(Default)">1000</Value>
</Setting>
</Settings> </Settings>
</SettingsFile> </SettingsFile>

View File

@ -19,8 +19,8 @@
<setting name="Com_Port" serializeAs="String"> <setting name="Com_Port" serializeAs="String">
<value>COM7</value> <value>COM7</value>
</setting> </setting>
<setting name="Setting" serializeAs="String"> <setting name="Chart_Items" serializeAs="String">
<value /> <value>1000</value>
</setting> </setting>
</Laminator_GUI.Properties.Settings> </Laminator_GUI.Properties.Settings>
</userSettings> </userSettings>

View File

@ -19,8 +19,8 @@
<setting name="Com_Port" serializeAs="String"> <setting name="Com_Port" serializeAs="String">
<value>COM7</value> <value>COM7</value>
</setting> </setting>
<setting name="Setting" serializeAs="String"> <setting name="Chart_Items" serializeAs="String">
<value /> <value>1000</value>
</setting> </setting>
</Laminator_GUI.Properties.Settings> </Laminator_GUI.Properties.Settings>
</userSettings> </userSettings>