From f0d4484c899317f09b466851a34e144073e5ecdf Mon Sep 17 00:00:00 2001 From: dl2alf Date: Sun, 2 Jan 2022 14:12:12 +0100 Subject: [PATCH] Merge V1.3.3.6 with V1.4.x --- AirScout.PlaneFeeds.Plugin.VirtualRadarServer/TLS.cs | 2 +- AirScout/OptionsDlg.Designer.cs | 1 + AirScout/Properties/AssemblyInfo.cs | 4 ++-- AirScout/Properties/Settings.settings | 3 +++ AirScout/app.config | 3 +++ ScoutBase/ScoutBase.Stations/StationDatabase.cs | 12 ++++++++++++ 6 files changed, 22 insertions(+), 3 deletions(-) diff --git a/AirScout.PlaneFeeds.Plugin.VirtualRadarServer/TLS.cs b/AirScout.PlaneFeeds.Plugin.VirtualRadarServer/TLS.cs index 4cba27b..29c5231 100644 --- a/AirScout.PlaneFeeds.Plugin.VirtualRadarServer/TLS.cs +++ b/AirScout.PlaneFeeds.Plugin.VirtualRadarServer/TLS.cs @@ -141,7 +141,7 @@ namespace System.Net return false; } - public static string DownloadFile (string url, int timeout, string apikey) + public static string DownloadFile(string url, int timeout, string apikey) { string response = ""; Uri uri = null; diff --git a/AirScout/OptionsDlg.Designer.cs b/AirScout/OptionsDlg.Designer.cs index a184705..c5cf1cd 100644 --- a/AirScout/OptionsDlg.Designer.cs +++ b/AirScout/OptionsDlg.Designer.cs @@ -551,6 +551,7 @@ this.bw_SRTM1_MapUpdater = new System.ComponentModel.BackgroundWorker(); this.bw_GLOBE_MapUpdater = new System.ComponentModel.BackgroundWorker(); this.bw_StationDataUpdater = new System.ComponentModel.BackgroundWorker(); + this.btn_DeleteSingleStation = new System.Windows.Forms.Button(); this.bw_ASTER3_MapUpdater = new System.ComponentModel.BackgroundWorker(); this.bw_ASTER1_MapUpdater = new System.ComponentModel.BackgroundWorker(); this.cb_Options_Locators_Activate = new System.Windows.Forms.CheckBox(); diff --git a/AirScout/Properties/AssemblyInfo.cs b/AirScout/Properties/AssemblyInfo.cs index 66cf7c2..1df1696 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.4.1.0")] -[assembly: AssemblyFileVersion("1.4.1.0")] +[assembly: AssemblyVersion("1.3.3.7")] +[assembly: AssemblyFileVersion("1.3.3.7")] diff --git a/AirScout/Properties/Settings.settings b/AirScout/Properties/Settings.settings index 59567ed..e9f3f29 100644 --- a/AirScout/Properties/Settings.settings +++ b/AirScout/Properties/Settings.settings @@ -604,6 +604,9 @@ MEaSUREs data and products are available at no charge from the LP DAAC.See https 11 + + False + Maidenhead locator system elvation tiles calculated by DL2ALF based on elevation data of the ASTER project: diff --git a/AirScout/app.config b/AirScout/app.config index d6ec38b..aa205b1 100644 --- a/AirScout/app.config +++ b/AirScout/app.config @@ -603,6 +603,9 @@ MEaSUREs data and products are available at no charge from the LP DAAC.See https 11 + + False + Maidenhead locator system elvation tiles calculated by DL2ALF based on elevation data of the ASTER project: diff --git a/ScoutBase/ScoutBase.Stations/StationDatabase.cs b/ScoutBase/ScoutBase.Stations/StationDatabase.cs index 1850bfc..103407c 100644 --- a/ScoutBase/ScoutBase.Stations/StationDatabase.cs +++ b/ScoutBase/ScoutBase.Stations/StationDatabase.cs @@ -539,6 +539,18 @@ namespace ScoutBase.Stations } + public List LocationGetAll(string call) + { + List l = new List(); + DataTable Result = db.Select("SELECT * FROM " + LocationDesignator.TableName + " WHERE CALL LIKE '" + call + "' ORDER BY Call ASC"); + if ((Result == null) || (Result.Rows.Count == 0)) + return l; + foreach (DataRow row in Result.Rows) + l.Add(new LocationDesignator(row)); + return l; + + } + public List LocationGetAll(BackgroundWorker caller) { // gets all locations from database