Merge branch 'master' into 'master'

Master

See merge request wetterstation/frontend!33

Wetterstation/Form1.cs

@@ -70,28 +70,28 @@ namespace Wetterstation
 
             cartesianChart1.AxisY.Add(new Axis
             {
-                LabelFormatter = val => val + "°C",
+                LabelFormatter = val => val + " °C",
                 IsEnabled = false,
                 Position = AxisPosition.LeftBottom
             });
 
             cartesianChart1.AxisY.Add(new Axis
             {
-                LabelFormatter = val => val + "%",
+                LabelFormatter = val => val + " %",
                 IsEnabled = false,
                 Position = AxisPosition.LeftBottom
             });
 
             cartesianChart1.AxisY.Add(new Axis
             {
-                LabelFormatter = val => val + "hPa",
+                LabelFormatter = val => val + " hPa",
                 IsEnabled = true,
                 Position = AxisPosition.RightTop
             });
 
             cartesianChart1.AxisY.Add(new Axis
             {
-                LabelFormatter = val => val + "ms",
+                LabelFormatter = val => val + " ms",
                 IsEnabled = false,
                 Position = AxisPosition.LeftBottom
             });
@@ -242,10 +242,11 @@ namespace Wetterstation
                 lbWindSpeed.Invoke(new Action(() => { lbWindSpeed.Text = weatherData.windSpeed + " ms"; }));
                 lbWindricht.Invoke(new Action(() => { lbWindricht.Text = weatherData.windDeg + " °"; }));
                 lbLuftdruck.Invoke(new Action(() => { lbLuftdruck.Text = weatherData.pressure + " mbar"; }));
-                pbKompassrose.Invoke(new Action(() => {
-                    pbKompassrose.Image = RotateImage((Bitmap)global::Wetterstation.Properties.Resources.ResourceManager.GetObject("WindRose_neu"), (int)weatherData.windDeg);
-                }));
-
+                pbKompassrose.Invoke(new Action(() => { pbKompassrose.Image = RotateImage((Bitmap)global::Wetterstation.Properties.Resources.ResourceManager.GetObject("WindRose_neu"), (int)weatherData.windDeg); }));
+                lbRain1h.Invoke(new Action(() => { lbRain1h.Text = weatherData.rain1h + " L/h"; }));
+                lbRain3h.Invoke(new Action(() => { lbRain3h.Text = weatherData.rain3h + " L/h"; }));
+                lbSnow1h.Invoke(new Action(() => { lbSnow1h.Text = weatherData.snow1h + " mm/h"; }));
+                lbSnow3h.Invoke(new Action(() => { lbSnow3h.Text = weatherData.snow3h + " mm/h"; }));
             }
             catch (Exception ignored) { }
         }