mirror
/
AirScout
kopia lustrzana https://github.com/dl2alf/AirScout
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge V1.3.3.6 with V1.4.x

pull/2/head^2
dl2alf 2022-01-02 14:12:12 +01:00
rodzic 342219c9bb
commit f0d4484c89
6 zmienionych plików z 22 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
AirScout.PlaneFeeds.Plugin.VirtualRadarServer/TLS.cs
Wyświetl plik

@ -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;

1
AirScout/OptionsDlg.Designer.cs wygenerowano
Wyświetl plik

@ -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();

4
AirScout/Properties/AssemblyInfo.cs
Wyświetl plik

@ -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")]

3
AirScout/Properties/Settings.settings
Wyświetl plik

@ -604,6 +604,9 @@ MEaSUREs data and products are available at no charge from the LP DAAC.See https
<Setting Name="Map_Preloader_MaxZoom" Type="System.Decimal" Scope="User">
<Value Profile="(Default)">11</Value>
</Setting>
<Setting Name="StationsMap_OverlayElevation" Type="System.String" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="Elevation_ASTER3_Copyright" Type="System.String" Scope="User">
<Value Profile="(Default)">Maidenhead locator system elvation tiles calculated by DL2ALF based on elevation data of the ASTER project:

3
AirScout/app.config
Wyświetl plik

@ -603,6 +603,9 @@ MEaSUREs data and products are available at no charge from the LP DAAC.See https
<setting name="Map_Preloader_MaxZoom" serializeAs="String">
<value>11</value>
</setting>
<setting name="StationsMap_OverlayElevation" serializeAs="String">
<value>False</value>
</setting>
<setting name="Elevation_ASTER3_Copyright" serializeAs="String">
<value>Maidenhead locator system elvation tiles calculated by DL2ALF based on elevation data of the ASTER project:

12
ScoutBase/ScoutBase.Stations/StationDatabase.cs
Wyświetl plik

@ -539,6 +539,18 @@ namespace ScoutBase.Stations
}
public List<LocationDesignator> LocationGetAll(string call)
{
List<LocationDesignator> l = new List<LocationDesignator>();
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<LocationDesignator> LocationGetAll(BackgroundWorker caller)
{
// gets all locations from database