- Timestamp:
- 09/21/15 16:28:38 (9 years ago)
- Location:
- stable
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Services.WebApp.Status/3.3/WebApp/status/statusCtrl.js
r12563 r12962 4 4 ['$scope', '$interval', 'app.status.data.service', 5 5 function ($scope, $interval, dataService) { 6 $scope.interval = 10000; // update interval in ms6 $scope.interval = defaultPageUpdateInterval; 7 7 $scope.knobOptions = { 8 8 'fgColor': "#f7921d", … … 103 103 $scope.cpu.knobData = Math.round(status.CpuUtilizationStatus.ActiveCpuUtilization); 104 104 $scope.core.knobData = Math.round(status.CoreStatus.CalculatingCores / status.CoreStatus.ActiveCores * 100); 105 $scope.memory.knobData = Math.round(status.MemoryStatus. UsedMemory / status.MemoryStatus.ActiveMemory * 100);105 $scope.memory.knobData = Math.round(status.MemoryStatus.CalculatingMemory / status.MemoryStatus.ActiveMemory * 100); 106 106 // chart series 107 107 var cpuSeries = $scope.cpu.series[0].data.splice(0); … … 127 127 128 128 cpuSeries.push([$scope.status.Timestamp, Math.round(status.CpuUtilizationStatus.TotalCpuUtilization)]); 129 // charts are currently filled with old total/used data130 // start temporary131 var usedCores = status.CoreStatus.TotalCores - status.CoreStatus.FreeCores;132 var usedMemory = status.MemoryStatus.TotalMemory - status.MemoryStatus.FreeMemory;133 // end temporary134 129 coreSeries[0].push([$scope.status.Timestamp, status.CoreStatus.TotalCores]); 135 coreSeries[1].push([$scope.status.Timestamp, usedCores]);130 coreSeries[1].push([$scope.status.Timestamp, status.CoreStatus.UsedCores]); 136 131 memorySeries[0].push([$scope.status.Timestamp, Math.round(status.MemoryStatus.TotalMemory / 1024)]); 137 memorySeries[1].push([$scope.status.Timestamp, Math.round( usedMemory / 1024)]);132 memorySeries[1].push([$scope.status.Timestamp, Math.round(status.MemoryStatus.UsedMemory / 1024)]); 138 133 $scope.cpu.series = [{ data: cpuSeries, label: " CPU Utilization", color: "#f7921d" }]; 139 134 $scope.core.series = [ … … 160 155 for (var i = 0; i < noOfStatus; ++i) { 161 156 var curStatus = status[i]; 162 var cpuData = Math.round(curStatus.CpuUtilizationStatus. ActiveCpuUtilization);157 var cpuData = Math.round(curStatus.CpuUtilizationStatus.TotalCpuUtilization); 163 158 cpuSeries.push([curStatus.Timestamp, cpuData]); 164 coreSeries[0].push([curStatus.Timestamp, curStatus.CoreStatus. ActiveCores]);165 coreSeries[1].push([curStatus.Timestamp, curStatus.CoreStatus. CalculatingCores]);166 memorySeries[0].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus. ActiveMemory / 1024)]);159 coreSeries[0].push([curStatus.Timestamp, curStatus.CoreStatus.TotalCores]); 160 coreSeries[1].push([curStatus.Timestamp, curStatus.CoreStatus.UsedCores]); 161 memorySeries[0].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus.TotalMemory / 1024)]); 167 162 memorySeries[1].push([curStatus.Timestamp, Math.round(curStatus.MemoryStatus.UsedMemory / 1024)]); 168 163 }
Note: See TracChangeset
for help on using the changeset viewer.