update to pyqt6

michael xu · michael xu · commit 863b18a1f118 · 2023-05-15T11:13:00.000+08:00
diff --git a/.qt_for_python/uic/indicatorParameters.py b/.qt_for_python/uic/indicatorParameters.py
@@ -2,13 +2,13 @@
 
 # Form implementation generated from reading ui file 'c:\perso\trading\anaconda3\backtrader-ichimoku\ui\indicatorParameters.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.5
+# Created by: PyQt6 UI code generator 5.15.5
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic5 is
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Dialog(object):
diff --git a/.qt_for_python/uic/loadDataFiles.py b/.qt_for_python/uic/loadDataFiles.py
@@ -8,7 +8,7 @@
 # run again.  Do not edit this file unless you know what you are doing.
 
 
-from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt6 import QtCore, QtGui, QtWidgets
 
 
 class Ui_Form(object):
diff --git a/README.md b/README.md
@@ -20,9 +20,9 @@ pip install git+https://github.com/backtrader2/backtrader matplotlib requests \
 
 # How to use it ?
 
-* Put your CSV Data in the *data* folder
-* Create your strategy and put it in the *strategies* folder
- Your strategy *file* name should be exactly the same as the strategy *class* name
+* Put your CSV Data in the *data* folder  
+* Create your strategy and put it in the *strategies* folder  
+ Your strategy *file* name should be exactly the same as the strategy *class* name  
  You can take a look at the provided exemples
 
 
diff --git a/SkinokBacktraderUI.py b/SkinokBacktraderUI.py
@@ -17,15 +17,12 @@
 #
 ###############################################################################
 
-import pandas
-
 #import sys
 #sys.path.append('D:/perso/trading/anaconda3/backtrader2')
 import backtrader as bt
 from CerebroEnhanced import *
 
 import sys, os
-from backtrader.order import BuyOrder, SellOrder
 sys.path.append(os.path.dirname(os.path.realpath(__file__)) + '/observers')
 sys.path.append(os.path.dirname(os.path.realpath(__file__)) + '/strategies')
 sys.path.append(os.path.dirname(os.path.realpath(__file__)) + '/../finplot')
@@ -69,7 +66,6 @@ def __init__(self):
 
         pass
 
-
     def resetCerebro(self):
 
         # create a "Cerebro" engine instance
@@ -101,7 +97,6 @@ def resetCerebro(self):
 
         pass
 
-
     # Return True if loading is successfull & the error string if False
     def loadData(self, dataPath, datetimeFormat, separator):
 
@@ -277,7 +272,6 @@ def run(self):
         
         pass
 
-
     def displayStrategyResults(self):
         # Stats on trades
         #portfolio_stats = self.strat_results.analyzers.getbyname('PyFolio')
diff --git a/finplotWindow.py b/finplotWindow.py
@@ -411,8 +411,10 @@ def zoomTo(self, dateStr1, dateStr2):
 
         for win in fplt.windows:
             for ax in win.axs:
-                x1 = self._date_str2x(ax, dateStr1)
-                x2 = self._date_str2x(ax, dateStr2)
+                # x1 = self._date_str2x(ax, dateStr1)
+                # x2 = self._date_str2x(ax, dateStr2)
+                x1 = fplt._dateStr2x(ax, dateStr1)
+                x2 = fplt._dateStr2x(ax, dateStr2)
 
                 # Do not zoom exactly on the trade, so take a little bit before & after
                 date1 = x1[0]
diff --git a/indicatorParametersUI.py b/indicatorParametersUI.py
@@ -1,4 +1,4 @@
-from PyQt5 import QtCore, QtWidgets, QtGui, uic
+from PyQt6 import QtCore, QtWidgets, QtGui, uic
 
 import os 
 
diff --git a/loadDataFilesUI.py b/loadDataFilesUI.py
@@ -1,4 +1,4 @@
-from PyQt5 import QtCore, QtWidgets, uic
+from PyQt6 import QtCore, QtWidgets, uic
 import pandas as pd
 import os 
 
diff --git a/main.py b/main.py
@@ -18,6 +18,5 @@
 ###############################################################################
 
 from SkinokBacktraderUI import SkinokBacktraderUI
-
 skinokTrader = SkinokBacktraderUI()
-skinokTrader.displayUI()
+skinokTrader.displayUI()
diff --git a/qt.conf b/qt.conf
@@ -0,0 +1,2 @@
+[Platforms]
+WindowsArguments = dpiawareness=2
diff --git a/strategies/sma_crossover.py b/strategies/sma_crossover.py
@@ -53,11 +53,11 @@ class sma_crossover(mt.MetaStrategy):
 
     params = (
         # period for the fast Moving Average
-        ('fast', 15),
+        ('fast', 5),
         # period for the slow moving average
         ('slow', 30),
         # Trade size
-        ('tradeSize', 2000)
+        ('tradeSize', 500)
     )
 
     def __init__(self, *argv):
