use time.timezone to replace fix timezone setting

michael xu · michael xu · commit d83084d8f9a8 · 2023-05-16T15:07:42.000+08:00
diff --git a/finplotWindow.py b/finplotWindow.py
@@ -15,6 +15,7 @@
 import pandas as pd
 import numpy as np
 from datetime import datetime as dt
+import time as _time
 import backtrader as bt
 from pyqtgraph import mkColor, mkBrush
 
@@ -401,7 +402,7 @@ def _date_str2x(self, ax, date_str):
         # print(lsttime)
 
         xtime = dt.strptime(date_str, '%Y-%m-%d %H:%M:%S')
-        xint = int((xtime.timestamp()+8*3600)*1e9)
+        xint = int((xtime.timestamp()-_time.timezone)*1e9)
         print(xint,lsttime[0])
         x = lsttime.index(xint)
 
diff --git a/userInterface.py b/userInterface.py
@@ -273,31 +273,31 @@ def fillTradesUI(self, trades):
 
                     # Trade id
                     item = QtWidgets.QTableWidgetItem( str(trade.ref) )
-                    item.setTextAlignment(QtCore.Qt.AlignCenter)
+                    item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
                     self.tradeTableWidget.setItem(row,0,item)
                     
                     item = QtWidgets.QTableWidgetItem( "Buy" if trade.long else "Sell" )
-                    item.setTextAlignment(QtCore.Qt.AlignCenter)    
+                    item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
                     self.tradeTableWidget.setItem(row,1,item)
 
                     item = QtWidgets.QTableWidgetItem( str(bt.num2date(trade.dtopen)) )
-                    item.setTextAlignment(QtCore.Qt.AlignCenter)
+                    item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
                     self.tradeTableWidget.setItem(row,2,item)
 
                     item = QtWidgets.QTableWidgetItem( str(bt.num2date(trade.dtclose)) )
-                    item.setTextAlignment(QtCore.Qt.AlignCenter)
+                    item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
                     self.tradeTableWidget.setItem(row,3,item)
 
                     item = QtWidgets.QTableWidgetItem( str(trade.price) )
-                    item.setTextAlignment(QtCore.Qt.AlignCenter)
+                    item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
                     self.tradeTableWidget.setItem(row,4,item)
 
                     item = QtWidgets.QTableWidgetItem( str(trade.commission) )
-                    item.setTextAlignment(QtCore.Qt.AlignCenter)
+                    item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
                     self.tradeTableWidget.setItem(row,5,item)
 
                     item = QtWidgets.QTableWidgetItem( str(trade.pnlcomm) )
-                    item.setTextAlignment(QtCore.Qt.AlignCenter)
+                    item.setTextAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
                     self.tradeTableWidget.setItem(row,6,item)
 
                 row += 1
@@ -332,13 +332,13 @@ def createOrdersUI(self):
         self.orderTableWidget.setHorizontalHeaderLabels( labels )
 
         self.orderTableWidget.horizontalHeader().setStretchLastSection(True)
-        self.orderTableWidget.horizontalHeader().setSectionResizeMode(QtWidgets.QHeaderView.Stretch)
+        self.orderTableWidget.horizontalHeader().setSectionResizeMode(QtWidgets.QHeaderView.ResizeMode.Stretch)
 
         self.orderTableWidget.setStyleSheet("alternate-background-color: #AAAAAA;background-color: #CCCCCC;")
         self.orderTableWidget.setAlternatingRowColors(True)
         self.orderTableWidget.setSortingEnabled(True)
-        self.orderTableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
-        self.orderTableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+        self.orderTableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
+        self.orderTableWidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
 
         self.dock_orders.addWidget(self.orderTableWidget)
 
@@ -806,10 +806,10 @@ def createTransactionsUI(self, trades):
         row = 0
         for date,values in trades:
             #for trade in trades:
-            self.transactionTableWidget.setItem(row,0,QtWidgets.QTableWidgetItem( date.strftime("%Y/%m/%d %H:%M:%S") ))
-            self.transactionTableWidget.setItem(row,1,QtWidgets.QTableWidgetItem( str(values[0][0]) ))
-            self.transactionTableWidget.setItem(row,2,QtWidgets.QTableWidgetItem( str(values[0][1]) ))
-            self.transactionTableWidget.setItem(row,3,QtWidgets.QTableWidgetItem( str(values[0][2]) ))
+            self.transactionTableWidget.setItem(row, 0, QtWidgets.QTableWidgetItem(date.strftime("%Y/%m/%d %H:%M:%S")))
+            self.transactionTableWidget.setItem(row, 1, QtWidgets.QTableWidgetItem(str(values[0][0])))
+            self.transactionTableWidget.setItem(row, 2, QtWidgets.QTableWidgetItem(str(values[0][1])))
+            self.transactionTableWidget.setItem(row, 3, QtWidgets.QTableWidgetItem(str(values[0][2])))
 
             row += 1
 
