eric: comparison eric6/UI/PythonDisViewer.py

-:9aad21c7765d
+:5e6792b85a8a
 from PyQt5.QtCore import pyqtSlot, Qt, QTimer
 from PyQt5.QtGui import QCursor, QBrush
 from PyQt5.QtWidgets import (
 QApplication, QTreeWidgetItem, QAbstractItemView, QWidget, QMenu
 )
+from E5Gui.E5Application import e5App
 import Preferences
 from .Ui_PythonDisViewer import Ui_PythonDisViewer
 self.__disMenu.addSeparator()
 self.__disMenu.addAction(
 self.tr('Expand All'), self.__expandAllDis)
 self.__disMenu.addAction(
 self.tr('Collapse All'), self.__collapseAllDis)
+self.__disMenu.addSeparator()
+self.__disMenu.addAction(
+self.tr('Configure...'), self.__configure)
 self.__codeInfoMenu = QMenu(self.codeInfoWidget)
 if self.__mode == PythonDisViewerModes.SourceDisassemblyMode:
 self.__codeInfoMenu.addAction(
 self.tr("Hide"), self.codeInfoWidget.hide)
 self.__codeInfoMenu.addAction(
 self.tr('Expand All'), self.__expandAllCodeInfo)
 self.__codeInfoMenu.addAction(
 self.tr('Collapse All'), self.__collapseAllCodeInfo)
+self.__codeInfoMenu.addSeparator()
+self.__codeInfoMenu.addAction(
+self.tr('Configure...'), self.__configure)
 self.__errorColor = QBrush(
 Preferences.getPython("DisViewerErrorColor"))
 self.__currentInstructionColor = QBrush(
 Preferences.getPython("DisViewerCurrentColor"))
 self.__jumpTargetColor = QBrush(
 Preferences.getPython("DisViewerLabeledColor"))
-self.disWidget.itemClicked.connect(self.__disItemClicked)
+self.__showCodeInfoDetails = Preferences.getPython(
+"DisViewerExpandCodeInfoDetails")
+if self.__mode == PythonDisViewerModes.SourceDisassemblyMode:
+self.disWidget.itemClicked.connect(self.__disItemClicked)
 self.disWidget.itemCollapsed.connect(self.__resizeDisColumns)
 self.disWidget.itemExpanded.connect(self.__resizeDisColumns)
 self.disWidget.customContextMenuRequested.connect(
 self.__disContextMenuRequested)
 if self.__mode == PythonDisViewerModes.SourceDisassemblyMode:
 self.__vm.disViewerStateChanged.connect(
 self.__disViewerStateChanged)
 self.codeInfoWidget.hide()
 self.hide()
 elif self.__mode == PythonDisViewerModes.TracebackMode:
 self.__styleLabels()
 @rtype dict
 """
 return {
 "name": co.co_name,
 "filename": co.co_filename,
+"firstlineno": co.co_firstlineno,
 "argcount": co.co_argcount,
 "posonlyargcount": co.co_posonlyargcount,
 "kwonlyargcount": co.co_kwonlyargcount,
 "nlocals": co.co_nlocals,
 "stacksize": co.co_stacksize,
 "flags": dis.pretty_flags(co.co_flags),
-"consts": co.co_consts,
+"consts": [str(const) for const in co.co_consts],
-"names": co.co_names,
+"names": [str(name) for name in co.co_names],
-"varnames": co.co_varnames,
+"varnames": [str(name) for name in co.co_varnames],
-"freevars": co.co_freevars,
+"freevars": [str(var) for var in co.co_freevars],
-"cellvars": co.co_cellvars,
+"cellvars": [str(var) for var in co.co_cellvars],
 }
 def __loadDIS(self):
 """
 Private method to generate the Disassembly from the source of the
 self.__createErrorItem(self.tr(
 "No editor has been opened."
 ))
 return
-self.disWidget.clear()
+self.clear()
 self.__editor.clearAllHighlights()
+self.codeInfoWidget.hide()
 source = self.__editor.text()
 if not source.strip():
 # empty editor or white space only
 self.__createErrorItem(self.tr(
 if lastInstructions:
 self.disWidget.scrollToItem(
 lastInstructions[0],
 QAbstractItemView.PositionAtCenter)
-if "codeInfo" in disassembly:
+if "codeinfo" in disassembly:
-self.__showCodeInfoData(disassembly["codeInfo"])
+self.__showCodeInfoData(disassembly["codeinfo"])
 def __resizeDisColumns(self):
 """
 Private method to resize the columns of the disassembly widget to
 suitable values.
 @param itm reference to the clicked item
 @type QTreeWidgetItem
 @param column column number of the click
 @type int
 """
-# TODO: add code to deal with Traceback mode
 self.__editor.clearAllHighlights()
 if itm is not None:
 startLine = itm.data(0, self.StartLineRole)
 endLine = itm.data(0, self.EndLineRole)
 self.__currentInstructionColor = QBrush(
 Preferences.getPython("DisViewerCurrentColor"))
 self.__jumpTargetColor = QBrush(
 Preferences.getPython("DisViewerLabeledColor"))
+self.__showCodeInfoDetails = Preferences.getPython(
+"DisViewerExpandCodeInfoDetails")
 if self.isVisible():
 self.__loadDIS()
 self.__styleLabels()
 def clear(self):
 """
 Public method to clear the display.
 """
 self.disWidget.clear()
+self.codeInfoWidget.clear()
 def __showCodeInfo(self):
 """
 Private slot handling the context menu action to show code info.
 """
 @param infoList list of info strings
 @type list of str
 """
 parent = QTreeWidgetItem(self.codeInfoWidget,
 [title, str(len(infoList))])
-# TODO: make this a configuration item
+parent.setExpanded(self.__showCodeInfoDetails)
-parent.setExpanded(False)
 for index, value in enumerate(infoList):
 itm = QTreeWidgetItem(parent, [str(index), str(value)])
 itm.setTextAlignment(0, Qt.AlignRight)
 if codeInfo:
 QTreeWidgetItem(self.codeInfoWidget, [
 self.tr("Name"), codeInfo["name"]])
 QTreeWidgetItem(self.codeInfoWidget, [
 self.tr("Filename"), codeInfo["filename"]])
+QTreeWidgetItem(self.codeInfoWidget, [
+self.tr("First Line"), str(codeInfo["firstlineno"])])
 QTreeWidgetItem(self.codeInfoWidget, [
 self.tr("Argument Count"), str(codeInfo["argcount"])])
 QTreeWidgetItem(self.codeInfoWidget, [
 self.tr("Positional-only Arguments"),
 str(codeInfo["posonlyargcount"])])
 """
 if self.disWidget.topLevelItemCount() > 0:
 # don't show context menu on empty list
 coord = self.codeInfoWidget.mapToGlobal(coord)
 self.__codeInfoMenu.popup(coord)
+def __configure(self):
+"""
+Private method to open the configuration dialog.
+"""
+e5App().getObject("UserInterface").showPreferences(
+"pythonPage")

Mercurial Repositories > eric / file comparison

comparison: eric6/UI/PythonDisViewer.py

eric6/UI/PythonDisViewer.py