Correct an issue on perCPU display

This commit is contained in:
Nicolas Hennion 2013-01-10 16:15:43 +01:00
parent bf28f60540
commit 00bd5aad2b

View File

@ -1816,7 +1816,7 @@ class glancesScreen:
# Display CPU stats # Display CPU stats
if screen_y > self.cpu_y + 5 and tag_percpu: if screen_y > self.cpu_y + 5 and tag_percpu:
# display per-CPU stats when space is available # Display per-CPU
self.term_window.addnstr(self.cpu_y, self.cpu_x, _("PerCPU"), 6, self.term_window.addnstr(self.cpu_y, self.cpu_x, _("PerCPU"), 6,
self.title_color if self.hascolors else self.title_color if self.hascolors else
curses.A_UNDERLINE) curses.A_UNDERLINE)
@ -1840,25 +1840,24 @@ class glancesScreen:
format((100 - percpu[i]['idle']) / 100, '>6.1%'), 6) format((100 - percpu[i]['idle']) / 100, '>6.1%'), 6)
# user # user
alert = self.__getCpuAlert(percpu[i]['user'])
self.term_window.addnstr( self.term_window.addnstr(
self.cpu_y + 1, self.cpu_x + 8 + i * 8, self.cpu_y + 1, self.cpu_x + 8 + i * 8,
format(percpu[i]['user'] / 100, '>6.1%'), 6, format(percpu[i]['user'] / 100, '>6.1%'), 6,
self.__colors_list2[alert]) self.__getCpuColor2(percpu[i]['user'], stat = 'user'))
# system # system
alert = self.__getCpuAlert(percpu[i]['system'])
self.term_window.addnstr( self.term_window.addnstr(
self.cpu_y + 2, self.cpu_x + 8 + i * 8, self.cpu_y + 2, self.cpu_x + 8 + i * 8,
format(percpu[i]['system'] / 100, '>6.1%'), 6, format(percpu[i]['system'] / 100, '>6.1%'), 6,
self.__colors_list2[alert]) self.__getCpuColor2(percpu[i]['system'], stat = 'system'))
# idle # idle
self.term_window.addnstr( self.term_window.addnstr(
self.cpu_y + 3, self.cpu_x + 8 + i * 8, self.cpu_y + 3, self.cpu_x + 8 + i * 8,
format(percpu[i]['idle'] / 100, '>6.1%'), 6) format(percpu[i]['idle'] / 100, '>6.1%'), 6)
# display CPU summary information
elif screen_y > self.cpu_y + 5 and screen_x > self.cpu_x + 18: elif screen_y > self.cpu_y + 5 and screen_x > self.cpu_x + 18:
# display CPU summary information
self.term_window.addnstr(self.cpu_y, self.cpu_x, _("CPU"), 3, self.term_window.addnstr(self.cpu_y, self.cpu_x, _("CPU"), 3,
self.title_color if self.hascolors else self.title_color if self.hascolors else
curses.A_UNDERLINE) curses.A_UNDERLINE)