Merge branch 'develop/feature/pmd_tab' into release/1.7.0

CXWorld · Sep 10, 2022 · 68bd75d · 68bd75d
2 parents 06e5f52 + a129172
commit 68bd75d
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 3 deletions.
diff --git a/source/CapFrameX.Overlay/OverlayEntryProvider.cs b/source/CapFrameX.Overlay/OverlayEntryProvider.cs
@@ -20,6 +20,7 @@
 using System.Reactive.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace CapFrameX.Overlay
 {
@@ -32,7 +33,7 @@ public class OverlayEntryProvider : IOverlayEntryProvider
         private static readonly HashSet<string> ONLINE_METRIC_NAMES = new HashSet<string>()
         {
             "OnlineAverage", "OnlineP1", "OnlineP0dot2", "OnlineApplicationLatency",
-            "OnlineStutteringPercentage", "SystemTime", "PmdGpuPowerCurrent", "PmdCpuPowerCurrent",
+            "OnlineStutteringPercentage", "PmdGpuPowerCurrent", "PmdCpuPowerCurrent",
             "PmdSystemPowerCurrent"
         };
 
@@ -256,6 +257,23 @@ void UpdateRealtimeMetricEntryDict(string onlineMetricName)
                 }
 
                 ONLINE_METRIC_NAMES.ForEach(UpdateRealtimeMetricEntryDict);
+
+                // System Time
+                if (!_overlayEntryCore.RealtimeMetricEntryDict.ContainsKey("SystemTime"))
+                    _overlayEntryCore.RealtimeMetricEntryDict.Add("SystemTime", entry);
+                else
+                    _overlayEntryCore.RealtimeMetricEntryDict["SystemTime"] = entry;
+
+                // Battery Info
+                if (!_overlayEntryCore.RealtimeMetricEntryDict.ContainsKey("BatteryLifePercent"))
+                    _overlayEntryCore.RealtimeMetricEntryDict.Add("BatteryLifePercent", entry);
+                else
+                    _overlayEntryCore.RealtimeMetricEntryDict["BatteryLifePercent"] = entry;
+
+                if (!_overlayEntryCore.RealtimeMetricEntryDict.ContainsKey("BatteryLifeRemaining"))
+                    _overlayEntryCore.RealtimeMetricEntryDict.Add("BatteryLifeRemaining", entry);
+                else
+                    _overlayEntryCore.RealtimeMetricEntryDict["BatteryLifeRemaining"] = entry;
             }
 
             CheckCustomSystemInfo();
@@ -286,6 +304,8 @@ private void ManageFormats()
             SetHardwareIsNumericState();
             SetAppInfoFormats();
             SetAppInfoIsNumericState();
+            SetBatteryInfoFormats();
+            SetBatteryInfoIsNumericState();
 
             _overlayEntries.ForEach(entry => entry.FormatChanged = true);
         }
@@ -531,6 +551,12 @@ private async Task UpdateSensorData()
                     case EOverlayEntryType.CX when entry.Identifier == "SystemTime":
                         entry.Value = ShowSystemTimeSeconds ? DateTime.Now.ToString("HH:mm:ss") : DateTime.Now.ToString("HH:mm");
                         break;
+                    case EOverlayEntryType.CX when entry.Identifier == "BatteryLifePercent":
+                        entry.Value = SystemInformation.PowerStatus.BatteryLifePercent * 100d;
+                        break;
+                    case EOverlayEntryType.CX when entry.Identifier == "BatteryLifeRemaining":
+                        entry.Value = SystemInformation.PowerStatus.BatteryLifeRemaining / 60d;
+                        break;
                     default:
                         break;
                 }
@@ -631,7 +657,7 @@ private void UpdateAppInfo()
 
         private void SetOnlineMetricsIsNumericState()
         {
-            foreach (var metricName in ONLINE_METRIC_NAMES.Where(name => name != "SystemTime"))
+            foreach (var metricName in ONLINE_METRIC_NAMES)
             {
                 _identifierOverlayEntryDict.TryGetValue(metricName, out IOverlayEntry metricEntry);
 
@@ -768,6 +794,36 @@ private void SetHardwareIsNumericState()
             }
         }
 
+        private void SetBatteryInfoIsNumericState()
+        {
+            foreach (var entry in _overlayEntries.Where(x =>
+                x.Identifier == "BatteryLifePercent" || x.Identifier == "BatteryLifeRemaining"))
+            {
+                entry.IsNumeric = true;
+            }
+        }
+
+        private void SetBatteryInfoFormats()
+        {
+            // BatteryLifePercent
+            _identifierOverlayEntryDict.TryGetValue("BatteryLifePercent", out IOverlayEntry batteryLifePercent);
+
+            if (batteryLifePercent != null)
+            {
+                batteryLifePercent.ValueUnitFormat = "%";
+                batteryLifePercent.ValueAlignmentAndDigits = "{0,5:F0}";
+            }
+
+            // BatteryLifeRemaining
+            _identifierOverlayEntryDict.TryGetValue("BatteryLifeRemaining", out IOverlayEntry batteryLifeRemaining);
+
+            if (batteryLifeRemaining != null)
+            {
+                batteryLifeRemaining.ValueUnitFormat = "min ";
+                batteryLifeRemaining.ValueAlignmentAndDigits = "{0,5:F0}";
+            }
+        }
+
         private void UpdateFormatting()
         {
             bool updateVariables = false;

diff --git a/source/CapFrameX.Overlay/OverlayUtils.cs b/source/CapFrameX.Overlay/OverlayUtils.cs
@@ -320,6 +320,32 @@ public static List<OverlayEntryWrapper> GetOverlayEntryDefaults()
                         ShowGraph = false,
                         ShowGraphIsEnabled = false,
                         Color = string.Empty
+                    },
+                     new OverlayEntryWrapper("BatteryLifePercent")
+                    {
+                        OverlayEntryType = EOverlayEntryType.CX,
+                        ShowOnOverlay = false,
+                        ShowOnOverlayIsEnabled = true,
+                        Description = "Battery Life (%)",
+                        GroupName = "Battery Life",
+                        Value = "0",
+                        ValueFormat = default,
+                        ShowGraph = false,
+                        ShowGraphIsEnabled = false,
+                        Color = string.Empty
+                    },
+                    new OverlayEntryWrapper("BatteryLifeRemaining")
+                    {
+                        OverlayEntryType = EOverlayEntryType.CX,
+                        ShowOnOverlay = false,
+                        ShowOnOverlayIsEnabled = true,
+                        Description = "Battery Life Remaining (min)",
+                        GroupName = "Battery Life",
+                        Value = "0",
+                        ValueFormat = default,
+                        ShowGraph = false,
+                        ShowGraphIsEnabled = false,
+                        Color = string.Empty
                     }
             };
         }

diff --git a/source/CapFrameX.PresentMonInterface/OnlineMetricService.cs b/source/CapFrameX.PresentMonInterface/OnlineMetricService.cs
@@ -410,7 +410,6 @@ public OnlinePmdMetrics GetPmdMetricsPowerCurrent()
             return pmdMetrics;
         }
 
-
         private float GetPmdCurrentPowerByIndexGroup(IList<PmdChannel[]> channelData, int[] indexGroup)
         {
             double sum = 0;