diff --git a/strategyResultsUI.py b/strategyResultsUI.py
@@ -1,4 +1,4 @@
-from PyQt5 import QtCore, QtWidgets, uic
+from PyQt6 import QtCore, QtWidgets, uic
 
 import os 
 
diff --git a/strategyTesterUI.py b/strategyTesterUI.py
@@ -1,4 +1,4 @@
-from PyQt5 import QtCore, QtWidgets, uic
+from PyQt6 import QtCore, QtWidgets, uic
 
 import os 
 
diff --git a/userInterface.py b/userInterface.py
@@ -17,18 +17,16 @@
 #
 ###############################################################################
 
-from PyQt5 import QtWidgets
+from PyQt6 import QtWidgets
+from PyQt6 import QtGui
+from PyQt6 import QtCore
 
-from PyQt5 import QtGui
-from PyQt5 import QtCore
 from numpy import NaN
 
 from pyqtgraph.dockarea import DockArea, Dock
 
-import sys, os
+import os
 
-sys.path.append('../finplot')
-import finplot as fplt
 import backtrader as bt
 
 # Ui made with Qt Designer
@@ -40,20 +38,15 @@
 # Import Chart lib
 import finplotWindow
 
-
-import datetime
-
 import qdarkstyle
-
-import pandas as pd
 import functools
 
 class UserInterface:
 
     #########
     #  
     #########
-    def __init__(self,controller):
+    def __init__(self, controller):
 
         self.controller = controller    # SkinokBacktraderUI
 
@@ -78,7 +71,7 @@ def __init__(self,controller):
         self.win.setWindowTitle("Skinok Backtrader UI v0.3")
         
         # Set width/height of QSplitter
-        self.app.setStyleSheet(qdarkstyle.load_stylesheet_pyqt5())
+        self.app.setStyleSheet(qdarkstyle._load_stylesheet())
 
         pass
 
@@ -196,25 +189,25 @@ def createUIs(self):
     def createActions(self):
 
         # Data sources
-        self.backtestDataActionGroup = QtWidgets.QActionGroup(self.win)
+        self.backtestDataActionGroup = QtGui.QActionGroup(self.win)
         
-        self.openCSVAction = QtWidgets.QAction(QtGui.QIcon(""),"Open CSV File", self.backtestDataActionGroup)
+        self.openCSVAction = QtGui.QAction(QtGui.QIcon(""),"Open CSV File", self.backtestDataActionGroup)
         self.openCSVAction.triggered.connect( self.loadDataFileUI.show )
 
         # AI
-        self.aiActionGroup = QtWidgets.QActionGroup(self.win)
+        self.aiActionGroup = QtGui.QActionGroup(self.win)
         
-        self.loadTFModelAction = QtWidgets.QAction(QtGui.QIcon(""),"Load Tensorflow Model", self.aiActionGroup)
+        self.loadTFModelAction = QtGui.QAction(QtGui.QIcon(""),"Load Tensorflow Model", self.aiActionGroup)
         self.loadTFModelAction.triggered.connect( self.loadTFModel )
 
         #self.loadTorchModelAction = QtWidgets.QAction(QtGui.QIcon(""),"Load Torch Model", self.aiActionGroup)
         #self.loadTorchModelAction.triggered.connect( self.loadTorchModel )
 
-        self.loadStableBaselines3Action = QtWidgets.QAction(QtGui.QIcon(""),"Load Stable Baselines 3 Model", self.aiActionGroup)
+        self.loadStableBaselines3Action = QtGui.QAction(QtGui.QIcon(""),"Load Stable Baselines 3 Model", self.aiActionGroup)
         self.loadStableBaselines3Action.triggered.connect( self.loadStableBaselinesModel )
 
         # Options
-        self.optionsActionGroup = QtWidgets.QActionGroup(self.win)
+        self.optionsActionGroup = QtGui.QActionGroup(self.win)
 
         pass
 
@@ -252,13 +245,13 @@ def createTradesUI(self):
         self.tradeTableWidget.verticalHeader().setVisible(False)
 
         self.tradeTableWidget.horizontalHeader().setStretchLastSection(True)
-        self.tradeTableWidget.horizontalHeader().setSectionResizeMode(QtWidgets.QHeaderView.Stretch)
+        self.tradeTableWidget.horizontalHeader().setSectionResizeMode(QtWidgets.QHeaderView.ResizeMode.Stretch)
 
         #self.tradeTableWidget.setStyleSheet("alternate-background-color: #AAAAAA;background-color: #CCCCCC;")
         self.tradeTableWidget.setAlternatingRowColors(True)
         self.tradeTableWidget.setSortingEnabled(True)
