[profitpy commit] r311 - in trunk: bin profit/lib profit/lib/widgets

[codesite...@google.com]

Author: troy.melhase
Date: Fri Jul 25 22:48:29 2008
New Revision: 311

Modified:
trunk/bin/hist_downloader
trunk/bin/profit_workbench
trunk/bin/strategy_designer
trunk/profit/lib/__init__.py
trunk/profit/lib/widgets/callableselectwidget.py
trunk/profit/lib/widgets/plot.py
trunk/profit/lib/widgets/plotdatadialog.py

Log:
Fixed remaining references to profit.lib.core. Unsure why original
greps didn't pick up these.

Modified: trunk/bin/hist_downloader
==============================================================================
--- trunk/bin/hist_downloader (original)
+++ trunk/bin/hist_downloader Fri Jul 25 22:48:29 2008
@@ -20,7 +20,7 @@
from ib.opt import ibConnection
from ib.opt.message import registry

-from profit.lib.core import Signals
+from profit.lib import Signals
from profit.lib.scripttools import defaults, check_duration, check_hms
from profit.lib.scripttools import CollectorThread, WaitingThread

Modified: trunk/bin/profit_workbench
==============================================================================
--- trunk/bin/profit_workbench (original)
+++ trunk/bin/profit_workbench Fri Jul 25 22:48:29 2008
@@ -9,7 +9,7 @@

from PyQt4.QtGui import QApplication

-from profit.lib.core import Settings
+from profit.lib import Settings
from profit.workbench.main import ProfitWorkbenchWindow

if __name__ == '__main__':

Modified: trunk/bin/strategy_designer
==============================================================================
--- trunk/bin/strategy_designer (original)
+++ trunk/bin/strategy_designer Fri Jul 25 22:48:29 2008
@@ -9,7 +9,7 @@

from PyQt4.QtGui import QApplication

-from profit.lib.core import Signals, Settings
+from profit.lib import Signals, Settings
from profit.strategydesigner import StrategyDesigner

Modified: trunk/profit/lib/__init__.py
==============================================================================
--- trunk/profit/lib/__init__.py (original)
+++ trunk/profit/lib/__init__.py Fri Jul 25 22:48:29 2008
@@ -11,18 +11,33 @@
from PyQt4.QtCore import (QCoreApplication, QPoint, QSettings, QSize,
QVariant, Qt, SIGNAL, SLOT)

+
## this module is generally the first to get imported by one of the
-## gui apps, so we execute our ugly hack here.
+## gui apps, so we execute our ugly hack here. this brings the
+## resources into the client program, but it does not bring in
+## PyQt4.QtGui.
if 'profit_rc' not in sys.modules:
from profit.lib.widgets import profit_rc
sys.modules['profit_rc'] = profit_rc
del(profit_rc)
## now back to our regularly scheduled programming.

+
+valueAlign = Qt.AlignRight | Qt.AlignVCenter
+instance = QCoreApplication.instance
logging.basicConfig(level=logging.DEBUG,
format='%(asctime)s %(levelname)s %(message)s')

+def nameIn(*names):
+ def check(obj):
+ try:
+ return obj.typeName in names
+ except (AttributeError, ):
+ return False
+ return check
+
+
def importName(name, reloaded=False):
""" import and return a module by name in dotted form

@@ -207,44 +222,22 @@
return QSettings.value(self, key, default)

-def roleIds():
+def generateUserRoles():
i = Qt.UserRole
while True:
yield i
i += 1
-nextRoleId = roleIds().next
+nextUserRole = generateUserRoles().next

class DataRoles:
- tickerId = nextRoleId()
- tickerSymbol = nextRoleId()
- histDataReqId = nextRoleId()
- url = nextRoleId()
- urlTitle = nextRoleId()
- strategyName = nextRoleId()
- displayImportName = nextRoleId()
-
- typeMap = {
- tickerId:int,
- histDataReqId:int,
- strategyName:str,
- }
-
-
-##
-valueAlign = Qt.AlignRight | Qt.AlignVCenter
-
-
-def nameIn(*names):
- def check(obj):
- try:
- return obj.typeName in names
- except (AttributeError, ):
- return False
- return check
-
-
-instance = QCoreApplication.instance
+ tickerId = nextUserRole()
+ tickerSymbol = nextUserRole()
+ histDataReqId = nextUserRole()
+ url = nextUserRole()
+ urlTitle = nextUserRole()
+ strategyName = nextUserRole()
+ displayImportName = nextUserRole()

class SessionHandler(object):

Modified: trunk/profit/lib/widgets/callableselectwidget.py
==============================================================================
--- trunk/profit/lib/widgets/callableselectwidget.py (original)
+++ trunk/profit/lib/widgets/callableselectwidget.py Fri Jul 25
22:48:29 2008
@@ -19,7 +19,7 @@
from PyQt4.QtCore import QProcess, QVariant, pyqtSignature
from PyQt4.QtGui import QFileDialog, QFrame, QInputDialog, QMessageBox

-from profit.lib.core import Settings, Signals
+from profit.lib import Settings, Signals
from profit.lib.widgets.syspathdialog import SysPathDialog
from profit.lib.widgets.ui_callableselect import Ui_CallableSelectWidget

Modified: trunk/profit/lib/widgets/plot.py
==============================================================================
--- trunk/profit/lib/widgets/plot.py (original)
+++ trunk/profit/lib/widgets/plot.py Fri Jul 25 22:48:29 2008
@@ -21,8 +21,7 @@

from ib.ext.TickType import TickType

-from profit.lib import defaults
-from profit.lib.core import Settings, Signals
+from profit.lib import Settings, Signals, defaults
from profit.lib.gui import ValueColorItem, colorIcon, complementColor
from profit.lib.widgets.plotdatadialog import PlotDataDialog
from profit.lib.widgets.plotitemdialog import PlotItemDialog

Modified: trunk/profit/lib/widgets/plotdatadialog.py
==============================================================================
--- trunk/profit/lib/widgets/plotdatadialog.py (original)
+++ trunk/profit/lib/widgets/plotdatadialog.py Fri Jul 25 22:48:29 2008
@@ -9,8 +9,7 @@
from PyQt4.QtGui import QApplication, QBrush, QColorDialog, QDialog
from PyQt4.QtGui import QFileDialog, QFont, QFontDialog, QListWidgetItem

-from profit.lib import defaults
-from profit.lib.core import Settings, Signals
+from profit.lib import Settings, Signals, defaults
from profit.lib.gui import colorIcon
from profit.lib.widgets.ui_plotdatadialog import Ui_PlotDataDialog