[#10] : Memory percent improve

Author: oliver254

src/MachineMonitor/MachineMonitor.csproj

@@ -50,6 +50,7 @@
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
@@ -136,9 +137,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <AdditionalFiles Include="Assets\machineicon.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </AdditionalFiles>
+    <EmbeddedResource Include="Assets\machineicon.ico" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resource.resx">

src/MachineMonitor/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1")]
-[assembly: AssemblyFileVersion("1.0.1")]
+[assembly: AssemblyVersion("1.0.2")]
+[assembly: AssemblyFileVersion("1.0.2")]

src/MachineMonitor/ViewModels/MainViewModel.cs

@@ -5,6 +5,8 @@
 using Monbsoft.MachineMonitor.Views;
 using System;
 using System.Diagnostics;
+using System.Linq;
+using System.Management;
 using System.Windows.Threading;
 using static Monbsoft.MachineMonitor.Messages.UpdatedConfigurationMessage;
 
@@ -13,7 +15,7 @@ namespace Monbsoft.MachineMonitor.ViewModels
     public class MainViewModel : ViewModelBase
     {
         #region Champs
-        private const double Giga = 1073741824d;
+        private const double Mega = 1048576d;
         private readonly ConfigurationStore _configuration;
         private readonly PerformanceCounter _cpuCounter;
         private readonly PerformanceCounter _memoryCounter;
@@ -27,6 +29,7 @@ public class MainViewModel : ViewModelBase
         private double _networkMax;
         private double _ram;
         private MainWindow _view;
+        private double _memoryTotal;
         #endregion
 
         #region Constructeurs
@@ -37,8 +40,7 @@ public MainViewModel(ConfigurationStore configuration)
         {
             _configuration = configuration;
             _cpuCounter = new PerformanceCounter("Processor", "% Processor Time", "_Total");
-            _memoryCounter = new PerformanceCounter("Memory", "Available Bytes");
-            _totalRamCounter = new PerformanceCounter("Memory", "Committed Bytes");
+            _memoryCounter = new PerformanceCounter("Memory", "Available MBytes");
 
             if (configuration != null && !string.IsNullOrEmpty(configuration.Network))
             {
@@ -103,7 +105,27 @@ public void Initialize(MainWindow view)
         {
             _view = view;
             OnTransparencyChange(_configuration.Transparent);
+
+            // récupère le total de mémoire
+            ManagementObjectSearcher searcher =
+                new ManagementObjectSearcher(
+                    "SELECT * FROM Win32_ComputerSystem");
+
+            foreach(var mobject in searcher.Get())
+            {
+                _memoryTotal = ToDouble(mobject, "TotalPhysicalMemory", Mega);
+            }
+
         }
+
+        private static double ToDouble(ManagementBaseObject mo, string name, double divider)
+        {
+            var value = mo[name];
+            return value == null
+                ? 0
+                : (double.TryParse(value.ToString(), out double result) ? result / divider : 0);
+        }
+
         /// <summary>
         /// Starts the counters.
         /// </summary>
@@ -113,10 +135,10 @@ public void Start()
         }
         private double CalculatePercent()
         {
-            double total = _totalRamCounter.NextValue();
             double free = _memoryCounter.NextValue();
-            double use = (total - free);
-            return (use / total) * 100;
+            double use = (_memoryTotal - free);
+            double percent = Math.Round((use / _memoryTotal) * 100, 2);
+            return percent;
         }
         private double GetPercentageNetwork()
         {

src/MachineMonitor/Views/MainWindow.xaml

@@ -8,7 +8,6 @@
         AllowsTransparency="True"
         Background="{StaticResource SystemControlBackgroundBrush}"
         Height="100" 
-        Icon="/MachineMonitor;component/Assets/machineicon.ico"
         Loaded="Window_Loaded" 
         ResizeMode="NoResize"
         Title="Machine Monitor"