[profitpy commit] r319 - in trunk/profit: lib lib/widgets workbench

[codesite...@google.com]

Author: troy.melhase
Date: Thu Jul 31 07:56:55 2008
New Revision: 319

Modified:
trunk/profit/lib/defaults.py
trunk/profit/lib/widgets/extendedshell.py
trunk/profit/lib/widgets/plot.py
trunk/profit/lib/widgets/ui_advancededitor.ui
trunk/profit/workbench/messagedisplay.py
trunk/profit/workbench/tickerdisplay.py

Log:
Added docstrings, splitter save/restore state to extended plot widget.

Modified: trunk/profit/lib/defaults.py
==============================================================================
--- trunk/profit/lib/defaults.py (original)
+++ trunk/profit/lib/defaults.py Thu Jul 31 07:56:55 2008
@@ -62,12 +62,20 @@
return pen

-def rightMainSplitterState():
+def rightSplitterState():
""" Resonable default for splitter state with primary widget on
the right.

@return QByteArray suitable for use with QSplitter.restoreState
"""
return QByteArray.fromBase64('AAAA/wAAAAAAAAACAAAAiQAAAm8BAAAABgEAAAAB')
+
+
+def leftSplitterState():
+ """ Resonable default for splitter state with primary widget on
the left.
+
+ @return QByteArray suitable for use with QSplitter.restoreState
+ """
+ return QByteArray.fromBase64('AAAA/wAAAAAAAAACAAADQwAAAaUBAAAABgEAAAAB')

def tickerDisplayFields():

Modified: trunk/profit/lib/widgets/extendedshell.py
==============================================================================
--- trunk/profit/lib/widgets/extendedshell.py (original)
+++ trunk/profit/lib/widgets/extendedshell.py Thu Jul 31 07:56:55 2008
@@ -7,20 +7,47 @@

from PyQt4.QtCore import Qt, pyqtSignature
from PyQt4.QtGui import QFrame
+
+from profit.lib import BasicHandler, defaults
from profit.lib.widgets.ui_extendedshell import Ui_ExtendedShell

-## save/load splitter state

-class ExtendedPythonShell(QFrame, Ui_ExtendedShell):
+class ExtendedPythonShell(QFrame, Ui_ExtendedShell, BasicHandler):
+ """ A shell widget extended with an editor widget.
+
+ """
def __init__(self, parent=None):
QFrame.__init__(self, parent)
self.setupUi(self)
+ self.setupWidgets()

- @pyqtSignature('')
- def on_actionExecute_triggered(self):
- source = str(self.editorWidget.text())
- self.shellWidget.runLines(source.split('\n'))
-
+ def setupWidgets(self):
+ """ Make our widgets like we like.

+ """
+ settings = self.settings
+ settings.beginGroup(self.__class__.__name__)
+ defaultState = defaults.leftSplitterState()
+ splitState = settings.value(settings.keys.splitstate, defaultState)
+ self.splitter.restoreState(splitState.toByteArray())
+ settings.endGroup()
+
+ def on_splitter_splitterMoved(self, pos, index):
+ """ Signal handler for splitter move; saves state to user settings.
+
+ @param pos ignored
+ @param index ignored
+ @return None
+ """
+ settings = self.settings
+ settings.beginGroup(self.__class__.__name__)
+ settings.setValue(settings.keys.splitstate, self.splitter.saveState())
+ settings.endGroup()

+ @pyqtSignature('')
+ def on_actionExecute_triggered(self):
+ """ Execute the source code in the shell.

+ """
+ lines = str(self.editorWidget.text()).split('\n')
+ self.shellWidget.runLines(lines)

Modified: trunk/profit/lib/widgets/plot.py
==============================================================================
--- trunk/profit/lib/widgets/plot.py (original)
+++ trunk/profit/lib/widgets/plot.py Thu Jul 31 07:56:55 2008
@@ -389,7 +389,7 @@
settings = self.settings
name = self.plotName()
statekey = '%s/%s' % (name, settings.keys.splitstate)
- state = settings.value(statekey, defaults.rightMainSplitterState())
+ state = settings.value(statekey, defaults.rightSplitterState())
self.plotSplitter.restoreState(state.toByteArray())
self.setupTree()
self.loadGrids()

Modified: trunk/profit/lib/widgets/ui_advancededitor.ui
==============================================================================
--- trunk/profit/lib/widgets/ui_advancededitor.ui (original)
+++ trunk/profit/lib/widgets/ui_advancededitor.ui Thu Jul 31 07:56:55 2008
@@ -14,10 +14,7 @@
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
+ <number>0</number>
</property>
<item>
<widget class="QsciScintilla" name="textEdit" >

Modified: trunk/profit/workbench/messagedisplay.py
==============================================================================
--- trunk/profit/workbench/messagedisplay.py (original)
+++ trunk/profit/workbench/messagedisplay.py Thu Jul 31 07:56:55 2008
@@ -107,7 +107,7 @@
"""
settings = self.settings
settings.beginGroup(settings.keys.messages)
- self.splitter.restoreState(defaults.rightMainSplitterState())
+ self.splitter.restoreState(defaults.rightSplitterState())
messageDetail = self.messageDetail
messageDetail.verticalHeader().hide()
horizHeader = messageDetail.horizontalHeader()

Modified: trunk/profit/workbench/tickerdisplay.py
==============================================================================
--- trunk/profit/workbench/tickerdisplay.py (original)
+++ trunk/profit/workbench/tickerdisplay.py Thu Jul 31 07:56:55 2008
@@ -87,7 +87,7 @@
defaultFields = defaults.tickerDisplayFields()
userFields = settings.valueLoad('selectedFields', defaultFields)
self.tickFieldSelect.setCheckedFields(userFields)
- defaultState = defaults.rightMainSplitterState()
+ defaultState = defaults.rightSplitterState()
splitState = settings.value(settings.keys.splitstate, defaultState)
self.splitter.restoreState(splitState.toByteArray())
settings.endGroup()