eric: comparison eric6/Debugger/DebugViewer.py

-:e04b7a25e241
+:322d1ee01510
 """
 sourceFile = pyqtSignal(str, int)
 preferencesChanged = pyqtSignal()
 ThreadIdRole = Qt.UserRole + 1
+DebuggerStateRole = Qt.UserRole + 2
 def __init__(self, debugServer, parent=None):
 """
 Constructor
 # add the viewer showing the connected debug backends
 self.__debuggersWidget = QWidget()
 self.__debuggersLayout = QVBoxLayout(self.__debuggersWidget)
 self.__debuggersLayout.setContentsMargins(0, 0, 0, 0)
-self.__debuggersLayout.addWidget(QLabel(self.tr("Debuggers:")))
+self.__debuggersLayout.addWidget(
+QLabel(self.tr("Debuggers and Threads:")))
 self.__debuggersList = QTreeWidget()
 self.__debuggersList.setHeaderLabels(
 [self.tr("ID"), self.tr("State"), ""])
 self.__debuggersList.header().setStretchLastSection(True)
 self.__debuggersList.setSortingEnabled(True)
-self.__debuggersList.setRootIsDecorated(False)
+self.__debuggersList.setRootIsDecorated(True)
 self.__debuggersList.setAlternatingRowColors(True)
 self.__debuggersLayout.addWidget(self.__debuggersList)
 self.__mainSplitter.addWidget(self.__debuggersWidget)
 self.__debuggersList.currentItemChanged.connect(
 index,
 self.tr("Shows a code disassembly in case of an exception."))
 self.__tabWidget.setCurrentWidget(self.glvWidget)
-# add the threads viewer
+self.__doDebuggersListUpdate = True
-self.__threadWidget = QWidget()
-self.__threadWidgetLayout = QVBoxLayout(self.__threadWidget)
+self.__mainSplitter.setSizes([100, 700])
-self.__threadWidgetLayout.setContentsMargins(0, 0, 0, 0)
-self.__threadWidgetLayout.addWidget(QLabel(self.tr("Threads:")))
-self.__threadList = QTreeWidget()
-self.__threadList.setHeaderLabels(
-[self.tr("Name"), self.tr("State"), ""])
-self.__threadList.setSortingEnabled(True)
-self.__threadList.setRootIsDecorated(False)
-self.__threadList.setAlternatingRowColors(True)
-self.__threadWidgetLayout.addWidget(self.__threadList)
-self.__mainSplitter.addWidget(self.__threadWidget)
-self.__doThreadListUpdate = True
-self.__threadList.currentItemChanged.connect(self.__threadSelected)
-self.__mainSplitter.setSizes([50, 700, 50])
 self.currentStack = None
 self.framenr = 0
 self.__autoViewSource = Preferences.getDebugger("AutoViewSourceCode")
 self.sourceButton.setVisible(not self.__autoViewSource)
