Merge pull request #90 from opensky-to/landing-analyis2.0

Landing analyis2.0
opensky-to · Dec 13, 2023 · ea8817e · ea8817e
2 parents 367ce75 + 361a8c2
commit ea8817e
Show file tree

Hide file tree

Showing 40 changed files with 652 additions and 258 deletions.
diff --git a/OpenSky.Agent.SimConnectMSFS/OpenSky.Agent.SimConnectMSFS.csproj b/OpenSky.Agent.SimConnectMSFS/OpenSky.Agent.SimConnectMSFS.csproj
@@ -51,8 +51,8 @@
     <Reference Include="Microsoft.Maps.MapControl.WPF, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Maps.MapControl.WPF.1.0.0.3\lib\net40-Client\Microsoft.Maps.MapControl.WPF.dll</HintPath>
     </Reference>
-    <Reference Include="OpenSky.FlightLogXML, Version=0.1.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenSky.FlightLogXML.0.1.7\lib\net48\OpenSky.FlightLogXML.dll</HintPath>
+    <Reference Include="OpenSky.FlightLogXML, Version=0.1.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenSky.FlightLogXML.0.1.8\lib\net48\OpenSky.FlightLogXML.dll</HintPath>
     </Reference>
     <Reference Include="ParallelExtensionsExtras, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MSFT.ParallelExtensionsExtras.1.2.0\lib\ParallelExtensionsExtras.dll</HintPath>

diff --git a/OpenSky.Agent.SimConnectMSFS/packages.config b/OpenSky.Agent.SimConnectMSFS/packages.config
@@ -5,7 +5,7 @@
   <package id="Microsoft.CodeAnalysis.NetAnalyzers" version="8.0.0" targetFramework="net48" developmentDependency="true" />
   <package id="Microsoft.Maps.MapControl.WPF" version="1.0.0.3" targetFramework="net48" />
   <package id="MSFT.ParallelExtensionsExtras" version="1.2.0" targetFramework="net48" />
-  <package id="OpenSky.FlightLogXML" version="0.1.7" targetFramework="net48" />
+  <package id="OpenSky.FlightLogXML" version="0.1.8" targetFramework="net48" />
   <package id="Serilog" version="3.1.1" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.Diagnostics.DiagnosticSource" version="8.0.0" targetFramework="net48" />

