Skip to content
Snippets Groups Projects
Commit 719476b5 authored by Dennis Eisold's avatar Dennis Eisold
Browse files

Forecast and days are updated; Application is closing now correctly

parent b9463f44
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Wetterstation/Form1.Designer.cs
+ 313
− 212
View file @ 719476b5
This diff is collapsed.
Wetterstation/Form1.cs
+ 41
− 5
View file @ 719476b5
......@@ -5,6 +5,7 @@ using System.Windows.Forms;
using uPLibrary.Networking.M2Mqtt;
using uPLibrary.Networking.M2Mqtt.Messages;
using Newtonsoft.Json;
using System.Globalization;
namespace Wetterstation
{
......@@ -77,8 +78,8 @@ namespace Wetterstation
//MQTT connect
public void mqttStart()
{
String topic_publish = "/wetterstation/backend/";
String topic_subscribe = "/wetterstation/frontend/#";
String topic_publish = "/wetterstation/backend/" + WeatherstationSettings.frontendId + "/";
String topic_subscribe = "/wetterstation/frontend/" + WeatherstationSettings.frontendId + "/#";
System.Console.WriteLine("Hello, World!");
// Create Client instance
......@@ -131,7 +132,7 @@ namespace Wetterstation
try
{
dynamic weatherData = JsonConvert.DeserializeObject(message.ToString());
lbAussenTemp.Invoke(new Action(() => { lbAussenTemp.Text = weatherData.sensors[1].temperature + " °C"; }));
lbAussenTemp.Invoke(new Action(() => { lbAussenTemp.Text = weatherData.temp + " °C"; }));
lbTempMin.Invoke(new Action(() => { lbTempMin.Text = weatherData.tempMin + " °C"; }));
lbTempMax.Invoke(new Action(() => { lbTempMax.Text = weatherData.tempMax + " °C"; }));
lbLuftfeuchtAussen.Invoke(new Action(() => { lbLuftfeuchtAussen.Text = weatherData.humidity + " %"; }));
......@@ -148,11 +149,36 @@ namespace Wetterstation
try
{
dynamic weatherData = JsonConvert.DeserializeObject(message.ToString());
lbAussenTemp.Invoke(new Action(() => { lbAussenTemp.Text = weatherData.sensors[1].temperature + " °C"; }));
lbForecastImage1.Invoke(new Action(() => { lbForecastImage1.Image = global::Wetterstation.Properties.Resources.ResourceManager.GetObject("_" + weatherData[0].icon1 + "_2x"); }));
lbForecastTemp1.Invoke(new Action(() => { lbForecastTemp1.Text = weatherData[0].temp + " °C"; }));
lbForecastDay1.Invoke(new Action(() => { lbForecastDay1.Text = getDayFromDateString(weatherData[0].from.ToString()); }));
lbForecastImage2.Invoke(new Action(() => { lbForecastImage2.Image = global::Wetterstation.Properties.Resources.ResourceManager.GetObject("_" + weatherData[1].icon1 + "_2x"); }));
lbForecastTemp2.Invoke(new Action(() => { lbForecastTemp2.Text = weatherData[1].temp + " °C"; }));
lbForecastDay2.Invoke(new Action(() => { lbForecastDay2.Text = getDayFromDateString(weatherData[1].from.ToString()); }));
lbForecastImage3.Invoke(new Action(() => { lbForecastImage3.Image = global::Wetterstation.Properties.Resources.ResourceManager.GetObject("_" + weatherData[2].icon1 + "_2x"); }));
lbForecastTemp3.Invoke(new Action(() => { lbForecastTemp3.Text = weatherData[2].temp + " °C"; }));lbForecastDay1.Invoke(new Action(() => { lbForecastDay1.Text = getDayFromDateString(weatherData[0].from.ToString()); }));
lbForecastDay3.Invoke(new Action(() => { lbForecastDay3.Text = getDayFromDateString(weatherData[2].from.ToString()); }));
lbForecastImage4.Invoke(new Action(() => { lbForecastImage4.Image = global::Wetterstation.Properties.Resources.ResourceManager.GetObject("_" + weatherData[3].icon1 + "_2x"); }));
lbForecastTemp4.Invoke(new Action(() => { lbForecastTemp4.Text = weatherData[3].temp + " °C"; }));
lbForecastDay4.Invoke(new Action(() => { lbForecastDay4.Text = getDayFromDateString(weatherData[3].from.ToString()); }));
lbForecastImage5.Invoke(new Action(() => { lbForecastImage5.Image = global::Wetterstation.Properties.Resources.ResourceManager.GetObject("_" + weatherData[4].icon1 + "_2x"); }));
lbForecastTemp5.Invoke(new Action(() => { lbForecastTemp5.Text = weatherData[4].temp + " °C"; }));
lbForecastDay5.Invoke(new Action(() => { lbForecastDay5.Text = getDayFromDateString(weatherData[4].from.ToString()); }));
}
catch (Exception ignored) { }
}
public String getDayFromDateString(String strDate)
{
DateTime dt = DateTime.ParseExact(strDate, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture);
CultureInfo culture = new CultureInfo("de-DE");
return culture.DateTimeFormat.GetDayName(dt.DayOfWeek).Substring(0, 2).ToString();
}
public void updateFormSensors(String message)
{
Console.WriteLine("Entered updateFormSensors");
......@@ -179,9 +205,13 @@ namespace Wetterstation
private void BtSystemKnopf_Click(object sender, EventArgs e)
{
Form settings = new Settings();
// abhängig von Form1
// Settings als Dialog starten, dann wird das Frontend geblockt und auf abschluss gewartet
settings.ShowDialog();
updateFormComplete();
// MQTT beenden und Verbindung neu aufbauen
this.myClient.Disconnect();
this.mqttStart();
// Neue Einstellungen an Backend senden
this.updateSettings2Mqtt();
}
......@@ -189,5 +219,11 @@ namespace Wetterstation
{
}
private void Hintergrund_FormClosed(object sender, FormClosedEventArgs e)
{
this.myClient.Disconnect();
Application.Exit();
}
}
}
Wetterstation/Properties/Resources.Designer.cs
+ 180
− 0
View file @ 719476b5
......@@ -60,6 +60,186 @@ namespace Wetterstation.Properties {
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _01d_2x {
get {
object obj = ResourceManager.GetObject("_01d_2x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _01n_2x {
get {
object obj = ResourceManager.GetObject("_01n_2x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _02d_2x {
get {
object obj = ResourceManager.GetObject("_02d_2x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _02n_2x {
get {
object obj = ResourceManager.GetObject("_02n_2x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _03d_2x {
get {
object obj = ResourceManager.GetObject("_03d_2x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _03n_2x {
get {
object obj = ResourceManager.GetObject("_03n_2x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _04d_2x {
get {
object obj = ResourceManager.GetObject("_04d_2x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _04n_2x {
get {
object obj = ResourceManager.GetObject("_04n_2x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _09d_2x {
get {
object obj = ResourceManager.GetObject("_09d_2x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _09n_2x {
get {
object obj = ResourceManager.GetObject("_09n_2x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _10d_2x {
get {
object obj = ResourceManager.GetObject("_10d_2x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _10n_2x {
get {
object obj = ResourceManager.GetObject("_10n_2x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _11d_2x {
get {
object obj = ResourceManager.GetObject("_11d_2x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _11n_2x {
get {
object obj = ResourceManager.GetObject("_11n_2x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _13d_2x {
get {
object obj = ResourceManager.GetObject("_13d_2x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _13n_2x {
get {
object obj = ResourceManager.GetObject("_13n_2x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _50d_2x {
get {
object obj = ResourceManager.GetObject("_50d_2x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _50n_2x {
get {
object obj = ResourceManager.GetObject("_50n_2x", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
......
Wetterstation/Properties/Resources.resx
+ 54
− 0
View file @ 719476b5
......@@ -148,4 +148,58 @@
<data name="Zahnrad12" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Zahnrad12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_01d_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\01d@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_01n_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\01n@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_02d_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\02d@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_02n_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\02n@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_03d_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\03d@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_03n_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\03n@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_04d_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\04d@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_04n_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\04n@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_09d_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\09d@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_09n_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\09n@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_10d_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\10d@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_10n_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\10n@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_11d_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\11d@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_11n_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\11n@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_13d_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\13d@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_13n_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\13n@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_50d_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\50d@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_50n_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\50n@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment