Mercurial Repositories > eric / changeset
changeset
Regenerated source docu after Variables Viewer merge.
Sun, 19 May 2019 12:35:24 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 19 May 2019 12:35:24 +0200
- changeset 7015
- b1a3094b33e1
- parent 7014
- 61172a5bc172
- child 7016
- 47f6b0c3a293
Regenerated source docu after Variables Viewer merge.
--- a/eric6/APIs/Python3/eric6.api Sun May 19 12:30:02 2019 +0200 +++ b/eric6/APIs/Python3/eric6.api Sun May 19 12:35:24 2019 +0200 @@ -290,6 +290,7 @@ eric6.DebugClients.Python.DebugClient.DebugClient?1() eric6.DebugClients.Python.DebugClientBase.DebugClientBase.Indicators?7 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.absPath?4(fn) +eric6.DebugClients.Python.DebugClientBase.DebugClientBase.arrayTypes?7 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.clientCapabilities?7 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.close?4(fd) eric6.DebugClients.Python.DebugClientBase.DebugClientBase.connectDebugger?4(port, remoteAddress=None, redirect=True) @@ -332,6 +333,9 @@ eric6.DebugClients.Python.DebugClientCapabilities.HasProfiler?7 eric6.DebugClients.Python.DebugClientCapabilities.HasShell?7 eric6.DebugClients.Python.DebugClientCapabilities.HasUnittest?7 +eric6.DebugClients.Python.DebugConfig.BatchSize?7 +eric6.DebugClients.Python.DebugConfig.ConfigKnownQtTypes?7 +eric6.DebugClients.Python.DebugConfig.ConfigQtNames?7 eric6.DebugClients.Python.DebugConfig.ConfigVarTypeStrings?7 eric6.DebugClients.Python.DebugUtilities.ArgInfo?7 eric6.DebugClients.Python.DebugUtilities._getfullargs?5(co) @@ -344,26 +348,25 @@ eric6.DebugClients.Python.DebugVariables.BaseResolver.getDictionary?4(var) eric6.DebugClients.Python.DebugVariables.BaseResolver.resolve?4(var, attribute) eric6.DebugClients.Python.DebugVariables.DefaultResolver.getDictionary?4(var) -eric6.DebugClients.Python.DebugVariables.DefaultResolver.resolve?4(var, attribute) eric6.DebugClients.Python.DebugVariables.DictResolver.getDictionary?4(var) eric6.DebugClients.Python.DebugVariables.DictResolver.keyToStr?4(key) eric6.DebugClients.Python.DebugVariables.DictResolver.resolve?4(var, attribute) +eric6.DebugClients.Python.DebugVariables.DictViewResolver.getDictionary?4(var) +eric6.DebugClients.Python.DebugVariables.DictViewResolver.resolve?4(var, attribute) eric6.DebugClients.Python.DebugVariables.ListResolver.getDictionary?4(var) eric6.DebugClients.Python.DebugVariables.ListResolver.resolve?4(var, attribute) -eric6.DebugClients.Python.DebugVariables.MaxItemsToHandle?7 eric6.DebugClients.Python.DebugVariables.MultiValueDictResolver.getDictionary?4(var) eric6.DebugClients.Python.DebugVariables.MultiValueDictResolver.resolve?4(var, attribute) eric6.DebugClients.Python.DebugVariables.NdArrayResolver.getDictionary?4(var) eric6.DebugClients.Python.DebugVariables.NdArrayResolver.resolve?4(var, attribute) eric6.DebugClients.Python.DebugVariables.SetResolver.getDictionary?4(var) eric6.DebugClients.Python.DebugVariables.SetResolver.resolve?4(var, attribute) -eric6.DebugClients.Python.DebugVariables.TooLargeAttribute?7 -eric6.DebugClients.Python.DebugVariables.TooLargeMessage?7 eric6.DebugClients.Python.DebugVariables._TypeMap?8 eric6.DebugClients.Python.DebugVariables._initTypeMap?5() eric6.DebugClients.Python.DebugVariables.arrayResolver?7 eric6.DebugClients.Python.DebugVariables.defaultResolver?7 eric6.DebugClients.Python.DebugVariables.dictResolver?7 +eric6.DebugClients.Python.DebugVariables.dictViewResolver?7 eric6.DebugClients.Python.DebugVariables.getType?4(obj) eric6.DebugClients.Python.DebugVariables.listResolver?7 eric6.DebugClients.Python.DebugVariables.multiValueDictResolver?7 @@ -612,10 +615,11 @@ eric6.Debugger.DebugViewer.DebugViewer.currentWidget?4() eric6.Debugger.DebugViewer.DebugViewer.handleClientStack?4(stack) eric6.Debugger.DebugViewer.DebugViewer.handleDebuggingStarted?4() +eric6.Debugger.DebugViewer.DebugViewer.handlePreferencesChanged?4() eric6.Debugger.DebugViewer.DebugViewer.handleResetUI?4() eric6.Debugger.DebugViewer.DebugViewer.initCallStackViewer?4(projectMode) eric6.Debugger.DebugViewer.DebugViewer.isCallTraceEnabled?4() -eric6.Debugger.DebugViewer.DebugViewer.preferencesChanged?4() +eric6.Debugger.DebugViewer.DebugViewer.preferencesChanged?7 eric6.Debugger.DebugViewer.DebugViewer.setCallTraceToProjectMode?4(enabled) eric6.Debugger.DebugViewer.DebugViewer.setCurrentWidget?4(widget) eric6.Debugger.DebugViewer.DebugViewer.setDebugger?4(debugUI) @@ -756,29 +760,40 @@ eric6.Debugger.VariablesFilterDialog.VariablesFilterDialog.on_buttonBox_clicked?4(button) eric6.Debugger.VariablesFilterDialog.VariablesFilterDialog.setSelection?4(lList, gList) eric6.Debugger.VariablesFilterDialog.VariablesFilterDialog?1(parent=None, name=None, modal=False) -eric6.Debugger.VariablesViewer.ArrayElementVarItem?1(parent, dvar, dvalue, dtype) -eric6.Debugger.VariablesViewer.SpecialArrayElementVarItem?1(parent, dvar, dvalue, dtype, frmnr, globalScope) -eric6.Debugger.VariablesViewer.SpecialVarItem.expand?4() -eric6.Debugger.VariablesViewer.SpecialVarItem?1(parent, dvar, dvalue, dtype, frmnr, globalScope) -eric6.Debugger.VariablesViewer.VariableItem.Indicators?7 +eric6.Debugger.VariablesViewer.SORT_ROLE?7 eric6.Debugger.VariablesViewer.VariableItem.Type2Indicators?7 -eric6.Debugger.VariablesViewer.VariableItem._buildKey?5() -eric6.Debugger.VariablesViewer.VariableItem.attachDummy?4() -eric6.Debugger.VariablesViewer.VariableItem.collapse?4() -eric6.Debugger.VariablesViewer.VariableItem.data?4(column, role) -eric6.Debugger.VariablesViewer.VariableItem.deleteChildren?4() -eric6.Debugger.VariablesViewer.VariableItem.expand?4() -eric6.Debugger.VariablesViewer.VariableItem.extractId?4(var) -eric6.Debugger.VariablesViewer.VariableItem.extractIndicators?4(var) -eric6.Debugger.VariablesViewer.VariableItem.getId?4() -eric6.Debugger.VariablesViewer.VariableItem.getValue?4() -eric6.Debugger.VariablesViewer.VariableItem?1(parent, dvar, dvalue, dtype) -eric6.Debugger.VariablesViewer.VariablesViewer.collapseItem?4(parentItem) -eric6.Debugger.VariablesViewer.VariablesViewer.expandItem?4(parentItem) +eric6.Debugger.VariablesViewer.VariableItem.absolutCount?4() +eric6.Debugger.VariablesViewer.VariableItem.arrayTypes?7 +eric6.Debugger.VariablesViewer.VariableItem.noOfItemsStr?7 +eric6.Debugger.VariablesViewer.VariableItem.nonExpandableTypes?7 +eric6.Debugger.VariablesViewer.VariableItem.populated?4() +eric6.Debugger.VariablesViewer.VariableItem.rx_nonprintable?7 +eric6.Debugger.VariablesViewer.VariableItem?1(parent, dvar, dtype, dvalue) +eric6.Debugger.VariablesViewer.VariablesModel.clear?4(reset=False) +eric6.Debugger.VariablesViewer.VariablesModel.columnCount?4(parent=QModelIndex()) +eric6.Debugger.VariablesViewer.VariablesModel.data?4(index, role=Qt.DisplayRole) +eric6.Debugger.VariablesViewer.VariablesModel.expand?7 +eric6.Debugger.VariablesViewer.VariablesModel.flags?4(index) +eric6.Debugger.VariablesViewer.VariablesModel.getMore?4() +eric6.Debugger.VariablesViewer.VariablesModel.handlePreferencesChanged?4() +eric6.Debugger.VariablesViewer.VariablesModel.hasChildren?4(parent=QModelIndex()) +eric6.Debugger.VariablesViewer.VariablesModel.headerData?4(section, orientation, role=Qt.DisplayRole) +eric6.Debugger.VariablesViewer.VariablesModel.index?4(row, column, parent=QModelIndex()) +eric6.Debugger.VariablesViewer.VariablesModel.parent?4(child) +eric6.Debugger.VariablesViewer.VariablesModel.resetModifiedMarker?4(parentIdx=QModelIndex(), pathlist=()) +eric6.Debugger.VariablesViewer.VariablesModel.rowCount?4(parent=QModelIndex()) +eric6.Debugger.VariablesViewer.VariablesModel.setExpanded?4(index, state) +eric6.Debugger.VariablesViewer.VariablesModel.showVariables?4(vlist, frmnr, pathlist=None) +eric6.Debugger.VariablesViewer.VariablesModel?1(treeView, globalScope) +eric6.Debugger.VariablesViewer.VariablesProxyModel.hasChildren?4(parent) +eric6.Debugger.VariablesViewer.VariablesProxyModel.setExpanded?4(index, state) +eric6.Debugger.VariablesViewer.VariablesProxyModel?1(parent=None) eric6.Debugger.VariablesViewer.VariablesViewer.handleResetUI?4() -eric6.Debugger.VariablesViewer.VariablesViewer.mouseDoubleClickEvent?4(mouseEvent) +eric6.Debugger.VariablesViewer.VariablesViewer.preferencesChanged?7 +eric6.Debugger.VariablesViewer.VariablesViewer.resizeEvent?4(event) eric6.Debugger.VariablesViewer.VariablesViewer.showVariable?4(vlist) eric6.Debugger.VariablesViewer.VariablesViewer.showVariables?4(vlist, frmnr) +eric6.Debugger.VariablesViewer.VariablesViewer.verticalScrollbarValueChanged?4(value) eric6.Debugger.VariablesViewer.VariablesViewer?1(viewer, globalScope, parent=None) eric6.Debugger.WatchPointModel.WatchPointModel.addWatchPoint?4(cond, special, properties) eric6.Debugger.WatchPointModel.WatchPointModel.columnCount?4(parent=None) @@ -7347,6 +7362,7 @@ eric6.Preferences.ConfigurationPages.CondaPage.CondaPage.save?4() eric6.Preferences.ConfigurationPages.CondaPage.CondaPage?1() eric6.Preferences.ConfigurationPages.CondaPage.create?4(dlg) +eric6.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase.colourChanged?7 eric6.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase.initColour?4(colourKey, button, prefMethod, byName=False, hasAlpha=False) eric6.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase.polishPage?4() eric6.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase.saveColours?4(prefMethod) @@ -7370,6 +7386,14 @@ eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.DebuggerGeneralPage.on_editAllowedHostButton_clicked?4() eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.DebuggerGeneralPage.save?4() eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.DebuggerGeneralPage?1() +eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.PreviewModel.columnCount?4(parent=QModelIndex()) +eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.PreviewModel.data?4(index, role=Qt.DisplayRole) +eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.PreviewModel.flags?4(index) +eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.PreviewModel.index?4(row, column, parent=QModelIndex()) +eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.PreviewModel.parent?4(child) +eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.PreviewModel.rowCount?4(parent=QModelIndex()) +eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.PreviewModel.setColor?4(key, bgcolour) +eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.PreviewModel?1() eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.create?4(dlg) eric6.Preferences.ConfigurationPages.DebuggerPython2Page.DebuggerPython2Page.on_refreshButton_clicked?4() eric6.Preferences.ConfigurationPages.DebuggerPython2Page.DebuggerPython2Page.on_venvDlgButton_clicked?4()
--- a/eric6/APIs/Python3/eric6.bas Sun May 19 12:30:02 2019 +0200 +++ b/eric6/APIs/Python3/eric6.bas Sun May 19 12:35:24 2019 +0200 @@ -27,7 +27,6 @@ ApplicationDiagramBuilder UMLDiagramBuilder ApplicationPage ConfigurationPageBase Ui_ApplicationPage ArgumentsError RuntimeError -ArrayElementVarItem VariableItem ArrayResolver BaseResolver AssociationItem E5ArrowItem Attribute ClbrBaseClasses.Attribute VisibilityMixin @@ -145,6 +144,7 @@ DelayedFileWatcher QFileSystemWatcher DeleteFilesConfirmationDialog QDialog Ui_DeleteFilesConfirmationDialog DictResolver BaseResolver +DictViewResolver ListResolver DiffColoursPage ConfigurationPageBase Ui_DiffColoursPage DiffDialog QWidget Ui_DiffDialog DiffHighlighter E5GenericDiffHighlighter @@ -711,6 +711,7 @@ PreferencesLexer QObject PreferencesLexerError Exception PreferencesLexerLanguageError PreferencesLexerError +PreviewModel QAbstractItemModel PreviewProcessingThread QThread Previewer QStackedWidget PreviewerHTML QWidget @@ -843,8 +844,6 @@ SnapshotTimer QWidget SnapshotWaylandGrabber QObject SortOptionsDialog QDialog Ui_SortOptionsDialog -SpecialArrayElementVarItem SpecialVarItem -SpecialVarItem VariableItem SpeedDial QObject SpeedDialReader QXmlStreamReader SpeedDialWriter QXmlStreamWriter @@ -988,9 +987,10 @@ Value str ValueChars str VariableDetailDialog QDialog Ui_VariableDetailDialog -VariableItem QTreeWidgetItem VariablesFilterDialog QDialog Ui_VariablesFilterDialog -VariablesViewer QTreeWidget +VariablesModel QAbstractItemModel +VariablesProxyModel QSortFilterProxyModel +VariablesViewer QTreeView VcsCommandOptionsDialog QDialog Ui_VcsCommandOptionsDialog VcsGitPlugin QObject VcsMercurialPlugin QObject
--- a/eric6/Debugger/VariablesViewer.py Sun May 19 12:30:02 2019 +0200 +++ b/eric6/Debugger/VariablesViewer.py Sun May 19 12:35:24 2019 +0200 @@ -574,7 +574,7 @@ Public Qt slot to get the index of item at row:column of parent. @param row number of rows - @rtype int + @type int @param column number of columns @type int @param parent the model parent
--- a/eric6/Documentation/Help/source.qhp Sun May 19 12:30:02 2019 +0200 +++ b/eric6/Documentation/Help/source.qhp Sun May 19 12:35:24 2019 +0200 @@ -2092,9 +2092,6 @@ <keyword name="ArgumentsError (Constructor)" id="ArgumentsError (Constructor)" ref="eric6.E5Gui.E5Action.html#ArgumentsError.__init__" /> <keyword name="ArgumentsError.__repr__" id="ArgumentsError.__repr__" ref="eric6.E5Gui.E5Action.html#ArgumentsError.__repr__" /> <keyword name="ArgumentsError.__str__" id="ArgumentsError.__str__" ref="eric6.E5Gui.E5Action.html#ArgumentsError.__str__" /> - <keyword name="ArrayElementVarItem" id="ArrayElementVarItem" ref="eric6.Debugger.VariablesViewer.html#ArrayElementVarItem" /> - <keyword name="ArrayElementVarItem (Constructor)" id="ArrayElementVarItem (Constructor)" ref="eric6.Debugger.VariablesViewer.html#ArrayElementVarItem.__init__" /> - <keyword name="ArrayItemsContainer" id="ArrayItemsContainer" ref="eric6.DebugClients.Python.DebugVariables.html#ArrayItemsContainer" /> <keyword name="ArrayResolver" id="ArrayResolver" ref="eric6.DebugClients.Python.DebugVariables.html#ArrayResolver" /> <keyword name="ArrayResolver.getDictionary" id="ArrayResolver.getDictionary" ref="eric6.DebugClients.Python.DebugVariables.html#ArrayResolver.getDictionary" /> <keyword name="ArrayResolver.resolve" id="ArrayResolver.resolve" ref="eric6.DebugClients.Python.DebugVariables.html#ArrayResolver.resolve" /> @@ -3996,10 +3993,10 @@ <keyword name="DebugViewer.currentWidget" id="DebugViewer.currentWidget" ref="eric6.Debugger.DebugViewer.html#DebugViewer.currentWidget" /> <keyword name="DebugViewer.handleClientStack" id="DebugViewer.handleClientStack" ref="eric6.Debugger.DebugViewer.html#DebugViewer.handleClientStack" /> <keyword name="DebugViewer.handleDebuggingStarted" id="DebugViewer.handleDebuggingStarted" ref="eric6.Debugger.DebugViewer.html#DebugViewer.handleDebuggingStarted" /> + <keyword name="DebugViewer.handlePreferencesChanged" id="DebugViewer.handlePreferencesChanged" ref="eric6.Debugger.DebugViewer.html#DebugViewer.handlePreferencesChanged" /> <keyword name="DebugViewer.handleResetUI" id="DebugViewer.handleResetUI" ref="eric6.Debugger.DebugViewer.html#DebugViewer.handleResetUI" /> <keyword name="DebugViewer.initCallStackViewer" id="DebugViewer.initCallStackViewer" ref="eric6.Debugger.DebugViewer.html#DebugViewer.initCallStackViewer" /> <keyword name="DebugViewer.isCallTraceEnabled" id="DebugViewer.isCallTraceEnabled" ref="eric6.Debugger.DebugViewer.html#DebugViewer.isCallTraceEnabled" /> - <keyword name="DebugViewer.preferencesChanged" id="DebugViewer.preferencesChanged" ref="eric6.Debugger.DebugViewer.html#DebugViewer.preferencesChanged" /> <keyword name="DebugViewer.setCallTraceToProjectMode" id="DebugViewer.setCallTraceToProjectMode" ref="eric6.Debugger.DebugViewer.html#DebugViewer.setCallTraceToProjectMode" /> <keyword name="DebugViewer.setCurrentWidget" id="DebugViewer.setCurrentWidget" ref="eric6.Debugger.DebugViewer.html#DebugViewer.setCurrentWidget" /> <keyword name="DebugViewer.setDebugger" id="DebugViewer.setDebugger" ref="eric6.Debugger.DebugViewer.html#DebugViewer.setDebugger" /> @@ -4152,7 +4149,6 @@ <keyword name="DeepLEngine.supportedLanguages" id="DeepLEngine.supportedLanguages" ref="eric6.Plugins.UiExtensionPlugins.Translator.TranslatorEngines.DeepLEngine.html#DeepLEngine.supportedLanguages" /> <keyword name="DefaultResolver" id="DefaultResolver" ref="eric6.DebugClients.Python.DebugVariables.html#DefaultResolver" /> <keyword name="DefaultResolver.getDictionary" id="DefaultResolver.getDictionary" ref="eric6.DebugClients.Python.DebugVariables.html#DefaultResolver.getDictionary" /> - <keyword name="DefaultResolver.resolve" id="DefaultResolver.resolve" ref="eric6.DebugClients.Python.DebugVariables.html#DefaultResolver.resolve" /> <keyword name="DefaultSearchEngines (Package)" id="DefaultSearchEngines (Package)" ref="index-eric6.Helpviewer.OpenSearch.DefaultSearchEngines.html" /> <keyword name="DefaultSearchEngines (Package)" id="DefaultSearchEngines (Package)" ref="index-eric6.WebBrowser.OpenSearch.DefaultSearchEngines.html" /> <keyword name="DelayedFileWatcher" id="DelayedFileWatcher" ref="eric6.WebBrowser.Tools.DelayedFileWatcher.html#DelayedFileWatcher" /> @@ -4170,6 +4166,9 @@ <keyword name="DictResolver.getDictionary" id="DictResolver.getDictionary" ref="eric6.DebugClients.Python.DebugVariables.html#DictResolver.getDictionary" /> <keyword name="DictResolver.keyToStr" id="DictResolver.keyToStr" ref="eric6.DebugClients.Python.DebugVariables.html#DictResolver.keyToStr" /> <keyword name="DictResolver.resolve" id="DictResolver.resolve" ref="eric6.DebugClients.Python.DebugVariables.html#DictResolver.resolve" /> + <keyword name="DictViewResolver" id="DictViewResolver" ref="eric6.DebugClients.Python.DebugVariables.html#DictViewResolver" /> + <keyword name="DictViewResolver.getDictionary" id="DictViewResolver.getDictionary" ref="eric6.DebugClients.Python.DebugVariables.html#DictViewResolver.getDictionary" /> + <keyword name="DictViewResolver.resolve" id="DictViewResolver.resolve" ref="eric6.DebugClients.Python.DebugVariables.html#DictViewResolver.resolve" /> <keyword name="DiffColoursPage" id="DiffColoursPage" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#DiffColoursPage" /> <keyword name="DiffColoursPage (Constructor)" id="DiffColoursPage (Constructor)" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html#DiffColoursPage.__init__" /> <keyword name="DiffColoursPage (Module)" id="DiffColoursPage (Module)" ref="eric6.Preferences.ConfigurationPages.DiffColoursPage.html" /> @@ -11665,7 +11664,6 @@ <keyword name="NavigationContainer (Constructor)" id="NavigationContainer (Constructor)" ref="eric6.WebBrowser.Navigation.NavigationContainer.html#NavigationContainer.__init__" /> <keyword name="NavigationContainer (Module)" id="NavigationContainer (Module)" ref="eric6.WebBrowser.Navigation.NavigationContainer.html" /> <keyword name="NavigationContainer.addWidget" id="NavigationContainer.addWidget" ref="eric6.WebBrowser.Navigation.NavigationContainer.html#NavigationContainer.addWidget" /> - <keyword name="NdArrayItemsContainer" id="NdArrayItemsContainer" ref="eric6.DebugClients.Python.DebugVariables.html#NdArrayItemsContainer" /> <keyword name="NdArrayResolver" id="NdArrayResolver" ref="eric6.DebugClients.Python.DebugVariables.html#NdArrayResolver" /> <keyword name="NdArrayResolver.__isNumeric" id="NdArrayResolver.__isNumeric" ref="eric6.DebugClients.Python.DebugVariables.html#NdArrayResolver.__isNumeric" /> <keyword name="NdArrayResolver.getDictionary" id="NdArrayResolver.getDictionary" ref="eric6.DebugClients.Python.DebugVariables.html#NdArrayResolver.getDictionary" /> @@ -12774,6 +12772,15 @@ <keyword name="Prefs" id="Prefs" ref="eric6.Preferences.__init__.html#Prefs" /> <keyword name="Prefs.initWebEngineSettingsDefaults" id="Prefs.initWebEngineSettingsDefaults" ref="eric6.Preferences.__init__.html#Prefs.initWebEngineSettingsDefaults" /> <keyword name="Prefs.initWebSettingsDefaults" id="Prefs.initWebSettingsDefaults" ref="eric6.Preferences.__init__.html#Prefs.initWebSettingsDefaults" /> + <keyword name="PreviewModel" id="PreviewModel" ref="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html#PreviewModel" /> + <keyword name="PreviewModel (Constructor)" id="PreviewModel (Constructor)" ref="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html#PreviewModel.__init__" /> + <keyword name="PreviewModel.columnCount" id="PreviewModel.columnCount" ref="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html#PreviewModel.columnCount" /> + <keyword name="PreviewModel.data" id="PreviewModel.data" ref="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html#PreviewModel.data" /> + <keyword name="PreviewModel.flags" id="PreviewModel.flags" ref="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html#PreviewModel.flags" /> + <keyword name="PreviewModel.index" id="PreviewModel.index" ref="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html#PreviewModel.index" /> + <keyword name="PreviewModel.parent" id="PreviewModel.parent" ref="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html#PreviewModel.parent" /> + <keyword name="PreviewModel.rowCount" id="PreviewModel.rowCount" ref="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html#PreviewModel.rowCount" /> + <keyword name="PreviewModel.setColor" id="PreviewModel.setColor" ref="eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html#PreviewModel.setColor" /> <keyword name="PreviewProcessingThread" id="PreviewProcessingThread" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread" /> <keyword name="PreviewProcessingThread (Constructor)" id="PreviewProcessingThread (Constructor)" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.__init__" /> <keyword name="PreviewProcessingThread.__convertMarkdown" id="PreviewProcessingThread.__convertMarkdown" ref="eric6.UI.Previewers.PreviewerHTML.html#PreviewProcessingThread.__convertMarkdown" /> @@ -14959,11 +14966,6 @@ <keyword name="SourceStat.inc" id="SourceStat.inc" ref="eric6.DataViews.CodeMetrics.html#SourceStat.inc" /> <keyword name="SourceStat.indent" id="SourceStat.indent" ref="eric6.DataViews.CodeMetrics.html#SourceStat.indent" /> <keyword name="SourceStat.push" id="SourceStat.push" ref="eric6.DataViews.CodeMetrics.html#SourceStat.push" /> - <keyword name="SpecialArrayElementVarItem" id="SpecialArrayElementVarItem" ref="eric6.Debugger.VariablesViewer.html#SpecialArrayElementVarItem" /> - <keyword name="SpecialArrayElementVarItem (Constructor)" id="SpecialArrayElementVarItem (Constructor)" ref="eric6.Debugger.VariablesViewer.html#SpecialArrayElementVarItem.__init__" /> - <keyword name="SpecialVarItem" id="SpecialVarItem" ref="eric6.Debugger.VariablesViewer.html#SpecialVarItem" /> - <keyword name="SpecialVarItem (Constructor)" id="SpecialVarItem (Constructor)" ref="eric6.Debugger.VariablesViewer.html#SpecialVarItem.__init__" /> - <keyword name="SpecialVarItem.expand" id="SpecialVarItem.expand" ref="eric6.Debugger.VariablesViewer.html#SpecialVarItem.expand" /> <keyword name="SpeedDial" id="SpeedDial" ref="eric6.Helpviewer.SpeedDial.SpeedDial.html#SpeedDial" /> <keyword name="SpeedDial" id="SpeedDial" ref="eric6.WebBrowser.SpeedDial.SpeedDial.html#SpeedDial" /> <keyword name="SpeedDial (Constructor)" id="SpeedDial (Constructor)" ref="eric6.Helpviewer.SpeedDial.SpeedDial.html#SpeedDial.__init__" /> @@ -17468,45 +17470,60 @@ <keyword name="VariableDetailDialog (Module)" id="VariableDetailDialog (Module)" ref="eric6.Debugger.VariableDetailDialog.html" /> <keyword name="VariableItem" id="VariableItem" ref="eric6.Debugger.VariablesViewer.html#VariableItem" /> <keyword name="VariableItem (Constructor)" id="VariableItem (Constructor)" ref="eric6.Debugger.VariablesViewer.html#VariableItem.__init__" /> - <keyword name="VariableItem._buildKey" id="VariableItem._buildKey" ref="eric6.Debugger.VariablesViewer.html#VariableItem._buildKey" /> - <keyword name="VariableItem.attachDummy" id="VariableItem.attachDummy" ref="eric6.Debugger.VariablesViewer.html#VariableItem.attachDummy" /> - <keyword name="VariableItem.collapse" id="VariableItem.collapse" ref="eric6.Debugger.VariablesViewer.html#VariableItem.collapse" /> - <keyword name="VariableItem.data" id="VariableItem.data" ref="eric6.Debugger.VariablesViewer.html#VariableItem.data" /> - <keyword name="VariableItem.deleteChildren" id="VariableItem.deleteChildren" ref="eric6.Debugger.VariablesViewer.html#VariableItem.deleteChildren" /> - <keyword name="VariableItem.expand" id="VariableItem.expand" ref="eric6.Debugger.VariablesViewer.html#VariableItem.expand" /> - <keyword name="VariableItem.extractId" id="VariableItem.extractId" ref="eric6.Debugger.VariablesViewer.html#VariableItem.extractId" /> - <keyword name="VariableItem.extractIndicators" id="VariableItem.extractIndicators" ref="eric6.Debugger.VariablesViewer.html#VariableItem.extractIndicators" /> - <keyword name="VariableItem.getId" id="VariableItem.getId" ref="eric6.Debugger.VariablesViewer.html#VariableItem.getId" /> - <keyword name="VariableItem.getValue" id="VariableItem.getValue" ref="eric6.Debugger.VariablesViewer.html#VariableItem.getValue" /> + <keyword name="VariableItem.__getName" id="VariableItem.__getName" ref="eric6.Debugger.VariablesViewer.html#VariableItem.__getName" /> + <keyword name="VariableItem.__getType" id="VariableItem.__getType" ref="eric6.Debugger.VariablesViewer.html#VariableItem.__getType" /> + <keyword name="VariableItem.__getValue" id="VariableItem.__getValue" ref="eric6.Debugger.VariablesViewer.html#VariableItem.__getValue" /> + <keyword name="VariableItem.absolutCount" id="VariableItem.absolutCount" ref="eric6.Debugger.VariablesViewer.html#VariableItem.absolutCount" /> + <keyword name="VariableItem.populated" id="VariableItem.populated" ref="eric6.Debugger.VariablesViewer.html#VariableItem.populated" /> <keyword name="VariablesFilterDialog" id="VariablesFilterDialog" ref="eric6.Debugger.VariablesFilterDialog.html#VariablesFilterDialog" /> <keyword name="VariablesFilterDialog (Constructor)" id="VariablesFilterDialog (Constructor)" ref="eric6.Debugger.VariablesFilterDialog.html#VariablesFilterDialog.__init__" /> <keyword name="VariablesFilterDialog (Module)" id="VariablesFilterDialog (Module)" ref="eric6.Debugger.VariablesFilterDialog.html" /> <keyword name="VariablesFilterDialog.getSelection" id="VariablesFilterDialog.getSelection" ref="eric6.Debugger.VariablesFilterDialog.html#VariablesFilterDialog.getSelection" /> <keyword name="VariablesFilterDialog.on_buttonBox_clicked" id="VariablesFilterDialog.on_buttonBox_clicked" ref="eric6.Debugger.VariablesFilterDialog.html#VariablesFilterDialog.on_buttonBox_clicked" /> <keyword name="VariablesFilterDialog.setSelection" id="VariablesFilterDialog.setSelection" ref="eric6.Debugger.VariablesFilterDialog.html#VariablesFilterDialog.setSelection" /> + <keyword name="VariablesModel" id="VariablesModel" ref="eric6.Debugger.VariablesViewer.html#VariablesModel" /> + <keyword name="VariablesModel (Constructor)" id="VariablesModel (Constructor)" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.__init__" /> + <keyword name="VariablesModel.__buildTreePath" id="VariablesModel.__buildTreePath" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.__buildTreePath" /> + <keyword name="VariablesModel.__cleanupParentList" id="VariablesModel.__cleanupParentList" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.__cleanupParentList" /> + <keyword name="VariablesModel.__findPendingItem" id="VariablesModel.__findPendingItem" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.__findPendingItem" /> + <keyword name="VariablesModel.__findVariable" id="VariablesModel.__findVariable" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.__findVariable" /> + <keyword name="VariablesModel.clear" id="VariablesModel.clear" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.clear" /> + <keyword name="VariablesModel.columnCount" id="VariablesModel.columnCount" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.columnCount" /> + <keyword name="VariablesModel.data" id="VariablesModel.data" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.data" /> + <keyword name="VariablesModel.flags" id="VariablesModel.flags" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.flags" /> + <keyword name="VariablesModel.getMore" id="VariablesModel.getMore" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.getMore" /> + <keyword name="VariablesModel.handlePreferencesChanged" id="VariablesModel.handlePreferencesChanged" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.handlePreferencesChanged" /> + <keyword name="VariablesModel.hasChildren" id="VariablesModel.hasChildren" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.hasChildren" /> + <keyword name="VariablesModel.headerData" id="VariablesModel.headerData" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.headerData" /> + <keyword name="VariablesModel.index" id="VariablesModel.index" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.index" /> + <keyword name="VariablesModel.parent" id="VariablesModel.parent" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.parent" /> + <keyword name="VariablesModel.resetModifiedMarker" id="VariablesModel.resetModifiedMarker" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.resetModifiedMarker" /> + <keyword name="VariablesModel.rowCount" id="VariablesModel.rowCount" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.rowCount" /> + <keyword name="VariablesModel.setExpanded" id="VariablesModel.setExpanded" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.setExpanded" /> + <keyword name="VariablesModel.showVariables" id="VariablesModel.showVariables" ref="eric6.Debugger.VariablesViewer.html#VariablesModel.showVariables" /> + <keyword name="VariablesProxyModel" id="VariablesProxyModel" ref="eric6.Debugger.VariablesViewer.html#VariablesProxyModel" /> + <keyword name="VariablesProxyModel (Constructor)" id="VariablesProxyModel (Constructor)" ref="eric6.Debugger.VariablesViewer.html#VariablesProxyModel.__init__" /> + <keyword name="VariablesProxyModel.hasChildren" id="VariablesProxyModel.hasChildren" ref="eric6.Debugger.VariablesViewer.html#VariablesProxyModel.hasChildren" /> + <keyword name="VariablesProxyModel.setExpanded" id="VariablesProxyModel.setExpanded" ref="eric6.Debugger.VariablesViewer.html#VariablesProxyModel.setExpanded" /> <keyword name="VariablesViewer" id="VariablesViewer" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer" /> <keyword name="VariablesViewer (Constructor)" id="VariablesViewer (Constructor)" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__init__" /> <keyword name="VariablesViewer (Module)" id="VariablesViewer (Module)" ref="eric6.Debugger.VariablesViewer.html" /> - <keyword name="VariablesViewer.__addItem" id="VariablesViewer.__addItem" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__addItem" /> - <keyword name="VariablesViewer.__buildTreePath" id="VariablesViewer.__buildTreePath" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__buildTreePath" /> + <keyword name="VariablesViewer.__collapseChildren" id="VariablesViewer.__collapseChildren" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__collapseChildren" /> <keyword name="VariablesViewer.__configure" id="VariablesViewer.__configure" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__configure" /> + <keyword name="VariablesViewer.__configureFilter" id="VariablesViewer.__configureFilter" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__configureFilter" /> <keyword name="VariablesViewer.__createPopupMenus" id="VariablesViewer.__createPopupMenus" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__createPopupMenus" /> - <keyword name="VariablesViewer.__expandItemSignal" id="VariablesViewer.__expandItemSignal" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__expandItemSignal" /> - <keyword name="VariablesViewer.__findItem" id="VariablesViewer.__findItem" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__findItem" /> - <keyword name="VariablesViewer.__generateItem" id="VariablesViewer.__generateItem" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__generateItem" /> - <keyword name="VariablesViewer.__getDispType" id="VariablesViewer.__getDispType" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__getDispType" /> + <keyword name="VariablesViewer.__expandChildren" id="VariablesViewer.__expandChildren" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__expandChildren" /> + <keyword name="VariablesViewer.__itemDoubleClicked" id="VariablesViewer.__itemDoubleClicked" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__itemDoubleClicked" /> + <keyword name="VariablesViewer.__mdlRequestExpand" id="VariablesViewer.__mdlRequestExpand" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__mdlRequestExpand" /> <keyword name="VariablesViewer.__refreshView" id="VariablesViewer.__refreshView" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__refreshView" /> - <keyword name="VariablesViewer.__resort" id="VariablesViewer.__resort" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__resort" /> - <keyword name="VariablesViewer.__sectionClicked" id="VariablesViewer.__sectionClicked" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__sectionClicked" /> <keyword name="VariablesViewer.__showContextMenu" id="VariablesViewer.__showContextMenu" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__showContextMenu" /> <keyword name="VariablesViewer.__showDetails" id="VariablesViewer.__showDetails" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__showDetails" /> <keyword name="VariablesViewer.__showVariableDetails" id="VariablesViewer.__showVariableDetails" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.__showVariableDetails" /> - <keyword name="VariablesViewer.collapseItem" id="VariablesViewer.collapseItem" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.collapseItem" /> - <keyword name="VariablesViewer.expandItem" id="VariablesViewer.expandItem" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.expandItem" /> <keyword name="VariablesViewer.handleResetUI" id="VariablesViewer.handleResetUI" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.handleResetUI" /> - <keyword name="VariablesViewer.mouseDoubleClickEvent" id="VariablesViewer.mouseDoubleClickEvent" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.mouseDoubleClickEvent" /> + <keyword name="VariablesViewer.resizeEvent" id="VariablesViewer.resizeEvent" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.resizeEvent" /> <keyword name="VariablesViewer.showVariable" id="VariablesViewer.showVariable" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.showVariable" /> <keyword name="VariablesViewer.showVariables" id="VariablesViewer.showVariables" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.showVariables" /> + <keyword name="VariablesViewer.verticalScrollbarValueChanged" id="VariablesViewer.verticalScrollbarValueChanged" ref="eric6.Debugger.VariablesViewer.html#VariablesViewer.verticalScrollbarValueChanged" /> <keyword name="VcsCommandOptionsDialog" id="VcsCommandOptionsDialog" ref="eric6.VCS.CommandOptionsDialog.html#VcsCommandOptionsDialog" /> <keyword name="VcsCommandOptionsDialog (Constructor)" id="VcsCommandOptionsDialog (Constructor)" ref="eric6.VCS.CommandOptionsDialog.html#VcsCommandOptionsDialog.__init__" /> <keyword name="VcsCommandOptionsDialog.getOptions" id="VcsCommandOptionsDialog.getOptions" ref="eric6.VCS.CommandOptionsDialog.html#VcsCommandOptionsDialog.getOptions" />
--- a/eric6/Documentation/Source/eric6.DebugClients.Python.DebugClientBase.html Sun May 19 12:30:02 2019 +0200 +++ b/eric6/Documentation/Source/eric6.DebugClients.Python.DebugClientBase.html Sun May 19 12:35:24 2019 +0200 @@ -77,7 +77,7 @@ object <h3>Class Attributes</h3> <table> -<tr><td>Indicators</td></tr><tr><td>clientCapabilities</td></tr> +<tr><td>Indicators</td></tr><tr><td>arrayTypes</td></tr><tr><td>clientCapabilities</td></tr> </table> <h3>Class Methods</h3> <table> @@ -299,7 +299,7 @@ </dd> </dl><a NAME="DebugClientBase.__dumpVariable" ID="DebugClientBase.__dumpVariable"></a> <h4>DebugClientBase.__dumpVariable</h4> -<b>__dumpVariable</b>(<i>var, frmnr, scope, filterList, maxSize</i>) +<b>__dumpVariable</b>(<i>var, frmnr, scope, filterList</i>) <p> Private method to return the variables of a frame to the debug server. </p><dl> @@ -309,21 +309,16 @@ </dd><dt><i>frmnr</i> (int)</dt> <dd> distance of frame reported on. 0 is the current frame -</dd><dt><i>scope</i></dt> +</dd><dt><i>scope</i> (int)</dt> <dd> -1 to report global variables, 0 for local variables (int) +1 to report global variables, 0 for local variables </dd><dt><i>filterList</i> (list of int)</dt> <dd> the indices of variable types to be filtered -</dd><dt><i>maxSize</i> (int)</dt> -<dd> -maximum size the formatted value of a variable will - be shown. If it is bigger than that, a 'too big' indication will - be given. </dd> </dl><a NAME="DebugClientBase.__dumpVariables" ID="DebugClientBase.__dumpVariables"></a> <h4>DebugClientBase.__dumpVariables</h4> -<b>__dumpVariables</b>(<i>frmnr, scope, filterList, maxSize</i>) +<b>__dumpVariables</b>(<i>frmnr, scope, filterList</i>) <p> Private method to return the variables of a frame to the debug server. </p><dl> @@ -336,11 +331,6 @@ </dd><dt><i>filterList</i> (list of int)</dt> <dd> the indices of variable types to be filtered -</dd><dt><i>maxSize</i> (int)</dt> -<dd> -maximum size the formatted value of a variable will - be shown. If it is bigger than that, a 'too big' indication will - be given. </dd> </dl><a NAME="DebugClientBase.__extractIndicators" ID="DebugClientBase.__extractIndicators"></a> <h4>DebugClientBase.__extractIndicators</h4> @@ -385,7 +375,7 @@ </dd> </dl><a NAME="DebugClientBase.__formatVariablesList" ID="DebugClientBase.__formatVariablesList"></a> <h4>DebugClientBase.__formatVariablesList</h4> -<b>__formatVariablesList</b>(<i>keylist, dict_, scope, filterList=None, formatSequences=False, maxSize=0</i>) +<b>__formatVariablesList</b>(<i>dict_, scope, filterList=None</i>) <p> Private method to produce a formated variables list. </p><p> @@ -395,10 +385,7 @@ expressions. The formated variables list (a list of tuples of 3 values) is returned. </p><dl> -<dt><i>keylist</i> (list of str)</dt> -<dd> -keys of the dictionary to be formatted -</dd><dt><i>dict_</i> (dict)</dt> +<dt><i>dict_</i> (dict)</dt> <dd> the dictionary to be scanned </dd><dt><i>scope</i> (int)</dt> @@ -412,16 +399,6 @@ the indices of variable types to be filtered. Variables are only added to the list, if their type is not contained in the filter list. -</dd><dt><i>formatSequences</i> (bool)</dt> -<dd> -flag indicating, that sequence or dictionary - variables should be formatted. If it is 0 (or false), just the - number of items contained in these variables is returned. -</dd><dt><i>maxSize</i> (int)</dt> -<dd> -maximum size the formatted value of a variable will - be shown. If it is bigger than that, a 'too big' indication will - be placed in the value field. </dd> </dl><dl> <dt>Returns:</dt>
--- a/eric6/Documentation/Source/eric6.DebugClients.Python.DebugConfig.html Sun May 19 12:30:02 2019 +0200 +++ b/eric6/Documentation/Source/eric6.DebugClients.Python.DebugConfig.html Sun May 19 12:35:24 2019 +0200 @@ -25,7 +25,7 @@ </p> <h3>Global Attributes</h3> <table> -<tr><td>ConfigVarTypeStrings</td></tr> +<tr><td>BatchSize</td></tr><tr><td>ConfigKnownQtTypes</td></tr><tr><td>ConfigQtNames</td></tr><tr><td>ConfigVarTypeStrings</td></tr> </table> <h3>Classes</h3> <table>
--- a/eric6/Documentation/Source/eric6.DebugClients.Python.DebugVariables.html Sun May 19 12:30:02 2019 +0200 +++ b/eric6/Documentation/Source/eric6.DebugClients.Python.DebugVariables.html Sun May 19 12:35:24 2019 +0200 @@ -25,14 +25,11 @@ </p> <h3>Global Attributes</h3> <table> -<tr><td>MaxItemsToHandle</td></tr><tr><td>TooLargeAttribute</td></tr><tr><td>TooLargeMessage</td></tr><tr><td>_TypeMap</td></tr><tr><td>arrayResolver</td></tr><tr><td>defaultResolver</td></tr><tr><td>dictResolver</td></tr><tr><td>listResolver</td></tr><tr><td>multiValueDictResolver</td></tr><tr><td>ndarrayResolver</td></tr><tr><td>setResolver</td></tr> +<tr><td>_TypeMap</td></tr><tr><td>arrayResolver</td></tr><tr><td>defaultResolver</td></tr><tr><td>dictResolver</td></tr><tr><td>dictViewResolver</td></tr><tr><td>listResolver</td></tr><tr><td>multiValueDictResolver</td></tr><tr><td>ndarrayResolver</td></tr><tr><td>setResolver</td></tr> </table> <h3>Classes</h3> <table> <tr> -<td><a href="#ArrayItemsContainer">ArrayItemsContainer</a></td> -<td>Class to store array.array items.</td> -</tr><tr> <td><a href="#ArrayResolver">ArrayResolver</a></td> <td>Class used to resolve from array.array including some meta data.</td> </tr><tr> @@ -45,15 +42,15 @@ <td><a href="#DictResolver">DictResolver</a></td> <td>Class used to resolve from a dictionary.</td> </tr><tr> +<td><a href="#DictViewResolver">DictViewResolver</a></td> +<td>Class used to resolve from dict views.</td> +</tr><tr> <td><a href="#ListResolver">ListResolver</a></td> <td>Class used to resolve from a tuple or list.</td> </tr><tr> <td><a href="#MultiValueDictResolver">MultiValueDictResolver</a></td> <td>Class used to resolve from Django multi value dictionaries.</td> </tr><tr> -<td><a href="#NdArrayItemsContainer">NdArrayItemsContainer</a></td> -<td>Class to store ndarray items.</td> -</tr><tr> <td><a href="#NdArrayResolver">NdArrayResolver</a></td> <td>Class used to resolve from numpy ndarray including some meta data.</td> </tr><tr> @@ -72,32 +69,6 @@ </tr> </table> <hr /><hr /> -<a NAME="ArrayItemsContainer" ID="ArrayItemsContainer"></a> -<h2>ArrayItemsContainer</h2> -<p> - Class to store array.array items. -</p> -<h3>Derived from</h3> -None -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> <a NAME="ArrayResolver" ID="ArrayResolver"></a> <h2>ArrayResolver</h2> <p> @@ -222,12 +193,6 @@ <dd> dict </dd> -</dl><dl> -<dt>Raises <b>NotImplementedError</b>:</dt> -<dd> -raised to indicate a missing - implementation -</dd> </dl><a NAME="BaseResolver.resolve" ID="BaseResolver.resolve"></a> <h4>BaseResolver.resolve</h4> <b>resolve</b>(<i>var, attribute</i>) @@ -251,12 +216,6 @@ <dd> any </dd> -</dl><dl> -<dt>Raises <b>NotImplementedError</b>:</dt> -<dd> -raised to indicate a missing - implementation -</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> @@ -280,9 +239,6 @@ <tr> <td><a href="#DefaultResolver.getDictionary">getDictionary</a></td> <td>Public method to get the attributes of a variable as a dictionary.</td> -</tr><tr> -<td><a href="#DefaultResolver.resolve">resolve</a></td> -<td>Public method to get an attribute from a variable.</td> </tr> </table> <h3>Static Methods</h3> @@ -309,29 +265,6 @@ <dd> dict </dd> -</dl><a NAME="DefaultResolver.resolve" ID="DefaultResolver.resolve"></a> -<h4>DefaultResolver.resolve</h4> -<b>resolve</b>(<i>var, attribute</i>) -<p> - Public method to get an attribute from a variable. -</p><dl> -<dt><i>var</i> (any)</dt> -<dd> -variable to extract an attribute or value from -</dd><dt><i>attribute</i> (str)</dt> -<dd> -name of the attribute to extract -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -value of the attribute -</dd> -</dl><dl> -<dt>Return Type:</dt> -<dd> -any -</dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> @@ -433,6 +366,81 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="DictViewResolver" ID="DictViewResolver"></a> +<h2>DictViewResolver</h2> +<p> + Class used to resolve from dict views. +</p> +<h3>Derived from</h3> +ListResolver +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#DictViewResolver.getDictionary">getDictionary</a></td> +<td>Public method to get the attributes of a variable as a dictionary.</td> +</tr><tr> +<td><a href="#DictViewResolver.resolve">resolve</a></td> +<td>Public method to get an attribute from a variable.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="DictViewResolver.getDictionary" ID="DictViewResolver.getDictionary"></a> +<h4>DictViewResolver.getDictionary</h4> +<b>getDictionary</b>(<i>var</i>) +<p> + Public method to get the attributes of a variable as a dictionary. +</p><dl> +<dt><i>var</i> (any)</dt> +<dd> +variable to be converted +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +dictionary containing the variable attributes +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +dict +</dd> +</dl><a NAME="DictViewResolver.resolve" ID="DictViewResolver.resolve"></a> +<h4>DictViewResolver.resolve</h4> +<b>resolve</b>(<i>var, attribute</i>) +<p> + Public method to get an attribute from a variable. +</p><dl> +<dt><i>var</i> (tuple or list)</dt> +<dd> +variable to extract an attribute or value from +</dd><dt><i>attribute</i> (str)</dt> +<dd> +id of the value to extract +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +value of the attribute +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +any +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="ListResolver" ID="ListResolver"></a> <h2>ListResolver</h2> <p> @@ -583,32 +591,6 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> -<a NAME="NdArrayItemsContainer" ID="NdArrayItemsContainer"></a> -<h2>NdArrayItemsContainer</h2> -<p> - Class to store ndarray items. -</p> -<h3>Derived from</h3> -None -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> - -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> <a NAME="NdArrayResolver" ID="NdArrayResolver"></a> <h2>NdArrayResolver</h2> <p> @@ -803,12 +785,12 @@ </dl><dl> <dt>Returns:</dt> <dd> -tuple containing the type, type name, type string and resolver +tuple containing the type name, type string and resolver </dd> </dl><dl> <dt>Return Type:</dt> <dd> -tuple of type, str, str, BaseResolver +tuple of str, str, BaseResolver </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/eric6/Documentation/Source/eric6.Debugger.DebugViewer.html Sun May 19 12:30:02 2019 +0200 +++ b/eric6/Documentation/Source/eric6.Debugger.DebugViewer.html Sun May 19 12:35:24 2019 +0200 @@ -63,7 +63,10 @@ the exception logger. Additionally a list of all threads is shown. </p><h3>Signals</h3> <dl> -<dt>sourceFile(string, int)</dt> +<dt>preferencesChanged()</dt> +<dd> +emitted to react on changed preferences +</dd><dt>sourceFile(string, int)</dt> <dd> emitted to open a source file at a line </dd> @@ -108,6 +111,9 @@ <td><a href="#DebugViewer.handleDebuggingStarted">handleDebuggingStarted</a></td> <td>Public slot to handle the start of a debugging session.</td> </tr><tr> +<td><a href="#DebugViewer.handlePreferencesChanged">handlePreferencesChanged</a></td> +<td>Public slot to handle the preferencesChanged signal.</td> +</tr><tr> <td><a href="#DebugViewer.handleResetUI">handleResetUI</a></td> <td>Public method to reset the SBVviewer.</td> </tr><tr> @@ -117,9 +123,6 @@ <td><a href="#DebugViewer.isCallTraceEnabled">isCallTraceEnabled</a></td> <td>Public method to get the state of the call trace function.</td> </tr><tr> -<td><a href="#DebugViewer.preferencesChanged">preferencesChanged</a></td> -<td>Public slot to handle the preferencesChanged signal.</td> -</tr><tr> <td><a href="#DebugViewer.setCallTraceToProjectMode">setCallTraceToProjectMode</a></td> <td>Public slot to set the call trace viewer to project mode.</td> </tr><tr> @@ -242,6 +245,11 @@ Public slot to handle the start of a debugging session. </p><p> This slot sets the variables filter expressions. +</p><a NAME="DebugViewer.handlePreferencesChanged" ID="DebugViewer.handlePreferencesChanged"></a> +<h4>DebugViewer.handlePreferencesChanged</h4> +<b>handlePreferencesChanged</b>(<i></i>) +<p> + Public slot to handle the preferencesChanged signal. </p><a NAME="DebugViewer.handleResetUI" ID="DebugViewer.handleResetUI"></a> <h4>DebugViewer.handleResetUI</h4> <b>handleResetUI</b>(<i></i>) @@ -267,12 +275,7 @@ <dd> flag indicating the state of the call trace function (boolean) </dd> -</dl><a NAME="DebugViewer.preferencesChanged" ID="DebugViewer.preferencesChanged"></a> -<h4>DebugViewer.preferencesChanged</h4> -<b>preferencesChanged</b>(<i></i>) -<p> - Public slot to handle the preferencesChanged signal. -</p><a NAME="DebugViewer.setCallTraceToProjectMode" ID="DebugViewer.setCallTraceToProjectMode"></a> +</dl><a NAME="DebugViewer.setCallTraceToProjectMode" ID="DebugViewer.setCallTraceToProjectMode"></a> <h4>DebugViewer.setCallTraceToProjectMode</h4> <b>setCallTraceToProjectMode</b>(<i>enabled</i>) <p>
--- a/eric6/Documentation/Source/eric6.Debugger.VariablesViewer.html Sun May 19 12:30:02 2019 +0200 +++ b/eric6/Documentation/Source/eric6.Debugger.VariablesViewer.html Sun May 19 12:35:24 2019 +0200 @@ -21,29 +21,26 @@ <body><a NAME="top" ID="top"></a> <h1>eric6.Debugger.VariablesViewer</h1> <p> -Module implementing the variables viewer widget. +Module implementing the variables viewer view based on QTreeView. </p> <h3>Global Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>SORT_ROLE</td></tr> </table> <h3>Classes</h3> <table> <tr> -<td><a href="#ArrayElementVarItem">ArrayElementVarItem</a></td> -<td>Class implementing a VariableItem that represents an array element.</td> -</tr><tr> -<td><a href="#SpecialArrayElementVarItem">SpecialArrayElementVarItem</a></td> -<td>Class implementing a QTreeWidgetItem that represents a special array variable node.</td> +<td><a href="#VariableItem">VariableItem</a></td> +<td>Class implementing the data structure for all variable items.</td> </tr><tr> -<td><a href="#SpecialVarItem">SpecialVarItem</a></td> -<td>Class implementing a VariableItem that represents a special variable node.</td> +<td><a href="#VariablesModel">VariablesModel</a></td> +<td>Class implementing the data model for QTreeView.</td> </tr><tr> -<td><a href="#VariableItem">VariableItem</a></td> -<td>Class implementing the data structure for variable items.</td> +<td><a href="#VariablesProxyModel">VariablesProxyModel</a></td> +<td>Class for handling the sort operations.</td> </tr><tr> <td><a href="#VariablesViewer">VariablesViewer</a></td> -<td>Class implementing the variables viewer widget.</td> +<td>Class implementing the variables viewer view.</td> </tr> </table> <h3>Functions</h3> @@ -51,16 +48,16 @@ <tr><td>None</td></tr> </table> <hr /><hr /> -<a NAME="ArrayElementVarItem" ID="ArrayElementVarItem"></a> -<h2>ArrayElementVarItem</h2> +<a NAME="VariableItem" ID="VariableItem"></a> +<h2>VariableItem</h2> <p> - Class implementing a VariableItem that represents an array element. + Class implementing the data structure for all variable items. </p> <h3>Derived from</h3> -VariableItem +object <h3>Class Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>Type2Indicators</td></tr><tr><td>arrayTypes</td></tr><tr><td>noOfItemsStr</td></tr><tr><td>nonExpandableTypes</td></tr><tr><td>rx_nonprintable</td></tr> </table> <h3>Class Methods</h3> <table> @@ -69,102 +66,132 @@ <h3>Methods</h3> <table> <tr> -<td><a href="#ArrayElementVarItem.__init__">ArrayElementVarItem</a></td> +<td><a href="#VariableItem.__init__">VariableItem</a></td> <td>Constructor</td> +</tr><tr> +<td><a href="#VariableItem.__getName">__getName</a></td> +<td>Private method to extract the variable name.</td> +</tr><tr> +<td><a href="#VariableItem.__getType">__getType</a></td> +<td>Private method to process the type of the variable.</td> +</tr><tr> +<td><a href="#VariableItem.__getValue">__getValue</a></td> +<td>Private method to process the variables value.</td> +</tr><tr> +<td><a href="#VariableItem.absolutCount">absolutCount</a></td> +<td>Public property to get the total number of children.</td> +</tr><tr> +<td><a href="#VariableItem.populated">populated</a></td> +<td>Public property returning a flag indicating if item is fully populated.</td> </tr> </table> <h3>Static Methods</h3> <table> <tr><td>None</td></tr> </table> -<a NAME="ArrayElementVarItem.__init__" ID="ArrayElementVarItem.__init__"></a> -<h4>ArrayElementVarItem (Constructor)</h4> -<b>ArrayElementVarItem</b>(<i>parent, dvar, dvalue, dtype</i>) +<a NAME="VariableItem.__init__" ID="VariableItem.__init__"></a> +<h4>VariableItem (Constructor)</h4> +<b>VariableItem</b>(<i>parent, dvar, dtype, dvalue</i>) <p> Constructor </p><dl> -<dt><i>parent</i></dt> +<dt><i>parent</i> (VariableItem)</dt> +<dd> +reference to the parent item +</dd><dt><i>dvar</i> (str)</dt> +<dd> +variable name +</dd><dt><i>dtype</i> (str)</dt> +<dd> +type string +</dd><dt><i>dvalue</i> (str)</dt> <dd> -parent of this item -</dd><dt><i>dvar</i></dt> +value string +</dd> +</dl><a NAME="VariableItem.__getName" ID="VariableItem.__getName"></a> +<h4>VariableItem.__getName</h4> +<b>__getName</b>(<i>dvar</i>) +<p> + Private method to extract the variable name. +</p><dl> +<dt><i>dvar</i> (str)</dt> +<dd> +name of variable maybe with ID +</dd> +</dl><a NAME="VariableItem.__getType" ID="VariableItem.__getType"></a> +<h4>VariableItem.__getType</h4> +<b>__getType</b>(<i>dtype</i>) +<p> + Private method to process the type of the variable. +</p><p> + If type is known to have children, the corresponding flag is set. +</p><dl> +<dt><i>dtype</i> (str)</dt> <dd> -variable name (string) -</dd><dt><i>dvalue</i></dt> +type string +</dd> +</dl><a NAME="VariableItem.__getValue" ID="VariableItem.__getValue"></a> +<h4>VariableItem.__getValue</h4> +<b>__getValue</b>(<i>dtype, dvalue</i>) +<p> + Private method to process the variables value. +</p><p> + Define and limit value, set tooltip text. If type is known to have + children, the corresponding flag is set. +</p><dl> +<dt><i>dtype</i> (str)</dt> +<dd> +type string +</dd><dt><i>dvalue</i> (str)</dt> <dd> -value string (string) -</dd><dt><i>dtype</i></dt> +value of variable encoded as utf-8 +</dd> +</dl><a NAME="VariableItem.absolutCount" ID="VariableItem.absolutCount"></a> +<h4>VariableItem.absolutCount</h4> +<b>absolutCount</b>(<i></i>) +<p> + Public property to get the total number of children. +</p><dl> +<dt>Returns:</dt> +<dd> +total number of children +</dd> +</dl><dl> +<dt>Return Type:</dt> <dd> -type string (string) +int +</dd> +</dl><a NAME="VariableItem.populated" ID="VariableItem.populated"></a> +<h4>VariableItem.populated</h4> +<b>populated</b>(<i></i>) +<p> + Public property returning a flag indicating if item is fully populated. +</p><dl> +<dt>Returns:</dt> +<dd> +item is fully populated +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +bool </dd> </dl> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> -<a NAME="SpecialArrayElementVarItem" ID="SpecialArrayElementVarItem"></a> -<h2>SpecialArrayElementVarItem</h2> +<a NAME="VariablesModel" ID="VariablesModel"></a> +<h2>VariablesModel</h2> <p> - Class implementing a QTreeWidgetItem that represents a special array - variable node. -</p> -<h3>Derived from</h3> -SpecialVarItem -<h3>Class Attributes</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#SpecialArrayElementVarItem.__init__">SpecialArrayElementVarItem</a></td> -<td>Constructor</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="SpecialArrayElementVarItem.__init__" ID="SpecialArrayElementVarItem.__init__"></a> -<h4>SpecialArrayElementVarItem (Constructor)</h4> -<b>SpecialArrayElementVarItem</b>(<i>parent, dvar, dvalue, dtype, frmnr, globalScope</i>) -<p> - Constructor -</p><dl> -<dt><i>parent</i></dt> + Class implementing the data model for QTreeView. +</p><h3>Signals</h3> +<dl> +<dt>expand</dt> <dd> -parent of this item -</dd><dt><i>dvar</i></dt> -<dd> -variable name (string) -</dd><dt><i>dvalue</i></dt> -<dd> -value string (string) -</dd><dt><i>dtype</i></dt> -<dd> -type string (string) -</dd><dt><i>frmnr</i></dt> -<dd> -frame number (0 is the current frame) (int) -</dd><dt><i>globalScope</i></dt> -<dd> -flag indicating global (True) or local (False) - variables +trigger QTreeView to expand given index </dd> </dl> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> -<a NAME="SpecialVarItem" ID="SpecialVarItem"></a> -<h2>SpecialVarItem</h2> -<p> - Class implementing a VariableItem that represents a special variable node. -</p><p> - These special variable nodes are generated for classes, lists, - tuples and dictionaries. -</p> <h3>Derived from</h3> -VariableItem +QAbstractItemModel <h3>Class Attributes</h3> <table> <tr><td>None</td></tr> @@ -176,251 +203,485 @@ <h3>Methods</h3> <table> <tr> -<td><a href="#SpecialVarItem.__init__">SpecialVarItem</a></td> +<td><a href="#VariablesModel.__init__">VariablesModel</a></td> <td>Constructor</td> </tr><tr> -<td><a href="#SpecialVarItem.expand">expand</a></td> -<td>Public method to expand the item.</td> -</tr> -</table> -<h3>Static Methods</h3> -<table> -<tr><td>None</td></tr> -</table> -<a NAME="SpecialVarItem.__init__" ID="SpecialVarItem.__init__"></a> -<h4>SpecialVarItem (Constructor)</h4> -<b>SpecialVarItem</b>(<i>parent, dvar, dvalue, dtype, frmnr, globalScope</i>) -<p> - Constructor -</p><dl> -<dt><i>parent</i></dt> -<dd> -parent of this item -</dd><dt><i>dvar</i></dt> -<dd> -variable name (string) -</dd><dt><i>dvalue</i></dt> -<dd> -value string (string) -</dd><dt><i>dtype</i></dt> -<dd> -type string (string) -</dd><dt><i>frmnr</i></dt> -<dd> -frame number (0 is the current frame) (int) -</dd><dt><i>globalScope</i></dt> -<dd> -flag indicating global (True) or local (False) - variables -</dd> -</dl><a NAME="SpecialVarItem.expand" ID="SpecialVarItem.expand"></a> -<h4>SpecialVarItem.expand</h4> -<b>expand</b>(<i></i>) -<p> - Public method to expand the item. -</p> -<div align="right"><a href="#top">Up</a></div> -<hr /><hr /> -<a NAME="VariableItem" ID="VariableItem"></a> -<h2>VariableItem</h2> -<p> - Class implementing the data structure for variable items. -</p> -<h3>Derived from</h3> -QTreeWidgetItem -<h3>Class Attributes</h3> -<table> -<tr><td>Indicators</td></tr><tr><td>Type2Indicators</td></tr> -</table> -<h3>Class Methods</h3> -<table> -<tr> -<td><a href="#VariableItem.extractId">extractId</a></td> -<td>Class method to extract the ID string from a variable text.</td> +<td><a href="#VariablesModel.__buildTreePath">__buildTreePath</a></td> +<td>Private method to build up a path from the root to parent.</td> +</tr><tr> +<td><a href="#VariablesModel.__cleanupParentList">__cleanupParentList</a></td> +<td>Private method to remove items which are left over at the end of the child list.</td> +</tr><tr> +<td><a href="#VariablesModel.__findPendingItem">__findPendingItem</a></td> +<td>Private method to find the next item to request data from debugger.</td> +</tr><tr> +<td><a href="#VariablesModel.__findVariable">__findVariable</a></td> +<td>Private method to get to the given variable.</td> +</tr><tr> +<td><a href="#VariablesModel.clear">clear</a></td> +<td>Public method to clear the complete data model.</td> +</tr><tr> +<td><a href="#VariablesModel.columnCount">columnCount</a></td> +<td>Public method to get the column count.</td> +</tr><tr> +<td><a href="#VariablesModel.data">data</a></td> +<td>Public method get the role data of item.</td> +</tr><tr> +<td><a href="#VariablesModel.flags">flags</a></td> +<td>Public method to get the item flags.</td> +</tr><tr> +<td><a href="#VariablesModel.getMore">getMore</a></td> +<td>Public method to fetch the next variable from debugger.</td> </tr><tr> -<td><a href="#VariableItem.extractIndicators">extractIndicators</a></td> -<td>Class method to extract the indicator string from a variable text.</td> -</tr> -</table> -<h3>Methods</h3> -<table> -<tr> -<td><a href="#VariableItem.__init__">VariableItem</a></td> -<td>Constructor</td> +<td><a href="#VariablesModel.handlePreferencesChanged">handlePreferencesChanged</a></td> +<td>Public slot to handle the preferencesChanged signal.</td> +</tr><tr> +<td><a href="#VariablesModel.hasChildren">hasChildren</a></td> +<td>Public method to get a flag if parent has children.</td> </tr><tr> -<td><a href="#VariableItem._buildKey">_buildKey</a></td> -<td>Protected method to build the access key for the variable.</td> +<td><a href="#VariablesModel.headerData">headerData</a></td> +<td>Public method get the header names.</td> </tr><tr> -<td><a href="#VariableItem.attachDummy">attachDummy</a></td> -<td>Public method to attach a dummy sub item to allow for lazy population.</td> +<td><a href="#VariablesModel.index">index</a></td> +<td>Public method to get the index of item at row:column of parent.</td> </tr><tr> -<td><a href="#VariableItem.collapse">collapse</a></td> -<td>Public method to collapse the item.</td> +<td><a href="#VariablesModel.parent">parent</a></td> +<td>Public method to get the parent of the given child.</td> </tr><tr> -<td><a href="#VariableItem.data">data</a></td> -<td>Public method to return the data for the requested role.</td> -</tr><tr> -<td><a href="#VariableItem.deleteChildren">deleteChildren</a></td> -<td>Public method to delete all children (cleaning the subtree).</td> +<td><a href="#VariablesModel.resetModifiedMarker">resetModifiedMarker</a></td> +<td>Public method to remove the modified marker from changed items.</td> </tr><tr> -<td><a href="#VariableItem.expand">expand</a></td> -<td>Public method to expand the item.</td> +<td><a href="#VariablesModel.rowCount">rowCount</a></td> +<td>Public method to get the row count.</td> </tr><tr> -<td><a href="#VariableItem.getId">getId</a></td> -<td>Public method to get the ID string.</td> +<td><a href="#VariablesModel.setExpanded">setExpanded</a></td> +<td>Public method to set the expanded state of item.</td> </tr><tr> -<td><a href="#VariableItem.getValue">getValue</a></td> -<td>Public method to return the value of the item.</td> +<td><a href="#VariablesModel.showVariables">showVariables</a></td> +<td>Public method to update the data model of variable in pathlist.</td> </tr> </table> <h3>Static Methods</h3> <table> <tr><td>None</td></tr> </table> -<a NAME="VariableItem.extractId" ID="VariableItem.extractId"></a> -<h4>VariableItem.extractId (class method)</h4> -<b>extractId</b>(<i>var</i>) +<a NAME="VariablesModel.__init__" ID="VariablesModel.__init__"></a> +<h4>VariablesModel (Constructor)</h4> +<b>VariablesModel</b>(<i>treeView, globalScope</i>) <p> - Class method to extract the ID string from a variable text. + Constructor </p><dl> -<dt><i>var</i> (str)</dt> +<dt><i>treeView</i> (VariablesViewer)</dt> +<dd> +QTreeView showing the data +</dd><dt><i>globalScope</i> (bool)</dt> <dd> -variable text +flag indicating global (True) or local (False) + variables +</dd> +</dl><a NAME="VariablesModel.__buildTreePath" ID="VariablesModel.__buildTreePath"></a> +<h4>VariablesModel.__buildTreePath</h4> +<b>__buildTreePath</b>(<i>parent</i>) +<p> + Private method to build up a path from the root to parent. +</p><dl> +<dt><i>parent</i> (VariableItem)</dt> +<dd> +item to build the path for </dd> </dl><dl> <dt>Returns:</dt> <dd> -tuple containing the variable text without ID and the ID string +list of names denoting the path from the root +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +tuple of str +</dd> +</dl><a NAME="VariablesModel.__cleanupParentList" ID="VariablesModel.__cleanupParentList"></a> +<h4>VariablesModel.__cleanupParentList</h4> +<b>__cleanupParentList</b>(<i>parent, parentIdx</i>) +<p> + Private method to remove items which are left over at the end of the + child list. +</p><dl> +<dt><i>parent</i> (VariableItem)</dt> +<dd> +to clean up +</dd><dt><i>parentIdx</i> (QModelIndex)</dt> +<dd> +the parent index as QModelIndex +</dd> +</dl><a NAME="VariablesModel.__findPendingItem" ID="VariablesModel.__findPendingItem"></a> +<h4>VariablesModel.__findPendingItem</h4> +<b>__findPendingItem</b>(<i>parent=None, pathlist=()</i>) +<p> + Private method to find the next item to request data from debugger. +</p><dl> +<dt><i>parent</i> (VariableItem)</dt> +<dd> +the model parent +</dd><dt><i>pathlist</i> (list of str)</dt> +<dd> +full path to the variable +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +next item index to request data from debugger +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QModelIndex +</dd> +</dl><a NAME="VariablesModel.__findVariable" ID="VariablesModel.__findVariable"></a> +<h4>VariablesModel.__findVariable</h4> +<b>__findVariable</b>(<i>pathlist</i>) +<p> + Private method to get to the given variable. +</p><dl> +<dt><i>pathlist</i> (list of str)</dt> +<dd> +full path to the variable +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +the found variable or None if it doesn't exist </dd> </dl><dl> <dt>Return Type:</dt> <dd> -tuple of two str +VariableItem or None </dd> -</dl><a NAME="VariableItem.extractIndicators" ID="VariableItem.extractIndicators"></a> -<h4>VariableItem.extractIndicators (class method)</h4> -<b>extractIndicators</b>(<i>var</i>) +</dl><a NAME="VariablesModel.clear" ID="VariablesModel.clear"></a> +<h4>VariablesModel.clear</h4> +<b>clear</b>(<i>reset=False</i>) +<p> + Public method to clear the complete data model. +</p><dl> +<dt><i>reset</i> (bool)</dt> +<dd> +flag to clear the expanded keys also +</dd> +</dl><a NAME="VariablesModel.columnCount" ID="VariablesModel.columnCount"></a> +<h4>VariablesModel.columnCount</h4> +<b>columnCount</b>(<i>parent=QModelIndex()</i>) <p> - Class method to extract the indicator string from a variable text. + Public method to get the column count. </p><dl> -<dt><i>var</i> (str)</dt> +<dt><i>parent</i> (QModelIndex)</dt> +<dd> +the model parent +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +number of columns +</dd> +</dl><dl> +<dt>Return Type:</dt> <dd> -variable text +int +</dd> +</dl><a NAME="VariablesModel.data" ID="VariablesModel.data"></a> +<h4>VariablesModel.data</h4> +<b>data</b>(<i>index, role=Qt.DisplayRole</i>) +<p> + Public method get the role data of item. +</p><dl> +<dt><i>index</i> (QModelIndex)</dt> +<dd> +the model index +</dd><dt><i>role</i> (QtCore.Qt.ItemDataRole)</dt> +<dd> +the requested data role </dd> </dl><dl> <dt>Returns:</dt> <dd> -tuple containing the variable text without indicators and the - indicator string +role data of item +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +Any +</dd> +</dl><a NAME="VariablesModel.flags" ID="VariablesModel.flags"></a> +<h4>VariablesModel.flags</h4> +<b>flags</b>(<i>index</i>) +<p> + Public method to get the item flags. +</p><dl> +<dt><i>index</i> (QModelIndex)</dt> +<dd> +of item +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +item flags +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QtCore.Qt.ItemFlag +</dd> +</dl><a NAME="VariablesModel.getMore" ID="VariablesModel.getMore"></a> +<h4>VariablesModel.getMore</h4> +<b>getMore</b>(<i></i>) +<p> + Public method to fetch the next variable from debugger. +</p><a NAME="VariablesModel.handlePreferencesChanged" ID="VariablesModel.handlePreferencesChanged"></a> +<h4>VariablesModel.handlePreferencesChanged</h4> +<b>handlePreferencesChanged</b>(<i></i>) +<p> + Public slot to handle the preferencesChanged signal. +</p><a NAME="VariablesModel.hasChildren" ID="VariablesModel.hasChildren"></a> +<h4>VariablesModel.hasChildren</h4> +<b>hasChildren</b>(<i>parent=QModelIndex()</i>) +<p> + Public method to get a flag if parent has children. +</p><dl> +<dt><i>parent</i> (QModelIndex)</dt> +<dd> +the model parent +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating parent has children </dd> </dl><dl> <dt>Return Type:</dt> <dd> -tuple of two str +bool </dd> -</dl><a NAME="VariableItem.__init__" ID="VariableItem.__init__"></a> -<h4>VariableItem (Constructor)</h4> -<b>VariableItem</b>(<i>parent, dvar, dvalue, dtype</i>) +</dl><a NAME="VariablesModel.headerData" ID="VariablesModel.headerData"></a> +<h4>VariablesModel.headerData</h4> +<b>headerData</b>(<i>section, orientation, role=Qt.DisplayRole</i>) <p> - Constructor + Public method get the header names. </p><dl> -<dt><i>parent</i></dt> +<dt><i>section</i> (int)</dt> +<dd> +the header section (row/coulumn) +</dd><dt><i>orientation</i> (QtCore.Qt.Orientation)</dt> <dd> -reference to the parent item -</dd><dt><i>dvar</i></dt> +the header's orientation +</dd><dt><i>role</i> (QtCore.Qt.ItemDataRole)</dt> +<dd> +the requested data role +</dd> +</dl><dl> +<dt>Returns:</dt> <dd> -variable name (string) -</dd><dt><i>dvalue</i></dt> -<dd> -value string (string) -</dd><dt><i>dtype</i></dt> +header name +</dd> +</dl><dl> +<dt>Return Type:</dt> <dd> -type string (string) +str or None </dd> -</dl><a NAME="VariableItem._buildKey" ID="VariableItem._buildKey"></a> -<h4>VariableItem._buildKey</h4> -<b>_buildKey</b>(<i></i>) +</dl><a NAME="VariablesModel.index" ID="VariablesModel.index"></a> +<h4>VariablesModel.index</h4> +<b>index</b>(<i>row, column, parent=QModelIndex()</i>) <p> - Protected method to build the access key for the variable. + Public method to get the index of item at row:column of parent. </p><dl> +<dt><i>row</i> (int)</dt> +<dd> +number of rows +</dd><dt><i>column</i> (int)</dt> +<dd> +number of columns +</dd><dt><i>parent</i> (QModelIndex)</dt> +<dd> +the model parent +</dd> +</dl><dl> <dt>Returns:</dt> <dd> -access key +new model index for child +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QModelIndex +</dd> +</dl><a NAME="VariablesModel.parent" ID="VariablesModel.parent"></a> +<h4>VariablesModel.parent</h4> +<b>parent</b>(<i>child</i>) +<p> + Public method to get the parent of the given child. +</p><dl> +<dt><i>child</i> (QModelIndex)</dt> +<dd> +the model child node +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +new model index for parent +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QModelIndex +</dd> +</dl><a NAME="VariablesModel.resetModifiedMarker" ID="VariablesModel.resetModifiedMarker"></a> +<h4>VariablesModel.resetModifiedMarker</h4> +<b>resetModifiedMarker</b>(<i>parentIdx=QModelIndex(), pathlist=()</i>) +<p> + Public method to remove the modified marker from changed items. +</p><dl> +<dt><i>parentIdx</i> (QModelIndex)</dt> +<dd> +item to reset marker +</dd><dt><i>pathlist</i> (list of str)</dt> +<dd> +full path to the variable +</dd> +</dl><a NAME="VariablesModel.rowCount" ID="VariablesModel.rowCount"></a> +<h4>VariablesModel.rowCount</h4> +<b>rowCount</b>(<i>parent=QModelIndex()</i>) +<p> + Public method to get the row count. +</p><dl> +<dt><i>parent</i> (QModelIndex)</dt> +<dd> +the model parent +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +number of rows </dd> </dl><dl> <dt>Return Type:</dt> <dd> -str +int +</dd> +</dl><a NAME="VariablesModel.setExpanded" ID="VariablesModel.setExpanded"></a> +<h4>VariablesModel.setExpanded</h4> +<b>setExpanded</b>(<i>index, state</i>) +<p> + Public method to set the expanded state of item. +</p><dl> +<dt><i>index</i> (QModelIndex)</dt> +<dd> +item to change expanded state +</dd><dt><i>state</i> (bool)</dt> +<dd> +state of the item </dd> -</dl><a NAME="VariableItem.attachDummy" ID="VariableItem.attachDummy"></a> -<h4>VariableItem.attachDummy</h4> -<b>attachDummy</b>(<i></i>) +</dl><a NAME="VariablesModel.showVariables" ID="VariablesModel.showVariables"></a> +<h4>VariablesModel.showVariables</h4> +<b>showVariables</b>(<i>vlist, frmnr, pathlist=None</i>) +<p> + Public method to update the data model of variable in pathlist. +</p><dl> +<dt><i>vlist</i> (list of str)</dt> +<dd> +the list of variables to be displayed. Each + list entry is a tuple of three values. + <ul> + <li>the variable name (string)</li> + <li>the variables type (string)</li> + <li>the variables value (string)</li> + </ul> +</dd><dt><i>frmnr</i> (int)</dt> +<dd> +frame number (0 is the current frame) +</dd><dt><i>pathlist</i> (list of str)</dt> +<dd> +full path to the variable +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="VariablesProxyModel" ID="VariablesProxyModel"></a> +<h2>VariablesProxyModel</h2> <p> - Public method to attach a dummy sub item to allow for lazy population. -</p><a NAME="VariableItem.collapse" ID="VariableItem.collapse"></a> -<h4>VariableItem.collapse</h4> -<b>collapse</b>(<i></i>) + Class for handling the sort operations. +</p> +<h3>Derived from</h3> +QSortFilterProxyModel +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#VariablesProxyModel.__init__">VariablesProxyModel</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#VariablesProxyModel.hasChildren">hasChildren</a></td> +<td>Public method to get a flag if parent has children.</td> +</tr><tr> +<td><a href="#VariablesProxyModel.setExpanded">setExpanded</a></td> +<td>Public slot to get a flag if parent has children.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="VariablesProxyModel.__init__" ID="VariablesProxyModel.__init__"></a> +<h4>VariablesProxyModel (Constructor)</h4> +<b>VariablesProxyModel</b>(<i>parent=None</i>) <p> - Public method to collapse the item. + Constructor +</p><dl> +<dt><i>parent</i> (QModelIndex)</dt> +<dd> +the parent model index +</dd> +</dl><a NAME="VariablesProxyModel.hasChildren" ID="VariablesProxyModel.hasChildren"></a> +<h4>VariablesProxyModel.hasChildren</h4> +<b>hasChildren</b>(<i>parent</i>) +<p> + Public method to get a flag if parent has children. </p><p> - Note: This is just a do nothing and should be overwritten. -</p><a NAME="VariableItem.data" ID="VariableItem.data"></a> -<h4>VariableItem.data</h4> -<b>data</b>(<i>column, role</i>) -<p> - Public method to return the data for the requested role. -</p><p> - This implementation changes the original behavior in a way, that the - display data is returned as the tooltip for column 1. + The given model index has to be transformed to the underlying source + model to get the correct result. </p><dl> -<dt><i>column</i></dt> +<dt><i>parent</i> (QModelIndex)</dt> <dd> -column number (integer) -</dd><dt><i>role</i></dt> -<dd> -data role (Qt.ItemDataRole) +the model parent </dd> </dl><dl> <dt>Returns:</dt> <dd> -requested data -</dd> -</dl><a NAME="VariableItem.deleteChildren" ID="VariableItem.deleteChildren"></a> -<h4>VariableItem.deleteChildren</h4> -<b>deleteChildren</b>(<i></i>) -<p> - Public method to delete all children (cleaning the subtree). -</p><a NAME="VariableItem.expand" ID="VariableItem.expand"></a> -<h4>VariableItem.expand</h4> -<b>expand</b>(<i></i>) -<p> - Public method to expand the item. -</p><p> - Note: This is just a do nothing and should be overwritten. -</p><a NAME="VariableItem.getId" ID="VariableItem.getId"></a> -<h4>VariableItem.getId</h4> -<b>getId</b>(<i></i>) -<p> - Public method to get the ID string. -</p><dl> -<dt>Returns:</dt> -<dd> -ID string +flag if parent has children </dd> </dl><dl> <dt>Return Type:</dt> <dd> -str +bool </dd> -</dl><a NAME="VariableItem.getValue" ID="VariableItem.getValue"></a> -<h4>VariableItem.getValue</h4> -<b>getValue</b>(<i></i>) +</dl><a NAME="VariablesProxyModel.setExpanded" ID="VariablesProxyModel.setExpanded"></a> +<h4>VariablesProxyModel.setExpanded</h4> +<b>setExpanded</b>(<i>index, state</i>) <p> - Public method to return the value of the item. + Public slot to get a flag if parent has children. +</p><p> + The given model index has to be transformed to the underlying source + model to get the correct result. </p><dl> -<dt>Returns:</dt> +<dt><i>index</i> (QModelIndex)</dt> <dd> -value of the item (string) +item to change expanded state +</dd><dt><i>state</i> (bool)</dt> +<dd> +state of the item </dd> </dl> <div align="right"><a href="#top">Up</a></div> @@ -428,20 +689,28 @@ <a NAME="VariablesViewer" ID="VariablesViewer"></a> <h2>VariablesViewer</h2> <p> - Class implementing the variables viewer widget. + Class implementing the variables viewer view. </p><p> - This widget is used to display the variables of the program being + This view is used to display the variables of the program being debugged in a tree. Compound types will be shown with their main entry first. Once the subtree has been expanded, the individual entries will be shown. Double clicking an entry will + expand or collapse the item, if it has children and the double click + was performed on the first column of the tree, otherwise it'll popup a dialog showing the variables parameters in a more readable form. This is especially useful for lengthy strings. </p><p> - This widget has two modes for displaying the global and the local + This view has two modes for displaying the global and the local variables. -</p> +</p><h3>Signals</h3> +<dl> +<dt>preferencesChanged()</dt> +<dd> +to inform model about new background colours +</dd> +</dl> <h3>Derived from</h3> -QTreeWidget +QTreeView <h3>Class Attributes</h3> <table> <tr><td>None</td></tr> @@ -456,39 +725,30 @@ <td><a href="#VariablesViewer.__init__">VariablesViewer</a></td> <td>Constructor</td> </tr><tr> -<td><a href="#VariablesViewer.__addItem">__addItem</a></td> -<td>Private method used to add an item to the list.</td> -</tr><tr> -<td><a href="#VariablesViewer.__buildTreePath">__buildTreePath</a></td> -<td>Private method to build up a path from the top to an item.</td> +<td><a href="#VariablesViewer.__collapseChildren">__collapseChildren</a></td> +<td>Private slot to collapse all child items of current parent.</td> </tr><tr> <td><a href="#VariablesViewer.__configure">__configure</a></td> <td>Private method to open the configuration dialog.</td> </tr><tr> +<td><a href="#VariablesViewer.__configureFilter">__configureFilter</a></td> +<td>Private method to open the variables filter dialog.</td> +</tr><tr> <td><a href="#VariablesViewer.__createPopupMenus">__createPopupMenus</a></td> <td>Private method to generate the popup menus.</td> </tr><tr> -<td><a href="#VariablesViewer.__expandItemSignal">__expandItemSignal</a></td> -<td>Private slot to handle the expanded signal.</td> -</tr><tr> -<td><a href="#VariablesViewer.__findItem">__findItem</a></td> -<td>Private method to search for an item.</td> +<td><a href="#VariablesViewer.__expandChildren">__expandChildren</a></td> +<td>Private slot to expand all child items of current parent.</td> </tr><tr> -<td><a href="#VariablesViewer.__generateItem">__generateItem</a></td> -<td>Private method used to generate a VariableItem.</td> +<td><a href="#VariablesViewer.__itemDoubleClicked">__itemDoubleClicked</a></td> +<td>Private method called if an item was double clicked.</td> </tr><tr> -<td><a href="#VariablesViewer.__getDispType">__getDispType</a></td> -<td>Private method used to get the display string for type vtype.</td> +<td><a href="#VariablesViewer.__mdlRequestExpand">__mdlRequestExpand</a></td> +<td>Private method to inform the view about items to be expand.</td> </tr><tr> <td><a href="#VariablesViewer.__refreshView">__refreshView</a></td> <td>Private slot to refresh the view.</td> </tr><tr> -<td><a href="#VariablesViewer.__resort">__resort</a></td> -<td>Private method to resort the tree.</td> -</tr><tr> -<td><a href="#VariablesViewer.__sectionClicked">__sectionClicked</a></td> -<td>Private method handling a click onto a header section.</td> -</tr><tr> <td><a href="#VariablesViewer.__showContextMenu">__showContextMenu</a></td> <td>Private slot to show the context menu.</td> </tr><tr> @@ -498,23 +758,20 @@ <td><a href="#VariablesViewer.__showVariableDetails">__showVariableDetails</a></td> <td>Private method to show details about a variable.</td> </tr><tr> -<td><a href="#VariablesViewer.collapseItem">collapseItem</a></td> -<td>Public slot to handle the collapsed signal.</td> -</tr><tr> -<td><a href="#VariablesViewer.expandItem">expandItem</a></td> -<td>Public slot to handle the expanded signal.</td> -</tr><tr> <td><a href="#VariablesViewer.handleResetUI">handleResetUI</a></td> <td>Public method to reset the VariablesViewer.</td> </tr><tr> -<td><a href="#VariablesViewer.mouseDoubleClickEvent">mouseDoubleClickEvent</a></td> -<td>Protected method of QAbstractItemView.</td> +<td><a href="#VariablesViewer.resizeEvent">resizeEvent</a></td> +<td>Protected slot informing about the widget size change.</td> </tr><tr> <td><a href="#VariablesViewer.showVariable">showVariable</a></td> <td>Public method to show variables in a list.</td> </tr><tr> <td><a href="#VariablesViewer.showVariables">showVariables</a></td> <td>Public method to show variables in a list.</td> +</tr><tr> +<td><a href="#VariablesViewer.verticalScrollbarValueChanged">verticalScrollbarValueChanged</a></td> +<td>Public slot informing about the scrollbar change.</td> </tr> </table> <h3>Static Methods</h3> @@ -527,180 +784,76 @@ <p> Constructor </p><dl> -<dt><i>viewer</i></dt> +<dt><i>viewer</i> (DebugViewer)</dt> <dd> -reference to the debug viewer object (DebugViewer) -</dd><dt><i>globalScope</i></dt> +reference to the debug viewer object +</dd><dt><i>globalScope</i> (bool)</dt> <dd> flag indicating global (True) or local (False) variables -</dd><dt><i>parent</i></dt> -<dd> -the parent (QWidget) -</dd> -</dl><a NAME="VariablesViewer.__addItem" ID="VariablesViewer.__addItem"></a> -<h4>VariablesViewer.__addItem</h4> -<b>__addItem</b>(<i>parent, vtype, var, value</i>) -<p> - Private method used to add an item to the list. -</p><p> - If the item is of a type with subelements (i.e. list, dictionary, - tuple), these subelements are added by calling this method recursively. -</p><dl> -<dt><i>parent</i></dt> -<dd> -the parent of the item to be added - (QTreeWidgetItem or None) -</dd><dt><i>vtype</i></dt> -<dd> -the type of the item to be added - (string) -</dd><dt><i>var</i></dt> +</dd><dt><i>parent</i> (QWidget)</dt> <dd> -the variable name (string) -</dd><dt><i>value</i></dt> -<dd> -the value string (string) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -The item that was added to the listview (QTreeWidgetItem). +the parent </dd> -</dl><a NAME="VariablesViewer.__buildTreePath" ID="VariablesViewer.__buildTreePath"></a> -<h4>VariablesViewer.__buildTreePath</h4> -<b>__buildTreePath</b>(<i>itm</i>) +</dl><a NAME="VariablesViewer.__collapseChildren" ID="VariablesViewer.__collapseChildren"></a> +<h4>VariablesViewer.__collapseChildren</h4> +<b>__collapseChildren</b>(<i></i>) <p> - Private method to build up a path from the top to an item. -</p><dl> -<dt><i>itm</i></dt> -<dd> -item to build the path for (QTreeWidgetItem) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -list of names denoting the path from the top (list of strings) -</dd> -</dl><a NAME="VariablesViewer.__configure" ID="VariablesViewer.__configure"></a> + Private slot to collapse all child items of current parent. +</p><a NAME="VariablesViewer.__configure" ID="VariablesViewer.__configure"></a> <h4>VariablesViewer.__configure</h4> <b>__configure</b>(<i></i>) <p> Private method to open the configuration dialog. +</p><a NAME="VariablesViewer.__configureFilter" ID="VariablesViewer.__configureFilter"></a> +<h4>VariablesViewer.__configureFilter</h4> +<b>__configureFilter</b>(<i></i>) +<p> + Private method to open the variables filter dialog. </p><a NAME="VariablesViewer.__createPopupMenus" ID="VariablesViewer.__createPopupMenus"></a> <h4>VariablesViewer.__createPopupMenus</h4> <b>__createPopupMenus</b>(<i></i>) <p> Private method to generate the popup menus. -</p><a NAME="VariablesViewer.__expandItemSignal" ID="VariablesViewer.__expandItemSignal"></a> -<h4>VariablesViewer.__expandItemSignal</h4> -<b>__expandItemSignal</b>(<i>parentItem</i>) -<p> - Private slot to handle the expanded signal. -</p><dl> -<dt><i>parentItem</i></dt> -<dd> -reference to the item being expanded - (QTreeWidgetItem) -</dd> -</dl><a NAME="VariablesViewer.__findItem" ID="VariablesViewer.__findItem"></a> -<h4>VariablesViewer.__findItem</h4> -<b>__findItem</b>(<i>slist, column, node=None</i>) +</p><a NAME="VariablesViewer.__expandChildren" ID="VariablesViewer.__expandChildren"></a> +<h4>VariablesViewer.__expandChildren</h4> +<b>__expandChildren</b>(<i></i>) <p> - Private method to search for an item. -</p><p> - It is used to find a specific item in column, - that is a child of node. If node is None, a child of the - QTreeWidget is searched. -</p><dl> -<dt><i>slist</i></dt> -<dd> -searchlist (list of strings) -</dd><dt><i>column</i></dt> -<dd> -index of column to search in (int) -</dd><dt><i>node</i></dt> -<dd> -start point of the search -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -the found item or None -</dd> -</dl><a NAME="VariablesViewer.__generateItem" ID="VariablesViewer.__generateItem"></a> -<h4>VariablesViewer.__generateItem</h4> -<b>__generateItem</b>(<i>parent, dvar, dvalue, dtype, isSpecial=False</i>) + Private slot to expand all child items of current parent. +</p><a NAME="VariablesViewer.__itemDoubleClicked" ID="VariablesViewer.__itemDoubleClicked"></a> +<h4>VariablesViewer.__itemDoubleClicked</h4> +<b>__itemDoubleClicked</b>(<i>index</i>) <p> - Private method used to generate a VariableItem. + Private method called if an item was double clicked. </p><dl> -<dt><i>parent</i></dt> -<dd> -parent of the item to be generated -</dd><dt><i>dvar</i></dt> +<dt><i>index</i> (QModelIndex)</dt> <dd> -variable name (string) -</dd><dt><i>dvalue</i></dt> -<dd> -value string (string) -</dd><dt><i>dtype</i></dt> -<dd> -type string (string) -</dd><dt><i>isSpecial</i></dt> -<dd> -flag indicating that a special node should be - generated (boolean) +the double clicked item </dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -The item that was generated (VariableItem). -</dd> -</dl><a NAME="VariablesViewer.__getDispType" ID="VariablesViewer.__getDispType"></a> -<h4>VariablesViewer.__getDispType</h4> -<b>__getDispType</b>(<i>vtype</i>) +</dl><a NAME="VariablesViewer.__mdlRequestExpand" ID="VariablesViewer.__mdlRequestExpand"></a> +<h4>VariablesViewer.__mdlRequestExpand</h4> +<b>__mdlRequestExpand</b>(<i>modelIndex</i>) <p> - Private method used to get the display string for type vtype. + Private method to inform the view about items to be expand. </p><dl> -<dt><i>vtype</i></dt> +<dt><i>modelIndex</i> (QModelIndex)</dt> <dd> -the type, the display string should be looked up for - (string) -</dd> -</dl><dl> -<dt>Returns:</dt> -<dd> -displaystring (string) +the model index </dd> </dl><a NAME="VariablesViewer.__refreshView" ID="VariablesViewer.__refreshView"></a> <h4>VariablesViewer.__refreshView</h4> <b>__refreshView</b>(<i></i>) <p> Private slot to refresh the view. -</p><a NAME="VariablesViewer.__resort" ID="VariablesViewer.__resort"></a> -<h4>VariablesViewer.__resort</h4> -<b>__resort</b>(<i>parent=None</i>) -<p> - Private method to resort the tree. -</p><dl> -<dt><i>parent</i> (QTreeWidgetItem)</dt> -<dd> -reference to a parent item -</dd> -</dl><a NAME="VariablesViewer.__sectionClicked" ID="VariablesViewer.__sectionClicked"></a> -<h4>VariablesViewer.__sectionClicked</h4> -<b>__sectionClicked</b>(<i></i>) -<p> - Private method handling a click onto a header section. </p><a NAME="VariablesViewer.__showContextMenu" ID="VariablesViewer.__showContextMenu"></a> <h4>VariablesViewer.__showContextMenu</h4> <b>__showContextMenu</b>(<i>coord</i>) <p> Private slot to show the context menu. </p><dl> -<dt><i>coord</i></dt> +<dt><i>coord</i> (QPoint)</dt> <dd> -the position of the mouse pointer (QPoint) +the position of the mouse pointer </dd> </dl><a NAME="VariablesViewer.__showDetails" ID="VariablesViewer.__showDetails"></a> <h4>VariablesViewer.__showDetails</h4> @@ -709,53 +862,28 @@ Private slot to show details about the selected variable. </p><a NAME="VariablesViewer.__showVariableDetails" ID="VariablesViewer.__showVariableDetails"></a> <h4>VariablesViewer.__showVariableDetails</h4> -<b>__showVariableDetails</b>(<i>itm</i>) +<b>__showVariableDetails</b>(<i>index</i>) <p> Private method to show details about a variable. </p><dl> -<dt><i>itm</i></dt> +<dt><i>index</i> (QModelIndex)</dt> <dd> reference to the variable item </dd> -</dl><a NAME="VariablesViewer.collapseItem" ID="VariablesViewer.collapseItem"></a> -<h4>VariablesViewer.collapseItem</h4> -<b>collapseItem</b>(<i>parentItem</i>) -<p> - Public slot to handle the collapsed signal. -</p><dl> -<dt><i>parentItem</i></dt> -<dd> -reference to the item being collapsed - (QTreeWidgetItem) -</dd> -</dl><a NAME="VariablesViewer.expandItem" ID="VariablesViewer.expandItem"></a> -<h4>VariablesViewer.expandItem</h4> -<b>expandItem</b>(<i>parentItem</i>) -<p> - Public slot to handle the expanded signal. -</p><dl> -<dt><i>parentItem</i></dt> -<dd> -reference to the item being expanded - (QTreeWidgetItem) -</dd> </dl><a NAME="VariablesViewer.handleResetUI" ID="VariablesViewer.handleResetUI"></a> <h4>VariablesViewer.handleResetUI</h4> <b>handleResetUI</b>(<i></i>) <p> Public method to reset the VariablesViewer. -</p><a NAME="VariablesViewer.mouseDoubleClickEvent" ID="VariablesViewer.mouseDoubleClickEvent"></a> -<h4>VariablesViewer.mouseDoubleClickEvent</h4> -<b>mouseDoubleClickEvent</b>(<i>mouseEvent</i>) +</p><a NAME="VariablesViewer.resizeEvent" ID="VariablesViewer.resizeEvent"></a> +<h4>VariablesViewer.resizeEvent</h4> +<b>resizeEvent</b>(<i>event</i>) <p> - Protected method of QAbstractItemView. -</p><p> - Reimplemented to disable expanding/collapsing of items when - double-clicking. Instead the double-clicked entry is opened. + Protected slot informing about the widget size change. </p><dl> -<dt><i>mouseEvent</i></dt> +<dt><i>event</i> (QResizeEvent)</dt> <dd> -the mouse event object (QMouseEvent) +information </dd> </dl><a NAME="VariablesViewer.showVariable" ID="VariablesViewer.showVariable"></a> <h4>VariablesViewer.showVariable</h4> @@ -763,11 +891,11 @@ <p> Public method to show variables in a list. </p><dl> -<dt><i>vlist</i></dt> +<dt><i>vlist</i> (list)</dt> <dd> the list of subitems to be displayed. The first element gives the path of the - parent variable. Each other listentry is + parent variable. Each other list entry is a tuple of three values. <ul> <li>the variable name (string)</li> @@ -781,18 +909,28 @@ <p> Public method to show variables in a list. </p><dl> -<dt><i>vlist</i></dt> +<dt><i>vlist</i> (list)</dt> <dd> the list of variables to be displayed. Each - listentry is a tuple of three values. + list entry is a tuple of three values. <ul> <li>the variable name (string)</li> <li>the variables type (string)</li> <li>the variables value (string)</li> </ul> -</dd><dt><i>frmnr</i></dt> +</dd><dt><i>frmnr</i> (int)</dt> <dd> -frame number (0 is the current frame) (int) +frame number (0 is the current frame) +</dd> +</dl><a NAME="VariablesViewer.verticalScrollbarValueChanged" ID="VariablesViewer.verticalScrollbarValueChanged"></a> +<h4>VariablesViewer.verticalScrollbarValueChanged</h4> +<b>verticalScrollbarValueChanged</b>(<i>value</i>) +<p> + Public slot informing about the scrollbar change. +</p><dl> +<dt><i>value</i> (int)</dt> +<dd> +current value of the vertical scrollbar </dd> </dl> <div align="right"><a href="#top">Up</a></div>
--- a/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.ConfigurationPageBase.html Sun May 19 12:30:02 2019 +0200 +++ b/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.ConfigurationPageBase.html Sun May 19 12:35:24 2019 +0200 @@ -43,7 +43,13 @@ <h2>ConfigurationPageBase</h2> <p> Class implementing the base class for all configuration pages. -</p> +</p><h3>Signals</h3> +<dl> +<dt>colourChanged(str, QColor)</dt> +<dd> +To inform about a new colour selection +</dd> +</dl> <h3>Derived from</h3> QWidget <h3>Class Attributes</h3>
--- a/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html Sun May 19 12:30:02 2019 +0200 +++ b/eric6/Documentation/Source/eric6.Preferences.ConfigurationPages.DebuggerGeneralPage.html Sun May 19 12:35:24 2019 +0200 @@ -32,6 +32,9 @@ <tr> <td><a href="#DebuggerGeneralPage">DebuggerGeneralPage</a></td> <td>Class implementing the Debugger General configuration page.</td> +</tr><tr> +<td><a href="#PreviewModel">PreviewModel</a></td> +<td>Class to show an example of the selected background colours for the debug viewer.</td> </tr> </table> <h3>Functions</h3> @@ -124,6 +127,204 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="PreviewModel" ID="PreviewModel"></a> +<h2>PreviewModel</h2> +<p> + Class to show an example of the selected background colours for the debug + viewer. +</p> +<h3>Derived from</h3> +QAbstractItemModel +<h3>Class Attributes</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<h3>Methods</h3> +<table> +<tr> +<td><a href="#PreviewModel.__init__">PreviewModel</a></td> +<td>Constructor</td> +</tr><tr> +<td><a href="#PreviewModel.columnCount">columnCount</a></td> +<td>Public Qt slot to get the column count.</td> +</tr><tr> +<td><a href="#PreviewModel.data">data</a></td> +<td>Public Qt slot get the role data of item.</td> +</tr><tr> +<td><a href="#PreviewModel.flags">flags</a></td> +<td>Public Qt slot to get the item flags.</td> +</tr><tr> +<td><a href="#PreviewModel.index">index</a></td> +<td>Public Qt slot to get the index of item at row:column of parent.</td> +</tr><tr> +<td><a href="#PreviewModel.parent">parent</a></td> +<td>Public Qt slot to get the parent of the given child.</td> +</tr><tr> +<td><a href="#PreviewModel.rowCount">rowCount</a></td> +<td>Public Qt slot to get the row count.</td> +</tr><tr> +<td><a href="#PreviewModel.setColor">setColor</a></td> +<td>Public slot to update the background colour indexed by key.</td> +</tr> +</table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> +<a NAME="PreviewModel.__init__" ID="PreviewModel.__init__"></a> +<h4>PreviewModel (Constructor)</h4> +<b>PreviewModel</b>(<i></i>) +<p> + Constructor +</p><a NAME="PreviewModel.columnCount" ID="PreviewModel.columnCount"></a> +<h4>PreviewModel.columnCount</h4> +<b>columnCount</b>(<i>parent=QModelIndex()</i>) +<p> + Public Qt slot to get the column count. +</p><dl> +<dt><i>parent</i> (QModelIndex)</dt> +<dd> +the model parent +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +number of columns +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int +</dd> +</dl><a NAME="PreviewModel.data" ID="PreviewModel.data"></a> +<h4>PreviewModel.data</h4> +<b>data</b>(<i>index, role=Qt.DisplayRole</i>) +<p> + Public Qt slot get the role data of item. +</p><dl> +<dt><i>index</i> (QModelIndex)</dt> +<dd> +the model index +</dd><dt><i>role</i> (QtCore.Qt.ItemDataRole)</dt> +<dd> +the requested data role +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +role data of item +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str, QBrush or None +</dd> +</dl><a NAME="PreviewModel.flags" ID="PreviewModel.flags"></a> +<h4>PreviewModel.flags</h4> +<b>flags</b>(<i>index</i>) +<p> + Public Qt slot to get the item flags. +</p><dl> +<dt><i>index</i> (QModelIndex)</dt> +<dd> +of item +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +item flags +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QtCore.Qt.ItemFlag +</dd> +</dl><a NAME="PreviewModel.index" ID="PreviewModel.index"></a> +<h4>PreviewModel.index</h4> +<b>index</b>(<i>row, column, parent=QModelIndex()</i>) +<p> + Public Qt slot to get the index of item at row:column of parent. +</p><dl> +<dt><i>row</i> (int)</dt> +<dd> +number of rows +</dd><dt><i>column</i> (int)</dt> +<dd> +number of columns +</dd><dt><i>parent</i> (QModelIndex)</dt> +<dd> +the model parent +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +new model index for child +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QModelIndex +</dd> +</dl><a NAME="PreviewModel.parent" ID="PreviewModel.parent"></a> +<h4>PreviewModel.parent</h4> +<b>parent</b>(<i>child</i>) +<p> + Public Qt slot to get the parent of the given child. +</p><dl> +<dt><i>child</i> (QModelIndex)</dt> +<dd> +the model child node +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +new model index for parent +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QModelIndex +</dd> +</dl><a NAME="PreviewModel.rowCount" ID="PreviewModel.rowCount"></a> +<h4>PreviewModel.rowCount</h4> +<b>rowCount</b>(<i>parent=QModelIndex()</i>) +<p> + Public Qt slot to get the row count. +</p><dl> +<dt><i>parent</i> (QModelIndex)</dt> +<dd> +the model parent +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +number of rows +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +int +</dd> +</dl><a NAME="PreviewModel.setColor" ID="PreviewModel.setColor"></a> +<h4>PreviewModel.setColor</h4> +<b>setColor</b>(<i>key, bgcolour</i>) +<p> + Public slot to update the background colour indexed by key. +</p><dl> +<dt><i>key</i> (str)</dt> +<dd> +the name of background +</dd><dt><i>bgcolour</i> (QColor)</dt> +<dd> +the new background colour +</dd> +</dl> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="create" ID="create"></a> <h2>create</h2> <b>create</b>(<i>dlg</i>)
--- a/eric6/Documentation/Source/index-eric6.Debugger.html Sun May 19 12:30:02 2019 +0200 +++ b/eric6/Documentation/Source/index-eric6.Debugger.html Sun May 19 12:35:24 2019 +0200 @@ -89,7 +89,7 @@ <td>Module implementing the variables filter dialog.</td> </tr><tr> <td><a href="eric6.Debugger.VariablesViewer.html">VariablesViewer</a></td> -<td>Module implementing the variables viewer widget.</td> +<td>Module implementing the variables viewer view based on QTreeView.</td> </tr><tr> <td><a href="eric6.Debugger.WatchPointModel.html">WatchPointModel</a></td> <td>Module implementing the Watch expression model.</td>
--- a/eric6/Preferences/ConfigurationPages/DebuggerGeneralPage.py Sun May 19 12:30:02 2019 +0200 +++ b/eric6/Preferences/ConfigurationPages/DebuggerGeneralPage.py Sun May 19 12:35:24 2019 +0200 @@ -356,7 +356,7 @@ Public Qt slot to get the index of item at row:column of parent. @param row number of rows - @rtype int + @type int @param column number of columns @type int @param parent the model parent