diff --git a/...Sky.Agent/Controls/Models/ErrorDetails.cs → ...Simulator/Controls/Models/ErrorDetails.cs b/...Sky.Agent/Controls/Models/ErrorDetails.cs → ...Simulator/Controls/Models/ErrorDetails.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace OpenSky.Agent.Controls.Models
+namespace OpenSky.Agent.Simulator.Controls.Models
 {
     using System;
 

diff --git a/...ontrols/Models/ExtendedMessageBoxImage.cs → ...ontrols/Models/ExtendedMessageBoxImage.cs b/...ontrols/Models/ExtendedMessageBoxImage.cs → ...ontrols/Models/ExtendedMessageBoxImage.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace OpenSky.Agent.Controls.Models
+namespace OpenSky.Agent.Simulator.Controls.Models
 {
     /// -------------------------------------------------------------------------------------------------
     /// <summary>

diff --git a/...ntrols/Models/ExtendedMessageBoxResult.cs → ...ntrols/Models/ExtendedMessageBoxResult.cs b/...ntrols/Models/ExtendedMessageBoxResult.cs → ...ntrols/Models/ExtendedMessageBoxResult.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace OpenSky.Agent.Controls.Models
+namespace OpenSky.Agent.Simulator.Controls.Models
 {
     /// -------------------------------------------------------------------------------------------------
     /// <summary>

diff --git a/...Sky.Agent/Controls/OpenSkyMessageBox.xaml → ...Simulator/Controls/OpenSkyMessageBox.xaml b/...Sky.Agent/Controls/OpenSkyMessageBox.xaml → ...Simulator/Controls/OpenSkyMessageBox.xaml
@@ -9,13 +9,13 @@
 ====================================================================================================================
 -->
 
-<UserControl x:Class="OpenSky.Agent.Controls.OpenSkyMessageBox"
+<UserControl x:Class="OpenSky.Agent.Simulator.Controls.OpenSkyMessageBox"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
                  xmlns:sf="http://schemas.syncfusion.com/wpf"
-                 xmlns:tools="clr-namespace:OpenSky.Agent.Tools"
+                 xmlns:tools="clr-namespace:OpenSky.Agent.Simulator.Tools"
                  mc:Ignorable="d" Foreground="White" tools:VisibilityAnimation.AnimationType="Fade" Visibility="Hidden"
                  d:DesignHeight="450" d:DesignWidth="800" Loaded="OpenSkyMessageBoxOnLoaded">
     <Grid>

diff --git a/....Agent/Controls/OpenSkyMessageBox.xaml.cs → ...ulator/Controls/OpenSkyMessageBox.xaml.cs b/....Agent/Controls/OpenSkyMessageBox.xaml.cs → ...ulator/Controls/OpenSkyMessageBox.xaml.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace OpenSky.Agent.Controls
+namespace OpenSky.Agent.Simulator.Controls
 {
     using System;
     using System.Media;
@@ -13,7 +13,7 @@ namespace OpenSky.Agent.Controls
     using System.Windows.Input;
     using System.Windows.Media;
 
-    using OpenSky.Agent.Controls.Models;
+    using OpenSky.Agent.Simulator.Controls.Models;
     using OpenSky.Agent.Simulator.Tools;
 
     /// -------------------------------------------------------------------------------------------------

diff --git a/...y.Agent/Controls/OpenSkyNotification.xaml → ...mulator/Controls/OpenSkyNotification.xaml b/...y.Agent/Controls/OpenSkyNotification.xaml → ...mulator/Controls/OpenSkyNotification.xaml
@@ -9,13 +9,13 @@
 ====================================================================================================================
 -->
 
-<UserControl x:Class="OpenSky.Agent.Controls.OpenSkyNotification"
+<UserControl x:Class="OpenSky.Agent.Simulator.Controls.OpenSkyNotification"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                  xmlns:sf="http://schemas.syncfusion.com/wpf"
-                 xmlns:tools="clr-namespace:OpenSky.Agent.Tools"
+                 xmlns:tools="clr-namespace:OpenSky.Agent.Simulator.Tools"
                  mc:Ignorable="d" 
                  d:DesignWidth="300" Foreground="White" tools:VisibilityAnimation.AnimationType="SlideFromRight" Visibility="Hidden" Loaded="OpenSkyNotificationOnLoaded">
     <Border Name="BackgroundBorder" Background="#023b31" CornerRadius="3" Width="300" Margin="0,0,5,5">

diff --git a/...gent/Controls/OpenSkyNotification.xaml.cs → ...ator/Controls/OpenSkyNotification.xaml.cs b/...gent/Controls/OpenSkyNotification.xaml.cs → ...ator/Controls/OpenSkyNotification.xaml.cs
@@ -4,14 +4,14 @@
 // </copyright>
 // --------------------------------------------------------------------------------------------------------------------
 
-namespace OpenSky.Agent.Controls
+namespace OpenSky.Agent.Simulator.Controls
 {
     using System;
     using System.Threading;
     using System.Windows;
     using System.Windows.Media;
 
-    using OpenSky.Agent.Controls.Models;
+    using OpenSky.Agent.Simulator.Controls.Models;
     using OpenSky.Agent.Simulator.Tools;
 
     /// -------------------------------------------------------------------------------------------------

diff --git a/OpenSky.Agent.Simulator/OpenSky.Agent.Simulator.csproj b/OpenSky.Agent.Simulator/OpenSky.Agent.Simulator.csproj
@@ -48,14 +48,17 @@
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="OpenSky.FlightLogXML, Version=0.1.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenSky.FlightLogXML.0.1.7\lib\net48\OpenSky.FlightLogXML.dll</HintPath>
+    <Reference Include="OpenSky.FlightLogXML, Version=0.1.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenSky.FlightLogXML.0.1.8\lib\net48\OpenSky.FlightLogXML.dll</HintPath>
     </Reference>
     <Reference Include="ParallelExtensionsExtras, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MSFT.ParallelExtensionsExtras.1.2.0\lib\ParallelExtensionsExtras.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="Syncfusion.SfProgressBar.WPF, Version=23.2460.7.0, Culture=neutral, PublicKeyToken=3d67ed1f87d44c89, processorArchitecture=MSIL">
+      <HintPath>..\packages\Syncfusion.SfProgressBar.WPF.23.2.7\lib\net46\Syncfusion.SfProgressBar.WPF.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Device" />
@@ -79,6 +82,15 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Controls\Models\ErrorDetails.cs" />
+    <Compile Include="Controls\Models\ExtendedMessageBoxImage.cs" />
+    <Compile Include="Controls\Models\ExtendedMessageBoxResult.cs" />
+    <Compile Include="Controls\OpenSkyMessageBox.xaml.cs">
+      <DependentUpon>OpenSkyMessageBox.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\OpenSkyNotification.xaml.cs">
+      <DependentUpon>OpenSkyNotification.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Enums\FuelTank.cs" />
     <Compile Include="Enums\Pushback.cs" />
     <Compile Include="Enums\Requests.cs" />
@@ -137,6 +149,7 @@
     <Compile Include="Tools\StringEnumExtension.cs" />
     <Compile Include="Tools\StringValueAttribute.cs" />
     <Compile Include="Tools\UpdateGUIDelegate.cs" />
+    <Compile Include="Tools\VisibilityAnimation.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="OpenAPIs\swagger.json">
@@ -149,6 +162,14 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="Controls\OpenSkyMessageBox.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Controls\OpenSkyNotification.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="OpenSkyColors.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -161,5 +182,6 @@
     <Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.8.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll" />
     <Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.8.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.NetAnalyzers.dll" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/OpenSky.Agent.Simulator/Properties/AssemblyInfo.cs b/OpenSky.Agent.Simulator/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@
 // --------------------------------------------------------------------------------------------------------------------
 
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("OpenSky.Agent.Simulator")]
@@ -19,3 +20,4 @@
 [assembly: Guid("30c467e8-2eee-41e5-be01-0142a61ba171")]
 [assembly: AssemblyVersion("0.5.9")]
 [assembly: AssemblyFileVersion("0.5.9")]
+[assembly: InternalsVisibleTo("OpenSky.Agent")]