Avans/ErgometerApplication
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change structure, bugfixes, change file saving.

Browse Source
This commit is contained in:
kennyboy55
2015-09-17 16:34:34 +02:00
parent 81252a2d0c
commit 350a28cd83
6 changed files with 158 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ErgometerApplication/.vs/ErgometerApplication/v14/.suo
BIN
View File
Binary file not shown.
ErgometerApplication/ErgometerApplication/Ergometer.Designer.cs
Generated
+83 -67
View File
@@ -43,27 +43,28 @@ namespace ErgometerApplication
this.timeButton = new System.Windows.Forms.Button();
this.energyButton = new System.Windows.Forms.Button();
this.distanceButton = new System.Windows.Forms.Button();
this.saveTimer = new System.Windows.Forms.Timer(this.components);
this.writeTimer = new System.Windows.Forms.Timer(this.components);
this.button3 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.metingNextButton = new System.Windows.Forms.Button();
this.metingBackButton = new System.Windows.Forms.Button();
this.readButton = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// richTextBox1
//
this.richTextBox1.Location = new System.Drawing.Point(13, 42);
this.richTextBox1.Location = new System.Drawing.Point(10, 34);
this.richTextBox1.Margin = new System.Windows.Forms.Padding(2);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.ReadOnly = true;
this.richTextBox1.Size = new System.Drawing.Size(203, 243);
this.richTextBox1.Size = new System.Drawing.Size(153, 198);
this.richTextBox1.TabIndex = 0;
this.richTextBox1.Text = "";
//
// connectButton
//
this.connectButton.Location = new System.Drawing.Point(115, 291);
this.connectButton.Location = new System.Drawing.Point(86, 236);
this.connectButton.Margin = new System.Windows.Forms.Padding(2);
this.connectButton.Name = "connectButton";
this.connectButton.Size = new System.Drawing.Size(101, 26);
this.connectButton.Size = new System.Drawing.Size(76, 21);
this.connectButton.TabIndex = 1;
this.connectButton.Text = "Connect";
this.connectButton.UseVisualStyleBackColor = true;
@@ -73,21 +74,21 @@ namespace ErgometerApplication
//
this.ComPortBox.FormattingEnabled = true;
this.ComPortBox.Items.AddRange(new object[] {
"CNCA0",
"CNCB0",
"COM3",
"COM4"});
this.ComPortBox.Location = new System.Drawing.Point(12, 291);
"COM8",
"COM9"});
this.ComPortBox.Location = new System.Drawing.Point(9, 236);
this.ComPortBox.Margin = new System.Windows.Forms.Padding(2);
this.ComPortBox.Name = "ComPortBox";
this.ComPortBox.Size = new System.Drawing.Size(97, 24);
this.ComPortBox.Size = new System.Drawing.Size(74, 21);
this.ComPortBox.TabIndex = 11;
//
// statusButton
//
this.statusButton.Enabled = false;
this.statusButton.Location = new System.Drawing.Point(127, 12);
this.statusButton.Location = new System.Drawing.Point(95, 10);
this.statusButton.Margin = new System.Windows.Forms.Padding(2);
this.statusButton.Name = "statusButton";
this.statusButton.Size = new System.Drawing.Size(89, 26);
this.statusButton.Size = new System.Drawing.Size(67, 21);
this.statusButton.TabIndex = 3;
this.statusButton.Text = "Status";
this.statusButton.UseVisualStyleBackColor = true;
@@ -96,9 +97,10 @@ namespace ErgometerApplication
// resetButton
//
this.resetButton.Enabled = false;
this.resetButton.Location = new System.Drawing.Point(12, 12);
this.resetButton.Location = new System.Drawing.Point(9, 10);
this.resetButton.Margin = new System.Windows.Forms.Padding(2);
this.resetButton.Name = "resetButton";
this.resetButton.Size = new System.Drawing.Size(97, 26);
this.resetButton.Size = new System.Drawing.Size(73, 21);
this.resetButton.TabIndex = 4;
this.resetButton.Text = "Reset";
this.resetButton.UseVisualStyleBackColor = true;
@@ -113,9 +115,10 @@ namespace ErgometerApplication
//
this.timerStatus.AutoSize = true;
this.timerStatus.Enabled = false;
this.timerStatus.Location = new System.Drawing.Point(223, 12);
this.timerStatus.Location = new System.Drawing.Point(167, 10);
this.timerStatus.Margin = new System.Windows.Forms.Padding(2);
this.timerStatus.Name = "timerStatus";
this.timerStatus.Size = new System.Drawing.Size(113, 21);
this.timerStatus.Size = new System.Drawing.Size(88, 17);
this.timerStatus.TabIndex = 5;
this.timerStatus.Text = "Auto Refresh";
this.timerStatus.UseVisualStyleBackColor = true;
@@ -124,17 +127,19 @@ namespace ErgometerApplication
// inputTextBox
//
this.inputTextBox.Enabled = false;
this.inputTextBox.Location = new System.Drawing.Point(223, 42);
this.inputTextBox.Location = new System.Drawing.Point(167, 34);
this.inputTextBox.Margin = new System.Windows.Forms.Padding(2);
this.inputTextBox.Name = "inputTextBox";
this.inputTextBox.Size = new System.Drawing.Size(113, 22);
this.inputTextBox.Size = new System.Drawing.Size(86, 20);
this.inputTextBox.TabIndex = 6;
//
// powerButton
//
this.powerButton.Enabled = false;
this.powerButton.Location = new System.Drawing.Point(223, 134);
this.powerButton.Location = new System.Drawing.Point(167, 109);
this.powerButton.Margin = new System.Windows.Forms.Padding(2);
this.powerButton.Name = "powerButton";
this.powerButton.Size = new System.Drawing.Size(113, 26);
this.powerButton.Size = new System.Drawing.Size(85, 21);
this.powerButton.TabIndex = 7;
this.powerButton.Text = "Set Power";
this.powerButton.UseVisualStyleBackColor = true;
@@ -143,9 +148,10 @@ namespace ErgometerApplication
// timeButton
//
this.timeButton.Enabled = false;
this.timeButton.Location = new System.Drawing.Point(223, 70);
this.timeButton.Location = new System.Drawing.Point(167, 57);
this.timeButton.Margin = new System.Windows.Forms.Padding(2);
this.timeButton.Name = "timeButton";
this.timeButton.Size = new System.Drawing.Size(113, 26);
this.timeButton.Size = new System.Drawing.Size(85, 21);
this.timeButton.TabIndex = 8;
this.timeButton.Text = "Set Time";
this.timeButton.UseVisualStyleBackColor = true;
@@ -154,9 +160,10 @@ namespace ErgometerApplication
// energyButton
//
this.energyButton.Enabled = false;
this.energyButton.Location = new System.Drawing.Point(223, 166);
this.energyButton.Location = new System.Drawing.Point(167, 135);
this.energyButton.Margin = new System.Windows.Forms.Padding(2);
this.energyButton.Name = "energyButton";
this.energyButton.Size = new System.Drawing.Size(113, 26);
this.energyButton.Size = new System.Drawing.Size(85, 21);
this.energyButton.TabIndex = 9;
this.energyButton.Text = "Set Energy";
this.energyButton.UseVisualStyleBackColor = true;
@@ -165,54 +172,63 @@ namespace ErgometerApplication
// distanceButton
//
this.distanceButton.Enabled = false;
this.distanceButton.Location = new System.Drawing.Point(223, 102);
this.distanceButton.Location = new System.Drawing.Point(167, 83);
this.distanceButton.Margin = new System.Windows.Forms.Padding(2);
this.distanceButton.Name = "distanceButton";
this.distanceButton.Size = new System.Drawing.Size(113, 26);
this.distanceButton.Size = new System.Drawing.Size(85, 21);
this.distanceButton.TabIndex = 10;
this.distanceButton.Text = "Set Distance";
this.distanceButton.UseVisualStyleBackColor = true;
this.distanceButton.Click += new System.EventHandler(this.distanceButton_Click);
//
// button3
// writeTimer
//
this.button3.Enabled = false;
this.button3.Location = new System.Drawing.Point(224, 268);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(110, 27);
this.button3.TabIndex = 16;
this.button3.Text = "next";
this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.button3_Click);
this.writeTimer.Interval = 10000;
this.writeTimer.Tick += new System.EventHandler(this.writeTimer_Tick);
//
// button2
// metingNextButton
//
this.button2.Enabled = false;
this.button2.Location = new System.Drawing.Point(223, 233);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(113, 29);
this.button2.TabIndex = 15;
this.button2.Text = "back";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
this.metingNextButton.Enabled = false;
this.metingNextButton.Location = new System.Drawing.Point(167, 235);
this.metingNextButton.Margin = new System.Windows.Forms.Padding(2);
this.metingNextButton.Name = "metingNextButton";
this.metingNextButton.Size = new System.Drawing.Size(85, 21);
this.metingNextButton.TabIndex = 16;
this.metingNextButton.Text = "Next ->";
this.metingNextButton.UseVisualStyleBackColor = true;
this.metingNextButton.Click += new System.EventHandler(this.metingNextButton_Click);
//
// button1
// metingBackButton
//
this.button1.Location = new System.Drawing.Point(221, 198);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(113, 29);
this.button1.TabIndex = 17;
this.button1.Text = "Read File";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
this.metingBackButton.Enabled = false;
this.metingBackButton.Location = new System.Drawing.Point(167, 210);
this.metingBackButton.Margin = new System.Windows.Forms.Padding(2);
this.metingBackButton.Name = "metingBackButton";
this.metingBackButton.Size = new System.Drawing.Size(85, 21);
this.metingBackButton.TabIndex = 15;
this.metingBackButton.Text = "<- Back";
this.metingBackButton.UseVisualStyleBackColor = true;
this.metingBackButton.Click += new System.EventHandler(this.metingBackButton_Click);
//
// readButton
//
this.readButton.Location = new System.Drawing.Point(167, 185);
this.readButton.Margin = new System.Windows.Forms.Padding(2);
this.readButton.Name = "readButton";
this.readButton.Size = new System.Drawing.Size(85, 21);
this.readButton.TabIndex = 17;
this.readButton.Text = "Read File";
this.readButton.UseVisualStyleBackColor = true;
this.readButton.Click += new System.EventHandler(this.readButton_Click);
//
// Ergometer
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(351, 328);
this.Controls.Add(this.button1);
this.Controls.Add(this.button3);
this.Controls.Add(this.button2);
this.ClientSize = new System.Drawing.Size(265, 273);
this.Controls.Add(this.readButton);
this.Controls.Add(this.metingNextButton);
this.Controls.Add(this.metingBackButton);
this.Controls.Add(this.distanceButton);
this.Controls.Add(this.energyButton);
this.Controls.Add(this.timeButton);
@@ -224,8 +240,9 @@ namespace ErgometerApplication
this.Controls.Add(this.ComPortBox);
this.Controls.Add(this.connectButton);
this.Controls.Add(this.richTextBox1);
this.MaximumSize = new System.Drawing.Size(369, 375);
this.MinimumSize = new System.Drawing.Size(369, 375);
this.Margin = new System.Windows.Forms.Padding(2);
this.MaximumSize = new System.Drawing.Size(281, 312);
this.MinimumSize = new System.Drawing.Size(281, 312);
this.Name = "Ergometer";
this.Text = "Ergometer";
this.ResumeLayout(false);
@@ -247,10 +264,9 @@ namespace ErgometerApplication
private System.Windows.Forms.Button timeButton;
private System.Windows.Forms.Button energyButton;
private System.Windows.Forms.Button distanceButton;
private System.Windows.Forms.Timer saveTimer;
private System.Windows.Forms.Timer writeTimer;
private System.Windows.Forms.Button button3;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button metingNextButton;
private System.Windows.Forms.Button metingBackButton;
private System.Windows.Forms.Button readButton;
}
}
ErgometerApplication/ErgometerApplication/Ergometer.cs
+70 -77
View File
@@ -10,20 +10,21 @@ using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using Newtonsoft.Json;
using System.IO;
namespace ErgometerApplication
{
public partial class Ergometer : Form
{
private ComPort comPort;
private Meting Write;
private List<Meting> _data;
private int i = 0;
List<Meting> readedFile = new List<Meting>();
List<Meting> readFile = new List<Meting>();
public Ergometer()
{
InitializeComponent();
comPort = new ComPort();
_data = new List<Meting>();
}
private void connectButton_Click(object sender, EventArgs e)
@@ -54,12 +55,9 @@ namespace ErgometerApplication
string response = comPort.Read();
Console.WriteLine(response);
Meting test = FormatHelper.Status(response);
Write = test;
string test2 = test.ToString();
richTextBox1.Text = test2;
Meting m = FormatHelper.Status(response);
SaveData(m);
richTextBox1.Text = m.ToString();
}
}
else
@@ -79,6 +77,8 @@ namespace ErgometerApplication
ComPortBox.Enabled = true;
richTextBox1.Text = "";
WriteFile();
}
}
@@ -90,7 +90,11 @@ namespace ErgometerApplication
comPort.Write("ST");
string response = comPort.Read();
Console.WriteLine(response);
richTextBox1.Text = FormatHelper.Status(response).ToString();
Meting m = FormatHelper.Status(response);
SaveData(m);
richTextBox1.Text = m.ToString();
WriteFile();
}
private void resetButton_Click(object sender, EventArgs e)
@@ -109,7 +113,9 @@ namespace ErgometerApplication
comPort.Write("ST");
string response = comPort.Read();
Console.WriteLine(response);
richTextBox1.Text = FormatHelper.Status(response).ToString();
Meting m = FormatHelper.Status(response);
SaveData(m);
richTextBox1.Text = m.ToString();
}
}
@@ -161,102 +167,89 @@ namespace ErgometerApplication
{
statusButton.Enabled = false;
updateTimer.Start();
saveTimer.Start();
writeTimer.Start();
}
else
{
statusButton.Enabled = true;
updateTimer.Stop();
saveTimer.Stop();
writeTimer.Stop();
}
}
private void saveTimer_Tick(object sender, EventArgs e)
{
saveData(Write);
}
private void writeFile()
private void readButton_Click(object sender, EventArgs e)
{
string json = Newtonsoft.Json.JsonConvert.SerializeObject(_data.ToArray());
System.IO.File.WriteAllText(@Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "//path.ergo", json);
}
private void saveData(Meting meting)
{
_data = new List<Meting>();
_data.Add(new Meting()
ReadFile();
if (readFile != null)
{
HeartBeat = Write.HeartBeat,
RPM = Write.RPM,
Speed = Write.Speed,
Distance = Write.Distance,
Power = Write.Power,
Energy = Write.Energy,
Seconds = Write.Seconds,
ActualPower = Write.ActualPower
});
metingNextButton.Enabled = true;
metingBackButton.Enabled = true;
}
}
private void metingBackButton_Click(object sender, EventArgs e)
{
if (i > 0)
{ i--;
metingNextButton.Enabled = true;
}
if (i == 0)
{
metingBackButton.Enabled = false;
}
richTextBox1.Text = readFile.ElementAt(i).ToString();
}
private void metingNextButton_Click(object sender, EventArgs e)
{
if (i < (readFile.Count - 1))
{ i++;
metingBackButton.Enabled = true;
}
if (i == (readFile.Count - 1))
{
metingNextButton.Enabled = false;
}
richTextBox1.Text = readFile.ElementAt(i).ToString();
}
private void writeTimer_Tick(object sender, EventArgs e)
{
writeFile();
WriteFile();
}
private void readFile()
private void WriteFile()
{
string json = Newtonsoft.Json.JsonConvert.SerializeObject(_data);
string path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "ErgometerSessionData.ergo");
System.IO.File.WriteAllText(path, json);
Console.WriteLine("Writing file: " + path);
}
private void SaveData(Meting meting)
{
_data.Add(meting);
}
private void ReadFile()
{
string path;
OpenFileDialog file = new OpenFileDialog();
file.Filter = "Ergometer files(*.ergo) | *.ergo | All files(*.*) | *.*";
if (file.ShowDialog() == DialogResult.OK)
{
path = file.FileName;
readedFile = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Meting>>(System.IO.File.ReadAllText(path));
richTextBox1.Text = readedFile.ElementAt(i).ToString();
readFile = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Meting>>(System.IO.File.ReadAllText(path));
richTextBox1.Text = readFile.ElementAt(i).ToString();
}
else
{
readedFile = null;
readFile = null;
}
}
private void button1_Click(object sender, EventArgs e)
{
readFile();
if (readedFile != null)
{
button3.Enabled = true;
button2.Enabled = true;
}
}
private void button2_Click(object sender, EventArgs e)
{
if (i > 0)
{ i--;
button3.Enabled = true;
}
if (i == 0)
{
button2.Enabled = false;
}
richTextBox1.Text = readedFile.ElementAt(i).ToString();
}
private void button3_Click(object sender, EventArgs e)
{
if (i < (readedFile.Count - 1))
{ i++;
button2.Enabled = true;
}
if (i == (readedFile.Count - 1))
{
button3.Enabled = false;
}
richTextBox1.Text = readedFile.ElementAt(i).ToString();
}
}
}
ErgometerApplication/ErgometerApplication/Ergometer.resx
+1 -4
View File
@@ -120,10 +120,7 @@
<metadata name="updateTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="saveTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>160, 17</value>
</metadata>
<metadata name="writeTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>285, 17</value>
<value>147, 19</value>
</metadata>
</root>
ErgometerApplication/ErgometerApplication/FormatHelper.cs
+1 -1
View File
@@ -26,7 +26,7 @@ namespace ErgometerApplication
string[] temp = status[6].Split(':');
int seconds = (int.Parse(temp[0]) * 60) + (int.Parse(temp[1]));
return new Meting(heartbeat, rpm, speed, distance, power, energy, seconds, actualpower);
return new Meting(heartbeat, rpm, speed, distance, power, energy, seconds, actualpower, (DateTime.Now - DateTime.Parse("1/1/1870 0:0:0")).TotalMilliseconds);
}
}
}
ErgometerApplication/ErgometerApplication/Meting.cs
+3 -1
View File
@@ -16,8 +16,9 @@ namespace ErgometerApplication
public int Energy { get; set; }
public int Seconds { get; set; }
public int ActualPower { get; set; }
public double TimeStamp { get; }
public Meting(int heartbeat, int rpm, double speed, double distance, int power, int energy, int seconds, int actualpower)
public Meting(int heartbeat, int rpm, double speed, double distance, int power, int energy, int seconds, int actualpower, double timestamp)
{
HeartBeat = heartbeat;
RPM = rpm;
@@ -27,6 +28,7 @@ namespace ErgometerApplication
Energy = energy;
Seconds = seconds;
ActualPower = actualpower;
TimeStamp = timestamp;
}
public Meting()
{