From f9b504574f0e30e3e9182c79dd95779a2099363e Mon Sep 17 00:00:00 2001 From: hawkeye Date: Fri, 18 Aug 2023 17:02:03 -0400 Subject: [PATCH] Add SimConnect download indicator --- DomainModel/DomainModel.csproj | 6 +++--- MainApp/AppWindow.xaml | 26 ++++++++++++++++++++++- MainApp/MainApp.csproj | 6 +++--- MainApp/ViewModel/ApplicationViewModel.cs | 2 ++ Orchestration/FlightSimData.cs | 2 ++ Orchestration/FlightSimOrchestrator.cs | 5 +++++ Orchestration/Orchestration.csproj | 6 +++--- RELEASENOTES.md | 2 ++ Shared/Shared.csproj | 6 +++--- SimconnectAgent/SimconnectAgent.csproj | 6 +++--- VERSION.md | 2 ++ WindowsAgent/WindowsAgent.csproj | 6 +++--- 12 files changed, 56 insertions(+), 19 deletions(-) diff --git a/DomainModel/DomainModel.csproj b/DomainModel/DomainModel.csproj index eb86ee9..c623581 100644 --- a/DomainModel/DomainModel.csproj +++ b/DomainModel/DomainModel.csproj @@ -11,9 +11,9 @@ https://github.com/hawkeye-stan/msfs-popout-panel-manager MSFSPopoutPanelManager.DomainModel x64 - 4.0.2.4 - 4.0.2.4 - 4.0.2.4 + 4.0.2.5 + 4.0.2.5 + 4.0.2.5 win-x64 Embedded Debug;Release;Local diff --git a/MainApp/AppWindow.xaml b/MainApp/AppWindow.xaml index 14bb0e5..83f5a23 100644 --- a/MainApp/AppWindow.xaml +++ b/MainApp/AppWindow.xaml @@ -67,7 +67,10 @@ - + + MSFSPopoutPanelManager.MainApp logo.ico x64 - 4.0.2.4 - 4.0.2.4 - 4.0.2.4 + 4.0.2.5 + 4.0.2.5 + 4.0.2.5 embedded en diff --git a/MainApp/ViewModel/ApplicationViewModel.cs b/MainApp/ViewModel/ApplicationViewModel.cs index 92b8ad2..7bfce2d 100644 --- a/MainApp/ViewModel/ApplicationViewModel.cs +++ b/MainApp/ViewModel/ApplicationViewModel.cs @@ -40,6 +40,8 @@ namespace MSFSPopoutPanelManager.MainApp.ViewModel // Set Always on Top if (Orchestrator.AppSettingData.ApplicationSetting.GeneralSetting.AlwaysOnTop) WindowActionManager.ApplyAlwaysOnTop(ApplicationHandle, PanelType.PopOutManager, Orchestrator.AppSettingData.ApplicationSetting.GeneralSetting.AlwaysOnTop); + + } public void WindowClosing() diff --git a/Orchestration/FlightSimData.cs b/Orchestration/FlightSimData.cs index 15e5c01..626723c 100644 --- a/Orchestration/FlightSimData.cs +++ b/Orchestration/FlightSimData.cs @@ -39,6 +39,8 @@ namespace MSFSPopoutPanelManager.Orchestration public bool IsSimulatorStarted { get; set; } + public bool IsSimConnectDataReceived { get; set; } + public bool IsInCockpit { get; set; } public IHudBarData HudBarData { get; set; } diff --git a/Orchestration/FlightSimOrchestrator.cs b/Orchestration/FlightSimOrchestrator.cs index f701441..c4eb64a 100644 --- a/Orchestration/FlightSimOrchestrator.cs +++ b/Orchestration/FlightSimOrchestrator.cs @@ -6,6 +6,7 @@ using MSFSPopoutPanelManager.WindowsAgent; using System; using System.Collections.Generic; using System.Threading; +using System.Threading.Tasks; namespace MSFSPopoutPanelManager.Orchestration { @@ -53,6 +54,7 @@ namespace MSFSPopoutPanelManager.Orchestration _simConnectProvider.OnDisconnected += (sender, e) => { + _flightSimData.IsSimConnectDataReceived = false; _flightSimData.IsSimConnectActive = false; WindowProcessManager.GetSimulatorProcess(); // refresh simulator process _flightSimData.Reset(); @@ -60,6 +62,7 @@ namespace MSFSPopoutPanelManager.Orchestration _simConnectProvider.OnException += (sender, e) => { + _flightSimData.IsSimConnectDataReceived = false; _flightSimData.IsSimConnectActive = false; }; @@ -84,6 +87,8 @@ namespace MSFSPopoutPanelManager.Orchestration var cameraViewTypeAndIndex1 = Convert.ToInt32(e.Find(d => d.PropertyName == SimDataDefinitions.PropName.CameraViewTypeAndIndex1).Value); if (cameraViewTypeAndIndex1 != _flightSimData.CameraViewTypeAndIndex1) _flightSimData.CameraViewTypeAndIndex1 = cameraViewTypeAndIndex1; + + _flightSimData.IsSimConnectDataReceived = true; }; _simConnectProvider.OnSimConnectDataHudBarRefreshed += (sender, e) => diff --git a/Orchestration/Orchestration.csproj b/Orchestration/Orchestration.csproj index c85290b..ef959ff 100644 --- a/Orchestration/Orchestration.csproj +++ b/Orchestration/Orchestration.csproj @@ -11,9 +11,9 @@ https://github.com/hawkeye-stan/msfs-popout-panel-manager MSFSPopoutPanelManager.Orchestration x64 - 4.0.2.4 - 4.0.2.4 - 4.0.2.4 + 4.0.2.5 + 4.0.2.5 + 4.0.2.5 win-x64 Embedded Debug;Release;Local diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 71e28ad..c84d9d0 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -11,4 +11,6 @@ * Added configurable keyboard shortcut to initiate pop out process (default is Ctrl-Shift-O). This keyboard shortcut can be configured in preference setting. This setting can be disabled to improve computing resource needed to constantly detect keyboard inputs. +* Added indicator to show SimConnect is receiving data. + * Fixed issue where full screen mode for pop out panel does not work on certain aircraft configuration. \ No newline at end of file diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj index bd818b3..676a299 100644 --- a/Shared/Shared.csproj +++ b/Shared/Shared.csproj @@ -11,9 +11,9 @@ https://github.com/hawkeye-stan/msfs-popout-panel-manager MSFSPopoutPanelManager.Shared x64 - 4.0.2.4 - 4.0.2.4 - 4.0.2.4 + 4.0.2.5 + 4.0.2.5 + 4.0.2.5 win-x64 Embedded Debug;Release;Local diff --git a/SimconnectAgent/SimconnectAgent.csproj b/SimconnectAgent/SimconnectAgent.csproj index ba5667e..8c408bb 100644 --- a/SimconnectAgent/SimconnectAgent.csproj +++ b/SimconnectAgent/SimconnectAgent.csproj @@ -11,9 +11,9 @@ https://github.com/hawkeye-stan/msfs-popout-panel-manager MSFSPopoutPanelManager.SimConnectAgent x64 - 4.0.2.4 - 4.0.2.4 - 4.0.2.4 + 4.0.2.5 + 4.0.2.5 + 4.0.2.5 win-x64 Embedded Debug;Release;Local diff --git a/VERSION.md b/VERSION.md index 4793995..e4b5869 100644 --- a/VERSION.md +++ b/VERSION.md @@ -14,6 +14,8 @@ * Added configurable keyboard shortcut to initiate pop out process (default is Ctrl-Shift-O). This keyboard shortcut can be configured in preference setting. This setting can be disabled to improve computing resource needed to constantly detect keyboard inputs. +* Added indicator to show SimConnect is receiving data. + * Fixed issue where full screen mode for pop out panel does not work on certain aircraft configuration. ## Version 4.0.1.2 diff --git a/WindowsAgent/WindowsAgent.csproj b/WindowsAgent/WindowsAgent.csproj index a760ebc..6f6751e 100644 --- a/WindowsAgent/WindowsAgent.csproj +++ b/WindowsAgent/WindowsAgent.csproj @@ -11,9 +11,9 @@ https://github.com/hawkeye-stan/msfs-popout-panel-manager MSFSPopoutPanelManager.WindowsAgent x64 - 4.0.2.4 - 4.0.2.4 - 4.0.2.4 + 4.0.2.5 + 4.0.2.5 + 4.0.2.5 win-x64 Embedded Debug;Release;Local