eric: comparison eric6/Debugger/DebugViewer.py

-:3a1ca2452c30
+:2971d5d19951
 """
 Module implementing a widget containing various debug related views.
 The views avaliable are:
 <ul>
-<li>selector showing all connected debugger backends</li>
+<li>selector showing all connected debugger backends with associated
+threads</li>
 <li>variables viewer for global variables for the selected debug client</li>
 <li>variables viewer for local variables for the selected debug client</li>
 <li>call stack viewer for the selected debug client</li>
 <li>call trace viewer</li>
 <li>viewer for breakpoints</li>
 <li>viewer for watch expressions</li>
 <li>viewer for exceptions</li>
-<li>viewer for threads for the selected debug client</li>
+<li>viewer for a code disassembly for an exception<li>
 </ul>
 """
 import os
-from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt
+from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QCoreApplication
 from PyQt5.QtWidgets import (
 QWidget, QVBoxLayout, QHBoxLayout, QLineEdit, QSizePolicy, QPushButton,
 QComboBox, QLabel, QTreeWidget, QTreeWidgetItem, QHeaderView, QSplitter
 )
 sourceFile = pyqtSignal(str, int)
 preferencesChanged = pyqtSignal()
 ThreadIdRole = Qt.UserRole + 1
 DebuggerStateRole = Qt.UserRole + 2
+# Map debug state to icon name
+StateIcon = {
+"broken": "break",
+"exception": "exceptions",
+"running": "mediaPlaybackStart",
+"syntax": "syntaxError22",
+}
+# Map debug state to user message
+StateMessage = {
+"broken": QCoreApplication.translate(
+"DebugViewer", "waiting at breakpoint"),
+"exception": QCoreApplication.translate(
+"DebugViewer", "waiting at exception"),
+"running": QCoreApplication.translate(
+"DebugViewer", "running"),
+"syntax": QCoreApplication.translate(
+"DebugViewer", "syntax error"),
+}
 def __init__(self, debugServer, parent=None):
 """
 Constructor
 # just show base filename to make it readable
 s = (os.path.basename(s[0]), s[1], s[2])
 self.stackComboBox.addItem('{0}:{1}:{2}'.format(*s))
 self.stackComboBox.blockSignals(block)
-def __clientLine(self, fn, line, debuggerId):
+def __clientLine(self, fn, line, debuggerId, threadName):
 """
 Private method to handle a change to the current line.
 @param fn filename
 @type str
 @param line linenumber
 @type int
 @param debuggerId ID of the debugger backend
 @type str
