Merge branch 'feature/GUI' of https://github.com/bartreedijk/TI-2.1-RemoteHealthCare into feature/GUI

Proftaak Remote Healthcare/Fietsclient/AppGlobal.cs

@@ -11,6 +11,8 @@ namespace Fietsclient
     {
         private static AppGlobal _instance;
 
+        public int[] StatusItemsChecked;
+
         Thread workerThread;
         public static AppGlobal Instance
         {

Proftaak Remote Healthcare/Fietsclient/MainForm.cs

@@ -20,6 +20,7 @@ namespace Fietsclient
         {
             InitializeComponent();
             _global = global;
+            ucSettings1.Visible = true;
             
         }
 

Proftaak Remote Healthcare/Fietsclient/User Controls/UcConsole.cs

@@ -33,8 +33,8 @@ namespace Fietsclient.User_Controls
         private void HandleBikeData(string[] data)
         {
 
-            addTextToLog("pulse: " + data[0] + ", rpm: " + data[1] + ",  speed*10: " + data[2] + ",  distance: " + data[3] +
-                ",  requested_power: " + data[4] + ", energy: " + data[5] + ", mm:ss: " + data[6] + ", actual_power: " + data[7]);
+            addTextToLog("Pulse: " + data[0] + ", Rpm: " + data[1] + ",  Speed: " + data[2] + ",  Distance: " + data[3] +
+                ",  Requestedpower: " + data[4] + ", Energy: " + data[5] + ", Time: " + data[6] + ", Actualpower: " + data[7]);
         }
     }
 }

Proftaak Remote Healthcare/Fietsclient/User Controls/UcSettings.cs

@@ -32,16 +32,11 @@ namespace Fietsclient.User_Controls
             _global.startAskingData();
         }
 
-        private void chkChooseData_SelectedIndexChanged(object sender, EventArgs e)
-        {
-
-        }
-
         private void cmbChooseCom_SelectionChangeCommitted(object sender, EventArgs e)
         {
-            if (!(cmbChooseCom.Text == ""))
+            if ((cmbChooseCom.Text == ""))
             {
-                _global.startComPort(cmbChooseCom.Text);
+                _global.startComPort(cmbChooseCom.SelectedItem.ToString());
                 pgbInit.Value = 100;
             }
         }

Proftaak Remote Healthcare/Fietsclient/User Controls/ucSettings.Designer.cs

@@ -30,7 +30,6 @@
         {
             this.cmbChooseCom = new System.Windows.Forms.ComboBox();
             this.pgbInit = new System.Windows.Forms.ProgressBar();
-            this.chkChooseData = new System.Windows.Forms.CheckedListBox();
             this.btnCloseCom = new System.Windows.Forms.Button();
             this.btnStartAsking = new System.Windows.Forms.Button();
             this.SuspendLayout();
@@ -51,24 +50,6 @@
             this.pgbInit.Size = new System.Drawing.Size(129, 23);
             this.pgbInit.TabIndex = 1;
             // 
-            // chkChooseData
-            // 
-            this.chkChooseData.FormattingEnabled = true;
-            this.chkChooseData.Items.AddRange(new object[] {
-            "Pulse",
-            "Rpm",
-            "Speed",
-            "Distance",
-            "Requestedpower",
-            "Energy",
-            "Time",
-            "Actualpower"});
-            this.chkChooseData.Location = new System.Drawing.Point(23, 435);
-            this.chkChooseData.Name = "chkChooseData";
-            this.chkChooseData.Size = new System.Drawing.Size(153, 140);
-            this.chkChooseData.TabIndex = 2;
-            this.chkChooseData.SelectedIndexChanged += new System.EventHandler(this.chkChooseData_SelectedIndexChanged);
-            // 
             // btnCloseCom
             // 
             this.btnCloseCom.Location = new System.Drawing.Point(432, 224);
@@ -95,7 +76,6 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.btnStartAsking);
             this.Controls.Add(this.btnCloseCom);
-            this.Controls.Add(this.chkChooseData);
             this.Controls.Add(this.pgbInit);
             this.Controls.Add(this.cmbChooseCom);
             this.Name = "UcSettings";
@@ -108,7 +88,6 @@
 
         private System.Windows.Forms.ComboBox cmbChooseCom;
         private System.Windows.Forms.ProgressBar pgbInit;
-        private System.Windows.Forms.CheckedListBox chkChooseData;
         private System.Windows.Forms.Button btnCloseCom;
         private System.Windows.Forms.Button btnStartAsking;
     }