Changeset 12521 for trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history

Timestamp:

06/26/15 11:16:48 (9 years ago)

Author:

dglaser

Message:

#2394:

HeuristicLab.Services.WebApp.Status-3.3:

• changed the DataController to return memory in kb instead of gb
• fixed the memory rounding error

File:

• trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/historyCtrl.js (modified) (2 diffs)

trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/historyCtrl.js

@@ -39 +39 @@
                 }
             };
+
 
             $scope.fromDate = new Date();
@@ -81 +82 @@
                         coreSeries[0].push([curStatus.Timestamp, curStatus.CoreStatus.ActiveCores]);
                         coreSeries[1].push([curStatus.Timestamp, curStatus.CoreStatus.CalculatingCores]);
-                        memorySeries[0].push([curStatus.Timestamp, curStatus.MemoryStatus.ActiveMemory]);
-                        memorySeries[1].push([curStatus.Timestamp, curStatus.MemoryStatus.UsedMemory]);
+                        memorySeries[0].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus.ActiveMemory / 1024)]);
+                        memorySeries[1].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus.UsedMemory / 1024)]);
                     }
                     $scope.cpuSeries = [{ data: cpuSeries, label: " CPU Utilization", color: "#f7921d" }];