eric: comparison eric6/Debugger/DebugUI.py

-:cc920e534ac0
+:72a72fd56494
 """
 import os
-from PyQt5.QtCore import pyqtSignal, QObject, Qt
+from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, Qt
 from PyQt5.QtGui import QKeySequence
 from PyQt5.QtWidgets import QMenu, QToolBar, QApplication, QDialog
 from UI.Info import Program
 if self.ui.getViewProfile() != "debug":
 self.ui.setDebugProfile()
 self.viewmanager.setFileLine(fn, line)
 if not forStack:
 self.__getThreadList()
-self.__getClientVariables()
+self.__getClientVariables(debuggerId)
 self.debugActGrp.setEnabled(True)
+@pyqtSlot(int, str, bool)
 def __clientExit(self, status, message, quiet):
 """
 Private method to handle the debugged program terminating.
 @param status exit code of the debugged program
 ' <b>{1}</b> at line <b>{2}</b>, character <b>{3}</b>.'
 '</p>')
 .format(filename, message, lineNo, characterNo))
 def __clientException(self, exceptionType, exceptionMessage, stackTrace,
-debuggerId=""):
+debuggerId):
 """
 Private method to handle an exception of the debugged program.
 @param exceptionType type of exception raised
 @type str
 self.exceptionInterrupt.emit()
 stack = []
 for fn, ln, func, args in stackTrace:
 stack.append((fn, ln, func, args))
 self.clientStack.emit(stack, debuggerId)
-self.__getClientVariables()
+self.__getClientVariables(debuggerId)
 self.ui.setDebugProfile()
 self.debugActGrp.setEnabled(True)
 return
 elif res == E5MessageBox.Ignore:
 if exceptionType not in self.excIgnoreList:
 else:
 self.debugActions[self.lastAction]()
 else:
 self.__continue()
-def __clientSignal(self, message, filename, lineNo, funcName, funcArgs):
+def __clientSignal(self, message, filename, lineNo, funcName, funcArgs,
+debuggerId):
 """
 Private method to handle a signal generated on the client side.
 @param message message of the syntax error
 @type str
 @type int
 @param funcName name of the function causing the signal
 @type str
 @param funcArgs function arguments
 @type str
+@param debuggerId ID of the debugger backend
+@type str
 """
 self.ui.raise_()
 self.ui.activateWindow()
 QApplication.processEvents()
 self.viewmanager.setFileLine(filename, lineNo, True)
 Private method to get the list of threads from the client.
 @param debuggerId ID of the debugger backend
 @type str
 """
-self.debugServer.remoteThreadList(debuggerId=debuggerId)
+self.debugServer.remoteThreadList(debuggerId)
-def __clientThreadSet(self):
+def __clientThreadSet(self, debuggerId):
 """
 Private method to handle a change of the client's current thread.
-"""
-self.debugServer.remoteClientVariables(0, self.localsVarFilter)
+@param debuggerId ID of the debugger backend
+@type str
-def __getClientVariables(self, debuggerId=""):
+"""
+self.debugServer.remoteClientVariables(
+debuggerId, 0, self.localsVarFilter)
+def __getClientVariables(self, debuggerId):
 """
 Private method to request the global and local variables.
 In the first step, the global variables are requested from the client.
 Once these have been received, the local variables are requested.
 @param debuggerId ID of the debugger backend
 @type str
 """
 # get globals first
-self.debugServer.remoteClientVariables(1, self.globalsVarFilter,
+self.debugServer.remoteClientVariables(
-debuggerId=debuggerId)
+debuggerId, 1, self.globalsVarFilter)
 # the local variables are requested once we have received the globals
-def __clientVariables(self, scope, variables):
+def __clientVariables(self, scope, variables, debuggerId):
 """
 Private method to write the clients variables to the user interface.
 @param scope scope of the variables (-1 = empty locals, 1 = global,
 0 = local)
+@type int
 @param variables the list of variables from the client
