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 5bf1f6c760d3732af17f0e9ffff63892fc1aec70..894774c5b890e295bde9ba14febfda606cae5d59 100644
--- a/Wetterstation/Form1.Designer.cs
+++ b/Wetterstation/Form1.Designer.cs
@@ -95,10 +95,9 @@ namespace Wetterstation
this.lbTextInnentemp.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(99)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbTextInnentemp.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbTextInnentemp.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
- this.lbTextInnentemp.Location = new System.Drawing.Point(224, 26);
- this.lbTextInnentemp.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbTextInnentemp.Location = new System.Drawing.Point(168, 21);
this.lbTextInnentemp.Name = "lbTextInnentemp";
- this.lbTextInnentemp.Size = new System.Drawing.Size(203, 29);
+ this.lbTextInnentemp.Size = new System.Drawing.Size(163, 24);
this.lbTextInnentemp.TabIndex = 0;
this.lbTextInnentemp.Text = "Innentemperatur";
//
@@ -108,10 +107,9 @@ namespace Wetterstation
this.lbTextAussentemp.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbTextAussentemp.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbTextAussentemp.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
- this.lbTextAussentemp.Location = new System.Drawing.Point(203, 153);
- this.lbTextAussentemp.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbTextAussentemp.Location = new System.Drawing.Point(152, 124);
this.lbTextAussentemp.Name = "lbTextAussentemp";
- this.lbTextAussentemp.Size = new System.Drawing.Size(224, 29);
+ this.lbTextAussentemp.Size = new System.Drawing.Size(180, 24);
this.lbTextAussentemp.TabIndex = 1;
this.lbTextAussentemp.Text = "Aussentemperatur";
//
@@ -121,10 +119,9 @@ 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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbTextWindSpeed.Location = new System.Drawing.Point(618, 25);
this.lbTextWindSpeed.Name = "lbTextWindSpeed";
- this.lbTextWindSpeed.Size = new System.Drawing.Size(208, 24);
+ this.lbTextWindSpeed.Size = new System.Drawing.Size(165, 18);
this.lbTextWindSpeed.TabIndex = 2;
this.lbTextWindSpeed.Text = "Windgeschwindigkeit";
//
@@ -134,10 +131,9 @@ namespace Wetterstation
this.lbTextLuftfeuchtInnen.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(99)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbTextLuftfeuchtInnen.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbTextLuftfeuchtInnen.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
- this.lbTextLuftfeuchtInnen.Location = new System.Drawing.Point(536, 26);
- this.lbTextLuftfeuchtInnen.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbTextLuftfeuchtInnen.Location = new System.Drawing.Point(402, 21);
this.lbTextLuftfeuchtInnen.Name = "lbTextLuftfeuchtInnen";
- this.lbTextLuftfeuchtInnen.Size = new System.Drawing.Size(189, 29);
+ this.lbTextLuftfeuchtInnen.Size = new System.Drawing.Size(149, 24);
this.lbTextLuftfeuchtInnen.TabIndex = 3;
this.lbTextLuftfeuchtInnen.Text = "Luftfeuchtigkeit";
//
@@ -147,23 +143,21 @@ namespace Wetterstation
this.Windrichtung.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.Windrichtung.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Windrichtung.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
- this.Windrichtung.Location = new System.Drawing.Point(1133, 26);
- this.Windrichtung.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.Windrichtung.Location = new System.Drawing.Point(850, 21);
this.Windrichtung.Name = "Windrichtung";
- this.Windrichtung.Size = new System.Drawing.Size(165, 29);
+ this.Windrichtung.Size = new System.Drawing.Size(134, 24);
this.Windrichtung.TabIndex = 4;
this.Windrichtung.Text = "Windrichtung";
//
// 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.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(55)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
+ this.pictureBox1.BackgroundImage = global::Wetterstation.Properties.Resources.WindRose_neu;
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.Location = new System.Drawing.Point(870, 48);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(119, 111);
+ this.pictureBox1.Size = new System.Drawing.Size(89, 90);
this.pictureBox1.TabIndex = 10;
this.pictureBox1.TabStop = false;
//
@@ -173,10 +167,9 @@ namespace Wetterstation
this.lbInnenTemp.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbInnenTemp.Font = new System.Drawing.Font("Arial", 48F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbInnenTemp.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
- this.lbInnenTemp.Location = new System.Drawing.Point(165, 53);
- this.lbInnenTemp.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbInnenTemp.Location = new System.Drawing.Point(124, 43);
this.lbInnenTemp.Name = "lbInnenTemp";
- this.lbInnenTemp.Size = new System.Drawing.Size(262, 93);
+ this.lbInnenTemp.Size = new System.Drawing.Size(211, 75);
this.lbInnenTemp.TabIndex = 13;
this.lbInnenTemp.Text = "NA C°";
//
@@ -187,10 +180,9 @@ namespace Wetterstation
this.lbAussenTemp.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbAussenTemp.Font = new System.Drawing.Font("Arial", 48F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbAussenTemp.ForeColor = System.Drawing.Color.White;
- this.lbAussenTemp.Location = new System.Drawing.Point(165, 182);
- this.lbAussenTemp.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbAussenTemp.Location = new System.Drawing.Point(124, 148);
this.lbAussenTemp.Name = "lbAussenTemp";
- this.lbAussenTemp.Size = new System.Drawing.Size(262, 93);
+ this.lbAussenTemp.Size = new System.Drawing.Size(211, 75);
this.lbAussenTemp.TabIndex = 15;
this.lbAussenTemp.Text = "NA °C";
//
@@ -200,10 +192,9 @@ 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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbWindSpeed.Location = new System.Drawing.Point(657, 46);
this.lbWindSpeed.Name = "lbWindSpeed";
- this.lbWindSpeed.Size = new System.Drawing.Size(108, 35);
+ this.lbWindSpeed.Size = new System.Drawing.Size(87, 29);
this.lbWindSpeed.TabIndex = 16;
this.lbWindSpeed.Text = "NA ms";
//
@@ -213,10 +204,9 @@ 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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbLuftFeuchtInnen.Location = new System.Drawing.Point(409, 46);
this.lbLuftFeuchtInnen.Name = "lbLuftFeuchtInnen";
- this.lbLuftFeuchtInnen.Size = new System.Drawing.Size(180, 70);
+ this.lbLuftFeuchtInnen.Size = new System.Drawing.Size(145, 56);
this.lbLuftFeuchtInnen.TabIndex = 17;
this.lbLuftFeuchtInnen.Text = "NA %";
//
@@ -226,10 +216,9 @@ 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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbWindricht.Location = new System.Drawing.Point(896, 151);
this.lbWindricht.Name = "lbWindricht";
- this.lbWindricht.Size = new System.Drawing.Size(54, 32);
+ this.lbWindricht.Size = new System.Drawing.Size(39, 24);
this.lbWindricht.TabIndex = 18;
this.lbWindricht.Text = "NA";
//
@@ -239,10 +228,9 @@ 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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbUhr.Location = new System.Drawing.Point(814, 656);
this.lbUhr.Name = "lbUhr";
- this.lbUhr.Size = new System.Drawing.Size(137, 35);
+ this.lbUhr.Size = new System.Drawing.Size(105, 29);
this.lbUhr.TabIndex = 19;
this.lbUhr.Text = "00:00:00";
//
@@ -252,10 +240,9 @@ 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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbDatum.Location = new System.Drawing.Point(804, 691);
this.lbDatum.Name = "lbDatum";
- this.lbDatum.Size = new System.Drawing.Size(151, 32);
+ this.lbDatum.Size = new System.Drawing.Size(118, 24);
this.lbDatum.TabIndex = 20;
this.lbDatum.Text = "01.01.1970";
//
@@ -265,10 +252,9 @@ namespace Wetterstation
this.lbTextTendenz.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(99)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbTextTendenz.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbTextTendenz.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
- this.lbTextTendenz.Location = new System.Drawing.Point(48, 32);
- this.lbTextTendenz.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbTextTendenz.Location = new System.Drawing.Point(36, 26);
this.lbTextTendenz.Name = "lbTextTendenz";
- this.lbTextTendenz.Size = new System.Drawing.Size(80, 20);
+ this.lbTextTendenz.Size = new System.Drawing.Size(68, 16);
this.lbTextTendenz.TabIndex = 25;
this.lbTextTendenz.Text = "Tendenz";
//
@@ -278,10 +264,9 @@ namespace Wetterstation
this.lbForecastDay1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbForecastDay1.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbForecastDay1.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
- this.lbForecastDay1.Location = new System.Drawing.Point(169, 293);
- this.lbForecastDay1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbForecastDay1.Location = new System.Drawing.Point(127, 238);
this.lbForecastDay1.Name = "lbForecastDay1";
- this.lbForecastDay1.Size = new System.Drawing.Size(64, 58);
+ this.lbForecastDay1.Size = new System.Drawing.Size(48, 47);
this.lbForecastDay1.TabIndex = 27;
this.lbForecastDay1.Text = "NA";
this.lbForecastDay1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -289,10 +274,9 @@ namespace Wetterstation
// lbForecastImage2
//
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.Location = new System.Drawing.Point(177, 271);
this.lbForecastImage2.Name = "lbForecastImage2";
- this.lbForecastImage2.Size = new System.Drawing.Size(71, 68);
+ this.lbForecastImage2.Size = new System.Drawing.Size(53, 55);
this.lbForecastImage2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.lbForecastImage2.TabIndex = 29;
this.lbForecastImage2.TabStop = false;
@@ -300,10 +284,9 @@ namespace Wetterstation
// lbForecastImage3
//
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.Location = new System.Drawing.Point(230, 271);
this.lbForecastImage3.Name = "lbForecastImage3";
- this.lbForecastImage3.Size = new System.Drawing.Size(71, 68);
+ this.lbForecastImage3.Size = new System.Drawing.Size(53, 55);
this.lbForecastImage3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.lbForecastImage3.TabIndex = 30;
this.lbForecastImage3.TabStop = false;
@@ -311,10 +294,9 @@ namespace Wetterstation
// lbForecastImage4
//
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.Location = new System.Drawing.Point(282, 271);
this.lbForecastImage4.Name = "lbForecastImage4";
- this.lbForecastImage4.Size = new System.Drawing.Size(71, 68);
+ this.lbForecastImage4.Size = new System.Drawing.Size(53, 55);
this.lbForecastImage4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.lbForecastImage4.TabIndex = 31;
this.lbForecastImage4.TabStop = false;
@@ -322,10 +304,9 @@ namespace Wetterstation
// lbForecastImage5
//
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.Location = new System.Drawing.Point(331, 271);
this.lbForecastImage5.Name = "lbForecastImage5";
- this.lbForecastImage5.Size = new System.Drawing.Size(71, 68);
+ this.lbForecastImage5.Size = new System.Drawing.Size(53, 55);
this.lbForecastImage5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.lbForecastImage5.TabIndex = 32;
this.lbForecastImage5.TabStop = false;
@@ -336,10 +317,9 @@ namespace Wetterstation
this.lbForecastDay2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbForecastDay2.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbForecastDay2.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
- this.lbForecastDay2.Location = new System.Drawing.Point(239, 293);
- this.lbForecastDay2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbForecastDay2.Location = new System.Drawing.Point(179, 238);
this.lbForecastDay2.Name = "lbForecastDay2";
- this.lbForecastDay2.Size = new System.Drawing.Size(64, 58);
+ this.lbForecastDay2.Size = new System.Drawing.Size(48, 47);
this.lbForecastDay2.TabIndex = 33;
this.lbForecastDay2.Text = "NA";
this.lbForecastDay2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -350,10 +330,9 @@ namespace Wetterstation
this.lbForecastDay3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbForecastDay3.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbForecastDay3.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
- this.lbForecastDay3.Location = new System.Drawing.Point(312, 293);
- this.lbForecastDay3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbForecastDay3.Location = new System.Drawing.Point(234, 238);
this.lbForecastDay3.Name = "lbForecastDay3";
- this.lbForecastDay3.Size = new System.Drawing.Size(64, 58);
+ this.lbForecastDay3.Size = new System.Drawing.Size(48, 47);
this.lbForecastDay3.TabIndex = 34;
this.lbForecastDay3.Text = "NA";
this.lbForecastDay3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -364,10 +343,9 @@ namespace Wetterstation
this.lbForecastDay4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbForecastDay4.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbForecastDay4.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
- this.lbForecastDay4.Location = new System.Drawing.Point(376, 293);
- this.lbForecastDay4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbForecastDay4.Location = new System.Drawing.Point(282, 238);
this.lbForecastDay4.Name = "lbForecastDay4";
- this.lbForecastDay4.Size = new System.Drawing.Size(64, 58);
+ this.lbForecastDay4.Size = new System.Drawing.Size(48, 47);
this.lbForecastDay4.TabIndex = 35;
this.lbForecastDay4.Text = "NA";
this.lbForecastDay4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -378,10 +356,9 @@ namespace Wetterstation
this.lbForecastDay5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbForecastDay5.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbForecastDay5.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
- this.lbForecastDay5.Location = new System.Drawing.Point(444, 293);
- this.lbForecastDay5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbForecastDay5.Location = new System.Drawing.Point(333, 238);
this.lbForecastDay5.Name = "lbForecastDay5";
- this.lbForecastDay5.Size = new System.Drawing.Size(64, 58);
+ this.lbForecastDay5.Size = new System.Drawing.Size(48, 47);
this.lbForecastDay5.TabIndex = 36;
this.lbForecastDay5.Text = "NA";
this.lbForecastDay5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -392,10 +369,9 @@ namespace Wetterstation
this.lbLuftfeuchtAussen.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbLuftfeuchtAussen.Font = new System.Drawing.Font("Arial", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbLuftfeuchtAussen.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.lbLuftfeuchtAussen.Location = new System.Drawing.Point(545, 186);
- this.lbLuftfeuchtAussen.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbLuftfeuchtAussen.Location = new System.Drawing.Point(409, 151);
this.lbLuftfeuchtAussen.Name = "lbLuftfeuchtAussen";
- this.lbLuftfeuchtAussen.Size = new System.Drawing.Size(180, 70);
+ this.lbLuftfeuchtAussen.Size = new System.Drawing.Size(145, 56);
this.lbLuftfeuchtAussen.TabIndex = 37;
this.lbLuftfeuchtAussen.Text = "NA %";
//
@@ -405,10 +381,9 @@ namespace Wetterstation
this.lbTextLuftfeuchtAussen.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(99)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbTextLuftfeuchtAussen.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbTextLuftfeuchtAussen.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
- this.lbTextLuftfeuchtAussen.Location = new System.Drawing.Point(536, 153);
- this.lbTextLuftfeuchtAussen.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbTextLuftfeuchtAussen.Location = new System.Drawing.Point(402, 124);
this.lbTextLuftfeuchtAussen.Name = "lbTextLuftfeuchtAussen";
- this.lbTextLuftfeuchtAussen.Size = new System.Drawing.Size(189, 29);
+ this.lbTextLuftfeuchtAussen.Size = new System.Drawing.Size(149, 24);
this.lbTextLuftfeuchtAussen.TabIndex = 38;
this.lbTextLuftfeuchtAussen.Text = "Luftfeuchtigkeit";
//
@@ -418,10 +393,9 @@ 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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbTextLuftdruck.Location = new System.Drawing.Point(656, 88);
this.lbTextLuftdruck.Name = "lbTextLuftdruck";
- this.lbTextLuftdruck.Size = new System.Drawing.Size(101, 25);
+ this.lbTextLuftdruck.Size = new System.Drawing.Size(85, 20);
this.lbTextLuftdruck.TabIndex = 39;
this.lbTextLuftdruck.Text = "Luftdruck";
//
@@ -431,10 +405,9 @@ 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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbLuftdruck.Location = new System.Drawing.Point(630, 108);
this.lbLuftdruck.Name = "lbLuftdruck";
- this.lbLuftdruck.Size = new System.Drawing.Size(120, 35);
+ this.lbLuftdruck.Size = new System.Drawing.Size(97, 29);
this.lbLuftdruck.TabIndex = 40;
this.lbLuftdruck.Text = "NA hPa";
//
@@ -442,10 +415,9 @@ namespace Wetterstation
//
this.lbHintergrund.Anchor = System.Windows.Forms.AnchorStyles.None;
this.lbHintergrund.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(99)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
- this.lbHintergrund.Location = new System.Drawing.Point(16, 22);
- this.lbHintergrund.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbHintergrund.Location = new System.Drawing.Point(12, 18);
this.lbHintergrund.Name = "lbHintergrund";
- this.lbHintergrund.Size = new System.Drawing.Size(1312, 436);
+ this.lbHintergrund.Size = new System.Drawing.Size(984, 354);
this.lbHintergrund.TabIndex = 42;
//
// lbCity
@@ -453,10 +425,9 @@ 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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbCity.Location = new System.Drawing.Point(1, 661);
this.lbCity.Name = "lbCity";
- this.lbCity.Size = new System.Drawing.Size(1343, 62);
+ this.lbCity.Size = new System.Drawing.Size(1007, 50);
this.lbCity.TabIndex = 43;
this.lbCity.Text = "Ort: NA";
this.lbCity.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -465,10 +436,9 @@ 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.Location = new System.Drawing.Point(124, 271);
this.lbForecastImage1.Name = "lbForecastImage1";
- this.lbForecastImage1.Size = new System.Drawing.Size(71, 68);
+ this.lbForecastImage1.Size = new System.Drawing.Size(53, 55);
this.lbForecastImage1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.lbForecastImage1.TabIndex = 44;
this.lbForecastImage1.TabStop = false;
@@ -478,10 +448,9 @@ namespace Wetterstation
this.btSystemKnopf.BackColor = System.Drawing.Color.Transparent;
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.Location = new System.Drawing.Point(968, 688);
this.btSystemKnopf.Name = "btSystemKnopf";
- this.btSystemKnopf.Size = new System.Drawing.Size(40, 37);
+ this.btSystemKnopf.Size = new System.Drawing.Size(30, 30);
this.btSystemKnopf.TabIndex = 46;
this.btSystemKnopf.TextAlign = System.Drawing.ContentAlignment.TopLeft;
this.btSystemKnopf.UseVisualStyleBackColor = false;
@@ -493,10 +462,9 @@ namespace Wetterstation
this.label1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.label1.Location = new System.Drawing.Point(636, 358);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(477, 291);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(41, 17);
+ this.label1.Size = new System.Drawing.Size(33, 13);
this.label1.TabIndex = 47;
this.label1.Text = "max.";
//
@@ -506,10 +474,9 @@ namespace Wetterstation
this.label2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.label2.Location = new System.Drawing.Point(639, 385);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(479, 313);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(38, 17);
+ this.label2.Size = new System.Drawing.Size(30, 13);
this.label2.TabIndex = 48;
this.label2.Text = "min.";
//
@@ -519,10 +486,9 @@ 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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(526, 271);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(48, 17);
+ this.label4.Size = new System.Drawing.Size(39, 13);
this.label4.TabIndex = 49;
this.label4.Text = "Innen";
//
@@ -532,10 +498,9 @@ namespace Wetterstation
this.label3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label3.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.label3.Location = new System.Drawing.Point(777, 334);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(583, 271);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(61, 17);
+ this.label3.Size = new System.Drawing.Size(48, 13);
this.label3.TabIndex = 50;
this.label3.Text = "Aussen";
//
@@ -545,10 +510,9 @@ namespace Wetterstation
this.label5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label5.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.label5.Location = new System.Drawing.Point(697, 358);
- this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label5.Location = new System.Drawing.Point(523, 291);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(51, 17);
+ this.label5.Size = new System.Drawing.Size(41, 13);
this.label5.TabIndex = 51;
this.label5.Text = "NA C°";
//
@@ -558,10 +522,9 @@ 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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbTempMax.Location = new System.Drawing.Point(590, 291);
this.lbTempMax.Name = "lbTempMax";
- this.lbTempMax.Size = new System.Drawing.Size(51, 17);
+ this.lbTempMax.Size = new System.Drawing.Size(41, 13);
this.lbTempMax.TabIndex = 52;
this.lbTempMax.Text = "NA C°";
//
@@ -571,10 +534,9 @@ 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.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbTempMin.Location = new System.Drawing.Point(590, 313);
this.lbTempMin.Name = "lbTempMin";
- this.lbTempMin.Size = new System.Drawing.Size(51, 17);
+ this.lbTempMin.Size = new System.Drawing.Size(41, 13);
this.lbTempMin.TabIndex = 54;
this.lbTempMin.Text = "NA C°";
//
@@ -584,10 +546,9 @@ namespace Wetterstation
this.label8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label8.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.label8.Location = new System.Drawing.Point(699, 385);
- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label8.Location = new System.Drawing.Point(524, 313);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(51, 17);
+ this.label8.Size = new System.Drawing.Size(41, 13);
this.label8.TabIndex = 53;
this.label8.Text = "NA C°";
//
@@ -597,9 +558,10 @@ namespace Wetterstation
this.lbForecastTemp1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbForecastTemp1.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbForecastTemp1.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.lbForecastTemp1.Location = new System.Drawing.Point(185, 406);
+ this.lbForecastTemp1.Location = new System.Drawing.Point(139, 330);
+ this.lbForecastTemp1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbForecastTemp1.Name = "lbForecastTemp1";
- this.lbForecastTemp1.Size = new System.Drawing.Size(51, 17);
+ this.lbForecastTemp1.Size = new System.Drawing.Size(41, 13);
this.lbForecastTemp1.TabIndex = 55;
this.lbForecastTemp1.Text = "NA °C";
//
@@ -609,9 +571,10 @@ namespace Wetterstation
this.lbForecastTemp2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbForecastTemp2.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbForecastTemp2.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.lbForecastTemp2.Location = new System.Drawing.Point(256, 406);
+ this.lbForecastTemp2.Location = new System.Drawing.Point(192, 330);
+ this.lbForecastTemp2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbForecastTemp2.Name = "lbForecastTemp2";
- this.lbForecastTemp2.Size = new System.Drawing.Size(51, 17);
+ this.lbForecastTemp2.Size = new System.Drawing.Size(41, 13);
this.lbForecastTemp2.TabIndex = 56;
this.lbForecastTemp2.Text = "NA °C";
//
@@ -621,9 +584,10 @@ namespace Wetterstation
this.lbForecastTemp3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbForecastTemp3.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbForecastTemp3.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.lbForecastTemp3.Location = new System.Drawing.Point(325, 406);
+ this.lbForecastTemp3.Location = new System.Drawing.Point(244, 330);
+ this.lbForecastTemp3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbForecastTemp3.Name = "lbForecastTemp3";
- this.lbForecastTemp3.Size = new System.Drawing.Size(51, 17);
+ this.lbForecastTemp3.Size = new System.Drawing.Size(41, 13);
this.lbForecastTemp3.TabIndex = 57;
this.lbForecastTemp3.Text = "NA °C";
//
@@ -633,9 +597,10 @@ namespace Wetterstation
this.lbForecastTemp4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbForecastTemp4.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbForecastTemp4.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.lbForecastTemp4.Location = new System.Drawing.Point(389, 406);
+ this.lbForecastTemp4.Location = new System.Drawing.Point(292, 330);
+ this.lbForecastTemp4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbForecastTemp4.Name = "lbForecastTemp4";
- this.lbForecastTemp4.Size = new System.Drawing.Size(51, 17);
+ this.lbForecastTemp4.Size = new System.Drawing.Size(41, 13);
this.lbForecastTemp4.TabIndex = 58;
this.lbForecastTemp4.Text = "NA °C";
//
@@ -645,27 +610,30 @@ namespace Wetterstation
this.lbForecastTemp5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(90)))), ((int)(((byte)(10)))), ((int)(((byte)(80)))), ((int)(((byte)(147)))));
this.lbForecastTemp5.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbForecastTemp5.ForeColor = System.Drawing.SystemColors.ButtonFace;
- this.lbForecastTemp5.Location = new System.Drawing.Point(461, 406);
+ this.lbForecastTemp5.Location = new System.Drawing.Point(346, 330);
+ this.lbForecastTemp5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbForecastTemp5.Name = "lbForecastTemp5";
- this.lbForecastTemp5.Size = new System.Drawing.Size(51, 17);
+ this.lbForecastTemp5.Size = new System.Drawing.Size(41, 13);
this.lbForecastTemp5.TabIndex = 59;
this.lbForecastTemp5.Text = "NA °C";
//
// cartesianChart1
//
- this.cartesianChart1.Location = new System.Drawing.Point(19, 480);
+ this.cartesianChart1.Location = new System.Drawing.Point(14, 390);
+ this.cartesianChart1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.cartesianChart1.Name = "cartesianChart1";
- this.cartesianChart1.Size = new System.Drawing.Size(1309, 310);
+ this.cartesianChart1.Size = new System.Drawing.Size(982, 252);
this.cartesianChart1.TabIndex = 60;
this.cartesianChart1.Text = "cartesianChart1";
//
// Hintergrund
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
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.ClientSize = new System.Drawing.Size(1008, 729);
+ this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.cartesianChart1);
this.Controls.Add(this.lbForecastTemp5);
this.Controls.Add(this.lbForecastTemp4);
@@ -708,11 +676,9 @@ 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.Name = "Hintergrund";
this.Text = "Wetterstation";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Hintergrund_FormClosed);
diff --git a/Wetterstation/Form1.cs b/Wetterstation/Form1.cs
index defed7c5c2eeae97f5488589d94135184935b127..2e7112191794ee49c5e3370d08b8d63614772eec 100644
--- a/Wetterstation/Form1.cs
+++ b/Wetterstation/Form1.cs
@@ -76,46 +76,10 @@ namespace Wetterstation
lbDatum.Text = DateTime.Now.ToShortDateString();
}
- private void LED_Click(object sender, EventArgs e)
- {
-
- System.Drawing.SolidBrush myBrush = new System.Drawing.SolidBrush(System.Drawing.Color.Red);
- System.Drawing.Graphics formGraphics;
- formGraphics = this.CreateGraphics();
- formGraphics.FillEllipse(myBrush, new Rectangle(818, 238, 12, 12));
- myBrush.Dispose();
- formGraphics.Dispose();
- }
+
- private void Label1_Click(object sender, EventArgs e)
- {
- System.Drawing.SolidBrush myBrush = new System.Drawing.SolidBrush(System.Drawing.Color.Red);
- System.Drawing.Graphics formGraphics;
- formGraphics = this.CreateGraphics();
- formGraphics.FillEllipse(myBrush, new Rectangle(872, 290, 12, 12));
- myBrush.Dispose();
- formGraphics.Dispose();
- }
- private void LED_S_Click(object sender, EventArgs e)
- {
- System.Drawing.SolidBrush myBrush = new System.Drawing.SolidBrush(System.Drawing.Color.Red);
- System.Drawing.Graphics formGraphics;
- formGraphics = this.CreateGraphics();
- formGraphics.FillEllipse(myBrush, new Rectangle(818,350, 12, 12));
- myBrush.Dispose();
- formGraphics.Dispose();
- }
-
- private void LED_W_Click(object sender, EventArgs e)
- {
- System.Drawing.SolidBrush myBrush = new System.Drawing.SolidBrush(System.Drawing.Color.Red);
- System.Drawing.Graphics formGraphics;
- formGraphics = this.CreateGraphics();
- formGraphics.FillEllipse(myBrush, new Rectangle(764, 290, 12, 12));
- myBrush.Dispose();
- formGraphics.Dispose();
- }
+
//MQTT connect
public void mqttStart()
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 3a731bc9e07616d266b9a4f10db5f48ea238bcca..32844da0441a8667d50cda3f72779edc905acabd 100644
--- a/Wetterstation/Settings.Designer.cs
+++ b/Wetterstation/Settings.Designer.cs
@@ -52,59 +52,67 @@
this.txtPlz = new System.Windows.Forms.Label();
this.tbLngCode = new System.Windows.Forms.TextBox();
this.lbLngCode = new System.Windows.Forms.Label();
+ this.lbNodeMcu1 = new System.Windows.Forms.Label();
+ this.lbNodeMcu2 = new System.Windows.Forms.Label();
+ this.tbNodeMcu1 = new System.Windows.Forms.TextBox();
+ this.tbNodeMcu2 = new System.Windows.Forms.TextBox();
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.Margin = new System.Windows.Forms.Padding(5);
- this.tbHost.MinimumSize = new System.Drawing.Size(531, 30);
+ this.tbHost.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbHost.Location = new System.Drawing.Point(10, 42);
+ this.tbHost.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tbHost.MaximumSize = new System.Drawing.Size(399, 26);
+ this.tbHost.MinimumSize = new System.Drawing.Size(399, 24);
this.tbHost.Name = "tbHost";
- this.tbHost.Size = new System.Drawing.Size(531, 35);
+ this.tbHost.Size = new System.Drawing.Size(399, 25);
this.tbHost.TabIndex = 1;
//
// 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.Margin = new System.Windows.Forms.Padding(5);
- this.tbPort.MinimumSize = new System.Drawing.Size(531, 30);
+ this.tbPort.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbPort.Location = new System.Drawing.Point(10, 92);
+ this.tbPort.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tbPort.MaximumSize = new System.Drawing.Size(399, 25);
+ this.tbPort.MinimumSize = new System.Drawing.Size(399, 20);
this.tbPort.Name = "tbPort";
- this.tbPort.Size = new System.Drawing.Size(531, 35);
+ this.tbPort.Size = new System.Drawing.Size(399, 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", 9.75F, 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.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lbUser.Location = new System.Drawing.Point(10, 123);
+ this.lbUser.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbUser.Name = "lbUser";
- this.lbUser.Size = new System.Drawing.Size(119, 24);
+ this.lbUser.Size = new System.Drawing.Size(77, 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.Margin = new System.Windows.Forms.Padding(5);
- this.tbUser.MinimumSize = new System.Drawing.Size(531, 30);
+ this.tbUser.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbUser.Location = new System.Drawing.Point(10, 142);
+ this.tbUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tbUser.MaximumSize = new System.Drawing.Size(399, 25);
+ this.tbUser.MinimumSize = new System.Drawing.Size(399, 20);
this.tbUser.Name = "tbUser";
- this.tbUser.Size = new System.Drawing.Size(531, 35);
+ this.tbUser.Size = new System.Drawing.Size(399, 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.Margin = new System.Windows.Forms.Padding(5);
- this.tbPasswort.MinimumSize = new System.Drawing.Size(531, 30);
+ this.tbPasswort.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbPasswort.Location = new System.Drawing.Point(10, 192);
+ this.tbPasswort.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tbPasswort.MaximumSize = new System.Drawing.Size(399, 25);
+ this.tbPasswort.MinimumSize = new System.Drawing.Size(399, 20);
this.tbPasswort.Name = "tbPasswort";
- this.tbPasswort.Size = new System.Drawing.Size(531, 35);
+ this.tbPasswort.Size = new System.Drawing.Size(399, 25);
this.tbPasswort.TabIndex = 4;
this.tbPasswort.UseSystemPasswordChar = true;
//
@@ -112,12 +120,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", 9.75F, 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.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lbPasswort.Location = new System.Drawing.Point(10, 173);
+ this.lbPasswort.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbPasswort.Name = "lbPasswort";
- this.lbPasswort.Size = new System.Drawing.Size(174, 24);
+ this.lbPasswort.Size = new System.Drawing.Size(112, 16);
this.lbPasswort.TabIndex = 10;
this.lbPasswort.Text = "MQTT Passswort";
//
@@ -125,104 +133,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", 9.75F, 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.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lbFrontend.Location = new System.Drawing.Point(10, 223);
+ this.lbFrontend.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbFrontend.Name = "lbFrontend";
- this.lbFrontend.Size = new System.Drawing.Size(219, 24);
+ this.lbFrontend.Size = new System.Drawing.Size(144, 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.Margin = new System.Windows.Forms.Padding(5);
- this.tbTopicFrontend.MinimumSize = new System.Drawing.Size(531, 30);
+ this.tbTopicFrontend.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbTopicFrontend.Location = new System.Drawing.Point(10, 242);
+ this.tbTopicFrontend.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tbTopicFrontend.MaximumSize = new System.Drawing.Size(399, 25);
+ this.tbTopicFrontend.MinimumSize = new System.Drawing.Size(399, 20);
this.tbTopicFrontend.Name = "tbTopicFrontend";
- this.tbTopicFrontend.Size = new System.Drawing.Size(531, 35);
+ this.tbTopicFrontend.Size = new System.Drawing.Size(399, 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", 9.75F, 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.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lbBackend.Location = new System.Drawing.Point(10, 273);
+ this.lbBackend.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbBackend.Name = "lbBackend";
- this.lbBackend.Size = new System.Drawing.Size(215, 24);
+ this.lbBackend.Size = new System.Drawing.Size(142, 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.Margin = new System.Windows.Forms.Padding(5);
- this.tbTopicBackend.MinimumSize = new System.Drawing.Size(531, 30);
+ this.tbTopicBackend.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbTopicBackend.Location = new System.Drawing.Point(9, 292);
+ this.tbTopicBackend.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tbTopicBackend.MaximumSize = new System.Drawing.Size(399, 25);
+ this.tbTopicBackend.MinimumSize = new System.Drawing.Size(399, 20);
this.tbTopicBackend.Name = "tbTopicBackend";
- this.tbTopicBackend.Size = new System.Drawing.Size(531, 35);
+ this.tbTopicBackend.Size = new System.Drawing.Size(399, 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", 9.75F, 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.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lbQos.Location = new System.Drawing.Point(10, 323);
+ this.lbQos.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbQos.Name = "lbQos";
- this.lbQos.Size = new System.Drawing.Size(114, 24);
+ this.lbQos.Size = new System.Drawing.Size(73, 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.Margin = new System.Windows.Forms.Padding(5);
- this.tbQos.MinimumSize = new System.Drawing.Size(531, 30);
+ this.tbQos.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbQos.Location = new System.Drawing.Point(10, 342);
+ this.tbQos.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tbQos.MaximumSize = new System.Drawing.Size(399, 25);
+ this.tbQos.MinimumSize = new System.Drawing.Size(399, 20);
this.tbQos.Name = "tbQos";
- this.tbQos.Size = new System.Drawing.Size(531, 35);
+ this.tbQos.Size = new System.Drawing.Size(399, 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", 9.75F, 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.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lbTimeout.Location = new System.Drawing.Point(10, 373);
+ this.lbTimeout.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbTimeout.Name = "lbTimeout";
- this.lbTimeout.Size = new System.Drawing.Size(152, 24);
+ this.lbTimeout.Size = new System.Drawing.Size(101, 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.Margin = new System.Windows.Forms.Padding(5);
- this.tbTimeout.MinimumSize = new System.Drawing.Size(531, 30);
+ this.tbTimeout.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbTimeout.Location = new System.Drawing.Point(10, 392);
+ this.tbTimeout.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tbTimeout.MaximumSize = new System.Drawing.Size(399, 25);
+ this.tbTimeout.MinimumSize = new System.Drawing.Size(399, 20);
this.tbTimeout.Name = "tbTimeout";
- this.tbTimeout.Size = new System.Drawing.Size(531, 35);
+ this.tbTimeout.Size = new System.Drawing.Size(399, 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", 9.75F, 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.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lbPlz.Location = new System.Drawing.Point(10, 473);
+ this.lbPlz.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbPlz.Name = "lbPlz";
- this.lbPlz.Size = new System.Drawing.Size(41, 24);
+ this.lbPlz.Size = new System.Drawing.Size(27, 16);
this.lbPlz.TabIndex = 19;
this.lbPlz.Text = "Ort";
//
@@ -230,21 +242,21 @@
//
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.Margin = new System.Windows.Forms.Padding(5);
- this.tbCity.MinimumSize = new System.Drawing.Size(531, 30);
+ this.tbCity.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbCity.Location = new System.Drawing.Point(10, 492);
+ this.tbCity.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tbCity.MaximumSize = new System.Drawing.Size(399, 25);
+ this.tbCity.MinimumSize = new System.Drawing.Size(399, 20);
this.tbCity.Name = "tbCity";
- this.tbCity.Size = new System.Drawing.Size(531, 35);
+ this.tbCity.Size = new System.Drawing.Size(399, 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.Margin = new System.Windows.Forms.Padding(4);
+ this.btnSave.Location = new System.Drawing.Point(109, 651);
this.btnSave.Name = "btnSave";
- this.btnSave.Size = new System.Drawing.Size(255, 86);
+ this.btnSave.Size = new System.Drawing.Size(191, 32);
this.btnSave.TabIndex = 11;
this.btnSave.Text = "Save Settings";
this.btnSave.UseVisualStyleBackColor = true;
@@ -253,9 +265,10 @@
// lbFrontendId
//
this.lbFrontendId.AutoSize = true;
- this.lbFrontendId.Location = new System.Drawing.Point(12, 9);
+ this.lbFrontendId.Location = new System.Drawing.Point(9, 5);
+ this.lbFrontendId.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lbFrontendId.Name = "lbFrontendId";
- this.lbFrontendId.Size = new System.Drawing.Size(46, 17);
+ this.lbFrontendId.Size = new System.Drawing.Size(35, 13);
this.lbFrontendId.TabIndex = 24;
this.lbFrontendId.Text = "label1";
//
@@ -263,12 +276,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", 9.75F, 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.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label1.Location = new System.Drawing.Point(10, 73);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(115, 24);
+ this.label1.Size = new System.Drawing.Size(75, 16);
this.label1.TabIndex = 25;
this.label1.Text = "MQTT Port";
//
@@ -276,12 +289,12 @@
//
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", 9.75F, 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.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label2.Location = new System.Drawing.Point(10, 23);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(119, 24);
+ this.label2.Size = new System.Drawing.Size(76, 16);
this.label2.TabIndex = 26;
this.label2.Text = "MQTT Host";
//
@@ -289,53 +302,112 @@
//
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.Font = new System.Drawing.Font("Arial", 11.25F, 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.Location = new System.Drawing.Point(12, 622);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(126, 24);
+ this.label3.Size = new System.Drawing.Size(95, 18);
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(113, 625);
+ this.txtPlz.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.txtPlz.Name = "txtPlz";
- this.txtPlz.Size = new System.Drawing.Size(46, 17);
+ this.txtPlz.Size = new System.Drawing.Size(21, 13);
this.txtPlz.TabIndex = 28;
- this.txtPlz.Text = "label4";
+ this.txtPlz.Text = "Plz";
+ this.txtPlz.Click += new System.EventHandler(this.TxtPlz_Click);
//
// 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.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbLngCode.Location = new System.Drawing.Point(10, 442);
+ this.tbLngCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tbLngCode.MaximumSize = new System.Drawing.Size(399, 25);
+ this.tbLngCode.MinimumSize = new System.Drawing.Size(399, 20);
this.tbLngCode.Name = "tbLngCode";
- this.tbLngCode.Size = new System.Drawing.Size(531, 35);
+ this.tbLngCode.Size = new System.Drawing.Size(399, 25);
this.tbLngCode.TabIndex = 9;
//
// 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", 9.75F, 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.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lbLngCode.Location = new System.Drawing.Point(10, 423);
+ this.lbLngCode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbLngCode.Name = "lbLngCode";
- this.lbLngCode.Size = new System.Drawing.Size(161, 24);
+ this.lbLngCode.Size = new System.Drawing.Size(109, 16);
this.lbLngCode.TabIndex = 29;
this.lbLngCode.Text = "Landeskennung";
//
+ // lbNodeMcu1
+ //
+ this.lbNodeMcu1.AutoSize = true;
+ this.lbNodeMcu1.BackColor = System.Drawing.Color.Transparent;
+ this.lbNodeMcu1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbNodeMcu1.ForeColor = System.Drawing.Color.White;
+ this.lbNodeMcu1.Location = new System.Drawing.Point(10, 523);
+ this.lbNodeMcu1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbNodeMcu1.Name = "lbNodeMcu1";
+ this.lbNodeMcu1.Size = new System.Drawing.Size(74, 16);
+ this.lbNodeMcu1.TabIndex = 30;
+ this.lbNodeMcu1.Text = "NodeMcu1";
+ //
+ // lbNodeMcu2
+ //
+ this.lbNodeMcu2.AutoSize = true;
+ this.lbNodeMcu2.BackColor = System.Drawing.Color.Transparent;
+ this.lbNodeMcu2.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbNodeMcu2.ForeColor = System.Drawing.Color.White;
+ this.lbNodeMcu2.Location = new System.Drawing.Point(10, 573);
+ this.lbNodeMcu2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbNodeMcu2.Name = "lbNodeMcu2";
+ this.lbNodeMcu2.Size = new System.Drawing.Size(74, 16);
+ this.lbNodeMcu2.TabIndex = 31;
+ this.lbNodeMcu2.Text = "NodeMcu2";
+ //
+ // tbNodeMcu1
+ //
+ this.tbNodeMcu1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+ this.tbNodeMcu1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
+ this.tbNodeMcu1.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbNodeMcu1.Location = new System.Drawing.Point(10, 542);
+ this.tbNodeMcu1.Margin = new System.Windows.Forms.Padding(4);
+ this.tbNodeMcu1.MaximumSize = new System.Drawing.Size(399, 25);
+ this.tbNodeMcu1.MinimumSize = new System.Drawing.Size(399, 20);
+ this.tbNodeMcu1.Name = "tbNodeMcu1";
+ this.tbNodeMcu1.Size = new System.Drawing.Size(399, 25);
+ this.tbNodeMcu1.TabIndex = 32;
+ //
+ // tbNodeMcu2
+ //
+ this.tbNodeMcu2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+ this.tbNodeMcu2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
+ this.tbNodeMcu2.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbNodeMcu2.Location = new System.Drawing.Point(10, 592);
+ this.tbNodeMcu2.Margin = new System.Windows.Forms.Padding(4);
+ this.tbNodeMcu2.MaximumSize = new System.Drawing.Size(399, 25);
+ this.tbNodeMcu2.MinimumSize = new System.Drawing.Size(399, 20);
+ this.tbNodeMcu2.Name = "tbNodeMcu2";
+ this.tbNodeMcu2.Size = new System.Drawing.Size(399, 25);
+ this.tbNodeMcu2.TabIndex = 33;
+ //
// Settings
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
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(425, 690);
+ this.Controls.Add(this.tbNodeMcu2);
+ this.Controls.Add(this.tbNodeMcu1);
+ this.Controls.Add(this.lbNodeMcu2);
+ this.Controls.Add(this.lbNodeMcu1);
this.Controls.Add(this.tbLngCode);
this.Controls.Add(this.lbLngCode);
this.Controls.Add(this.txtPlz);
@@ -361,7 +433,7 @@
this.Controls.Add(this.tbPort);
this.Controls.Add(this.tbHost);
this.Location = new System.Drawing.Point(500, 0);
- this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "Settings";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Settings";
@@ -396,5 +468,9 @@
private System.Windows.Forms.Label txtPlz;
private System.Windows.Forms.TextBox tbLngCode;
private System.Windows.Forms.Label lbLngCode;
+ private System.Windows.Forms.Label lbNodeMcu1;
+ private System.Windows.Forms.Label lbNodeMcu2;
+ private System.Windows.Forms.TextBox tbNodeMcu1;
+ private System.Windows.Forms.TextBox tbNodeMcu2;
}
}
\ No newline at end of file
diff --git a/Wetterstation/Settings.cs b/Wetterstation/Settings.cs
index f960fd203a01ef9fbbd03fb3570965ef0df4c9ce..6e39b21117a3b1df08a8844ef9a3b808063ee77c 100644
--- a/Wetterstation/Settings.cs
+++ b/Wetterstation/Settings.cs
@@ -131,5 +131,10 @@ namespace Wetterstation
txtPlz.Text = strTemp.Split(' ').Last();
}
}
+
+ private void TxtPlz_Click(object sender, EventArgs e)
+ {
+
+ }
}
}
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/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" />