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

V1.3.3.2

pull/3/head
dl2alf 2020-04-19 09:23:30 +02:00
rodzic caad9f27c9
commit 09113b0c54
10 zmienionych plików z 36 dodań i 298 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
AirScout.PlaneFeeds.Plugin.RTL1090/Properties/AssemblyInfo.cs
Wyświetl plik

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

172
AirScout.PlaneFeeds.Plugin.RTL1090/Properties/Settings.Designer.cs wygenerowano
Wyświetl plik

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

55
AirScout.PlaneFeeds.Plugin.RTL1090/Properties/Settings.settings
Wyświetl plik

@ -1,56 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="AirScout.PlaneFeeds.Plugin.RTL1090.Properties" GeneratedClassName="Settings">
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
<Profiles />
<Settings>
<Setting Name="Name" Type="System.String" Scope="User">
<Value Profile="(Default)">[RawData] RTL1090 data </Value>
</Setting>
<Setting Name="Info" Type="System.String" Scope="User">
<Value Profile="(Default)">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.
</Value>
</Setting>
<Setting Name="Disclaimer" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="Disclaimer_Accepted" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="Server" Type="System.String" Scope="User">
<Value Profile="(Default)">localhost</Value>
</Setting>
<Setting Name="Port" Type="System.Int32" Scope="User">
<Value Profile="(Default)">31001</Value>
</Setting>
<Setting Name="Binary" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="Report_Messages" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="MarkLocal" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="Version" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="HasSettings" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="CanImport" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="CanExport" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="SaveToFile" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
<Settings />
</SettingsFile>

10
AirScout.PlaneFeeds.Plugin.RTL1090/RTL1090.cs
Wyświetl plik

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

57
AirScout.PlaneFeeds.Plugin.RTL1090/app.config
Wyświetl plik

@ -1,62 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="AirScout.PlaneFeeds.Plugin.RTL1090.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
</sectionGroup>
</configSections>
<userSettings>
<AirScout.PlaneFeeds.Plugin.RTL1090.Properties.Settings>
<setting name="Name" serializeAs="String">
<value>[RawData] RTL1090 data </value>
</setting>
<setting name="Info" serializeAs="String">
<value>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.
</value>
</setting>
<setting name="Disclaimer" serializeAs="String">
<value />
</setting>
<setting name="Disclaimer_Accepted" serializeAs="String">
<value />
</setting>
<setting name="Server" serializeAs="String">
<value>localhost</value>
</setting>
<setting name="Port" serializeAs="String">
<value>31001</value>
</setting>
<setting name="Binary" serializeAs="String">
<value>True</value>
</setting>
<setting name="Report_Messages" serializeAs="String">
<value>True</value>
</setting>
<setting name="MarkLocal" serializeAs="String">
<value>True</value>
</setting>
<setting name="Version" serializeAs="String">
<value />
</setting>
<setting name="HasSettings" serializeAs="String">
<value>True</value>
</setting>
<setting name="CanImport" serializeAs="String">
<value>False</value>
</setting>
<setting name="CanExport" serializeAs="String">
<value>False</value>
</setting>
<setting name="SaveToFile" serializeAs="String">
<value>False</value>
</setting>
</AirScout.PlaneFeeds.Plugin.RTL1090.Properties.Settings>
</userSettings>
</configuration>

14
AirScout/MapDlg.cs
Wyświetl plik

@ -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)
{

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.3.3.0")]
[assembly: AssemblyFileVersion("1.3.3.0")]
[assembly: AssemblyVersion("1.3.3.2")]
[assembly: AssemblyFileVersion("1.3.3.2")]

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

@ -381,7 +381,7 @@
<Value Profile="(Default)">http://www.airscout.eu</Value>
</Setting>
<Setting Name="Watchlist_SyncWithKST" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="Watchlist_Activated" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>

14
AirScout/VersionHistory.txt
Wyświetl plik

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

2
AirScout/app.config
Wyświetl plik

@ -385,7 +385,7 @@
<value>http://www.airscout.eu</value>
</setting>
<setting name="Watchlist_SyncWithKST" serializeAs="String">
<value>True</value>
<value>False</value>
</setting>
<setting name="Watchlist_Activated" serializeAs="String">
<value>True</value>