-"""
+@type list
-self.ui.activateDebugViewer()
+@param debuggerId ID of the debugger backend
-if scope > 0:
+@type str
-self.debugViewer.showVariables(variables, True)
+"""
-if scope == 1:
+if debuggerId == self.getSelectedDebuggerId():
-# now get the local variables
+self.ui.activateDebugViewer()
-self.debugServer.remoteClientVariables(0, self.localsVarFilter)
+if scope > 0:
-elif scope == 0:
+self.debugViewer.showVariables(variables, True)
-self.debugViewer.showVariables(variables, False)
+if scope == 1:
-elif scope == -1:
+# now get the local variables
-vlist = [(self.tr('No locals available.'), '', '')]
+self.debugServer.remoteClientVariables(
-self.debugViewer.showVariables(vlist, False)
+self.getSelectedDebuggerId(),
+0, self.localsVarFilter)
-def __clientVariable(self, scope, variables):
+elif scope == 0:
+self.debugViewer.showVariables(variables, False)
+elif scope == -1:
+vlist = [(self.tr('No locals available.'), '', '')]
+self.debugViewer.showVariables(vlist, False)
+def __clientVariable(self, scope, variables, debuggerId):
 """
 Private method to write the contents of a clients classvariable to
 the user interface.
-@param scope scope of the variables (-1 = empty global, 1 = global,
+@param scope scope of the variables (-1 = empty locals, 1 = global,
 0 = local)
-@param variables the list of members of a classvariable from the client
+@type int
-"""
+@param variables the list of variables from the client
-self.ui.activateDebugViewer()
+@type list
-if scope == 1:
+@param debuggerId ID of the debugger backend
-self.debugViewer.showVariable(variables, True)
+@type str
-elif scope == 0:
+"""
-self.debugViewer.showVariable(variables, False)
+if debuggerId == self.getSelectedDebuggerId():
+self.ui.activateDebugViewer()
+if scope == 1:
+self.debugViewer.showVariable(variables, True)
+elif scope == 0:
+self.debugViewer.showVariable(variables, False)
 def __clientBreakConditionError(self, filename, lineno):
 """
 Private method to handle a condition error of a breakpoint.
 """
 Private method to handle the Continue action.
 """
 self.lastAction = 0
 self.__enterRemote()
-self.debugServer.remoteContinue()
+self.debugServer.remoteContinue(self.getSelectedDebuggerId())
 self.__getThreadList()
 def __specialContinue(self):
 """
 Private method to handle the Special Continue action.
 """
 self.lastAction = 2
 self.__enterRemote()
-self.debugServer.remoteContinue(1)
+self.debugServer.remoteContinue(self.getSelectedDebuggerId(), 1)
 self.__getThreadList()
 def __step(self):
 """
 Private method to handle the Step action.
 """
 self.lastAction = 1
 self.__enterRemote()
-self.debugServer.remoteStep()
+self.debugServer.remoteStep(self.getSelectedDebuggerId())
 def __stepOver(self):
 """
 Private method to handle the Step Over action.
 """
 self.lastAction = 2
 self.__enterRemote()
-self.debugServer.remoteStepOver()
+self.debugServer.remoteStepOver(self.getSelectedDebuggerId())
 self.__getThreadList()
 def __stepOut(self):
 """
 Private method to handle the Step Out action.
 """
 self.lastAction = 3
 self.__enterRemote()
-self.debugServer.remoteStepOut()
+self.debugServer.remoteStepOut(self.getSelectedDebuggerId())
 self.__getThreadList()
 def __stepQuit(self):
 """
 Private method to handle the Step Quit action.
 """
 self.lastAction = 4
 self.__enterRemote()
-self.debugServer.remoteStepQuit()
+self.debugServer.remoteStepQuit(self.getSelectedDebuggerId())
 self.__resetUI()
 def __runToCursor(self):
 """
 Private method to handle the Run to Cursor action.
 self.lastAction = 0
 aw = self.viewmanager.activeWindow()
 line = aw.getCursorPosition()[0] + 1
 self.__enterRemote()
 self.debugServer.remoteBreakpoint(
+self.getSelectedDebuggerId(),
 aw.getFileName(), line, 1, None, 1)
-self.debugServer.remoteContinue()
+self.debugServer.remoteContinue(self.getSelectedDebuggerId())
 self.__getThreadList()
 def __moveInstructionPointer(self):
 """
 Private method to move the instruction pointer to a different line.
 """
 self.lastAction = 0
 aw = self.viewmanager.activeWindow()
 line = aw.getCursorPosition()[0] + 1
-self.debugServer.remoteMoveIP(line)
+self.debugServer.remoteMoveIP(self.getSelectedDebuggerId(), line)
 def __enterRemote(self):
 """
 Private method to update the user interface.
 @type str
 """
 self.debugServer.remoteClientStack(debuggerId)
 self.__getThreadList(debuggerId)
 self.__getClientVariables(debuggerId)
+def getSelectedDebuggerId(self):
+"""
+Public method to get the currently selected debugger ID.
+@return selected debugger ID
+@rtype str
+"""
+return self.debugViewer.getSelectedDebuggerId()

Mercurial Repositories > eric / file comparison

comparison: eric6/Debugger/DebugUI.py

eric6/Debugger/DebugUI.py