diff -r 0e5421d679e7 -r ea526b78ee6c Debugger/DebugViewer.py --- a/Debugger/DebugViewer.py Tue Mar 07 18:46:09 2017 +0100 +++ b/Debugger/DebugViewer.py Tue Mar 07 18:53:18 2017 +0100 @@ -362,37 +362,37 @@ """ self.callTraceViewer.setProjectMode(enabled) - def showVariables(self, vlist, globals): + def showVariables(self, vlist, showGlobals): """ Public method to show the variables in the respective window. @param vlist list of variables to display - @param globals flag indicating global/local state + @param showGlobals flag indicating global/local state """ - if globals: + if showGlobals: self.globalsViewer.showVariables(vlist, self.framenr) else: self.localsViewer.showVariables(vlist, self.framenr) - def showVariable(self, vlist, globals): + def showVariable(self, vlist, showGlobals): """ Public method to show the variables in the respective window. @param vlist list of variables to display - @param globals flag indicating global/local state + @param showGlobals flag indicating global/local state """ - if globals: + if showGlobals: self.globalsViewer.showVariable(vlist) else: self.localsViewer.showVariable(vlist) - def showVariablesTab(self, globals): + def showVariablesTab(self, showGlobals): """ Public method to make a variables tab visible. - @param globals flag indicating global/local state + @param showGlobals flag indicating global/local state """ - if globals: + if showGlobals: self.__tabWidget.setCurrentWidget(self.glvWidget) else: self.__tabWidget.setCurrentWidget(self.lvWidget) @@ -465,16 +465,16 @@ """ Public slot to set the global variable filter. """ - filter = self.globalsFilterEdit.text() - self.debugServer.remoteClientSetFilter(1, filter) + filterStr = self.globalsFilterEdit.text() + self.debugServer.remoteClientSetFilter(1, filterStr) self.debugServer.remoteClientVariables(2, self.globalsFilter) def setLocalsFilter(self): """ Public slot to set the local variable filter. """ - filter = self.localsFilterEdit.text() - self.debugServer.remoteClientSetFilter(0, filter) + filterStr = self.localsFilterEdit.text() + self.debugServer.remoteClientSetFilter(0, filterStr) if self.currentStack: self.debugServer.remoteClientVariables( 0, self.localsFilter, self.framenr)