Merge pull request #992 from nclsHart/gpu-plugin-shortcuts

add gpu plugin shortcuts

glances/outputs/static/html/help.html

@@ -58,6 +58,10 @@
     <div class="col-sm-12 col-lg-6">{{help.enable_disable_process_stats}}</div>
     <div class="col-sm-12 col-lg-6">{{help.show_hide_irq}}</div>
 </div>
+<div class="row">
+    <div class="col-sm-12 col-lg-6">{{help.enable_disable_gpu}}</div>
+    <div class="col-sm-12 col-lg-6">{{help.enable_disable_mean_gpu}}</div>
+</div>
 <div class="row">
     <div class="col-sm-12 col-lg-6">{{help.enable_disable_quick_look}}</div>
     <div class="col-sm-12 col-lg-6"></div>

glances/outputs/static/html/stats.html

@@ -35,7 +35,7 @@
         <div class="col-sm-6 col-md-4 col-lg-3" ng-if="!arguments.disable_mem">
             <section id="mem" class="plugin" ng-include src="'plugins/mem.html'"></section>
         </div>
-        <div class="hidden-xs hidden-sm col-md-4 col-lg-3" ng-if="!arguments.disable_mem && statsGpu.gpus.length == 0">
+        <div class="hidden-xs hidden-sm col-md-4 col-lg-3" ng-if="!arguments.disable_mem && !(!arguments.disable_gpu && statsGpu.gpus.length > 0)">
             <section id="mem_more" class="plugin" ng-include src="'plugins/mem_more.html'"></section>
         </div>
         <div class="col-sm-6 col-md-4 col-lg-3" ng-if="!arguments.disable_memswap">

glances/outputs/static/js/controllers.js

@@ -184,6 +184,10 @@ glancesApp.controller('statsController', function ($scope, $rootScope, $interval
                 // 6 => Enable/disable mean gpu
                 $scope.arguments.meangpu = !$scope.arguments.meangpu;
                 break;
+            case $event.shiftKey && $event.keyCode == keycodes.g:
+                // G => Enable/disable gpu
+                $scope.arguments.disable_gpu = !$scope.arguments.disable_gpu;
+                break;
             case $event.shiftKey && $event.keyCode == keycodes.FIVE:
                 $scope.arguments.disable_quicklook = !$scope.arguments.disable_quicklook;
                 $scope.arguments.disable_cpu = !$scope.arguments.disable_cpu;

glances/outputs/static/public/help.html

@@ -58,6 +58,10 @@
     <div class="col-sm-12 col-lg-6">{{help.enable_disable_process_stats}}</div>
     <div class="col-sm-12 col-lg-6">{{help.show_hide_irq}}</div>
 </div>
+<div class="row">
+    <div class="col-sm-12 col-lg-6">{{help.enable_disable_gpu}}</div>
+    <div class="col-sm-12 col-lg-6">{{help.enable_disable_mean_gpu}}</div>
+</div>
 <div class="row">
     <div class="col-sm-12 col-lg-6">{{help.enable_disable_quick_look}}</div>
     <div class="col-sm-12 col-lg-6"></div>

glances/outputs/static/public/js/main.min.js

@@ -216,6 +216,10 @@ glancesApp.controller('statsController', ["$scope", "$rootScope", "$interval", "
                 // 6 => Enable/disable mean gpu
                 $scope.arguments.meangpu = !$scope.arguments.meangpu;
                 break;
+            case $event.shiftKey && $event.keyCode == keycodes.g:
+                // G => Enable/disable gpu
+                $scope.arguments.disable_gpu = !$scope.arguments.disable_gpu;
+                break;
             case $event.shiftKey && $event.keyCode == keycodes.FIVE:
                 $scope.arguments.disable_quicklook = !$scope.arguments.disable_quicklook;
                 $scope.arguments.disable_cpu = !$scope.arguments.disable_cpu;

glances/outputs/static/public/stats.html

@@ -35,7 +35,7 @@
         <div class="col-sm-6 col-md-4 col-lg-3" ng-if="!arguments.disable_mem">
             <section id="mem" class="plugin" ng-include src="'plugins/mem.html'"></section>
         </div>
-        <div class="hidden-xs hidden-sm col-md-4 col-lg-3" ng-if="!arguments.disable_mem && statsGpu.gpus.length == 0">
+        <div class="hidden-xs hidden-sm col-md-4 col-lg-3" ng-if="!arguments.disable_mem && !(!arguments.disable_gpu && statsGpu.gpus.length > 0)">
             <section id="mem_more" class="plugin" ng-include src="'plugins/mem_more.html'"></section>
         </div>
         <div class="col-sm-6 col-md-4 col-lg-3" ng-if="!arguments.disable_memswap">

glances/plugins/glances_help.py

@@ -94,6 +94,8 @@ class Plugin(GlancesPlugin):
         self.view_data['show_hide_ip'] = msg_col2.format('I', 'Show/hide IP module')
         self.view_data['diskio_iops'] = msg_col2.format('B', 'Count/rate for Disk I/O')
         self.view_data['show_hide_top_menu'] = msg_col2.format('5', 'Show/hide top menu (QL, CPU, MEM, SWAP and LOAD)')
+        self.view_data['enable_disable_gpu'] = msg_col.format('G', 'Enable/disable gpu plugin')
+        self.view_data['enable_disable_mean_gpu'] = msg_col2.format('6', 'Enable/disable mean gpu')
         self.view_data['edit_pattern_filter'] = 'ENTER: Edit the process filter pattern'
 
     def get_view_data(self, args=None):
@@ -167,6 +169,9 @@ class Plugin(GlancesPlugin):
         ret.append(self.curse_add_line(self.view_data['enable_disable_short_processname']))
         ret.append(self.curse_add_line(self.view_data['show_hide_irq']))
         ret.append(self.curse_new_line())
+        ret.append(self.curse_add_line(self.view_data['enable_disable_gpu']))
+        ret.append(self.curse_add_line(self.view_data['enable_disable_mean_gpu']))
+        ret.append(self.curse_new_line())
         ret.append(self.curse_add_line(self.view_data['enable_disable_irix']))
         ret.append(self.curse_add_line(self.view_data['quit']))
         ret.append(self.curse_new_line())