Values added

Author: oliver254

src/MachineMonitor/Helpers/BitHelper.cs

@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+
+namespace Monbsoft.MachineMonitor.Helpers
+{
+    public static class BitHelper
+    {
+        private static readonly Dictionary<int, string> byteUnits = new Dictionary<int, string>
+        {
+            { 0, "bits/s" },
+            { 1, "Kbits/s" },
+            { 2, "Mbits/s" },
+            { 3, "Gbits/s" },
+            { 4, "Tbits/s" }
+        };
+
+        public static string DisplayByte(double bytes)
+        {
+            int index = 0;
+            bool find = false;
+
+            double rate = bytes * 8;
+            double next;
+            while (!find && index < 4)
+            {
+                next = rate / 1000;
+                if (next >= 1.0d)
+                {
+                    index++;
+                    rate = next;
+                }
+                else
+                {
+                    find = true;
+                }
+            }
+            return $"{rate.ToString("F1")} {byteUnits[index]}";
+        }
+    }
+}

src/MachineMonitor/Helpers/OctetHelper.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Monbsoft.MachineMonitor.Helpers
+{
+    public static class OctetHelper
+    {
+        private static readonly Dictionary<int, string> octetUnits = new Dictionary<int, string>
+        {
+            {0, "Mo" },
+            {1, "Go" },
+            {2, "To" },
+            {3, "Po" }
+        };
+        public static string DisplayMega(double mega)
+        {
+            bool find = false;
+            double value = mega;
+            int index = 0;
+            while(!find && index <3)
+            {
+                double next = value / 1024;
+                if(next >= 1.0)
+                {
+                    value = next;
+                }
+                else
+                {
+                    index++;
+                    find = true;
+
+                }
+            }
+
+            return $"{value.ToString("F1")} {octetUnits[index]}";
+        }
+    }
+}

src/MachineMonitor/MachineMonitor.csproj

@@ -74,6 +74,8 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="Configuration\ConfigurationStore.cs" />
+    <Compile Include="Helpers\BitHelper.cs" />
+    <Compile Include="Helpers\OctetHelper.cs" />
     <Compile Include="Messages\UpdatedConfigurationMessage.cs" />
     <Compile Include="Properties\Resource.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -145,5 +147,6 @@
       <LastGenOutput>Resource.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

src/MachineMonitor/ViewModels/MainViewModel.cs

@@ -1,6 +1,7 @@
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Messaging;
 using Monbsoft.MachineMonitor.Configuration;
+using Monbsoft.MachineMonitor.Helpers;
 using Monbsoft.MachineMonitor.Messages;
 using Monbsoft.MachineMonitor.Views;
 using System;
@@ -23,6 +24,8 @@ public class MainViewModel : ViewModelBase
         private double _cpu;
         private double _disk;
         private PerformanceCounter _diskCounter;
+        private string _displayMemory;
+        private string _displayNetwork;
         private double _memoryTotal;
         private double _network;
         private PerformanceCounter _networkCounter;
@@ -72,6 +75,22 @@ public double Disk
             set { Set(ref _disk, value); }
         }
 
+        /// <summary>
+        /// Gets or sets the usage of the memory with the specified unit.
+        /// </summary>
+        public string DisplayMemory
+        {
+            get { return _displayMemory; }
+            set { Set(ref _displayMemory, value); }
+        }
+        /// <summary>
+        /// Gets or sets the usage of the network with the specified unit.
+        /// </summary>
+        public string DisplayNetwork
+        {
+            get { return _displayNetwork; }
+            set { Set(ref _displayNetwork, value); }
+        }
         /// <summary>
         /// Gets or sets the percentage of the network usage.
         /// </summary>
@@ -109,8 +128,7 @@ public void Initialize(MainWindow view)
             foreach(var mobject in searcher.Get())
             {
                 _memoryTotal = ToDouble(mobject, "TotalPhysicalMemory", Mega);
-            }
-
+            }           
         }
 
         /// <summary>
@@ -132,6 +150,8 @@ private double CalculatePercent()
             double free = _memoryCounter.NextValue();
             double use = (_memoryTotal - free);
             double percent = Math.Round((use / _memoryTotal) * 100, 2);
+
+            DisplayMemory = OctetHelper.DisplayMega(use);
             return percent;
         }
         private double GetPercentageNetwork()
@@ -140,11 +160,16 @@ private double GetPercentageNetwork()
             {
                 return 0d;
             }
-            double value = ((double)_networkCounter.NextValue() * 8) / 1000000;
+            double bytes = ((double)_networkCounter.NextValue());
+
+            double value = ((double)bytes * 8) / 1000000;
             if (_networkMax < value)
             {
                 _networkMax = value;
             }
+
+            DisplayNetwork = BitHelper.DisplayByte(bytes);
+
             return value * 100 / _networkMax;
         }
         private void HandleUpdatedConfiguration(UpdatedConfigurationMessage updatedMessage)

src/MachineMonitor/Views/MainWindow.xaml

@@ -36,6 +36,7 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>            
             <RowDefinition/>
         </Grid.RowDefinitions>
         <!-- cpu -->
@@ -64,6 +65,12 @@
                                     Value="{Binding Ram, Mode=OneWay}"                                    
                                     Width="50">
         </controls:RadialProgressBar>
+        <TextBlock Foreground="White"
+                   Grid.Column="1"
+                   Grid.Row="2"
+                   Margin="0,5"
+                   Text="{Binding DisplayMemory, Mode=OneWay}"
+                   TextAlignment="Center"/>                   
         <!-- Disk -->
         <TextBlock Grid.Column="2"
                    Style="{StaticResource TitleStyle}" 
@@ -91,6 +98,12 @@
                                     Thickness="6"
                                     Value="{Binding Network, Mode=OneWay}"                                    
                                     Width="50">
-        </controls:RadialProgressBar>        
+        </controls:RadialProgressBar>
+        <TextBlock Foreground="White" 
+                   Grid.Column="3"
+                   Grid.Row="2"     
+                   Margin="0,5"
+                   Text="{Binding DisplayNetwork, Mode=OneWay}"
+                   TextAlignment="Center"/>
     </Grid>
 </Window>