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

Fix comport connecting. Removed useless data views

Browse Source
This commit is contained in:
kennyboy55
2015-11-03 20:43:33 +01:00
parent 50a8b83ca9
commit 0e9ed3f088
2 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ErgometerIPR/ErgometerApplication/ClientApplicatie.Designer.cs
Generated
+7 -12
View File
@@ -46,13 +46,10 @@ namespace ErgometerApplication
this.labelHallo = new System.Windows.Forms.Label(); this.labelHallo = new System.Windows.Forms.Label();
this.heartBeat = new PanelClientData("Hartslag", 50, 220); this.heartBeat = new PanelClientData("Hartslag", 50, 220);
this.RPM = new PanelClientData("RPM", 0, 120); this.RPM = new PanelClientData("RPM", 30, 70);
this.speed = new PanelClientData("Snelheid", 0, 50);
this.distance = new PanelClientData("Afstand (km)", 0, 100);
this.power = new PanelClientData("Weerstand", 25, 400); this.power = new PanelClientData("Weerstand", 25, 400);
this.energy = new PanelClientData("Energie", 0, 200); this.actualpower = new PanelClientData("Huidige Weerstand", 0, 400);
this.actualpower = new PanelClientData("Absolute Weerstand", 0, 400); this.time = new PanelClientData("Tijd", 0, 0);
this.time = new PanelClientData("Tijd", 0, 400);
this.steps = new PanelClientSteps(); this.steps = new PanelClientSteps();
this.panelClientContainer.SuspendLayout(); this.panelClientContainer.SuspendLayout();
@@ -88,13 +85,11 @@ namespace ErgometerApplication
this.panelDataViewLeft.Size = new System.Drawing.Size(18, 600); this.panelDataViewLeft.Size = new System.Drawing.Size(18, 600);
this.panelDataViewLeft.TabIndex = 3; this.panelDataViewLeft.TabIndex = 3;
this.panelDataViewLeft.BackColor = System.Drawing.Color.Gray; this.panelDataViewLeft.BackColor = System.Drawing.Color.Gray;
this.panelDataViewLeft.Controls.Add(heartBeat);
this.panelDataViewLeft.Controls.Add(RPM);
this.panelDataViewLeft.Controls.Add(speed);
this.panelDataViewLeft.Controls.Add(distance);
this.panelDataViewLeft.Controls.Add(power); this.panelDataViewLeft.Controls.Add(power);
this.panelDataViewLeft.Controls.Add(energy);
this.panelDataViewLeft.Controls.Add(actualpower); this.panelDataViewLeft.Controls.Add(actualpower);
this.panelDataViewLeft.Controls.Add(RPM);
this.panelDataViewLeft.Controls.Add(heartBeat);
this.panelDataViewLeft.Controls.Add(steps); this.panelDataViewLeft.Controls.Add(steps);
this.panelDataViewLeft.Controls.Add(time); this.panelDataViewLeft.Controls.Add(time);
@@ -189,7 +184,7 @@ namespace ErgometerApplication
private System.Windows.Forms.Button buttonLogOff; private System.Windows.Forms.Button buttonLogOff;
private System.Windows.Forms.Label labelUsername; private System.Windows.Forms.Label labelUsername;
private System.Windows.Forms.Label labelHallo; private System.Windows.Forms.Label labelHallo;
public PanelClientData heartBeat, RPM, speed, distance, power, energy, seconds, actualpower, time; public PanelClientData heartBeat, RPM, power, seconds, actualpower, time;
public PanelClientSteps steps; public PanelClientSteps steps;
} }
ErgometerIPR/ErgometerApplication/ClientApplicatie.cs
+18 -12
View File
@@ -45,10 +45,7 @@ namespace ErgometerApplication
heartBeat.updateValue(m.HeartBeat); heartBeat.updateValue(m.HeartBeat);
RPM.updateValue(m.RPM); RPM.updateValue(m.RPM);
speed.updateValue(m.Speed);
distance.updateValue(m.Distance);
power.updateValue(m.Power); power.updateValue(m.Power);
energy.updateValue(m.Energy);
actualpower.updateValue(m.ActualPower); actualpower.updateValue(m.ActualPower);
time.updateValue(m.Seconds); time.updateValue(m.Seconds);
@@ -74,19 +71,28 @@ namespace ErgometerApplication
} }
if (password.Length > 0) if (password.Length > 0)
{ {
string error = ""; if (SerialPort.GetPortNames().Length > 0)
bool connect = MainClient.Connect(SerialPort.GetPortNames()[0], username, password, out error);
if (connect)
{ {
panelGatherInfo.BringToFront(); string error = "";
panelTopBar.Visible = true; bool connect = MainClient.Connect(SerialPort.GetPortNames()[0], username, password, out error);
this.labelUsername.Text = panelLogin.textBoxUsername.Text;
if (connect)
{
panelGatherInfo.BringToFront();
panelTopBar.Visible = true;
this.labelUsername.Text = panelLogin.textBoxUsername.Text;
}
else
{
panelLogin.lblVerification.Text = error;
panelLogin.lblVerification.ForeColor = Color.Red;
panelLogin.lblVerification.Visible = true;
}
} }
else else
{ {
panelLogin.lblVerification.Text = error; panelLogin.lblVerification.Text = "De Ergometer is niet verbonden.";
panelLogin.lblVerification.ForeColor = Color.Red; panelLogin.lblVerification.ForeColor = Color.Red;
panelLogin.lblVerification.Visible = true; panelLogin.lblVerification.Visible = true;
} }