Merge branch 'release/1.6.7' of https://github.com/CXWorld/CapFrameX …

…into release/1.6.7
CXWorld · Jan 18, 2022 · b81f6de · b81f6de
2 parents aa5b582 + b09df81
commit b81f6de
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 43 deletions.
diff --git a/source/CapFrameX.Contracts/CapFrameX.Contracts.csproj b/source/CapFrameX.Contracts/CapFrameX.Contracts.csproj
@@ -129,6 +129,7 @@
     <Compile Include="Overlay\IOverlayService.cs" />
     <Compile Include="RTSS\IRTSSService.cs" />
     <Compile Include="Sensor\EHardwareType.cs" />
+    <Compile Include="Sensor\IProcessService.cs" />
     <Compile Include="Sensor\ISensorConfig.cs" />
     <Compile Include="Sensor\ISensorEntry.cs" />
     <Compile Include="Sensor\ISensorService.cs" />

diff --git a/source/CapFrameX.Contracts/RTSS/IRTSSService.cs b/source/CapFrameX.Contracts/RTSS/IRTSSService.cs
@@ -1,13 +1,12 @@
 using CapFrameX.Contracts.Overlay;
+using CapFrameX.Contracts.Sensor;
 using System;
-using System.Reactive.Subjects;
 using System.Threading.Tasks;
 
 namespace CapFrameX.Contracts.RTSS
 {
-    public interface IRTSSService
+    public interface IRTSSService : IProcessService
     {
-        ISubject<int> ProcessIdStream { get; }
         bool IsRTSSInstalled();
         string GetApiInfo(int processId);
         Tuple<double, double> GetCurrentFramerate(int processId);

diff --git a/source/CapFrameX.Contracts/Sensor/IProcessService.cs b/source/CapFrameX.Contracts/Sensor/IProcessService.cs
@@ -0,0 +1,9 @@
+using System.Reactive.Subjects;
+
+namespace CapFrameX.Contracts.Sensor
+{
+    public interface IProcessService
+    {
+        ISubject<int> ProcessIdStream { get; }
+    }
+}
diff --git a/source/CapFrameX.Data/ReportInfo.cs b/source/CapFrameX.Data/ReportInfo.cs
@@ -11,9 +11,9 @@ public class ReportInfo
 		[DisplayName("Creation time")]
 		public string Time { get; set; }
 		[DisplayName("# samples")]
-		public string NumberOfSamples {get; set; }
+		public int NumberOfSamples {get; set; }
 		[DisplayName("Record time (s)")]
-		public string RecordTime { get; set; }
+		public double RecordTime { get; set; }
 		[DisplayName("CPU Name")]
 		public string Cpu { get; set; }
 		[DisplayName("GPU Name")]

diff --git a/source/CapFrameX.ViewModel/ReportViewModel.cs b/source/CapFrameX.ViewModel/ReportViewModel.cs
@@ -203,7 +203,7 @@ private void OnCopyTableData()
                     (ShowCreationDate ? "\t" + reportInfo.Date?.ToString(cultureInfo) : "") +
                     (ShowCreationTime ? "\t" + reportInfo.Time?.ToString(cultureInfo) : "") +
                     (ShowNumberOfSamples ? "\t" + reportInfo.NumberOfSamples : "") +
-                    (ShowRecordTime ? "\t" + reportInfo.RecordTime?.ToString(cultureInfo) : "") +
+                    (ShowRecordTime ? "\t" + reportInfo.RecordTime : "") +
                     (ShowCpuName ? "\t" + reportInfo.Cpu : "") +
                     (ShowGpuName ? "\t" + reportInfo.GraphicCard : "") +
                     (ShowRamName ? "\t" + reportInfo.Ram : "") +
@@ -300,8 +300,8 @@ double GeMetricValue(IList<double> sequence, EMetric metric) =>
                 Game = recordInfo.GameName,
                 Date = recordInfo.CreationDate,
                 Time = recordInfo.CreationTime,
-                NumberOfSamples = frameTimes.Count.ToString(),
-                RecordTime = Math.Round(recordTime, 2).ToString(),
+                NumberOfSamples = frameTimes.Count,
+                RecordTime = Math.Round(recordTime, 2),
                 Cpu = recordInfo.ProcessorName == null ? "" : recordInfo.ProcessorName.Trim(new char[] { ' ', '"' }),
                 GraphicCard = recordInfo.GraphicCardName == null ? "" : recordInfo.GraphicCardName.Trim(new char[] { ' ', '"' }),
                 Ram = recordInfo.SystemRamInfo == null ? "" : recordInfo.SystemRamInfo.Trim(new char[] { ' ', '"' }),

diff --git a/source/OpenHardwareMonitor/Hardware/ATI/ATIGPU.cs b/source/OpenHardwareMonitor/Hardware/ATI/ATIGPU.cs
@@ -56,9 +56,9 @@ internal sealed class ATIGPU : GPUBase
         private readonly int overdriveVersion;
 
         public ATIGPU(string name, int adapterIndex, int busNumber,
-          int deviceNumber, IntPtr context, ISettings settings, ISensorConfig config, IRTSSService rTSSService)
+          int deviceNumber, IntPtr context, ISettings settings, ISensorConfig config, IProcessService processService)
           : base(name, new Identifier("atigpu",
-            adapterIndex.ToString(CultureInfo.InvariantCulture)), settings, rTSSService)
+            adapterIndex.ToString(CultureInfo.InvariantCulture)), settings, processService)
         {
             this.adapterIndex = adapterIndex;
             this.busNumber = busNumber;
@@ -388,8 +388,8 @@ public override void Update()
                     }
 
                     // Linear fitting function (model)
