[profitpy commit] r317 - in trunk: . bin profit/lib profit/lib/models profit/lib/series profit/lib/session profit/l...
codesite...@google.com
Date: Thu Jul 31 01:28:11 2008
New Revision: 317
Added:
trunk/profit/models/
- copied from r316, /trunk/profit/lib/models/
trunk/profit/series/
- copied from r302, /trunk/profit/lib/series/
trunk/profit/series/__init__.py
- copied, changed from r316, /trunk/profit/lib/series/__init__.py
trunk/profit/series/advanced.py
- copied, changed from r316, /trunk/profit/lib/series/advanced.py
trunk/profit/series/basic.py
- copied unchanged from r316, /trunk/profit/lib/series/basic.py
trunk/profit/session/
- copied from r302, /trunk/profit/lib/session/
trunk/profit/session/__init__.py
- copied, changed from r316, /trunk/profit/lib/session/__init__.py
trunk/profit/session/collection.py
- copied unchanged from r316, /trunk/profit/lib/session/collection.py
trunk/profit/session/requestthread.py
- copied unchanged from r316, /trunk/profit/lib/session/requestthread.py
trunk/profit/session/savethread.py
- copied unchanged from r316, /trunk/profit/lib/session/savethread.py
trunk/profit/strategy/
- copied from r302, /trunk/profit/lib/strategy/
trunk/profit/strategy/__init__.py
- copied unchanged from r316, /trunk/profit/lib/strategy/__init__.py
trunk/profit/strategy/builder.py
- copied, changed from r316, /trunk/profit/lib/strategy/builder.py
trunk/profit/strategy/schema.py
- copied, changed from r316, /trunk/profit/lib/strategy/schema.py
Removed:
trunk/profit/lib/models/
trunk/profit/lib/series/
trunk/profit/lib/session/
trunk/profit/lib/strategy/
Modified:
trunk/README
trunk/bin/hist_downloader
trunk/profit/lib/scripttools.py
trunk/profit/lib/widgets/extendedshell.py
trunk/profit/lib/widgets/shell.py
trunk/profit/lib/widgets/ui_extendedshell.ui
trunk/profit/strategydesigner/treeitems.py
trunk/profit/workbench/accountdisplay.py
trunk/profit/workbench/main.py
trunk/profit/workbench/messagedisplay.py
Log:
Removed needless lib nesting. Corrected editor-to-shell execution.
Modified: trunk/README
==============================================================================
--- trunk/README (original)
+++ trunk/README Thu Jul 31 01:28:11 2008
@@ -8,8 +8,6 @@
of tickerIds with symbol. extend tickers display with contract
details.
-4. un-nest profit/lib/ packages (leave widgets)
-
macro:
1. add buffer editor to shell panel. perhaps update shell w/ code
from eric4
Modified: trunk/bin/hist_downloader
==============================================================================
--- trunk/bin/hist_downloader (original)
+++ trunk/bin/hist_downloader Thu Jul 31 01:28:11 2008
@@ -24,7 +24,7 @@
from profit.lib.scripttools import defaults, check_duration, check_hms
from profit.lib.scripttools import CollectorThread, WaitingThread
-from profit.lib.session import Session, SessionBuilder, Ticker, Order,
Contract, Series
+from profit.session import Session, SessionBuilder, Ticker, Order,
Contract, Series
class LocalOption(optparse.Option):
Modified: trunk/profit/lib/scripttools.py
==============================================================================
--- trunk/profit/lib/scripttools.py (original)
+++ trunk/profit/lib/scripttools.py Thu Jul 31 01:28:11 2008
@@ -14,7 +14,7 @@
from PyQt4.QtCore import QCoreApplication, QThread
from profit.lib import Signals
-from profit.lib.session import Session
+from profit.session import Session
class defaults:
Modified: trunk/profit/lib/widgets/extendedshell.py
==============================================================================
--- trunk/profit/lib/widgets/extendedshell.py (original)
+++ trunk/profit/lib/widgets/extendedshell.py Thu Jul 31 01:28:11 2008
@@ -6,7 +6,7 @@
# Author: Troy Melhase <tr...@gci.net>
from PyQt4.QtCore import Qt, pyqtSignature
-from PyQt4.QtGui import QFrame, QKeyEvent
+from PyQt4.QtGui import QFrame
from profit.lib.widgets.ui_extendedshell import Ui_ExtendedShell
## save/load splitter state
@@ -18,10 +18,9 @@
@pyqtSignature('')
def on_execButton_clicked(self):
- shell = self.shellWidget
- #shell.runLines(str(self.editorWidget.text()).split('\n'))
- shell.insertPlainText(self.editorWidget.text())
- e = QKeyEvent(QKeyEvent.KeyPress,
- Qt.Key_Return, Qt.NoModifier)
- shell.keyPressEvent(e)
+ source = str(self.editorWidget.text())
+ self.shellWidget.runLines(source.split('\n'))
+
+
+
Modified: trunk/profit/lib/widgets/shell.py
==============================================================================
--- trunk/profit/lib/widgets/shell.py (original)
+++ trunk/profit/lib/widgets/shell.py Thu Jul 31 01:28:11 2008
@@ -20,7 +20,7 @@
from traceback import extract_tb, format_exception_only, format_list
from PyQt4.QtCore import Qt, QString
-from PyQt4.QtGui import QApplication, QBrush, QColor, QFont,
QTextCursor, QTextEdit, QTextCharFormat
+from PyQt4.QtGui import QApplication, QBrush, QColor, QFont,
QKeyEvent, QTextCursor, QTextEdit, QTextCharFormat
from profit.lib import Settings, Signals, BasicHandler
@@ -209,9 +209,12 @@
self.clearLine()
def runLines(self, lines):
- interp = self.interp
+ event = QKeyEvent(QKeyEvent.KeyPress, Qt.Key_Return, Qt.NoModifier)
for line in lines:
- interp.runsource(line)
+ self.lines.append(line+"\n")
+ self.keyPressEvent(event)
+ self.run()
+
def clearLine(self):
self.point = 0
Modified: trunk/profit/lib/widgets/ui_extendedshell.ui
==============================================================================
--- trunk/profit/lib/widgets/ui_extendedshell.ui (original)
+++ trunk/profit/lib/widgets/ui_extendedshell.ui Thu Jul 31 01:28:11 2008
@@ -62,24 +62,31 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="execButton" >
+ <widget class="QToolButton" name="toolButton" >
<property name="text" >
<string>Execute</string>
</property>
- <property name="icon" >
- <iconset resource="profit.qrc" >
- <normaloff>:/images/icons/misc.png</normaloff>:/images/icons/misc.png</iconset>
- </property>
</widget>
</item>
</layout>
</item>
</layout>
- <zorder>editorWidget</zorder>
</widget>
</widget>
</item>
</layout>
+ <action name="actionExecute" >
+ <property name="icon" >
+ <iconset resource="profit.qrc" >
+ <normaloff>:/images/icons/misc.png</normaloff>:/images/icons/misc.png</iconset>
+ </property>
+ <property name="text" >
+ <string>Execute</string>
+ </property>
+ <property name="shortcut" >
+ <string>Ctrl+E</string>
+ </property>
+ </action>
</widget>
<customwidgets>
<customwidget>
@@ -98,5 +105,22 @@
<resources>
<include location="profit.qrc" />
</resources>
- <connections/>
+ <connections>
+ <connection>
+ <sender>toolButton</sender>
+ <signal>clicked()</signal>
+ <receiver>actionExecute</receiver>
+ <slot>trigger()</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>355</x>
+ <y>363</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>-1</x>
+ <y>-1</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
</ui>
Copied: trunk/profit/series/__init__.py (from r316, /trunk/profit/lib/series/__init__.py)
==============================================================================
--- /trunk/profit/lib/series/__init__.py (original)
+++ trunk/profit/series/__init__.py Thu Jul 31 01:28:11 2008
@@ -10,8 +10,8 @@
import warnings
warnings.filterwarnings('ignore', category=DeprecationWarning, module='numpy')
-from profit.lib.series.basic import *
+from profit.series.basic import *
try:
- from profit.lib.series.advanced import *
+ from profit.series.advanced import *
except (ImportError, ):
pass
Copied: trunk/profit/series/advanced.py (from r316, /trunk/profit/lib/series/advanced.py)
==============================================================================
--- /trunk/profit/lib/series/advanced.py (original)
+++ trunk/profit/series/advanced.py Thu Jul 31 01:28:11 2008
@@ -8,7 +8,7 @@
from numpy import arctan, array, log, mean, std, median
from scipy.stats import linregress, mode
-from profit.lib.series.basic import SeriesIndex, MovingAverageIndex
+from profit.series.basic import SeriesIndex, MovingAverageIndex
class FisherTransform(MovingAverageIndex):
Copied: trunk/profit/session/__init__.py (from r316, /trunk/profit/lib/session/__init__.py)
==============================================================================
--- /trunk/profit/lib/session/__init__.py (original)
+++ trunk/profit/session/__init__.py Thu Jul 31 01:28:11 2008
@@ -17,10 +17,10 @@
from profit.lib import logging
from profit.lib import Signals
-from profit.lib.session import collection
-from profit.lib.session.savethread import SaveThread
-from profit.lib.session.requestthread import RequestThread
-from profit.lib.strategy.builder import SessionStrategyBuilder
+from profit.session import collection
+from profit.session.savethread import SaveThread
+from profit.session.requestthread import RequestThread
+from profit.strategy.builder import SessionStrategyBuilder
class DataMaps(object):
Copied: trunk/profit/strategy/builder.py (from r316, /trunk/profit/lib/strategy/builder.py)
==============================================================================
--- /trunk/profit/lib/strategy/builder.py (original)
+++ trunk/profit/strategy/builder.py Thu Jul 31 01:28:11 2008
@@ -12,7 +12,7 @@
from PyQt4.QtCore import QObject
from profit.lib import Signals, instance
-from profit.lib.series import Series, MACDHistogram
+from profit.series import Series, MACDHistogram
from ib.ext.Contract import Contract
from ib.ext.Order import Order
Copied: trunk/profit/strategy/schema.py (from r316, /trunk/profit/lib/strategy/schema.py)
==============================================================================
--- /trunk/profit/lib/strategy/schema.py (original)
+++ trunk/profit/strategy/schema.py Thu Jul 31 01:28:11 2008
@@ -66,7 +66,7 @@
class TickerFieldIndex(object):
- """ TickerFieldIndexs associate an index class (found in profit.lib.series)
+ """ TickerFieldIndexs associate an index class (found in profit.series)
with parameters.
"""
Modified: trunk/profit/strategydesigner/treeitems.py
==============================================================================
--- trunk/profit/strategydesigner/treeitems.py (original)
+++ trunk/profit/strategydesigner/treeitems.py Thu Jul 31 01:28:11 2008
@@ -8,7 +8,7 @@
from PyQt4.QtGui import (
QApplication, QBrush, QColor, QIcon, QPixmap, QStandardItem)
-from profit.lib.strategy import schema
+from profit.strategy import schema
defaultName = 'Unknown'
Modified: trunk/profit/workbench/accountdisplay.py
==============================================================================
--- trunk/profit/workbench/accountdisplay.py (original)
+++ trunk/profit/workbench/accountdisplay.py Thu Jul 31 01:28:11 2008
@@ -9,8 +9,8 @@
from profit.lib import BasicHandler, Signals, valueAlign
from profit.lib.gui import colorIcon, complementColor
-from profit.lib.series import Series
from profit.lib.widgets.plot import PlotCurve, ControlTreeValueItem
+from profit.series import Series
from profit.workbench.widgets.ui_accountdisplay import Ui_AccountDisplay
Modified: trunk/profit/workbench/main.py
==============================================================================
--- trunk/profit/workbench/main.py (original)
+++ trunk/profit/workbench/main.py Thu Jul 31 01:28:11 2008
@@ -24,14 +24,12 @@
from profit.lib import defaults
from profit.lib import Signals, Settings, instance
from profit.lib.gui import ValueColorItem, warningBox
-from profit.lib.session import Session
-
from profit.lib.widgets.dock import Dock
from profit.lib.widgets.output import OutputWidget
from profit.lib.widgets.propertyeditor import PropertyEditor
from profit.lib.widgets.shell import PythonShell
-
from profit.lib.widgets.extendedshell import ExtendedPythonShell
+from profit.session import Session
from profit.workbench.widgets.ui_main import Ui_ProfitWorkbenchWindow
from profit.workbench.sessiontree import SessionTree
Modified: trunk/profit/workbench/messagedisplay.py
==============================================================================
--- trunk/profit/workbench/messagedisplay.py (original)
+++ trunk/profit/workbench/messagedisplay.py Thu Jul 31 01:28:11 2008
@@ -14,7 +14,7 @@
from profit.lib import BasicHandler, Slots, defaults
from profit.lib.gui import colorIcon
-from profit.lib.models.messages import MessagesTableModel
+from profit.models.messages import MessagesTableModel
from profit.workbench.widgets.ui_messagedisplay import Ui_MessageDisplay