Skip to content

Commit d83084d

Browse files
author
michael xu
committed
use time.timezone to replace fix timezone setting
1 parent 64aaa3c commit d83084d

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

finplotWindow.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import pandas as pd
1616
import numpy as np
1717
from datetime import datetime as dt
18+
import time as _time
1819
import backtrader as bt
1920
from pyqtgraph import mkColor, mkBrush
2021

@@ -401,7 +402,7 @@ def _date_str2x(self, ax, date_str):
401402
# print(lsttime)
402403

403404
xtime = dt.strptime(date_str, '%Y-%m-%d %H:%M:%S')
404-
xint = int((xtime.timestamp()+8*3600)*1e9)
405+
xint = int((xtime.timestamp()-_time.timezone)*1e9)
405406
print(xint,lsttime[0])
406407
x = lsttime.index(xint)
407408

userInterface.py

+14-14
Original file line numberDiff line numberDiff line change
@@ -273,31 +273,31 @@ def fillTradesUI(self, trades):
273273

274274
# Trade id
275275
item = QtWidgets.QTableWidgetItem( str(trade.ref) )
276-
item.setTextAlignment(QtCore.Qt.AlignCenter)
276+
item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
277277
self.tradeTableWidget.setItem(row,0,item)
278278

279279
item = QtWidgets.QTableWidgetItem( "Buy" if trade.long else "Sell" )
280-
item.setTextAlignment(QtCore.Qt.AlignCenter)
280+
item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
281281
self.tradeTableWidget.setItem(row,1,item)
282282

283283
item = QtWidgets.QTableWidgetItem( str(bt.num2date(trade.dtopen)) )
284-
item.setTextAlignment(QtCore.Qt.AlignCenter)
284+
item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
285285
self.tradeTableWidget.setItem(row,2,item)
286286

287287
item = QtWidgets.QTableWidgetItem( str(bt.num2date(trade.dtclose)) )
288-
item.setTextAlignment(QtCore.Qt.AlignCenter)
288+
item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
289289
self.tradeTableWidget.setItem(row,3,item)
290290

291291
item = QtWidgets.QTableWidgetItem( str(trade.price) )
292-
item.setTextAlignment(QtCore.Qt.AlignCenter)
292+
item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
293293
self.tradeTableWidget.setItem(row,4,item)
294294

295295
item = QtWidgets.QTableWidgetItem( str(trade.commission) )
296-
item.setTextAlignment(QtCore.Qt.AlignCenter)
296+
item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
297297
self.tradeTableWidget.setItem(row,5,item)
298298

299299
item = QtWidgets.QTableWidgetItem( str(trade.pnlcomm) )
300-
item.setTextAlignment(QtCore.Qt.AlignCenter)
300+
item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
301301
self.tradeTableWidget.setItem(row,6,item)
302302

303303
row += 1
@@ -332,13 +332,13 @@ def createOrdersUI(self):
332332
self.orderTableWidget.setHorizontalHeaderLabels( labels )
333333

334334
self.orderTableWidget.horizontalHeader().setStretchLastSection(True)
335-
self.orderTableWidget.horizontalHeader().setSectionResizeMode(QtWidgets.QHeaderView.Stretch)
335+
self.orderTableWidget.horizontalHeader().setSectionResizeMode(QtWidgets.QHeaderView.ResizeMode.Stretch)
336336

337337
self.orderTableWidget.setStyleSheet("alternate-background-color: #AAAAAA;background-color: #CCCCCC;")
338338
self.orderTableWidget.setAlternatingRowColors(True)
339339
self.orderTableWidget.setSortingEnabled(True)
340-
self.orderTableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
341-
self.orderTableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
340+
self.orderTableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
341+
self.orderTableWidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
342342

343343
self.dock_orders.addWidget(self.orderTableWidget)
344344

@@ -806,10 +806,10 @@ def createTransactionsUI(self, trades):
806806
row = 0
807807
for date,values in trades:
808808
#for trade in trades:
809-
self.transactionTableWidget.setItem(row,0,QtWidgets.QTableWidgetItem( date.strftime("%Y/%m/%d %H:%M:%S") ))
810-
self.transactionTableWidget.setItem(row,1,QtWidgets.QTableWidgetItem( str(values[0][0]) ))
811-
self.transactionTableWidget.setItem(row,2,QtWidgets.QTableWidgetItem( str(values[0][1]) ))
812-
self.transactionTableWidget.setItem(row,3,QtWidgets.QTableWidgetItem( str(values[0][2]) ))
809+
self.transactionTableWidget.setItem(row, 0, QtWidgets.QTableWidgetItem(date.strftime("%Y/%m/%d %H:%M:%S")))
810+
self.transactionTableWidget.setItem(row, 1, QtWidgets.QTableWidgetItem(str(values[0][0])))
811+
self.transactionTableWidget.setItem(row, 2, QtWidgets.QTableWidgetItem(str(values[0][1])))
812+
self.transactionTableWidget.setItem(row, 3, QtWidgets.QTableWidgetItem(str(values[0][2])))
813813

814814
row += 1
815815

0 commit comments

Comments
 (0)