diff --git a/Wetterstation/App.config b/Wetterstation/App.config
index bd82cd95d64f0c73e9423b38c9eaa39f78498eab..f2123231cbc5f466b0d10a16d3821cd7a2ebe2c6 100644
--- a/Wetterstation/App.config
+++ b/Wetterstation/App.config
@@ -1,25 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
- <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
- <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+ <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+ <section name="entityFramework"
+ type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
+ requirePermission="false"/>
</configSections>
<connectionStrings>
- <add name="Default" connectionString="Data Source=.\frontend.db;Version=3;" providerName="System.Data.SqlClient" />
+ <add name="Default" connectionString="Data Source=.\frontend.db;Version=3;" providerName="System.Data.SqlClient"/>
</connectionStrings>
<startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
</startup>
<entityFramework>
<providers>
- <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
- <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
+ <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
+ <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6"/>
</providers>
</entityFramework>
<system.data>
<DbProviderFactories>
- <remove invariant="System.Data.SQLite.EF6" />
- <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
- <remove invariant="System.Data.SQLite" /><add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /></DbProviderFactories>
+ <remove invariant="System.Data.SQLite.EF6"/>
+ <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6"
+ description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6"/>
+ <remove invariant="System.Data.SQLite"/><add name="SQLite Data Provider" invariant="System.Data.SQLite"
+ description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite"/></DbProviderFactories>
</system.data>
</configuration>
\ No newline at end of file
diff --git a/Wetterstation/Form1.Designer.cs b/Wetterstation/Form1.Designer.cs
index 710a3d8c655d6ca20b2c8538eaea8de3cebae38f..fef98708cb433fe94c92feeb598fe1b038ed2800 100644
--- a/Wetterstation/Form1.Designer.cs
+++ b/Wetterstation/Form1.Designer.cs
@@ -121,7 +121,7 @@ namespace Wetterstation
this.lbTextWindSpeed.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbTextWindSpeed.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbTextWindSpeed.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
- this.lbTextWindSpeed.Location = new System.Drawing.Point(776, 31);
+ this.lbTextWindSpeed.Location = new System.Drawing.Point(824, 31);
this.lbTextWindSpeed.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbTextWindSpeed.Name = "lbTextWindSpeed";
this.lbTextWindSpeed.Size = new System.Drawing.Size(208, 24);
@@ -157,13 +157,14 @@ namespace Wetterstation
// pictureBox1
//
this.pictureBox1.Anchor = System.Windows.Forms.AnchorStyles.None;
- this.pictureBox1.BackColor = System.Drawing.Color.Transparent;
- this.pictureBox1.BackgroundImage = global::Wetterstation.Properties.Resources.Kompassrose;
- this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.pictureBox1.Location = new System.Drawing.Point(1161, 59);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.pictureBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
+ this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.pictureBox1.Image = global::Wetterstation.Properties.Resources.WindRose_neu;
+ this.pictureBox1.Location = new System.Drawing.Point(1160, 59);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(119, 111);
+ this.pictureBox1.Size = new System.Drawing.Size(120, 120);
+ this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 10;
this.pictureBox1.TabStop = false;
//
@@ -200,7 +201,7 @@ namespace Wetterstation
this.lbWindSpeed.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbWindSpeed.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbWindSpeed.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.lbWindSpeed.Location = new System.Drawing.Point(876, 56);
+ this.lbWindSpeed.Location = new System.Drawing.Point(876, 57);
this.lbWindSpeed.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbWindSpeed.Name = "lbWindSpeed";
this.lbWindSpeed.Size = new System.Drawing.Size(108, 35);
@@ -213,7 +214,7 @@ namespace Wetterstation
this.lbLuftFeuchtInnen.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbLuftFeuchtInnen.Font = new System.Drawing.Font("Arial", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbLuftFeuchtInnen.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.lbLuftFeuchtInnen.Location = new System.Drawing.Point(545, 56);
+ this.lbLuftFeuchtInnen.Location = new System.Drawing.Point(545, 57);
this.lbLuftFeuchtInnen.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbLuftFeuchtInnen.Name = "lbLuftFeuchtInnen";
this.lbLuftFeuchtInnen.Size = new System.Drawing.Size(180, 70);
@@ -226,7 +227,7 @@ namespace Wetterstation
this.lbWindricht.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbWindricht.Font = new System.Drawing.Font("Arial", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbWindricht.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.lbWindricht.Location = new System.Drawing.Point(1194, 186);
+ this.lbWindricht.Location = new System.Drawing.Point(1195, 186);
this.lbWindricht.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbWindricht.Name = "lbWindricht";
this.lbWindricht.Size = new System.Drawing.Size(54, 32);
@@ -239,7 +240,7 @@ namespace Wetterstation
this.lbUhr.BackColor = System.Drawing.Color.Transparent;
this.lbUhr.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbUhr.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.lbUhr.Location = new System.Drawing.Point(1086, 807);
+ this.lbUhr.Location = new System.Drawing.Point(1085, 807);
this.lbUhr.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbUhr.Name = "lbUhr";
this.lbUhr.Size = new System.Drawing.Size(137, 35);
@@ -252,7 +253,7 @@ namespace Wetterstation
this.lbDatum.BackColor = System.Drawing.Color.Transparent;
this.lbDatum.Font = new System.Drawing.Font("Arial", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbDatum.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.lbDatum.Location = new System.Drawing.Point(1072, 851);
+ this.lbDatum.Location = new System.Drawing.Point(1072, 850);
this.lbDatum.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbDatum.Name = "lbDatum";
this.lbDatum.Size = new System.Drawing.Size(151, 32);
@@ -290,7 +291,7 @@ namespace Wetterstation
//
this.lbForecastImage2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbForecastImage2.Location = new System.Drawing.Point(236, 334);
- this.lbForecastImage2.Margin = new System.Windows.Forms.Padding(4);
+ this.lbForecastImage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.lbForecastImage2.Name = "lbForecastImage2";
this.lbForecastImage2.Size = new System.Drawing.Size(71, 68);
this.lbForecastImage2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -301,7 +302,7 @@ namespace Wetterstation
//
this.lbForecastImage3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbForecastImage3.Location = new System.Drawing.Point(307, 334);
- this.lbForecastImage3.Margin = new System.Windows.Forms.Padding(4);
+ this.lbForecastImage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.lbForecastImage3.Name = "lbForecastImage3";
this.lbForecastImage3.Size = new System.Drawing.Size(71, 68);
this.lbForecastImage3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -312,7 +313,7 @@ namespace Wetterstation
//
this.lbForecastImage4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbForecastImage4.Location = new System.Drawing.Point(376, 334);
- this.lbForecastImage4.Margin = new System.Windows.Forms.Padding(4);
+ this.lbForecastImage4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.lbForecastImage4.Name = "lbForecastImage4";
this.lbForecastImage4.Size = new System.Drawing.Size(71, 68);
this.lbForecastImage4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -323,7 +324,7 @@ namespace Wetterstation
//
this.lbForecastImage5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbForecastImage5.Location = new System.Drawing.Point(441, 334);
- this.lbForecastImage5.Margin = new System.Windows.Forms.Padding(4);
+ this.lbForecastImage5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.lbForecastImage5.Name = "lbForecastImage5";
this.lbForecastImage5.Size = new System.Drawing.Size(71, 68);
this.lbForecastImage5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -418,7 +419,7 @@ namespace Wetterstation
this.lbTextLuftdruck.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbTextLuftdruck.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbTextLuftdruck.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
- this.lbTextLuftdruck.Location = new System.Drawing.Point(883, 108);
+ this.lbTextLuftdruck.Location = new System.Drawing.Point(875, 108);
this.lbTextLuftdruck.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbTextLuftdruck.Name = "lbTextLuftdruck";
this.lbTextLuftdruck.Size = new System.Drawing.Size(101, 25);
@@ -431,7 +432,7 @@ namespace Wetterstation
this.lbLuftdruck.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbLuftdruck.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbLuftdruck.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.lbLuftdruck.Location = new System.Drawing.Point(864, 133);
+ this.lbLuftdruck.Location = new System.Drawing.Point(840, 133);
this.lbLuftdruck.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbLuftdruck.Name = "lbLuftdruck";
this.lbLuftdruck.Size = new System.Drawing.Size(120, 35);
@@ -454,7 +455,7 @@ namespace Wetterstation
this.lbCity.BackColor = System.Drawing.Color.Transparent;
this.lbCity.Font = new System.Drawing.Font("Arial Black", 27.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbCity.ForeColor = System.Drawing.Color.White;
- this.lbCity.Location = new System.Drawing.Point(1, 813);
+ this.lbCity.Location = new System.Drawing.Point(1, 814);
this.lbCity.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbCity.Name = "lbCity";
this.lbCity.Size = new System.Drawing.Size(1343, 62);
@@ -467,7 +468,7 @@ namespace Wetterstation
this.lbForecastImage1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbForecastImage1.InitialImage = global::Wetterstation.Properties.Resources._01d_2x;
this.lbForecastImage1.Location = new System.Drawing.Point(165, 334);
- this.lbForecastImage1.Margin = new System.Windows.Forms.Padding(4);
+ this.lbForecastImage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.lbForecastImage1.Name = "lbForecastImage1";
this.lbForecastImage1.Size = new System.Drawing.Size(71, 68);
this.lbForecastImage1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
@@ -480,7 +481,7 @@ namespace Wetterstation
this.btSystemKnopf.BackgroundImage = global::Wetterstation.Properties.Resources.Zahnrad12;
this.btSystemKnopf.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.btSystemKnopf.Location = new System.Drawing.Point(1291, 847);
- this.btSystemKnopf.Margin = new System.Windows.Forms.Padding(4);
+ this.btSystemKnopf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btSystemKnopf.Name = "btSystemKnopf";
this.btSystemKnopf.Size = new System.Drawing.Size(40, 37);
this.btSystemKnopf.TabIndex = 46;
@@ -520,7 +521,7 @@ namespace Wetterstation
this.label4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label4.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.label4.Location = new System.Drawing.Point(702, 334);
+ this.label4.Location = new System.Drawing.Point(701, 334);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(48, 17);
@@ -559,7 +560,7 @@ namespace Wetterstation
this.lbTempMax.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbTempMax.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbTempMax.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.lbTempMax.Location = new System.Drawing.Point(786, 358);
+ this.lbTempMax.Location = new System.Drawing.Point(787, 358);
this.lbTempMax.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbTempMax.Name = "lbTempMax";
this.lbTempMax.Size = new System.Drawing.Size(51, 17);
@@ -572,7 +573,7 @@ namespace Wetterstation
this.lbTempMin.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbTempMin.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbTempMin.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.lbTempMin.Location = new System.Drawing.Point(786, 385);
+ this.lbTempMin.Location = new System.Drawing.Point(787, 385);
this.lbTempMin.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbTempMin.Name = "lbTempMin";
this.lbTempMin.Size = new System.Drawing.Size(51, 17);
@@ -655,6 +656,7 @@ namespace Wetterstation
// cartesianChart1
//
this.cartesianChart1.Location = new System.Drawing.Point(19, 480);
+ this.cartesianChart1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.cartesianChart1.Name = "cartesianChart1";
this.cartesianChart1.Size = new System.Drawing.Size(1309, 310);
this.cartesianChart1.TabIndex = 60;
@@ -665,9 +667,10 @@ namespace Wetterstation
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackgroundImage = global::Wetterstation.Properties.Resources.Bild_Dennis_Formatiert;
+ this.BackgroundImage = global::Wetterstation.Properties.Resources.saturn;
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ClientSize = new System.Drawing.Size(1344, 897);
+ this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.cartesianChart1);
this.Controls.Add(this.lbForecastTemp5);
this.Controls.Add(this.lbForecastTemp4);
@@ -710,11 +713,10 @@ namespace Wetterstation
this.Controls.Add(this.lbTextWindSpeed);
this.Controls.Add(this.lbTextAussentemp);
this.Controls.Add(this.lbTextInnentemp);
- this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.lbHintergrund);
this.Controls.Add(this.lbCity);
this.DoubleBuffered = true;
- this.Margin = new System.Windows.Forms.Padding(4);
+ this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Hintergrund";
this.Text = "Wetterstation";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Hintergrund_FormClosed);
diff --git a/Wetterstation/Properties/Resources.Designer.cs b/Wetterstation/Properties/Resources.Designer.cs
index 4fc441b04f960fe03a73c531190c6dda3bd415c2..3ad2441884254f262b224bada7569448a2c5a630 100644
--- a/Wetterstation/Properties/Resources.Designer.cs
+++ b/Wetterstation/Properties/Resources.Designer.cs
@@ -300,6 +300,16 @@ namespace Wetterstation.Properties {
}
}
+ /// <summary>
+ /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+ /// </summary>
+ internal static System.Drawing.Bitmap WindRose_neu {
+ get {
+ object obj = ResourceManager.GetObject("WindRose_neu", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
diff --git a/Wetterstation/Properties/Resources.resx b/Wetterstation/Properties/Resources.resx
index 89cfcf1cf1c901f4df10193190899f0d13f9fccd..9ebb11d75095b649991611f7ac7ab4aef621c077 100644
--- a/Wetterstation/Properties/Resources.resx
+++ b/Wetterstation/Properties/Resources.resx
@@ -118,88 +118,91 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="earth" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\earth.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="Kompassrose" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Kompassrose.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="saturn" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\saturn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="Zahnrad" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Zahnrad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="Zahnrad1" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Zahnrad1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="Bild_Dennis_Formatiert" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Bild_Dennis_Formatiert.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="Systemknopf" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Systemknopf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="Strand" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\Strand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <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="Zahnrad11" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Zahnrad11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <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 name="Strand" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Strand.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 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>
<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 name="earth" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\earth.jpg;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 name="Bild_Dennis_Formatiert" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Bild_Dennis_Formatiert.jpg;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="_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="_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="_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="Zahnrad1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Zahnrad1.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="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="Kompassrose" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Kompassrose.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="saturn" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\saturn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="Zahnrad" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Zahnrad.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="_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="_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="_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="Systemknopf" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Systemknopf.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="_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 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="_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 name="WindRose_neu" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\WindRose_neu2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/Wetterstation/Resources/KompassRose_neu.png b/Wetterstation/Resources/KompassRose_neu.png
new file mode 100644
index 0000000000000000000000000000000000000000..5915475f187bb8f26e1c95ebf65acfe19e4b65eb
Binary files /dev/null and b/Wetterstation/Resources/KompassRose_neu.png differ
diff --git a/Wetterstation/Resources/WiRo.png b/Wetterstation/Resources/WiRo.png
new file mode 100644
index 0000000000000000000000000000000000000000..5915475f187bb8f26e1c95ebf65acfe19e4b65eb
Binary files /dev/null and b/Wetterstation/Resources/WiRo.png differ
diff --git a/Wetterstation/Resources/WiRo1.png b/Wetterstation/Resources/WiRo1.png
new file mode 100644
index 0000000000000000000000000000000000000000..5915475f187bb8f26e1c95ebf65acfe19e4b65eb
Binary files /dev/null and b/Wetterstation/Resources/WiRo1.png differ
diff --git a/Wetterstation/Resources/WiRo2.png b/Wetterstation/Resources/WiRo2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7b4310aa09724849d5a7fd126ae4af5bf77e3e6
Binary files /dev/null and b/Wetterstation/Resources/WiRo2.png differ
diff --git a/Wetterstation/Resources/WiRo3.png b/Wetterstation/Resources/WiRo3.png
new file mode 100644
index 0000000000000000000000000000000000000000..5915475f187bb8f26e1c95ebf65acfe19e4b65eb
Binary files /dev/null and b/Wetterstation/Resources/WiRo3.png differ
diff --git a/Wetterstation/Resources/WiRo4.png b/Wetterstation/Resources/WiRo4.png
new file mode 100644
index 0000000000000000000000000000000000000000..5915475f187bb8f26e1c95ebf65acfe19e4b65eb
Binary files /dev/null and b/Wetterstation/Resources/WiRo4.png differ
diff --git a/Wetterstation/Resources/WindRose_neu.png b/Wetterstation/Resources/WindRose_neu.png
new file mode 100644
index 0000000000000000000000000000000000000000..22511bfe004f4877ff18e5976a0c4a6e0707a3cf
Binary files /dev/null and b/Wetterstation/Resources/WindRose_neu.png differ
diff --git a/Wetterstation/Resources/WindRose_neu1.png b/Wetterstation/Resources/WindRose_neu1.png
new file mode 100644
index 0000000000000000000000000000000000000000..22511bfe004f4877ff18e5976a0c4a6e0707a3cf
Binary files /dev/null and b/Wetterstation/Resources/WindRose_neu1.png differ
diff --git a/Wetterstation/Resources/WindRose_neu2.png b/Wetterstation/Resources/WindRose_neu2.png
new file mode 100644
index 0000000000000000000000000000000000000000..22511bfe004f4877ff18e5976a0c4a6e0707a3cf
Binary files /dev/null and b/Wetterstation/Resources/WindRose_neu2.png differ
diff --git a/Wetterstation/Settings.Designer.cs b/Wetterstation/Settings.Designer.cs
index 8c0c4e6b3fcb6b78361dd86a784f1f30566bfa27..89abaf1400375815e19fcab6e7a5172885f92ba1 100644
--- a/Wetterstation/Settings.Designer.cs
+++ b/Wetterstation/Settings.Designer.cs
@@ -48,64 +48,73 @@
this.lbFrontendId = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
this.txtPlz = new System.Windows.Forms.Label();
- this.tbLngCode = new System.Windows.Forms.TextBox();
this.lbLngCode = new System.Windows.Forms.Label();
+ this.tbLngCode = new System.Windows.Forms.TextBox();
+ this.lbNode1 = new System.Windows.Forms.Label();
+ this.lbNode1SensorInnen = new System.Windows.Forms.Label();
+ this.tbNode1 = new System.Windows.Forms.TextBox();
+ this.tbNode1SensorInnen = new System.Windows.Forms.TextBox();
+ this.tbNode1SensorAussen = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// tbHost
//
- this.tbHost.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbHost.Location = new System.Drawing.Point(14, 76);
+ this.tbHost.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbHost.Location = new System.Drawing.Point(11, 52);
this.tbHost.Margin = new System.Windows.Forms.Padding(5);
- this.tbHost.MinimumSize = new System.Drawing.Size(531, 30);
+ this.tbHost.MaximumSize = new System.Drawing.Size(531, 26);
+ this.tbHost.MinimumSize = new System.Drawing.Size(250, 25);
this.tbHost.Name = "tbHost";
- this.tbHost.Size = new System.Drawing.Size(531, 35);
+ this.tbHost.Size = new System.Drawing.Size(250, 25);
this.tbHost.TabIndex = 1;
this.tbHost.TextChanged += new System.EventHandler(this.TbHost_TextChanged);
//
// tbPort
//
- this.tbPort.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbPort.Location = new System.Drawing.Point(14, 145);
+ this.tbPort.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbPort.Location = new System.Drawing.Point(11, 114);
this.tbPort.Margin = new System.Windows.Forms.Padding(5);
- this.tbPort.MinimumSize = new System.Drawing.Size(531, 30);
+ this.tbPort.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbPort.MinimumSize = new System.Drawing.Size(250, 25);
this.tbPort.Name = "tbPort";
- this.tbPort.Size = new System.Drawing.Size(531, 35);
+ this.tbPort.Size = new System.Drawing.Size(250, 25);
this.tbPort.TabIndex = 2;
//
// lbUser
//
this.lbUser.AutoSize = true;
this.lbUser.BackColor = System.Drawing.Color.Transparent;
- this.lbUser.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbUser.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbUser.ForeColor = System.Drawing.Color.White;
- this.lbUser.Location = new System.Drawing.Point(14, 185);
+ this.lbUser.Location = new System.Drawing.Point(12, 151);
this.lbUser.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbUser.Name = "lbUser";
- this.lbUser.Size = new System.Drawing.Size(119, 24);
+ this.lbUser.Size = new System.Drawing.Size(85, 16);
this.lbUser.TabIndex = 7;
this.lbUser.Text = "MQTT User";
//
// tbUser
//
- this.tbUser.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbUser.Location = new System.Drawing.Point(14, 214);
+ this.tbUser.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbUser.Location = new System.Drawing.Point(11, 175);
this.tbUser.Margin = new System.Windows.Forms.Padding(5);
- this.tbUser.MinimumSize = new System.Drawing.Size(531, 30);
+ this.tbUser.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbUser.MinimumSize = new System.Drawing.Size(250, 25);
this.tbUser.Name = "tbUser";
- this.tbUser.Size = new System.Drawing.Size(531, 35);
+ this.tbUser.Size = new System.Drawing.Size(250, 25);
this.tbUser.TabIndex = 3;
//
// tbPasswort
//
- this.tbPasswort.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbPasswort.Location = new System.Drawing.Point(14, 283);
+ this.tbPasswort.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbPasswort.Location = new System.Drawing.Point(11, 236);
this.tbPasswort.Margin = new System.Windows.Forms.Padding(5);
- this.tbPasswort.MinimumSize = new System.Drawing.Size(531, 30);
+ this.tbPasswort.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbPasswort.MinimumSize = new System.Drawing.Size(250, 25);
this.tbPasswort.Name = "tbPasswort";
- this.tbPasswort.Size = new System.Drawing.Size(531, 35);
+ this.tbPasswort.Size = new System.Drawing.Size(250, 25);
this.tbPasswort.TabIndex = 4;
this.tbPasswort.UseSystemPasswordChar = true;
//
@@ -113,12 +122,12 @@
//
this.lbPasswort.AutoSize = true;
this.lbPasswort.BackColor = System.Drawing.Color.Transparent;
- this.lbPasswort.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbPasswort.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbPasswort.ForeColor = System.Drawing.Color.White;
- this.lbPasswort.Location = new System.Drawing.Point(14, 254);
+ this.lbPasswort.Location = new System.Drawing.Point(8, 213);
this.lbPasswort.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbPasswort.Name = "lbPasswort";
- this.lbPasswort.Size = new System.Drawing.Size(174, 24);
+ this.lbPasswort.Size = new System.Drawing.Size(124, 16);
this.lbPasswort.TabIndex = 10;
this.lbPasswort.Text = "MQTT Passswort";
//
@@ -126,104 +135,108 @@
//
this.lbFrontend.AutoSize = true;
this.lbFrontend.BackColor = System.Drawing.Color.Transparent;
- this.lbFrontend.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbFrontend.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbFrontend.ForeColor = System.Drawing.Color.White;
- this.lbFrontend.Location = new System.Drawing.Point(14, 323);
+ this.lbFrontend.Location = new System.Drawing.Point(306, 28);
this.lbFrontend.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbFrontend.Name = "lbFrontend";
- this.lbFrontend.Size = new System.Drawing.Size(219, 24);
+ this.lbFrontend.Size = new System.Drawing.Size(158, 16);
this.lbFrontend.TabIndex = 11;
this.lbFrontend.Text = "MQTT Topic Frontend";
//
// tbTopicFrontend
//
- this.tbTopicFrontend.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbTopicFrontend.Location = new System.Drawing.Point(14, 352);
+ this.tbTopicFrontend.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbTopicFrontend.Location = new System.Drawing.Point(309, 53);
this.tbTopicFrontend.Margin = new System.Windows.Forms.Padding(5);
- this.tbTopicFrontend.MinimumSize = new System.Drawing.Size(531, 30);
+ this.tbTopicFrontend.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbTopicFrontend.MinimumSize = new System.Drawing.Size(250, 25);
this.tbTopicFrontend.Name = "tbTopicFrontend";
- this.tbTopicFrontend.Size = new System.Drawing.Size(531, 35);
+ this.tbTopicFrontend.Size = new System.Drawing.Size(250, 25);
this.tbTopicFrontend.TabIndex = 5;
//
// lbBackend
//
this.lbBackend.AutoSize = true;
this.lbBackend.BackColor = System.Drawing.Color.Transparent;
- this.lbBackend.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbBackend.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbBackend.ForeColor = System.Drawing.Color.White;
- this.lbBackend.Location = new System.Drawing.Point(14, 392);
+ this.lbBackend.Location = new System.Drawing.Point(306, 89);
this.lbBackend.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbBackend.Name = "lbBackend";
- this.lbBackend.Size = new System.Drawing.Size(215, 24);
+ this.lbBackend.Size = new System.Drawing.Size(154, 16);
this.lbBackend.TabIndex = 13;
this.lbBackend.Text = "MQTT Topic Backend";
//
// tbTopicBackend
//
- this.tbTopicBackend.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbTopicBackend.Location = new System.Drawing.Point(14, 421);
+ this.tbTopicBackend.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbTopicBackend.Location = new System.Drawing.Point(309, 114);
this.tbTopicBackend.Margin = new System.Windows.Forms.Padding(5);
- this.tbTopicBackend.MinimumSize = new System.Drawing.Size(531, 30);
+ this.tbTopicBackend.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbTopicBackend.MinimumSize = new System.Drawing.Size(250, 25);
this.tbTopicBackend.Name = "tbTopicBackend";
- this.tbTopicBackend.Size = new System.Drawing.Size(531, 35);
+ this.tbTopicBackend.Size = new System.Drawing.Size(250, 25);
this.tbTopicBackend.TabIndex = 6;
//
// lbQos
//
this.lbQos.AutoSize = true;
this.lbQos.BackColor = System.Drawing.Color.Transparent;
- this.lbQos.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbQos.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbQos.ForeColor = System.Drawing.Color.White;
- this.lbQos.Location = new System.Drawing.Point(14, 461);
+ this.lbQos.Location = new System.Drawing.Point(306, 151);
this.lbQos.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbQos.Name = "lbQos";
- this.lbQos.Size = new System.Drawing.Size(114, 24);
+ this.lbQos.Size = new System.Drawing.Size(80, 16);
this.lbQos.TabIndex = 15;
this.lbQos.Text = "MQTT Qos";
//
// tbQos
//
- this.tbQos.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbQos.Location = new System.Drawing.Point(14, 490);
+ this.tbQos.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbQos.Location = new System.Drawing.Point(309, 175);
this.tbQos.Margin = new System.Windows.Forms.Padding(5);
- this.tbQos.MinimumSize = new System.Drawing.Size(531, 30);
+ this.tbQos.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbQos.MinimumSize = new System.Drawing.Size(250, 25);
this.tbQos.Name = "tbQos";
- this.tbQos.Size = new System.Drawing.Size(531, 35);
+ this.tbQos.Size = new System.Drawing.Size(250, 25);
this.tbQos.TabIndex = 7;
//
// lbTimeout
//
this.lbTimeout.AutoSize = true;
this.lbTimeout.BackColor = System.Drawing.Color.Transparent;
- this.lbTimeout.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbTimeout.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbTimeout.ForeColor = System.Drawing.Color.White;
- this.lbTimeout.Location = new System.Drawing.Point(14, 530);
+ this.lbTimeout.Location = new System.Drawing.Point(306, 213);
this.lbTimeout.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbTimeout.Name = "lbTimeout";
- this.lbTimeout.Size = new System.Drawing.Size(152, 24);
+ this.lbTimeout.Size = new System.Drawing.Size(108, 16);
this.lbTimeout.TabIndex = 17;
this.lbTimeout.Text = "MQTT Timeout";
//
// tbTimeout
//
- this.tbTimeout.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbTimeout.Location = new System.Drawing.Point(14, 559);
+ this.tbTimeout.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbTimeout.Location = new System.Drawing.Point(309, 236);
this.tbTimeout.Margin = new System.Windows.Forms.Padding(5);
- this.tbTimeout.MinimumSize = new System.Drawing.Size(531, 30);
+ this.tbTimeout.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbTimeout.MinimumSize = new System.Drawing.Size(250, 25);
this.tbTimeout.Name = "tbTimeout";
- this.tbTimeout.Size = new System.Drawing.Size(531, 35);
+ this.tbTimeout.Size = new System.Drawing.Size(250, 25);
this.tbTimeout.TabIndex = 8;
//
// lbPlz
//
this.lbPlz.AutoSize = true;
this.lbPlz.BackColor = System.Drawing.Color.Transparent;
- this.lbPlz.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbPlz.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbPlz.ForeColor = System.Drawing.Color.White;
- this.lbPlz.Location = new System.Drawing.Point(14, 668);
+ this.lbPlz.Location = new System.Drawing.Point(306, 275);
this.lbPlz.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbPlz.Name = "lbPlz";
- this.lbPlz.Size = new System.Drawing.Size(41, 24);
+ this.lbPlz.Size = new System.Drawing.Size(30, 16);
this.lbPlz.TabIndex = 19;
this.lbPlz.Text = "Ort";
//
@@ -231,30 +244,31 @@
//
this.tbCity.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.tbCity.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
- this.tbCity.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbCity.Location = new System.Drawing.Point(14, 697);
+ this.tbCity.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbCity.Location = new System.Drawing.Point(309, 299);
this.tbCity.Margin = new System.Windows.Forms.Padding(5);
- this.tbCity.MinimumSize = new System.Drawing.Size(531, 30);
+ this.tbCity.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbCity.MinimumSize = new System.Drawing.Size(250, 25);
this.tbCity.Name = "tbCity";
- this.tbCity.Size = new System.Drawing.Size(531, 35);
+ this.tbCity.Size = new System.Drawing.Size(250, 25);
this.tbCity.TabIndex = 10;
this.tbCity.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbCity_KeyDown);
//
// btnSave
//
- this.btnSave.Location = new System.Drawing.Point(143, 783);
+ this.btnSave.Location = new System.Drawing.Point(608, 293);
this.btnSave.Margin = new System.Windows.Forms.Padding(4);
this.btnSave.Name = "btnSave";
- this.btnSave.Size = new System.Drawing.Size(255, 86);
+ this.btnSave.Size = new System.Drawing.Size(250, 35);
this.btnSave.TabIndex = 11;
- this.btnSave.Text = "Save Settings";
+ this.btnSave.Text = "Speichern";
this.btnSave.UseVisualStyleBackColor = true;
this.btnSave.Click += new System.EventHandler(this.Button1_Click);
//
// lbFrontendId
//
this.lbFrontendId.AutoSize = true;
- this.lbFrontendId.Location = new System.Drawing.Point(12, 9);
+ this.lbFrontendId.Location = new System.Drawing.Point(12, 6);
this.lbFrontendId.Name = "lbFrontendId";
this.lbFrontendId.Size = new System.Drawing.Size(46, 17);
this.lbFrontendId.TabIndex = 24;
@@ -264,12 +278,12 @@
//
this.label1.AutoSize = true;
this.label1.BackColor = System.Drawing.Color.Transparent;
- this.label1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label1.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.ForeColor = System.Drawing.Color.White;
- this.label1.Location = new System.Drawing.Point(14, 116);
+ this.label1.Location = new System.Drawing.Point(8, 89);
this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(115, 24);
+ this.label1.Size = new System.Drawing.Size(81, 16);
this.label1.TabIndex = 25;
this.label1.Text = "MQTT Port";
//
@@ -277,70 +291,142 @@
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label2.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.ForeColor = System.Drawing.Color.White;
- this.label2.Location = new System.Drawing.Point(14, 47);
+ this.label2.Location = new System.Drawing.Point(8, 28);
this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(119, 24);
+ this.label2.Size = new System.Drawing.Size(84, 16);
this.label2.TabIndex = 26;
this.label2.Text = "MQTT Host";
//
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label3.ForeColor = System.Drawing.Color.White;
- this.label3.Location = new System.Drawing.Point(14, 737);
- this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(126, 24);
- this.label3.TabIndex = 27;
- this.label3.Text = "Postleitzahl:";
- //
// txtPlz
//
this.txtPlz.AutoSize = true;
- this.txtPlz.Location = new System.Drawing.Point(149, 741);
+ this.txtPlz.Location = new System.Drawing.Point(344, 274);
this.txtPlz.Name = "txtPlz";
- this.txtPlz.Size = new System.Drawing.Size(46, 17);
+ this.txtPlz.Size = new System.Drawing.Size(27, 17);
this.txtPlz.TabIndex = 28;
- this.txtPlz.Text = "label4";
- //
- // tbLngCode
- //
- this.tbLngCode.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbLngCode.Location = new System.Drawing.Point(14, 628);
- this.tbLngCode.Margin = new System.Windows.Forms.Padding(5);
- this.tbLngCode.MinimumSize = new System.Drawing.Size(531, 30);
- this.tbLngCode.Name = "tbLngCode";
- this.tbLngCode.Size = new System.Drawing.Size(531, 35);
- this.tbLngCode.TabIndex = 9;
+ this.txtPlz.Text = "Plz";
+ this.txtPlz.Click += new System.EventHandler(this.TxtPlz_Click);
//
// lbLngCode
//
this.lbLngCode.AutoSize = true;
this.lbLngCode.BackColor = System.Drawing.Color.Transparent;
- this.lbLngCode.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbLngCode.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbLngCode.ForeColor = System.Drawing.Color.White;
- this.lbLngCode.Location = new System.Drawing.Point(14, 599);
+ this.lbLngCode.Location = new System.Drawing.Point(8, 274);
this.lbLngCode.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbLngCode.Name = "lbLngCode";
- this.lbLngCode.Size = new System.Drawing.Size(161, 24);
+ this.lbLngCode.Size = new System.Drawing.Size(121, 16);
this.lbLngCode.TabIndex = 29;
this.lbLngCode.Text = "Landeskennung";
//
+ // tbLngCode
+ //
+ this.tbLngCode.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbLngCode.Location = new System.Drawing.Point(11, 299);
+ this.tbLngCode.Margin = new System.Windows.Forms.Padding(5);
+ this.tbLngCode.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbLngCode.MinimumSize = new System.Drawing.Size(250, 25);
+ this.tbLngCode.Name = "tbLngCode";
+ this.tbLngCode.Size = new System.Drawing.Size(250, 25);
+ this.tbLngCode.TabIndex = 9;
+ //
+ // lbNode1
+ //
+ this.lbNode1.AutoSize = true;
+ this.lbNode1.BackColor = System.Drawing.Color.Transparent;
+ this.lbNode1.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbNode1.ForeColor = System.Drawing.Color.White;
+ this.lbNode1.Location = new System.Drawing.Point(605, 28);
+ this.lbNode1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lbNode1.Name = "lbNode1";
+ this.lbNode1.Size = new System.Drawing.Size(116, 16);
+ this.lbNode1.TabIndex = 30;
+ this.lbNode1.Text = "Sensor Node Id";
+ //
+ // lbNode1SensorInnen
+ //
+ this.lbNode1SensorInnen.AutoSize = true;
+ this.lbNode1SensorInnen.BackColor = System.Drawing.Color.Transparent;
+ this.lbNode1SensorInnen.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbNode1SensorInnen.ForeColor = System.Drawing.Color.White;
+ this.lbNode1SensorInnen.Location = new System.Drawing.Point(605, 89);
+ this.lbNode1SensorInnen.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lbNode1SensorInnen.Name = "lbNode1SensorInnen";
+ this.lbNode1SensorInnen.Size = new System.Drawing.Size(102, 16);
+ this.lbNode1SensorInnen.TabIndex = 31;
+ this.lbNode1SensorInnen.Text = "Sensor innen";
+ //
+ // tbNode1
+ //
+ this.tbNode1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+ this.tbNode1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
+ this.tbNode1.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbNode1.Location = new System.Drawing.Point(608, 53);
+ this.tbNode1.Margin = new System.Windows.Forms.Padding(5);
+ this.tbNode1.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbNode1.MinimumSize = new System.Drawing.Size(250, 25);
+ this.tbNode1.Name = "tbNode1";
+ this.tbNode1.Size = new System.Drawing.Size(250, 25);
+ this.tbNode1.TabIndex = 32;
+ //
+ // tbNode1SensorInnen
+ //
+ this.tbNode1SensorInnen.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+ this.tbNode1SensorInnen.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
+ this.tbNode1SensorInnen.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbNode1SensorInnen.Location = new System.Drawing.Point(608, 114);
+ this.tbNode1SensorInnen.Margin = new System.Windows.Forms.Padding(5);
+ this.tbNode1SensorInnen.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbNode1SensorInnen.MinimumSize = new System.Drawing.Size(250, 25);
+ this.tbNode1SensorInnen.Name = "tbNode1SensorInnen";
+ this.tbNode1SensorInnen.Size = new System.Drawing.Size(250, 25);
+ this.tbNode1SensorInnen.TabIndex = 33;
+ //
+ // tbNode1SensorAussen
+ //
+ this.tbNode1SensorAussen.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+ this.tbNode1SensorAussen.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
+ this.tbNode1SensorAussen.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbNode1SensorAussen.Location = new System.Drawing.Point(608, 175);
+ this.tbNode1SensorAussen.Margin = new System.Windows.Forms.Padding(5);
+ this.tbNode1SensorAussen.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbNode1SensorAussen.MinimumSize = new System.Drawing.Size(250, 25);
+ this.tbNode1SensorAussen.Name = "tbNode1SensorAussen";
+ this.tbNode1SensorAussen.Size = new System.Drawing.Size(250, 25);
+ this.tbNode1SensorAussen.TabIndex = 35;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.BackColor = System.Drawing.Color.Transparent;
+ this.label3.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label3.ForeColor = System.Drawing.Color.White;
+ this.label3.Location = new System.Drawing.Point(605, 151);
+ this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(105, 16);
+ this.label3.TabIndex = 34;
+ this.label3.Text = "Sensor außen";
+ //
// Settings
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ScrollBar;
- this.ClientSize = new System.Drawing.Size(567, 889);
+ this.ClientSize = new System.Drawing.Size(874, 339);
+ this.Controls.Add(this.tbNode1SensorAussen);
+ this.Controls.Add(this.label3);
+ this.Controls.Add(this.tbNode1SensorInnen);
+ this.Controls.Add(this.tbNode1);
+ this.Controls.Add(this.lbNode1SensorInnen);
+ this.Controls.Add(this.lbNode1);
this.Controls.Add(this.tbLngCode);
this.Controls.Add(this.lbLngCode);
this.Controls.Add(this.txtPlz);
- this.Controls.Add(this.label3);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.lbFrontendId);
@@ -373,6 +459,7 @@
}
#endregion
+
private System.Windows.Forms.TextBox tbHost;
private System.Windows.Forms.TextBox tbPort;
private System.Windows.Forms.Label lbUser;
@@ -393,9 +480,14 @@
private System.Windows.Forms.Label lbFrontendId;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label txtPlz;
- private System.Windows.Forms.TextBox tbLngCode;
private System.Windows.Forms.Label lbLngCode;
+ private System.Windows.Forms.TextBox tbLngCode;
+ private System.Windows.Forms.Label lbNode1;
+ private System.Windows.Forms.Label lbNode1SensorInnen;
+ private System.Windows.Forms.TextBox tbNode1;
+ private System.Windows.Forms.TextBox tbNode1SensorInnen;
+ private System.Windows.Forms.TextBox tbNode1SensorAussen;
+ private System.Windows.Forms.Label label3;
}
}
\ No newline at end of file
diff --git a/Wetterstation/Settings.cs b/Wetterstation/Settings.cs
index 5147da77a8d1b50a478354b01045be7fef9e992c..986cc075b5116c255f678e65bcc3296304761047 100644
--- a/Wetterstation/Settings.cs
+++ b/Wetterstation/Settings.cs
@@ -9,10 +9,8 @@ using System.Linq;
namespace Wetterstation
{
-
public partial class Settings : Form
{
- bool debug = false;
SettingsModel WeatherstationSettings = new SettingsModel();
public Settings()
@@ -20,11 +18,7 @@ namespace Wetterstation
InitializeComponent();
lbFrontendId.Text = "Frontend Id: " + generateId();
- if(debug)
- {
- Console.WriteLine("Settings Daten werden aus der frontend.db ausgelesen ...");
- }
-
+ Console.WriteLine("Daten werden aus DB ausgelesen ...");
WeatherstationSettings = SqliteDataAccess.LoadWeatherstationSettings();
}
@@ -41,6 +35,9 @@ namespace Wetterstation
tbCity.Text = WeatherstationSettings.city;
txtPlz.Text = WeatherstationSettings.plz;
tbLngCode.Text = WeatherstationSettings.lngCode;
+ tbNode1.Text = WeatherstationSettings.node1Id;
+ tbNode1SensorInnen.Text = WeatherstationSettings.node1Innen;
+ tbNode1SensorAussen.Text = WeatherstationSettings.node1Aussen;
}
private String generateId()
@@ -51,7 +48,7 @@ namespace Wetterstation
ManagementObjectSearcher searcher = new ManagementObjectSearcher("root\\CIMV2", "SELECT * FROM Win32_Processor");
foreach (ManagementObject queryObj in searcher.Get()) {
- result = queryObj["ProcessorId"] + Environment.UserName;
+ result = queryObj["SerialNumber"] + Environment.UserName;
}
}
catch (ManagementException e) {
@@ -83,11 +80,7 @@ namespace Wetterstation
private void Settings_Load(object sender, EventArgs e)
{
- if(debug)
- {
- Console.WriteLine("Bin in Settings_Load !!!!!!!");
- }
-
+ Console.WriteLine("Bin in Settings_Load !!!!!!!");
LoadWeatherstationSettings();
acPlz();
}
@@ -126,13 +119,11 @@ namespace Wetterstation
mqttSettings.plz = txtPlz.Text;
mqttSettings.city = tbCity.Text;
mqttSettings.lngCode = tbLngCode.Text;
+ mqttSettings.node1Id = tbNode1.Text;
+ mqttSettings.node1Innen = tbNode1SensorInnen.Text;
+ mqttSettings.node1Aussen = tbNode1SensorAussen.Text;
- if(debug)
- {
- Console.WriteLine("Speichere Settings ");
- }
-
- //update die frontend.db Tabelle settings mit den geänderten Daten
+ Console.WriteLine("Speichere Settings ");
SqliteDataAccess.SaveWeatherstationSettings(mqttSettings);
this.Close();
@@ -147,7 +138,7 @@ namespace Wetterstation
}
}
- private void TbHost_TextChanged(object sender, EventArgs e)
+ private void TxtPlz_Click(object sender, EventArgs e)
{
}
diff --git a/Wetterstation/SettingsModel.cs b/Wetterstation/SettingsModel.cs
index 4ab9657db4f36043cc2426d3713a9fb8dee7f7a4..47362f4eaec1787fb323f874913e533bda3624ee 100644
--- a/Wetterstation/SettingsModel.cs
+++ b/Wetterstation/SettingsModel.cs
@@ -25,5 +25,11 @@
public string city { get; set; }
public string lngCode { get; set; }
+
+ public string node1Id { get; set; }
+
+ public string node1Innen { get; set; }
+
+ public string node1Aussen { get; set; }
}
}
diff --git a/Wetterstation/SqliteDataAccess.cs b/Wetterstation/SqliteDataAccess.cs
index f94a9750732cfffba853a4fd5783352effd98b24..d9a155b113cc9c32e750b4f2b634fc086ede2f74 100644
--- a/Wetterstation/SqliteDataAccess.cs
+++ b/Wetterstation/SqliteDataAccess.cs
@@ -35,7 +35,10 @@ namespace Wetterstation
"frontendId = @frontendId, " +
"lngCode = @lngCode, " +
"plz = @plz, " +
- "city = @city;",
+ "city = @city, " +
+ "node1Id = @node1Id, " +
+ "node1Innen = @node1Innen, " +
+ "node1Aussen = @node1Aussen;",
mqttSettings);
}
}
diff --git a/Wetterstation/Wetterstation.csproj b/Wetterstation/Wetterstation.csproj
index 881049583cb5e6e9faf5730e015bf0a1633a4bcb..835111fec99c11fd6de185a1e96054d93dab5f1c 100644
--- a/Wetterstation/Wetterstation.csproj
+++ b/Wetterstation/Wetterstation.csproj
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="..\packages\EntityFramework.6.3.0\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.props')" />
+ <Import Project="..\packages\EntityFramework.6.4.0\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.0\build\EntityFramework.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -40,10 +40,10 @@
<HintPath>..\packages\Dapper.2.0.30\lib\net461\Dapper.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
- <HintPath>..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.dll</HintPath>
+ <HintPath>..\packages\EntityFramework.6.4.0\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
- <HintPath>..\packages\EntityFramework.6.3.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+ <HintPath>..\packages\EntityFramework.6.4.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="LiveCharts, Version=0.9.7.0, Culture=neutral, PublicKeyToken=0bc1f845d1ebb8df, processorArchitecture=MSIL">
<HintPath>..\packages\LiveCharts.0.9.7\lib\net45\LiveCharts.dll</HintPath>
@@ -107,6 +107,7 @@
<Compile Include="Settings.Designer.cs">
<DependentUpon>Settings.cs</DependentUpon>
</Compile>
+ <None Include="Resources\WindRose_neu2.png" />
<EmbeddedResource Include="Form1.resx">
<DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource>
@@ -189,8 +190,8 @@
<ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.112.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.112.0\build\net46\System.Data.SQLite.Core.targets'))" />
- <Error Condition="!Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.3.0\build\EntityFramework.props'))" />
- <Error Condition="!Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.3.0\build\EntityFramework.targets'))" />
+ <Error Condition="!Exists('..\packages\EntityFramework.6.4.0\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.0\build\EntityFramework.props'))" />
+ <Error Condition="!Exists('..\packages\EntityFramework.6.4.0\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.0\build\EntityFramework.targets'))" />
</Target>
- <Import Project="..\packages\EntityFramework.6.3.0\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.3.0\build\EntityFramework.targets')" />
+ <Import Project="..\packages\EntityFramework.6.4.0\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.0\build\EntityFramework.targets')" />
</Project>
\ No newline at end of file
diff --git a/Wetterstation/frontend.db b/Wetterstation/frontend.db
index c80ebb9c6818e01761d660126550e2db0fb072a6..7e1b4d4372f4d4c8bf9fd216946249a2f97e0f41 100644
Binary files a/Wetterstation/frontend.db and b/Wetterstation/frontend.db differ
diff --git a/Wetterstation/packages.config b/Wetterstation/packages.config
index bb376b6ab0c9f0628dc9a063288be2bb4c35ea13..2ac4426cb74fe55ba5cf75cc7d2f83cfe9141132 100644
--- a/Wetterstation/packages.config
+++ b/Wetterstation/packages.config
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Dapper" version="2.0.30" targetFramework="net472" />
- <package id="EntityFramework" version="6.3.0" targetFramework="net472" />
+ <package id="EntityFramework" version="6.4.0" targetFramework="net472" />
<package id="LiveCharts" version="0.9.7" targetFramework="net472" />
<package id="LiveCharts.WinForms" version="0.9.7.1" targetFramework="net472" />
<package id="LiveCharts.Wpf" version="0.9.7" targetFramework="net472" />