Skip to content

Commit

Permalink
Merge branch 'hotfix/removePercentageChange'
Browse files Browse the repository at this point in the history
  • Loading branch information
CWFranklin committed May 9, 2014
2 parents 0200b79 + 22588ae commit 22205c0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CadenceHost/Helpers/Statistics.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public Statistics()
/// <returns>The current CPU usage</returns>
public string GetCurrentCpu()
{
return (Math.Truncate(_cpuCounter.NextValue()) / 100).ToString(CultureInfo.InvariantCulture);
return _cpuCounter.NextValue().ToString(CultureInfo.InvariantCulture);
}

/// <summary>
Expand All @@ -71,13 +71,13 @@ public string GetCurrentCpu()
/// <returns>The current RAM usage</returns>
public string GetCurrentRam()
{
return (_ramCounter.NextValue()).ToString(CultureInfo.InvariantCulture);
return _ramCounter.NextValue().ToString(CultureInfo.InvariantCulture);
}

public string GetCurrentRamPercent()
{
return
(Math.Truncate(100 - (Convert.ToDouble(GetCurrentRam())/Convert.ToDouble(GetTotalRamSize())*100))/100).ToString(CultureInfo.InvariantCulture);
(100 - (Convert.ToDouble(GetCurrentRam())/Convert.ToDouble(GetTotalRamSize())*100)).ToString(CultureInfo.InvariantCulture);
}

public String GetTotalRamSize()
Expand Down

0 comments on commit 22205c0

Please sign in to comment.