-"""
+@param threadName name of the thread signaling the event
-self.__setDebuggerIconAndState(debuggerId, "break", "broken")
+@type str
+"""
+self.__setDebuggerIconAndState(debuggerId, "broken")
+self.__setThreadIconAndState(debuggerId, threadName, "broken")
 if debuggerId != self.getSelectedDebuggerId():
 self.__setCurrentDebugger(debuggerId)
 @pyqtSlot(str, int, str, bool, str)
 def __clientExit(self, program, status, message, quiet, debuggerId):
 self.stackComboBox.clear()
 self.__removeDebugger(debuggerId)
 def __clientSyntaxError(self, message, filename, lineNo, characterNo,
-debuggerId):
+debuggerId, threadName):
 """
 Private method to handle a syntax error in the debugged program.
 @param message message of the syntax error
 @type str
 @type int
 @param characterNo character number of the syntax error position
 @type int
 @param debuggerId ID of the debugger backend
 @type str
-"""
+@param threadName name of the thread signaling the event
-self.__setDebuggerIconAndState(debuggerId, "syntaxError22",
+@type str
-"exception")
+"""
+self.__setDebuggerIconAndState(debuggerId, "syntax")
+self.__setThreadIconAndState(debuggerId, threadName, "syntax")
 def __clientException(self, exceptionType, exceptionMessage, stackTrace,
-debuggerId):
+debuggerId, threadName):
 """
 Private method to handle an exception of the debugged program.
 @param exceptionType type of exception raised
 @type str
 @type (str
 @param stackTrace list of stack entries
 @type list of str
 @param debuggerId ID of the debugger backend
 @type str
-"""
+@param threadName name of the thread signaling the event
-self.__setDebuggerIconAndState(debuggerId, "exceptions", "exception")
+@type str
+"""
+self.__setDebuggerIconAndState(debuggerId, "exception")
+self.__setThreadIconAndState(debuggerId, threadName, "exception")
 def setVariablesFilter(self, globalsFilter, localsFilter):
 """
 Public slot to set the local variables filter.
 # it is a thread item
 return itm.parent().data(0, self.DebuggerStateRole)
 else:
 return ""
-def __setDebuggerIconAndState(self, debuggerId, iconName, state):
+def __setDebuggerIconAndState(self, debuggerId, state):
 """
 Private method to set the icon for a specific debugger ID.
 @param debuggerId ID of the debugger backend (empty ID means the
 currently selected one)
-@type str
-@param iconName name of the icon to be used
 @type str
 @param state state of the debugger (broken, exception, running)
 @type str
 """
 debuggerItem = None
 if foundItems:
 debuggerItem = foundItems[0]
 if debuggerItem is None:
 debuggerItem = self.__debuggersList.currentItem()
 if debuggerItem is not None:
+try:
+iconName = DebugViewer.StateIcon[state]
+except KeyError:
+iconName = "question"
+try:
+stateText = DebugViewer.StateMessage[state]
+except KeyError:
+stateText = self.tr("unknown state ({0})").format(state)
 debuggerItem.setIcon(0, UI.PixmapCache.getIcon(iconName))
 debuggerItem.setData(0, self.DebuggerStateRole, state)
-if state == "broken":
+debuggerItem.setText(1, stateText)
-debuggerItem.setText(1, self.tr("waiting at breakpoint"))
-elif state == "exception":
-debuggerItem.setText(1, self.tr("waiting at exception"))
-elif state == "running":
-debuggerItem.setText(1, self.tr("running"))
-else:
-debuggerItem.setText(
-1, self.tr("unknown state ({0})").format(state))
 self.__debuggersList.header().resizeSections(
 QHeaderView.ResizeToContents)
 def __removeDebugger(self, debuggerId):
 currentChild = ""
 self.__doDebuggersListUpdate = False
 debuggerItem.takeChildren()
 for thread in threadList:
 if thread.get('except', False):
-state = self.tr("waiting at exception")
+stateText = DebugViewer.StateMessage["exception"]
-icon = "exceptions"
+iconName = DebugViewer.StateIcon["exception"]
 debugStatus = 1
 elif thread['broken']:
-state = self.tr("waiting at breakpoint")
+stateText = DebugViewer.StateMessage["broken"]
-icon = "break"
+iconName = DebugViewer.StateIcon["broken"]
 if debugStatus < 1:
 debugStatus = 0
 else:
-state = self.tr("running")
+stateText = DebugViewer.StateMessage["running"]
-icon = "mediaPlaybackStart"
+iconName = DebugViewer.StateIcon["running"]
-itm = QTreeWidgetItem(debuggerItem, [thread['name'], state])
+itm = QTreeWidgetItem(debuggerItem,
+[thread['name'], stateText])
 itm.setData(0, self.ThreadIdRole, thread['id'])
-itm.setIcon(0, UI.PixmapCache.getIcon(icon))
+itm.setIcon(0, UI.PixmapCache.getIcon(iconName))
 if currentChild == thread['name']:
 self.__debuggersList.setCurrentItem(itm)
 if thread['id'] == currentID:
 font = debuggerItem.font(0)
 font.setItalic(True)
 QHeaderView.ResizeToContents)
 self.__debuggersList.header().setStretchLastSection(True)
 self.__doDebuggersListUpdate = True
 if debugStatus == -1:
-icon = "mediaPlaybackStart"
+debuggerState = "running"
-state = "running"
 elif debugStatus == 0:
-icon = "break"
+debuggerState = "broken"
-state = "broken"
 else:
-icon = "exceptions"
+debuggerState = "exception"
-state = "exception"
+self.__setDebuggerIconAndState(debuggerId, debuggerState)
-self.__setDebuggerIconAndState(debuggerId, icon, state)
+def __setThreadIconAndState(self, debuggerId, threadName, state):
+"""
+Private method to set the icon for a specific thread name and
+debugger ID.
+@param debuggerId ID of the debugger backend (empty ID means the
+currently selected one)
+@type str
+@param threadName name of the thread signaling the event
+@type str
+@param state state of the debugger (broken, exception, running)
+@type str
+"""
+debuggerItem = None
+if debuggerId:
+foundItems = self.__debuggersList.findItems(
+debuggerId, Qt.MatchExactly)
+if foundItems:
+debuggerItem = foundItems[0]
+if debuggerItem is None:
+debuggerItem = self.__debuggersList.currentItem()
+if debuggerItem is not None:
+for index in range(debuggerItem.childCount()):
+childItem = debuggerItem.child(index)
+if childItem.text(0) == threadName:
+break
+else:
+childItem = None
+if childItem is not None:
+try:
+iconName = DebugViewer.StateIcon[state]
+except KeyError:
+iconName = "question"
+try:
+stateText = DebugViewer.StateMessage[state]
+except KeyError:
+stateText = self.tr("unknown state ({0})").format(state)
+childItem.setIcon(0, UI.PixmapCache.getIcon(iconName))
+childItem.setText(1, stateText)
+self.__debuggersList.header().resizeSections(
+QHeaderView.ResizeToContents)

Mercurial Repositories > eric / file comparison

comparison: eric6/Debugger/DebugViewer.py

eric6/Debugger/DebugViewer.py