Merge branch 'master' into 'master'

Tendenz for humidity and reordered frontend

See merge request !40

Wetterstation/Form1.cs

@@ -252,6 +252,10 @@ namespace Wetterstation
                 if(!node1Out.humidity)
                 {
                     lbLuftfeuchtAussen.Invoke(new Action(() => { lbLuftfeuchtAussen.Text = weatherData.humidity + " %"; }));
+                    owm.Humiditys = (double)weatherData.humidity;
+                    if (owm._humiditys.Count < 10) lbTendenzHumidityOut.Invoke(new Action(() => { lbTendenzHumidityOut.Visible = false; }));
+                    else lbTendenzHumidityOut.Invoke(new Action(() => { lbTendenzHumidityOut.Visible = true; }));
+                    lbTendenzHumidityOut.Invoke(new Action(() => { lbTendenzHumidityOut.Image = RotateImage((Bitmap)global::Wetterstation.Properties.Resources.ResourceManager.GetObject("Tendenz"), owm.humidityTendenz()); }));
                 }
                 if(!node1Out.windSpeed)
                 {
@@ -369,6 +373,10 @@ namespace Wetterstation
                 {
                     node1In.humidity = true;
                     lbLuftFeuchtInnen.Invoke(new Action(() => { lbLuftFeuchtInnen.Text = weatherData[0]["humidity"] + " %"; }));
+                    node1Out.Humiditys = (double)weatherData[0]["humidity"];
+                    if (node1In._humiditys.Count < 10) lbTendenzHumidityIn.Invoke(new Action(() => { lbTendenzHumidityIn.Visible = false; }));
+                    else lbTendenzHumidityIn.Invoke(new Action(() => { lbTendenzHumidityIn.Visible = true; }));
+                    lbTendenzHumidityIn.Invoke(new Action(() => { lbTendenzHumidityIn.Image = RotateImage((Bitmap)global::Wetterstation.Properties.Resources.ResourceManager.GetObject("Tendenz"), node1In.humidityTendenz()); }));
                 }
                 if (weatherData[0]["client"] == node1In.host && weatherData[0]["sensor"] == node1In.name && weatherData[0]["pressure"] != null)
                 {
@@ -396,6 +404,10 @@ namespace Wetterstation
                 {
                     node1Out.humidity = true;
                     lbLuftfeuchtAussen.Invoke(new Action(() => { lbLuftfeuchtAussen.Text = weatherData[0]["humidity"] + " %"; }));
+                    node1Out.Humiditys = (double)weatherData[0]["humidity"];
+                    if (node1Out._humiditys.Count < 10) lbTendenzHumidityOut.Invoke(new Action(() => { lbTendenzHumidityOut.Visible = false; }));
+                    else lbTendenzHumidityOut.Invoke(new Action(() => { lbTendenzHumidityOut.Visible = true; }));
+                    lbTendenzHumidityOut.Invoke(new Action(() => { lbTendenzHumidityOut.Image = RotateImage((Bitmap)global::Wetterstation.Properties.Resources.ResourceManager.GetObject("Tendenz"), node1Out.humidityTendenz()); }));
                 }
 
             }

Wetterstation/Sensor.cs

@@ -19,6 +19,7 @@ namespace Wetterstation
         public double tempMax { get; set; }
         public List<double> _temperatures = new List<double>();
         public List<double> _pressures = new List<double>();
+        public List<double> _humiditys = new List<double>();
         public double Temperatures
         {
             set
@@ -41,6 +42,17 @@ namespace Wetterstation
                 _pressures.Add(value);
             }
         }
+        public double Humiditys
+        {
+            set
+            {
+                if (_humiditys.Count == 10)
+                {
+                    _humiditys.RemoveAt(0);
+                }
+                _humiditys.Add(value);
+            }
+        }
         public float tempTendenz()
         {
             int up = 0;
@@ -84,6 +96,29 @@ namespace Wetterstation
                 }
             }
 
+            if (up > down) return 180;
+            else return 0;
+        }
+        public float humidityTendenz()
+        {
+            int up = 0;
+            int down = 0;
+            double oldHumidity = 0;
+
+            foreach (double humidity in _humiditys)
+            {
+                if (humidity > oldHumidity)
+                {
+                    up++;
+                    oldHumidity = humidity;
+                }
+                else
+                {
+                    down++;
+                    oldHumidity = humidity;
+                }
+            }
+
             if (up > down) return 180;
             else return 0;
         }