greatbody
/
glances
mirror of https://github.com/nicolargo/glances
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor display method of the curses interface sprint 3

pull/739/merge
nicolargo 2016-12-28 18:41:46 +01:00
parent 27aa7371fc
commit 42356c45b3
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
glances/outputs/glances_curses.py
View File

@ -687,24 +687,13 @@ class _GlancesCurses(object):
plugin_display_optional[p] = True
if stats_number > 1:
self.space_between_column = max(1, int((self.screen.getmaxyx()[1] - stats_width) / (stats_number - 1)))
# No space ? Remove optionnal MEM stats
if self.space_between_column < 3:
plugin_display_optional['mem'] = False
if self.args.disable_mem:
plugin_widths['mem'] = 0
else:
plugin_widths['mem'] = self.get_stats_display_width(stat_display["mem"], without_option=True)
stats_width = sum(itervalues(plugin_widths)) + 1
self.space_between_column = max(1, int((self.screen.getmaxyx()[1] - stats_width) / (stats_number - 1)))
# No space again ? Remove optionnal CPU stats
if self.space_between_column < 3:
plugin_display_optional['cpu'] = False
if self.args.disable_cpu:
plugin_widths['cpu'] = 0
else:
plugin_widths['cpu'] = self.get_stats_display_width(stat_display["cpu"], without_option=True)
stats_width = sum(itervalues(plugin_widths)) + 1
self.space_between_column = max(1, int((self.screen.getmaxyx()[1] - stats_width) / (stats_number - 1)))
for p in ['mem', 'cpu']:
# No space ? Remove optional stats
if self.space_between_column < 3:
plugin_display_optional[p] = False
plugin_widths[p] = self.get_stats_display_width(stat_display[p], without_option=True) if hasattr(self.args, 'disable_' + p) else 0
stats_width = sum(itervalues(plugin_widths)) + 1
self.space_between_column = max(1, int((self.screen.getmaxyx()[1] - stats_width) / (stats_number - 1)))
else:
self.space_between_column = 0