-# connect somer debug server signals
+# connect some debug server signals
 self.debugServer.clientStack.connect(
 self.handleClientStack)
 self.debugServer.clientThreadList.connect(
-self.showThreadList)
+self.__addThreadList)
 self.debugServer.clientDebuggerId.connect(
 self.__clientDebuggerId)
 self.debugServer.passiveDebugStarted.connect(
 self.handleDebuggingStarted)
 self.debugServer.clientLine.connect(
 self.setGlobalsFilter()
 self.setLocalsFilter()
 self.sourceButton.setEnabled(False)
 self.currentStack = None
 self.stackComboBox.clear()
-self.__threadList.clear()
 self.__tabWidget.setCurrentWidget(self.glvWidget)
 self.breakpointViewer.handleResetUI()
 self.__debuggersList.clear()
 self.disassemblyViewer.clear()
 self.setGlobalsFilter()
 self.setLocalsFilter()
 self.sourceButton.setEnabled(False)
 self.currentStack = None
 self.stackComboBox.clear()
-self.__threadList.clear()
 self.__removeDebugger(debuggerId)
 def __clientSyntaxError(self, message, filename, lineNo, characterNo,
 debuggerId):
 @param widget reference to the widget
 @type QWidget
 """
 self.__tabWidget.setCurrentWidget(widget)
-def showThreadList(self, currentID, threadList, debuggerId):
+def __callStackFrameSelected(self, frameNo):
 """
-Public method to show the thread list.
+Private slot to handle the selection of a call stack entry of the
+call stack viewer.
+@param frameNo frame number (index) of the selected entry
+@type int
+"""
+if frameNo >= 0:
+self.stackComboBox.setCurrentIndex(frameNo)
+def __debuggerSelected(self, current, previous):
+"""
+Private slot to handle the selection of a debugger backend in the
+debuggers list.
+@param current reference to the new current item
+@type QTreeWidgetItem
+@param previous reference to the previous current item
+@type QTreeWidgetItem
+"""
+if current is not None and self.__doDebuggersListUpdate:
+if current.parent() is None:
+# it is a debugger item
+debuggerId = current.text(0)
+self.globalsViewer.handleResetUI()
+self.localsViewer.handleResetUI()
+self.currentStack = None
+self.stackComboBox.clear()
+self.callStackViewer.clear()
+self.debugUI.getDebuggerData(debuggerId)
+self.debugUI.setDebugActionsEnabled(
+self.getSelectedDebuggerState() != "running")
+self.__showSource()
+else:
+# it is a thread item
+tid = current.data(0, self.ThreadIdRole)
+self.debugServer.remoteSetThread(
+self.getSelectedDebuggerId(), tid)
+def __clientDebuggerId(self, debuggerId):
+"""
+Private slot to receive the ID of a newly connected debugger backend.
+@param debuggerId ID of a newly connected debugger backend
+@type str
+"""
+itm = QTreeWidgetItem(self.__debuggersList, [debuggerId])
+if self.__debuggersList.topLevelItemCount() > 1:
+self.debugUI.showNotification(
+self.tr("<p>Debugger with ID <b>{0}</b> has been connected."
+"</p>")
+.format(debuggerId))
+self.__debuggersList.header().resizeSections(
+QHeaderView.ResizeToContents)
+if self.__debuggersList.topLevelItemCount() == 1:
+# it is the only item, select it as the current one
+self.__debuggersList.setCurrentItem(itm)
+def __setCurrentDebugger(self, debuggerId):
+"""
+Private method to set the current debugger based on the given ID.
+@param debuggerId ID of the debugger to set as current debugger
+@type str
+"""
+debuggerItems = self.__debuggersList.findItems(
+debuggerId, Qt.MatchExactly)
+if debuggerItems:
+debuggerItem = debuggerItems[0]
+currentItem = self.__debuggersList.currentItem()
+if currentItem is debuggerItem:
+# nothing to do
+return
+currentParent = currentItem.parent()
+if currentParent is None:
+# current is a debugger item
+self.__debuggersList.setCurrentItem(debuggerItem)
+elif currentParent is debuggerItem:
+# nothing to do
+return
+else:
+self.__debuggersList.setCurrentItem(debuggerItem)
+def isOnlyDebugger(self):
+"""
+Public method to test, if only one debugger is connected.
+@return flag indicating that only one debugger is connected
+@rtype bool
+"""
+return self.__debuggersList.topLevelItemCount() == 1
+def getSelectedDebuggerId(self):
+"""
+Public method to get the currently selected debugger ID.
+@return selected debugger ID
+@rtype str
+"""
+itm = self.__debuggersList.currentItem()
+if itm:
+if itm.parent() is None:
+# it is a debugger item
+return itm.text(0)
+else:
+# it is a thread item
+return itm.parent().text(0)
+else:
+return ""
+def getSelectedDebuggerState(self):
+"""
+Public method to get the currently selected debugger's state.
+@return selected debugger's state (broken, exception, running)
+@rtype str
+"""
+itm = self.__debuggersList.currentItem()
+if itm:
+if itm.parent() is None:
+# it is a debugger item
+return itm.data(0, self.DebuggerStateRole)
+else:
+# it is a thread item
+return itm.parent().data(0, self.DebuggerStateRole)
+else:
+return ""
+def __setDebuggerIconAndState(self, debuggerId, iconName, 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 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:
+debuggerItem.setIcon(0, UI.PixmapCache.getIcon(iconName))
+debuggerItem.setData(0, self.DebuggerStateRole, state)
+if state == "broken":
+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):
+"""
+Private method to remove a debugger given its ID.
+@param debuggerId ID of the debugger to be removed from the list
+@type str
+"""
+foundItems = self.__debuggersList.findItems(
+debuggerId, Qt.MatchExactly)
+if foundItems:
+index = self.__debuggersList.indexOfTopLevelItem(foundItems[0])
+itm = self.__debuggersList.takeTopLevelItem(index)
+# __IGNORE_WARNING__
+del itm
+def __addThreadList(self, currentID, threadList, debuggerId):
+"""
+Private method to add the list of threads to a debugger entry.
 @param currentID id of the current thread
 @type int
 @param threadList list of dictionaries containing the thread data
 @type list of dict
 @param debuggerId ID of the debugger backend
 @type str
 """
 debugStatus = -1    # i.e. running
-if debuggerId == self.getSelectedDebuggerId():
+debuggerItems = self.__debuggersList.findItems(
-citm = None
+debuggerId, Qt.MatchExactly)
+if debuggerItems:
-self.__threadList.clear()
+debuggerItem = debuggerItems[0]
+currentItem = self.__debuggersList.currentItem()
+if currentItem.parent() is debuggerItem:
+currentChild = currentItem.text(0)
+else:
+currentChild = ""
+self.__doDebuggersListUpdate = False
+debuggerItem.takeChildren()
 for thread in threadList:
 if thread.get('except', False):
 state = self.tr("waiting at exception")
 icon = "exceptions"
 debugStatus = 1
 if debugStatus < 1:
 debugStatus = 0
 else:
 state = self.tr("running")
 icon = "mediaPlaybackStart"
-itm = QTreeWidgetItem(self.__threadList,
+itm = QTreeWidgetItem(debuggerItem, [thread['name'], state])
-[thread['name'], state])
 itm.setData(0, self.ThreadIdRole, thread['id'])
 itm.setIcon(0, UI.PixmapCache.getIcon(icon))
+if currentChild == thread['name']:
+self.__debuggersList.setCurrentItem(itm)
 if thread['id'] == currentID:
-citm = itm
+font = debuggerItem.font(0)
+font.setItalic(True)
-self.__threadList.header().resizeSections(
+itm.setFont(0, font)
-QHeaderView.ResizeToContents)
-self.__threadList.header().setStretchLastSection(True)
+debuggerItem.setExpanded(debuggerItem.childCount() > 0)
-if citm:
-self.__doThreadListUpdate = False
-self.__threadList.setCurrentItem(citm)
-self.__doThreadListUpdate = True
-else:
-for thread in threadList:
-if thread.get('except', False):
-debugStatus = 1
-elif thread['broken']:
-if debugStatus < 1:
-debugStatus = 0
-if debugStatus == -1:
-icon = "mediaPlaybackStart"
-state = "running"
-elif debugStatus == 0:
-icon = "break"
-state = "broken"
-else:
-icon = "exceptions"
-state = "exception"
-self.__setDebuggerIconAndState(debuggerId, icon, state)
-def __threadSelected(self, current, previous):
-"""
-Private slot to handle the selection of a thread in the thread list.
-@param current reference to the new current item
-@type QTreeWidgetItem
-@param previous reference to the previous current item
-@type QTreeWidgetItem
-"""
-if current is not None and self.__doThreadListUpdate:
-tid = current.data(0, self.ThreadIdRole)
-self.debugServer.remoteSetThread(self.getSelectedDebuggerId(), tid)
-def __callStackFrameSelected(self, frameNo):
-"""
-Private slot to handle the selection of a call stack entry of the
-call stack viewer.
-@param frameNo frame number (index) of the selected entry
-@type int
-"""
-if frameNo >= 0:
-self.stackComboBox.setCurrentIndex(frameNo)
-def __debuggerSelected(self, current, previous):
-"""
-Private slot to handle the selection of a debugger backend in the
-debuggers list.
-@param current reference to the new current item
-@type QTreeWidgetItem
-@param previous reference to the previous current item
-@type QTreeWidgetItem
-"""
-if current is not None:
-debuggerId = current.text(0)
-else:
-debuggerId = ""
-if debuggerId:
-self.globalsViewer.handleResetUI()
-self.localsViewer.handleResetUI()
-self.currentStack = None
-self.stackComboBox.clear()
-self.__threadList.clear()
-self.callStackViewer.clear()
-self.debugUI.getDebuggerData(debuggerId)
-self.debugUI.setDebugActionsEnabled(
-self.getSelectedDebuggerState() != "running")
-self.__showSource()
-def __clientDebuggerId(self, debuggerId):
-"""
-Private slot to receive the ID of a newly connected debugger backend.
-@param debuggerId ID of a newly connected debugger backend
-@type str
-"""
-itm = QTreeWidgetItem(self.__debuggersList, [debuggerId])
-if self.__debuggersList.topLevelItemCount() > 1:
-self.debugUI.showNotification(
-self.tr("<p>Debugger with ID <b>{0}</b> has been connected."
-"</p>")
-.format(debuggerId))
-self.__debuggersList.header().resizeSections(
-QHeaderView.ResizeToContents)
-if self.__debuggersList.topLevelItemCount() == 1:
-# it is the only item, select it as the current one
-self.__debuggersList.setCurrentItem(itm)
-def __setCurrentDebugger(self, debuggerId):
-"""
-Private method to set the current debugger based on the given ID.
-@param debuggerId ID of the debugger to set as current debugger
-@type str
-"""
-foundItems = self.__debuggersList.findItems(debuggerId,
-Qt.MatchExactly)
-if foundItems:
-self.__debuggersList.setCurrentItem(foundItems[0])
-def isOnlyDebugger(self):
-"""
-Public method to test, if only one debugger is connected.
-@return flag indicating that only one debugger is connected
-@rtype bool
-"""
-return self.__debuggersList.topLevelItemCount() == 1
-def getSelectedDebuggerId(self):
-"""
-Public method to get the currently selected debugger ID.
-@return selected debugger ID
-@rtype str
-"""
-itm = self.__debuggersList.currentItem()
-if itm:
-return itm.text(0)
-else:
-return ""
-def getSelectedDebuggerState(self):
-"""
-Public method to get the currently selected debugger's state.
-@return selected debugger's state (broken, exception, running)
-@rtype str
-"""
-itm = self.__debuggersList.currentItem()
-if itm:
-return itm.data(0, Qt.UserRole)
-else:
-return ""
-def __setDebuggerIconAndState(self, debuggerId, iconName, 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 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:
-debuggerItem.setIcon(0, UI.PixmapCache.getIcon(iconName))
-debuggerItem.setData(0, Qt.UserRole, state)
-if state == "broken":
-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)
+self.__debuggersList.header().setStretchLastSection(True)
-def __removeDebugger(self, debuggerId):
+self.__doDebuggersListUpdate = True
-"""
-Private method to remove a debugger given its ID.
+if debugStatus == -1:
+icon = "mediaPlaybackStart"
-@param debuggerId ID of the debugger to be removed from the list
+state = "running"
-@type str
+elif debugStatus == 0:
-"""
+icon = "break"
-foundItems = self.__debuggersList.findItems(
+state = "broken"
-debuggerId, Qt.MatchExactly)
+else:
-if foundItems:
+icon = "exceptions"
-index = self.__debuggersList.indexOfTopLevelItem(foundItems[0])
+state = "exception"
-itm = self.__debuggersList.takeTopLevelItem(index)
+self.__setDebuggerIconAndState(debuggerId, icon, state)
-# __IGNORE_WARNING__
-del itm

Mercurial Repositories > eric / file comparison

comparison: eric6/Debugger/DebugViewer.py

eric6/Debugger/DebugViewer.py