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

[codesite...@google.com]

Author: troy.melhase
Date: Fri Jul 25 23:03:04 2008
New Revision: 312

Modified:
trunk/profit/lib/__init__.py
trunk/profit/workbench/executionsdisplay.py
trunk/profit/workbench/historicaldatadisplay.py
trunk/profit/workbench/orderdisplay.py
trunk/profit/workbench/portfoliodisplay.py
trunk/profit/workbench/tickerdisplay.py

Log:
Changed name of nameIn function to makeCheckNames. Arg.

Modified: trunk/profit/lib/__init__.py
==============================================================================
--- trunk/profit/lib/__init__.py (original)
+++ trunk/profit/lib/__init__.py Fri Jul 25 23:03:04 2008
@@ -29,13 +29,13 @@
format='%(asctime)s %(levelname)s %(message)s')

-def nameIn(*names):
- def check(obj):
+def makeCheckNames(*names):
+ def checkNames(obj):
try:
return obj.typeName in names
except (AttributeError, ):
return False
- return check
+ return checkNames

def importName(name, reloaded=False):

Modified: trunk/profit/workbench/executionsdisplay.py
==============================================================================
--- trunk/profit/workbench/executionsdisplay.py (original)
+++ trunk/profit/workbench/executionsdisplay.py Fri Jul 25 23:03:04 2008
@@ -9,7 +9,7 @@
from PyQt4.QtCore import QAbstractTableModel, QVariant, Qt
from PyQt4.QtGui import QFrame

-from profit.lib import SessionHandler, Signals, Slots, nameIn, valueAlign
+from profit.lib import SessionHandler, Signals, Slots, makeCheckNames, valueAlign
from profit.lib.gui import symbolIcon
from profit.workbench.widgets.ui_executionsdisplay import Ui_ExecutionsDisplay

@@ -85,9 +85,9 @@
@param session Session instance
@return None
"""
- ismsg = nameIn('ExecDetails')
+ isExecMessage = makeCheckNames('ExecDetails')
msgs = enumerate((msg for time, msg in session.messages))
- self.messageIndexes = [idx for idx, msg in msgs if ismsg(msg)]
+ self.messageIndexes = [idx for idx, msg in msgs if isExecMessage(msg)]
self.session = session
self.messages = session.messages
session.registerMeta(self)

Modified: trunk/profit/workbench/historicaldatadisplay.py
==============================================================================
--- trunk/profit/workbench/historicaldatadisplay.py (original)
+++ trunk/profit/workbench/historicaldatadisplay.py Fri Jul 25 23:03:04 2008
@@ -9,15 +9,15 @@
from PyQt4.QtCore import Qt
from PyQt4.QtGui import QFrame, QIcon

-from profit.lib import SessionHandler, nameIn
+from profit.lib import SessionHandler, makeCheckNames
from profit.lib.gui import ValueTableItem
from profit.workbench.widgets.ui_historicaldatadisplay import Ui_HistoricalDataDisplay

def replayHistoricalData(messages, callback):
- ismsg = nameIn('HistoricalData')
+ isHistMessage = makeCheckNames('HistoricalData')
def pred((t, m)):
- return ismsg(m)
+ return isHistMessage(m)
for time, message in ifilter(pred, reversed(messages)):
callback(message)

Modified: trunk/profit/workbench/orderdisplay.py
==============================================================================
--- trunk/profit/workbench/orderdisplay.py (original)
+++ trunk/profit/workbench/orderdisplay.py Fri Jul 25 23:03:04 2008
@@ -9,7 +9,7 @@
from PyQt4.QtCore import Qt
from PyQt4.QtGui import QFrame

-from profit.lib import SessionHandler, nameIn
+from profit.lib import SessionHandler, makeCheckNames
from profit.workbench.widgets.ui_orderdisplay import Ui_OrderDisplay

## TODO: orders should be displayed in a parent/child relationship,
@@ -21,10 +21,10 @@
"""

"""
- ismsg = nameIn('OpenOrder', 'OrderStatus')
+ isOrderMessage = makeCheckNames('OpenOrder', 'OrderStatus')
calls = {'OpenOrder':openOrder, 'OrderStatus':orderStatus}
def pred((t, m)):
- return ismsg(m)
+ return isOrderMessage(m)
for time, message in ifilter(pred, messages):
calls[message.typeName](message)

Modified: trunk/profit/workbench/portfoliodisplay.py
==============================================================================
--- trunk/profit/workbench/portfoliodisplay.py (original)
+++ trunk/profit/workbench/portfoliodisplay.py Fri Jul 25 23:03:04 2008
@@ -9,17 +9,17 @@
from PyQt4.QtCore import Qt
from PyQt4.QtGui import QFrame, QIcon

-from profit.lib import SessionHandler, nameIn
+from profit.lib import SessionHandler, makeCheckNames
from profit.lib.gui import ValueTableItem
from profit.workbench.widgets.ui_portfoliodisplay import Ui_PortfolioDisplay

def replayPortfolio(messages, callback):
- ismsg = nameIn('UpdatePortfolio')
- symbols = (m.contract.m_symbol for t, m in messages if ismsg(m))
+ isPortMessage = makeCheckNames('UpdatePortfolio')
+ symbols = (m.contract.m_symbol for t, m in messages if isPortMessage(m))
for symbol in set(symbols):
def pred((t, m)):
- return ismsg(m) and m.contract.m_symbol==symbol
+ return isPortMessage(m) and m.contract.m_symbol==symbol
for time, message in ifilter(pred, reversed(messages)):
callback(message)
break

Modified: trunk/profit/workbench/tickerdisplay.py
==============================================================================
--- trunk/profit/workbench/tickerdisplay.py (original)
+++ trunk/profit/workbench/tickerdisplay.py Fri Jul 25 23:03:04 2008
@@ -14,9 +14,8 @@
from ib.ext.TickType import TickType
from ib.opt.message import TickPrice

-from profit.lib import defaults
from profit.lib import (SessionHandler, SettingsHandler, Signals,
- nameIn, DataRoles, instance)
+ makeCheckNames, DataRoles, defaults, instance, )
from profit.lib.gui import (UrlRequestor, ValueTableItem, separator,
makeUrlAction, )
from profit.workbench.portfoliodisplay import replayPortfolio
@@ -43,7 +42,7 @@
@param callback function to call with replayed messages
@return None
"""
- isMsg = nameIn('TickSize', 'TickPrice')
+ isMsg = makeCheckNames('TickSize', 'TickPrice')
for symbol, tickerId in symbols.items():
for field in fieldColumns.keys():
def pred((t, m)):