eric: comparison eric6/Debugger/DebugViewer.py

-:21df384d6150
+:cc920e534ac0
 """
 import os
-from PyQt5.QtCore import pyqtSignal
+from PyQt5.QtCore import pyqtSignal, Qt
 from PyQt5.QtWidgets import (
 QWidget, QVBoxLayout, QHBoxLayout, QLineEdit, QSizePolicy, QPushButton,
 QComboBox, QLabel, QTreeWidget, QTreeWidgetItem, QHeaderView, QFrame
 )
 self.__mainLayout = QVBoxLayout()
 self.__mainLayout.setContentsMargins(0, 0, 0, 0)
 self.setLayout(self.__mainLayout)
 # add the viewer showing the connected debug backends
-self.__debuggersLayout = QHBoxLayout(self)
+self.__debuggersLayout = QHBoxLayout()
 self.__debuggersLayout.addWidget(QLabel(self.tr("Debuggers:")))
 self.__debuggersCombo = QComboBox(self)
 self.__debuggersCombo.setSizePolicy(
 QSizePolicy.Expanding, QSizePolicy.Fixed)
 self.__debuggersLayout.addWidget(self.__debuggersCombo)
 self.__mainLayout.addLayout(self.__debuggersLayout)
-self.__debuggersCombo.currentTextChanged.connect(
+self.__debuggersCombo.currentIndexChanged[str].connect(
 self.__debuggerSelected)
 # add a line to separate debugger selector from debugger specific parts
 hline = QFrame(self)
 hline.setFrameStyle(QFrame.Sunken)
 self.__mainLayout.setStretchFactor(self.__threadList, 1)
 self.currentStack = None
 self.framenr = 0
-self.debugServer.clientStack.connect(self.handleClientStack)
 self.__autoViewSource = Preferences.getDebugger("AutoViewSourceCode")
 self.sourceButton.setVisible(not self.__autoViewSource)
+# connect somer debug server signals
+self.debugServer.clientStack.connect(
+self.handleClientStack)
+self.debugServer.clientThreadList.connect(
+self.showThreadList)
+self.debugServer.clientDebuggerIds.connect(
+self.showDebuggersList)
+self.debugServer.passiveDebugStarted.connect(
+self.handleDebuggingStarted)
+self.debugServer.clientLine.connect(
+self.__clientLine)
+self.debugServer.clientException.connect(
+self.exceptionLogger.addException)
+self.debugServer.passiveDebugStarted.connect(
+self.exceptionLogger.debuggingStarted)
+self.debugServer.clientLine.connect(
+self.breakpointViewer.highlightBreakpoint)
 def handlePreferencesChanged(self):
 """
 Public slot to handle the preferencesChanged signal.
 """
 self.__autoViewSource = Preferences.getDebugger("AutoViewSourceCode")
 Public method to set a reference to the Debug UI.
 @param debugUI reference to the DebugUI object (DebugUI)
 """
 self.debugUI = debugUI
+self.callStackViewer.setDebugger(debugUI)
+# connect some debugUI signals
 self.debugUI.clientStack.connect(self.handleClientStack)
-self.callStackViewer.setDebugger(debugUI)
+self.debugUI.debuggingStarted.connect(
+self.exceptionLogger.debuggingStarted)
+self.debugUI.debuggingStarted.connect(
+self.handleDebuggingStarted)
 def handleResetUI(self):
 """
 Public method to reset the SBVviewer.
 """
 self.globalsViewer.handleResetUI()
 if showGlobals:
 self.__tabWidget.setCurrentWidget(self.glvWidget)
 else:
 self.__tabWidget.setCurrentWidget(self.lvWidget)