-                    // TBP = 15W + 1.1 * ASIC Power
-                    powerTotalBoardSimulated.Value = powerTotalValue > 0 ? (float)Math.Round(15f + 1.11f * powerTotalValue, 0) : 0;
+                    // TBP = 5W + 1.155 * ASIC Power
+                    powerTotalBoardSimulated.Value = powerTotalValue > 0 ? (float)Math.Round(5f + 1.155f * powerTotalValue, 0) : 0;
                     ActivateSensor(powerTotalBoardSimulated);
                 }
 

diff --git a/source/OpenHardwareMonitor/Hardware/ATI/ATIGroup.cs b/source/OpenHardwareMonitor/Hardware/ATI/ATIGroup.cs
@@ -25,7 +25,7 @@ internal class ATIGroup : IGroup
 
         private IntPtr context = IntPtr.Zero;
 
-        public ATIGroup(ISettings settings, ISensorConfig sensorConfig, IRTSSService rTSSService)
+        public ATIGroup(ISettings settings, ISensorConfig sensorConfig, IProcessService processService)
         {
             try
             {
@@ -110,7 +110,7 @@ public ATIGroup(ISettings settings, ISensorConfig sensorConfig, IRTSSService rTS
                                           adapterInfo[i].DeviceNumber, 
                                           context, settings,
                                           sensorConfig,
-                                          rTSSService));
+                                          processService));
                                 }
 
                                 report.AppendLine();

