diff --git a/AirScout.PlaneFeeds.Plugin.RTL1090/Properties/AssemblyInfo.cs b/AirScout.PlaneFeeds.Plugin.RTL1090/Properties/AssemblyInfo.cs index a375963..1596939 100644 --- a/AirScout.PlaneFeeds.Plugin.RTL1090/Properties/AssemblyInfo.cs +++ b/AirScout.PlaneFeeds.Plugin.RTL1090/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // indem Sie "*" wie unten gezeigt eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.0.0")] -[assembly: AssemblyFileVersion("1.3.0.0")] +[assembly: AssemblyVersion("1.3.0.1")] +[assembly: AssemblyFileVersion("1.3.0.1")] diff --git a/AirScout.PlaneFeeds.Plugin.RTL1090/Properties/Settings.Designer.cs b/AirScout.PlaneFeeds.Plugin.RTL1090/Properties/Settings.Designer.cs index b461a0c..d2a248b 100644 --- a/AirScout.PlaneFeeds.Plugin.RTL1090/Properties/Settings.Designer.cs +++ b/AirScout.PlaneFeeds.Plugin.RTL1090/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace AirScout.PlaneFeeds.Plugin.RTL1090.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -22,175 +22,5 @@ namespace AirScout.PlaneFeeds.Plugin.RTL1090.Properties { return defaultInstance; } } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("[RawData] RTL1090 data ")] - public string Name { - get { - return ((string)(this["Name"])); - } - set { - this["Name"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("Raw data feed from simple ADS-B receivers (DVB-T dongles).\r\n\r\n(c) AirScout (www.a" + - "irscout.eu)\r\n\r\nUse this feed together with RTL1090.exe or similar software.\r\nFee" + - "d software must output raw data either binary or ASCII format via TCP.\r\n\r\n\r\n")] - public string Info { - get { - return ((string)(this["Info"])); - } - set { - this["Info"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string Disclaimer { - get { - return ((string)(this["Disclaimer"])); - } - set { - this["Disclaimer"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string Disclaimer_Accepted { - get { - return ((string)(this["Disclaimer_Accepted"])); - } - set { - this["Disclaimer_Accepted"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("localhost")] - public string Server { - get { - return ((string)(this["Server"])); - } - set { - this["Server"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("31001")] - public int Port { - get { - return ((int)(this["Port"])); - } - set { - this["Port"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool Binary { - get { - return ((bool)(this["Binary"])); - } - set { - this["Binary"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool Report_Messages { - get { - return ((bool)(this["Report_Messages"])); - } - set { - this["Report_Messages"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool MarkLocal { - get { - return ((bool)(this["MarkLocal"])); - } - set { - this["MarkLocal"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string Version { - get { - return ((string)(this["Version"])); - } - set { - this["Version"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool HasSettings { - get { - return ((bool)(this["HasSettings"])); - } - set { - this["HasSettings"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool CanImport { - get { - return ((bool)(this["CanImport"])); - } - set { - this["CanImport"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool CanExport { - get { - return ((bool)(this["CanExport"])); - } - set { - this["CanExport"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool SaveToFile { - get { - return ((bool)(this["SaveToFile"])); - } - set { - this["SaveToFile"] = value; - } - } } } diff --git a/AirScout.PlaneFeeds.Plugin.RTL1090/Properties/Settings.settings b/AirScout.PlaneFeeds.Plugin.RTL1090/Properties/Settings.settings index 29bf71d..8e615f2 100644 --- a/AirScout.PlaneFeeds.Plugin.RTL1090/Properties/Settings.settings +++ b/AirScout.PlaneFeeds.Plugin.RTL1090/Properties/Settings.settings @@ -1,56 +1,5 @@  - + - - - [RawData] RTL1090 data - - - Raw data feed from simple ADS-B receivers (DVB-T dongles). - -(c) AirScout (www.airscout.eu) - -Use this feed together with RTL1090.exe or similar software. -Feed software must output raw data either binary or ASCII format via TCP. - - - - - - - - - - - - localhost - - - 31001 - - - True - - - True - - - True - - - - - - True - - - False - - - False - - - False - - + \ No newline at end of file diff --git a/AirScout.PlaneFeeds.Plugin.RTL1090/RTL1090.cs b/AirScout.PlaneFeeds.Plugin.RTL1090/RTL1090.cs index 8559989..0893ef4 100644 --- a/AirScout.PlaneFeeds.Plugin.RTL1090/RTL1090.cs +++ b/AirScout.PlaneFeeds.Plugin.RTL1090/RTL1090.cs @@ -323,7 +323,7 @@ namespace AirScout.PlaneFeeds.Plugin.RTL1090 plane.Time = info.Timestamp; plane.Hex = info.ICAO24; // mark call with "@" if option is enabled - plane.Call = (Properties.Settings.Default.MarkLocal) ? "@" + info.Call : info.Call; + plane.Call = (Settings.MarkLocal) ? "@" + info.Call : info.Call; plane.Lat = info.Lat; plane.Lon = info.Lon; plane.Alt = info.Alt; @@ -337,7 +337,7 @@ namespace AirScout.PlaneFeeds.Plugin.RTL1090 planes.Add(plane); } // save raw data to file if enabled - if (Properties.Settings.Default.SaveToFile) + if (Settings.SaveToFile) { JavaScriptSerializer js = new JavaScriptSerializer(); string json = js.Serialize(planes); @@ -385,14 +385,14 @@ namespace AirScout.PlaneFeeds.Plugin.RTL1090 { // setup TCP listener client = new TcpClient(); - string server = Properties.Settings.Default.Server; - client.Connect(server, Properties.Settings.Default.Port); + string server = Settings.Server; + client.Connect(server, Settings.Port); sr = new StreamReader(client.GetStream()); // inner loop // receive messages in a loop do { - if (Properties.Settings.Default.Binary) + if (Settings.Binary) msg = ReceiveBinaryMsg(sr.BaseStream); else msg = ReceiveAVRMsg(sr); diff --git a/AirScout.PlaneFeeds.Plugin.RTL1090/app.config b/AirScout.PlaneFeeds.Plugin.RTL1090/app.config index dc954c1..3e4f9f3 100644 --- a/AirScout.PlaneFeeds.Plugin.RTL1090/app.config +++ b/AirScout.PlaneFeeds.Plugin.RTL1090/app.config @@ -1,62 +1,5 @@  - -
- - - - - [RawData] RTL1090 data - - - Raw data feed from simple ADS-B receivers (DVB-T dongles). - -(c) AirScout (www.airscout.eu) - -Use this feed together with RTL1090.exe or similar software. -Feed software must output raw data either binary or ASCII format via TCP. - - - - - - - - - - - - localhost - - - 31001 - - - True - - - True - - - True - - - - - - True - - - False - - - False - - - False - - - \ No newline at end of file diff --git a/AirScout/MapDlg.cs b/AirScout/MapDlg.cs index ebcea81..37bb784 100644 --- a/AirScout/MapDlg.cs +++ b/AirScout/MapDlg.cs @@ -1138,6 +1138,7 @@ namespace AirScout gm_Nearest.Overlays.Add(gmo_NearestPaths); gm_Nearest.Overlays.Add(gmo_NearestPlanes); gm_Nearest.Position = new PointLatLng(Properties.Settings.Default.MyLat, Properties.Settings.Default.MyLon); + gm_Nearest.ShowCenter = false; // setting User Agent to fix Open Street Map issue 2016-09-20 GMap.NET.MapProviders.GMapProvider.UserAgent = "AirScout"; @@ -1216,8 +1217,8 @@ namespace AirScout } Log.WriteMessage("Upgrading settings."); Properties.Settings.Default.Upgrade(); - // handle skip to version 1.3.0.0 - if (String.IsNullOrEmpty(Properties.Settings.Default.Version) || (String.Compare(Properties.Settings.Default.Version, "1.3.0.0") < 0)) + // handle skip to version 1.3.3.1 + if (String.IsNullOrEmpty(Properties.Settings.Default.Version) || (String.Compare(Properties.Settings.Default.Version, "1.3.3.0") < 0)) { /* // reset elevation data url to new default values @@ -1232,6 +1233,9 @@ namespace AirScout Properties.Settings.Default.StationDatabase_Update_URL = GetPropertyDefaultValue(nameof(Properties.Settings.Default.StationDatabase_Update_URL)); */ + // reset Sync with KST option + Properties.Settings.Default.Watchlist_SyncWithKST = GetPropertyDefaultValue(nameof(Properties.Settings.Default.Watchlist_SyncWithKST)); + Properties.Settings.Default.Version = Application.ProductVersion; SaveUserSettings(); @@ -2920,7 +2924,7 @@ namespace AirScout if (Dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK) { // enbale/disable manage watchlist button - btn_Control_Manage_Watchlist.Enabled = !Properties.Settings.Default.Watchlist_SyncWithKST; + btn_Control_Manage_Watchlist.Enabled = !Properties.Settings.Default.Watchlist_SyncWithKST || !Properties.Settings.Default.Server_Activate; // Re-initialze charts InitializeCharts(); // clear paths cache assuming that new options were set @@ -3972,7 +3976,7 @@ namespace AirScout foreach (PlaneInfo plane in nearestplanes) { // maintain highest potential - if (plane.Potential > highestpotential) + if ((plane.Category >= Properties.Settings.Default.Planes_Filter_Min_Category) && (plane.Potential > highestpotential)) highestpotential = plane.Potential; // add or update plane in active planes list PlaneInfo activeplane; @@ -4761,7 +4765,7 @@ namespace AirScout private void tp_Control_Multi_Enter(object sender, EventArgs e) { // enbale/disable manage watchlist button - btn_Control_Manage_Watchlist.Enabled = !Properties.Settings.Default.Watchlist_SyncWithKST; + btn_Control_Manage_Watchlist.Enabled = !Properties.Settings.Default.Watchlist_SyncWithKST || !Properties.Settings.Default.Server_Activate; if (PathMode != AIRSCOUTPATHMODE.MULTI) { diff --git a/AirScout/Properties/AssemblyInfo.cs b/AirScout/Properties/AssemblyInfo.cs index 30ea79c..2d98742 100644 --- a/AirScout/Properties/AssemblyInfo.cs +++ b/AirScout/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.3.0")] -[assembly: AssemblyFileVersion("1.3.3.0")] +[assembly: AssemblyVersion("1.3.3.2")] +[assembly: AssemblyFileVersion("1.3.3.2")] diff --git a/AirScout/Properties/Settings.settings b/AirScout/Properties/Settings.settings index 16986bf..6f73e24 100644 --- a/AirScout/Properties/Settings.settings +++ b/AirScout/Properties/Settings.settings @@ -381,7 +381,7 @@ http://www.airscout.eu - True + False True diff --git a/AirScout/VersionHistory.txt b/AirScout/VersionHistory.txt index 0d19062..1f6ec34 100644 --- a/AirScout/VersionHistory.txt +++ b/AirScout/VersionHistory.txt @@ -1,4 +1,16 @@ -2020-xx-xx: V1.3.3.0 +2020-04-19: V1.3.3.2 +==================== + +- Bugfix: Commit issues with V1.3.3.1, changes were not synchronized with web repository --> fixed + +2020-04-18: V1.3.3.1 +==================== + +- Bugfix: Manage Watchlist button should be enabled by default (also when Network Service is disabled) --> fixed (tnx OZ9GE) +- Bugfix: RTL1090 plane feed does not care about settings, always using default settings --> fixed (tnx G4WSZ) +- Bugfix: Watchlist entries in Multi-Path mode are colored regardless of a minimum plane category is set in plane filter --> fixed (tnx OZ9GE) + +2020-04-10: V1.3.3.0 ==================== - Feature: Option to restrict call sign database to locations inside the area of interest (via "Option/Stations"), all others outside this area will be deleted in each update prcodedure diff --git a/AirScout/app.config b/AirScout/app.config index 59f0756..0cd43f1 100644 --- a/AirScout/app.config +++ b/AirScout/app.config @@ -385,7 +385,7 @@ http://www.airscout.eu - True + False True