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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
kennyboy55
2015-11-02 12:48:52 +01:00
parent ae9eac8ff7 d236d350b2
commit 177c89c43e
4 changed files with 72 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ErgometerIPR/ErgometerDoctorApplication/Client/PanelClientSteps.cs
+61
View File
@@ -0,0 +1,61 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace ErgometerApplication
{
public class PanelClientSteps : Panel
{
public Label UitlegText;
public Label HeaderLabel;
private string text;
public PanelClientSteps() : base()
{
this.HeaderLabel = new System.Windows.Forms.Label();
this.UitlegText = new System.Windows.Forms.Label();
//
// initialize panel
//
this.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.Controls.Add(this.UitlegText);
this.Controls.Add(this.HeaderLabel);
this.Dock = System.Windows.Forms.DockStyle.Top;
this.Location = new System.Drawing.Point(0, 0);
this.Name = "PanelClientSteps";
this.Size = new System.Drawing.Size(284, 150);
//
// HeaderLabel
//
this.HeaderLabel.AutoSize = true;
this.HeaderLabel.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.HeaderLabel.Location = new System.Drawing.Point(12, 9);
this.HeaderLabel.Name = "HeaderLabel";
this.HeaderLabel.Size = new System.Drawing.Size(105, 21);
this.HeaderLabel.TabIndex = 0;
this.HeaderLabel.Text = "Uitleg";
//
// UitlegText
//
this.UitlegText.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)));
this.UitlegText.AutoSize = true;
this.UitlegText.Font = new System.Drawing.Font("Segoe UI", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.UitlegText.Location = new System.Drawing.Point(12, 35);
this.UitlegText.Name = "UitlegText";
this.UitlegText.Size = new System.Drawing.Size(800, 32);
this.UitlegText.TabIndex = 2;
this.UitlegText.Text = text;
}
public void setText(string text)
{
this.UitlegText.Text = text;
}
}
}
ErgometerIPR/ErgometerDoctorApplication/Client/SessionWindow.Designer.cs
Generated
+3
View File
@@ -50,6 +50,7 @@ namespace ErgometerDoctorApplication
this.energy = new PanelClientData("Energie", 0, 200);
this.actualpower = new PanelClientData("Absolute Weerstand", 0, 400);
this.time = new PanelClientData("Tijd", 0, 400);
this.steps = new ErgometerApplication.PanelClientSteps();
this.panelClientContainer.SuspendLayout();
this.panelTopBar.SuspendLayout();
@@ -81,6 +82,7 @@ namespace ErgometerDoctorApplication
this.panelDataViewLeft.Controls.Add(power);
this.panelDataViewLeft.Controls.Add(energy);
this.panelDataViewLeft.Controls.Add(actualpower);
this.panelDataViewLeft.Controls.Add(steps);
this.panelDataViewLeft.Controls.Add(time);
@@ -156,6 +158,7 @@ namespace ErgometerDoctorApplication
private System.Windows.Forms.Label labelUsername;
private System.Windows.Forms.Label labelHallo;
public PanelClientData heartBeat, RPM, speed, distance, power, energy, seconds, actualpower, time;
public ErgometerApplication.PanelClientSteps steps;
private void createTitle()
{
ErgometerIPR/ErgometerDoctorApplication/Client/SessionWindow.cs
+5 -1
View File
@@ -41,7 +41,6 @@ namespace ErgometerDoctorApplication
updateGraph = new UpdateGraph(this.LoadGraph);
InitializeComponent();
if(! ActiveSession)
{
panelClientChat.richTextBox1.Enabled = false;
@@ -50,6 +49,11 @@ namespace ErgometerDoctorApplication
}
}
public void updateStepsText(string text)
{
steps.setText(text);
}
public void ClientApplicatie_Resize(object sender, EventArgs e)
{
Control control = (Control)sender;
ErgometerIPR/ErgometerDoctorApplication/ErgometerDoctorApplication.csproj
+3
View File
@@ -62,6 +62,9 @@
<Compile Include="Client\PanelClientData.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Client\PanelClientSteps.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Client\PanelGraphView.cs">
<SubType>Component</SubType>
</Compile>