-        self.tradeTableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
-        self.tradeTableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+        self.tradeTableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
+        self.tradeTableWidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
 
         self.strategyResultsUI.ResultsTabWidget.widget(0).layout().addWidget(self.tradeTableWidget)
 
@@ -455,9 +448,9 @@ def fillSummaryUI(self, brokerCash, brokerValue, tradeAnalysis):
             self.summaryTableWidget.setItem(7,1,QtWidgets.QTableWidgetItem(str(tradeAnalysis["short"]["total"])))
 
             self.summaryTableWidget.horizontalHeader().setStretchLastSection(True)
-            self.summaryTableWidget.horizontalHeader().setSectionResizeMode(QtWidgets.QHeaderView.Stretch)
+            self.summaryTableWidget.horizontalHeader().setSectionResizeMode(QtWidgets.QHeaderView.ResizeMode.Stretch)
 
-            self.summaryTableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
+            self.summaryTableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
 
         pass
 
@@ -546,7 +539,7 @@ def createControlPanel(self):
         self.controlPanelLayout.addWidget(self.ResetPB)
 
         # Spacer
-        spacer = QtWidgets.QSpacerItem(50,20,QtWidgets.QSizePolicy.Minimum)
+        spacer = QtWidgets.QSpacerItem(50,20,QtWidgets.QSizePolicy.Policy.Minimum)
         self.controlPanelLayout.addSpacerItem(spacer)
 
         # SMA
@@ -566,7 +559,7 @@ def createControlPanel(self):
         self.controlPanelLayout.addWidget(self.EmaPB)
 
         # Spacer
-        spacer = QtWidgets.QSpacerItem(50,20,QtWidgets.QSizePolicy.Minimum)
+        spacer = QtWidgets.QSpacerItem(50,20,QtWidgets.QSizePolicy.Policy.Minimum)
         self.controlPanelLayout.addSpacerItem(spacer)
 
         # RSI
@@ -602,7 +595,7 @@ def createControlPanel(self):
         self.controlPanelLayout.addWidget(self.IchimokuPB)
 
         # Spacer 
-        spacer = QtWidgets.QSpacerItem(50,20,QtWidgets.QSizePolicy.Minimum)
+        spacer = QtWidgets.QSpacerItem(50,20,QtWidgets.QSizePolicy.Policy.Minimum)
         self.controlPanelLayout.addSpacerItem(spacer)
 
         # Dark mode
@@ -621,7 +614,7 @@ def createControlPanel(self):
         self.controlPanelLayout.addWidget(self.volumesCB)
 
         # Spacer
-        self.controlPanelLayout.insertSpacerItem(0, QtWidgets.QSpacerItem( 0,0, hPolicy=QtWidgets.QSizePolicy.Expanding, vPolicy=QtWidgets.QSizePolicy.Preferred) )
+        self.controlPanelLayout.insertSpacerItem(0, QtWidgets.QSpacerItem( 0,0, hPolicy=QtWidgets.QSizePolicy.Policy.Expanding, vPolicy=QtWidgets.QSizePolicy.Policy.Preferred) )
 
         return self.controlPanel
 

Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,13 @@`
`2`	`2`
`3`	`3`	`# Form implementation generated from reading ui file 'c:\perso\trading\anaconda3\backtrader-ichimoku\ui\indicatorParameters.ui'`
`4`	`4`	`#`
`5`		`-# Created by: PyQt5 UI code generator 5.15.5`
	`5`	`+# Created by: PyQt6 UI code generator 5.15.5`
`6`	`6`	`#`
`7`	`7`	`# WARNING: Any manual changes made to this file will be lost when pyuic5 is`
`8`	`8`	`# run again. Do not edit this file unless you know what you are doing.`
`9`	`9`
`10`	`10`
`11`		`-from PyQt5 import QtCore, QtGui, QtWidgets`
	`11`	`+from PyQt6 import QtCore, QtGui, QtWidgets`
`12`	`12`
`13`	`13`
`14`	`14`	`class Ui_Dialog(object):`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from PyQt5 import QtCore, QtWidgets, QtGui, uic`
	`1`	`+from PyQt6 import QtCore, QtWidgets, QtGui, uic`
`2`	`2`
`3`	`3`	`import os`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from PyQt5 import QtCore, QtWidgets, uic`
	`1`	`+from PyQt6 import QtCore, QtWidgets, uic`
`2`	`2`	`import pandas as pd`
`3`	`3`	`import os`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[Platforms]`
	`2`	`+WindowsArguments = dpiawareness=2`