diff --git a/source/OpenHardwareMonitor/Hardware/Computer.cs b/source/OpenHardwareMonitor/Hardware/Computer.cs
@@ -18,13 +18,12 @@ This Source Code Form is subject to the terms of the Mozilla Public
 
 namespace OpenHardwareMonitor.Hardware
 {
-
     public class Computer : IComputer
     {
         private readonly List<IGroup> groups = new List<IGroup>();
         private readonly ISettings settings;
         private readonly ISensorConfig sensorConfig;
-        private readonly IRTSSService rTSSService;
+        private readonly IProcessService processService;
 
         private SMBIOS smbios;
 
@@ -38,12 +37,12 @@ public class Computer : IComputer
         private bool hddEnabled;
 
 #pragma warning disable CS3001 // Argumenttyp ist nicht CLS-kompatibel
-        public Computer(ISensorConfig config, IRTSSService service)
+        public Computer(ISensorConfig config, IProcessService processService)
 #pragma warning restore CS3001 // Argumenttyp ist nicht CLS-kompatibel
         {
             this.settings = new Settings();
             sensorConfig = config;
-            rTSSService = service;
+            this.processService = processService;
         }
 
         private void Add(IGroup group)
@@ -100,12 +99,12 @@ public void Open()
                 Add(new CPU.CPUGroup(settings, sensorConfig));
 
             if (ramEnabled)
-                Add(new RAM.RAMGroup(settings, sensorConfig, rTSSService));
+                Add(new RAM.RAMGroup(settings, sensorConfig, processService));
 
             if (gpuEnabled)
             {
-                Add(new ATI.ATIGroup(settings, sensorConfig, rTSSService));
-                Add(new Nvidia.NvidiaGroup(settings, sensorConfig, rTSSService));
+                Add(new ATI.ATIGroup(settings, sensorConfig, processService));
+                Add(new Nvidia.NvidiaGroup(settings, sensorConfig, processService));
             }
 
             if (fanControllerEnabled)
@@ -166,7 +165,7 @@ public bool RAMEnabled
                 if (open && value != ramEnabled)
                 {
                     if (value)
-                        Add(new RAM.RAMGroup(settings, sensorConfig, rTSSService));
+                        Add(new RAM.RAMGroup(settings, sensorConfig, processService));
                     else
                         RemoveType<RAM.RAMGroup>();
                 }
@@ -185,8 +184,8 @@ public bool GPUEnabled
                 {
                     if (value)
                     {
-                        Add(new ATI.ATIGroup(settings, sensorConfig, rTSSService));
-                        Add(new Nvidia.NvidiaGroup(settings, sensorConfig, rTSSService));
+                        Add(new ATI.ATIGroup(settings, sensorConfig, processService));
+                        Add(new Nvidia.NvidiaGroup(settings, sensorConfig, processService));
                     }
                     else
                     {

diff --git a/source/OpenHardwareMonitor/Hardware/GPUBase.cs b/source/OpenHardwareMonitor/Hardware/GPUBase.cs
@@ -1,4 +1,5 @@
 using CapFrameX.Contracts.RTSS;
+using CapFrameX.Contracts.Sensor;
 using Serilog;
 using System;
 using System.Collections.Generic;
@@ -57,7 +58,7 @@ internal abstract class GPUBase : Hardware
         protected float refreshRateCurrentWindowHandle;
         protected RefreshRateBuffer<float> refreshRateBuffer;
 
-        public GPUBase(string name, Identifier identifier, ISettings settings, IRTSSService rTSSService) : base(name, identifier, settings)
+        public GPUBase(string name, Identifier identifier, ISettings settings, IProcessService processService) : base(name, identifier, settings)
         {
             refreshRateBuffer = new RefreshRateBuffer<float>(2);
 
@@ -111,7 +112,7 @@ public GPUBase(string name, Identifier identifier, ISettings settings, IRTSSServ
                 {
                     var category = new PerformanceCounterCategory("GPU Process Memory");
 
-                    _ = rTSSService
+                    _ = processService
                     .ProcessIdStream
                     .DistinctUntilChanged()
                     .Subscribe(id =>

diff --git a/source/OpenHardwareMonitor/Hardware/IGroup.cs b/source/OpenHardwareMonitor/Hardware/IGroup.cs
@@ -8,15 +8,15 @@ This Source Code Form is subject to the terms of the Mozilla Public
 	
 */
 
-namespace OpenHardwareMonitor.Hardware {
+namespace OpenHardwareMonitor.Hardware
+{
+    internal interface IGroup
+    {
 
-  internal interface IGroup {
+        IHardware[] Hardware { get; }
 
-    IHardware[] Hardware { get; }
-
-    string GetReport();
-
-    void Close();
-  }
+        string GetReport();
 
+        void Close();
+    }
 }
diff --git a/source/OpenHardwareMonitor/Hardware/Nvidia/NvidiaGPU.cs b/source/OpenHardwareMonitor/Hardware/Nvidia/NvidiaGPU.cs
@@ -51,9 +51,9 @@ internal class NvidiaGPU : GPUBase
         private readonly Sensor voltageLimit;
 
         public NvidiaGPU(int adapterIndex, NvPhysicalGpuHandle handle,
-          NvDisplayHandle? displayHandle, ISettings settings, ISensorConfig config, IRTSSService rTSSService)
+          NvDisplayHandle? displayHandle, ISettings settings, ISensorConfig config, IProcessService processService)
           : base(GetName(handle), new Identifier("nvidiagpu",
-              adapterIndex.ToString(CultureInfo.InvariantCulture)), settings, rTSSService)
+              adapterIndex.ToString(CultureInfo.InvariantCulture)), settings, processService)
         {
             this.adapterIndex = adapterIndex;
             this.handle = handle;

diff --git a/source/OpenHardwareMonitor/Hardware/Nvidia/NvidiaGroup.cs b/source/OpenHardwareMonitor/Hardware/Nvidia/NvidiaGroup.cs
@@ -21,7 +21,7 @@ internal class NvidiaGroup : IGroup
         private readonly List<Hardware> hardware = new List<Hardware>();
         private readonly StringBuilder report = new StringBuilder();
 
-        public NvidiaGroup(ISettings settings, ISensorConfig sensorConfig, IRTSSService rTSSService)
+        public NvidiaGroup(ISettings settings, ISensorConfig sensorConfig, IProcessService processService)
         {
             if (!NVAPI.IsAvailable)
                 return;
@@ -101,7 +101,7 @@ public NvidiaGroup(ISettings settings, ISensorConfig sensorConfig, IRTSSService
             for (int i = 0; i < count; i++)
             {
                 displayHandles.TryGetValue(handles[i], out NvDisplayHandle displayHandle);
-                hardware.Add(new NvidiaGPU(i, handles[i], displayHandle, settings, sensorConfig, rTSSService));
+                hardware.Add(new NvidiaGPU(i, handles[i], displayHandle, settings, sensorConfig, processService));
             }
 
             report.AppendLine();

diff --git a/source/OpenHardwareMonitor/Hardware/RAM/GenericRAM.cs b/source/OpenHardwareMonitor/Hardware/RAM/GenericRAM.cs
@@ -34,7 +34,7 @@ internal class GenericRAM : Hardware
         private PerformanceCounter ramUsageGamePerformanceCounter;
         private PerformanceCounter ramAndCacheUsageGamePerformanceCounter;
 
-        public GenericRAM(string name, ISettings settings, ISensorConfig config, IRTSSService service)
+        public GenericRAM(string name, ISettings settings, ISensorConfig config, IProcessService processService)
           : base(name, new Identifier("ram"), settings)
         {
             sensorConfig = config;
@@ -43,7 +43,7 @@ public GenericRAM(string name, ISettings settings, ISensorConfig config, IRTSSSe
             {
                 if (PerformanceCounterCategory.Exists("Process"))
                 {
-                    service
+                    processService
                     .ProcessIdStream
                     .DistinctUntilChanged()
                     .Subscribe(id =>

diff --git a/source/OpenHardwareMonitor/Hardware/RAM/RAMGroup.cs b/source/OpenHardwareMonitor/Hardware/RAM/RAMGroup.cs
@@ -8,7 +8,6 @@ This Source Code Form is subject to the terms of the Mozilla Public
 	
 */
 
-using CapFrameX.Contracts.RTSS;
 using CapFrameX.Contracts.Sensor;
 using System;
 
@@ -18,7 +17,7 @@ internal class RAMGroup : IGroup
     {
         private Hardware[] hardware;
 
-        public RAMGroup(ISettings settings, ISensorConfig sensorConfig, IRTSSService rTSSService)
+        public RAMGroup(ISettings settings, ISensorConfig sensorConfig, IProcessService processService)
         {
             // No implementation for RAM on Unix systems
             int p = (int)Environment.OSVersion.Platform;
@@ -28,7 +27,7 @@ public RAMGroup(ISettings settings, ISensorConfig sensorConfig, IRTSSService rTS
                 return;
             }
 
-            hardware = new Hardware[] { new GenericRAM("Generic Memory", settings, sensorConfig, rTSSService) };
+            hardware = new Hardware[] { new GenericRAM("Generic Memory", settings, sensorConfig, processService) };
         }
 
         public string GetReport()