eric: comparison Debugger/VariablesViewer.py

-:a2e8f3c420ec
+:5a5666ab6e89
 Public method to delete all children (cleaning the subtree).
 """
 for itm in self.takeChildren():
 del itm
-def key(self, column):
-"""
-Public method generating the key for this item.
-@param column the column to sort on (integer)
-@return text of the column (string)
-"""
-return self.text(column)
-def __lt__(self, other):
-"""
-Special method to check, if the item is less than the other one.
-@param other reference to item to compare against (QTreeWidgetItem)
-@return true, if this item is less than other (boolean)
-"""
-column = self.treeWidget().sortColumn()
-return self.key(column) < other.key(column)
 def expand(self):
 """
 Public method to expand the item.
 Note: This is just a do nothing and should be overwritten.
 Array elements have numbers as names, but the key must be
 right justified and zero filled to 6 decimal places. Then
 element 2 will have a key of '000002' and appear before
 element 10 with a key of '000010'
 """
-keyStr = self.text(0)
+col0Str = self.text(0)
-self.arrayElementKey = "{0:6d}".format(int(keyStr))
+self.setText(0, "{0:6d}".format(int(col0Str)))
-def key(self, column):
-"""
-Public method generating the key for this item.
-@param column the column to sort on (integer)
-@return key of the item (string)
-"""
-if column == 0:
-return self.arrayElementKey
-else:
-return VariableItem.key(self, column)
 class SpecialArrayElementVarItem(SpecialVarItem):
 """
 Class implementing a QTreeWidgetItem that represents a special array
 Array elements have numbers as names, but the key must be
 right justified and zero filled to 6 decimal places. Then
 element 2 will have a key of '000002' and appear before
 element 10 with a key of '000010'
 """
-keyStr = self.text(0)[:-2]  # strip off [], () or {}
+col0Str = self.text(0)[:-2]  # strip off [], () or {}
-self.arrayElementKey = "{0:6d}".format(int(keyStr))
+indicator = self.text(0)[-2:]
+self.setText(0, "{0:6d}{1}".format(int(col0Str), indicator))
-def key(self, column):
-"""
-Public method generating the key for this item.
-@param column the column to sort on (integer)
-@return key of the item (string)
-"""
-if column == 0:
-return self.arrayElementKey
-else:
-return SpecialVarItem.key(self, column)
 class VariablesViewer(QTreeWidget):
 """
 Class implementing the variables viewer widget.
 header.setSortIndicatorShown(True)
 if qVersion() >= "5.0.0":
 header.setSectionsClickable(True)
 else:
 header.setClickable(True)
+header.sectionClicked.connect(self.__sectionClicked)
 header.resizeSection(0, 120)    # variable column
 header.resizeSection(1, 150)    # value column
 self.__createPopupMenus()
 self.setContextMenuPolicy(Qt.CustomContextMenu)
 if len(vlist):
 self.resortEnabled = False
 for (var, vtype, value) in vlist:
 self.__addItem(None, vtype, var, value)
-# reexpand tree
+# re-expand tree
 openItems = sorted(self.openItems[:])
 self.openItems = []
 for itemPath in openItems:
 itm = self.__findItem(itemPath, 0)
 if itm is not None:
 if vlist:
 itm = self.__findItem(vlist[0], 0)
 for var, vtype, value in vlist[1:]:
 self.__addItem(itm, vtype, var, value)
-# reexpand tree
+# re-expand tree
 openItems = sorted(self.openItems[:])
 self.openItems = []
 for itemPath in openItems:
 itm = self.__findItem(itemPath, 0)
 if itm is not None and not itm.isExpanded():
 if parentItem.populated:
 return
 try:
 parentItem.expand()
-self.__resort()
 except AttributeError:
 super(VariablesViewer, self).expandItem(parentItem)
 def collapseItem(self, parentItem):
 """
 try:
 parentItem.collapse()
 except AttributeError:
 super(VariablesViewer, self).collapseItem(parentItem)
-def __resort(self):
+def __sectionClicked(self):
+"""
+Private method handling a click onto a header section.
+"""
+self.__resort()
+def __resort(self, parent=None):
 """
 Private method to resort the tree.
+@param parent reference to a parent item
+@type QTreeWidgetItem
 """
 if self.resortEnabled:
-self.sortItems(self.sortColumn(),
+if parent is not None:
-self.header().sortIndicatorOrder())
+parent.sortChildren(self.sortColumn(),
+self.header().sortIndicatorOrder())
+else:
+self.sortItems(self.sortColumn(),
+self.header().sortIndicatorOrder())
 def handleResetUI(self):
 """
 Public method to reset the VariablesViewer.
 """

Mercurial Repositories > eric / file comparison

comparison: Debugger/VariablesViewer.py

Debugger/VariablesViewer.py