Refresh the host monitor at startup and remember preference. (#671)

AcademySoftwareFoundation · Apr 30, 2020 · 4f815a6 · 4f815a6
1 parent a6c5a61
commit 4f815a6
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/cuegui/cuegui/HostMonitor.py b/cuegui/cuegui/HostMonitor.py
@@ -31,6 +31,7 @@
 
 log = cuegui.Logger.getLogger(__file__)
 
+
 FILTER_HEIGHT = 20
 
 
@@ -51,18 +52,21 @@ def __init__(self, parent):
 
         # This hlayout would contain any filter/control buttons
         hlayout = QtWidgets.QHBoxLayout()
-        self.__filterByHostNameSetup(hlayout)      # Menu to filter by host name
-        self.__filterAllocationSetup(hlayout)    # Menu to filter by allocation
-        self.__filterHardwareStateSetup(hlayout) # Menu to filter by hardware state
+        self.__filterByHostNameSetup(hlayout)     # Menu to filter by host name
+        self.__filterAllocationSetup(hlayout)     # Menu to filter by allocation
+        self.__filterHardwareStateSetup(hlayout)     # Menu to filter by hardware state
         hlayout.addStretch()
-        self.__refreshToggleCheckBoxSetup(hlayout) # Checkbox to disable auto refresh
-        self.__refreshButtonSetup(hlayout)         # Button to refresh
-        self.__clearButtonSetup(hlayout)           # Button to clear all filters
+        self.__refreshToggleCheckBoxSetup(hlayout)     # Checkbox to enable/disable auto refresh
+        self.__refreshButtonSetup(hlayout)     # Button to refresh
+        self.__clearButtonSetup(hlayout)     # Button to clear all filters
 
         self.layout().addLayout(hlayout)
         self.layout().addWidget(self.hostMonitorTree)
 
-        self.__viewHostsSetup()                  # For view_hosts signal
+        self.__viewHostsSetup()     # For view_hosts signal
+
+        if bool(int(QtGui.qApp.settings.value("AutoRefreshMonitorHost", 1))):     # For refresh on launch
+            self.updateRequest()
 
     def updateRequest(self):
         self.hostMonitorTree.updateRequest()
@@ -256,6 +260,7 @@ def __refreshToggleCheckBoxSetup(self, layout):
 
     def __refreshToggleCheckBoxHandle(self, state):
         self.hostMonitorTree.enableRefresh = bool(state)
+        QtGui.qApp.settings.setValue("AutoRefreshMonitorHost", int(bool(state)))
 
 # ==============================================================================
 # Button to refresh

diff --git a/cuegui/cuegui/HostMonitorTree.py b/cuegui/cuegui/HostMonitorTree.py
@@ -165,7 +165,7 @@ def __init__(self, parent):
         self.startTicksUpdate(40)
         # Don't start refreshing until the user sets a filter or hits refresh
         self.ticksWithoutUpdate = -1
-        self.enableRefresh = False
+        self.enableRefresh = bool(int(QtGui.qApp.settings.value("AutoRefreshMonitorHost", 1)))
 
     def tick(self):
         if self.ticksWithoutUpdate >= self.updateInterval and \

diff --git a/cuegui/cuegui/ProcMonitor.py b/cuegui/cuegui/ProcMonitor.py
@@ -30,6 +30,7 @@
 
 log = cuegui.Logger.getLogger(__file__)
 
+
 FILTER_HEIGHT = 20
 
 
@@ -50,19 +51,22 @@ def __init__(self, parent):
 
         # This hlayout would contain any filter/control buttons
         hlayout = QtWidgets.QHBoxLayout()
-        self.__filterByHostNameSetup(hlayout)   # Menu to filter by proc name
+        self.__filterByHostNameSetup(hlayout)     # Menu to filter by proc name
         hlayout.addStretch()
-        self.__refreshToggleCheckBoxSetup(hlayout) # Checkbox to disable auto refresh
-        self.__refreshButtonSetup(hlayout)    # Button to refresh
-        self.__clearButtonSetup(hlayout)      # Button to clear all filters
+        self.__refreshToggleCheckBoxSetup(hlayout)     # Checkbox to enable/disable auto refresh
+        self.__refreshButtonSetup(hlayout)     # Button to refresh
+        self.__clearButtonSetup(hlayout)     # Button to clear all filters
 
         self.layout().addLayout(hlayout)
         self.layout().addWidget(self.procMonitorTree)
 
-        self.__viewProcsSetup()               # For view_hosts signal
-        self.__hostDoubleClickedSetup()       # Views procs when a host is double clicked
+        self.__viewProcsSetup()     # For view_hosts signal
+        self.__hostDoubleClickedSetup()     # Views procs when a host is double clicked
 
-        self.__viewHostsSetup()               # For view_hosts signal
+        self.__viewHostsSetup()     # For view_hosts signal
+
+        if bool(int(QtGui.qApp.settings.value("AutoRefreshMonitorProc", 1))):     # For refresh on launch
+            self.updateRequest()
 
     def updateRequest(self):
         self.procMonitorTree.updateRequest()
@@ -120,6 +124,7 @@ def __refreshToggleCheckBoxSetup(self, layout):
 
     def __refreshToggleCheckBoxHandle(self, state):
         self.procMonitorTree.enableRefresh = bool(state)
+        QtGui.qApp.settings.setValue("AutoRefreshMonitorProc", int(bool(state)))
 
 # ==============================================================================
 # Button to refresh

diff --git a/cuegui/cuegui/ProcMonitorTree.py b/cuegui/cuegui/ProcMonitorTree.py
@@ -91,7 +91,7 @@ def __init__(self, parent):
         self.startTicksUpdate(40)
         # Don't start refreshing until the user sets a filter or hits refresh
         self.ticksWithoutUpdate = -1
-        self.enableRefresh = False
+        self.enableRefresh = bool(int(QtGui.qApp.settings.value("AutoRefreshMonitorProc", 1)))
 
     def tick(self):
         if self.ticksWithoutUpdate >= self.updateInterval and \