-def handleClientStack(self, stack):
+def handleClientStack(self, stack, debuggerId):
 """
 Public slot to show the call stack of the program being debugged.
 @param stack list of tuples with call stack data (file name,
 line number, function name, formatted argument/values list)
-"""
+@type list of tuples of (str, str, str, str)
-block = self.stackComboBox.blockSignals(True)
+@param debuggerId ID of the debugger backend
-self.framenr = 0
+@type str
-self.stackComboBox.clear()
+"""
-self.currentStack = stack
+if debuggerId == self.__debuggersCombo.currentText():
-self.sourceButton.setEnabled(len(stack) > 0)
+block = self.stackComboBox.blockSignals(True)
-for s in stack:
+self.framenr = 0
-# just show base filename to make it readable
+self.stackComboBox.clear()
-s = (os.path.basename(s[0]), s[1], s[2])
+self.currentStack = stack
-self.stackComboBox.addItem('{0}:{1}:{2}'.format(*s))
+self.sourceButton.setEnabled(len(stack) > 0)
-self.stackComboBox.blockSignals(block)
+for s in stack:
+# 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):
+"""
+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
+"""
+if debuggerId:
+index = self.__debuggersCombo.findText(debuggerId, Qt.MatchExactly)
+if index >= 0:
+self.__debuggersCombo.setItemIcon(
+index, UI.PixmapCache.getIcon("exceptions.png"))
 def setVariablesFilter(self, globalsFilter, localsFilter):
 """
 Public slot to set the local variables filter.
 @param globalsFilter filter list for global variable types
 @param widget reference to the widget (QWidget)
 """
 self.__tabWidget.setCurrentWidget(widget)
-def showThreadList(self, currentID, threadList):
+def showThreadList(self, currentID, threadList, debuggerId):
 """
 Public method to show the thread list.
-@param currentID id of the current thread (integer)
+@param currentID id of the current thread
+@type int
 @param threadList list of dictionaries containing the thread data
-"""
+@type list of dict
-citm = None
+@param debuggerId ID of the debugger backend
+@type str
-self.__threadList.clear()
+"""
-for thread in threadList:
+debugStatus = -1    # i.e. running
-if thread.get('except', False):
-state = self.tr("waiting at exception")
+if debuggerId == self.__debuggersCombo.currentText():
-icon = "exceptions.png"
+citm = None
-elif thread['broken']:
-state = self.tr("waiting at breakpoint")
+self.__threadList.clear()
-icon = "mediaPlaybackPause.png"
+for thread in threadList:
-else:
+if thread.get('except', False):
-state = self.tr("running")
+state = self.tr("waiting at exception")
-icon = "mediaPlaybackStart.png"
+icon = "exceptions.png"
-itm = QTreeWidgetItem(self.__threadList,
+debugStatus = 1
-["{0:d}".format(thread['id']),
+elif thread['broken']:
-thread['name'], state])
+state = self.tr("waiting at breakpoint")
-itm.setIcon(0, UI.PixmapCache.getIcon(icon))
+icon = "mediaPlaybackPause.png"
-if thread['id'] == currentID:
+if debugStatus < 1:
-citm = itm
+debugStatus = 0
+else:
-self.__threadList.header().resizeSections(QHeaderView.ResizeToContents)
+state = self.tr("running")
-self.__threadList.header().setStretchLastSection(True)
+icon = "mediaPlaybackStart.png"
+itm = QTreeWidgetItem(self.__threadList,
-if citm:
+["{0:d}".format(thread['id']),
-self.__doThreadListUpdate = False
+thread['name'], state])
-self.__threadList.setCurrentItem(citm)
+itm.setIcon(0, UI.PixmapCache.getIcon(icon))
-self.__doThreadListUpdate = True
+if thread['id'] == currentID:
+citm = itm
+self.__threadList.header().resizeSections(
+QHeaderView.ResizeToContents)
+self.__threadList.header().setStretchLastSection(True)
+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.png"
+elif debugStatus == 0:
+icon = "mediaPlaybackPause.png"
+else:
+icon = "exceptions.png"
+self.__debuggersCombo.setItemIcon(self.__debuggersCombo.currentIndex(),
+UI.PixmapCache.getIcon(icon))
 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 (QTreeWidgetItem)

Mercurial Repositories > eric / file comparison

comparison: eric6/Debugger/DebugViewer.py

eric6/Debugger/DebugViewer.py