Skip to content

Commit 919b5ac

Browse files
SkinokSkinok
committed
Migration to QT6 completed !
Bim
1 parent e74e08d commit 919b5ac

10 files changed

+29
-41
lines changed

‎.qt_for_python/uic/indicatorParameters.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
# Form implementation generated from reading ui file 'c:\perso\trading\anaconda3\backtrader-ichimoku\ui\indicatorParameters.ui'
44
#
5-
# Created by: PyQt5 UI code generator 5.15.5
5+
# Created by: PyQt6 UI code generator 5.15.5
66
#
77
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
88
# run again. Do not edit this file unless you know what you are doing.
99

1010

11-
from PyQt5 import QtCore, QtGui, QtWidgets
11+
from PyQt6 import QtCore, QtGui, QtWidgets
1212

1313

1414
class Ui_Dialog(object):

‎.qt_for_python/uic/loadDataFiles.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# run again. Do not edit this file unless you know what you are doing.
99

1010

11-
from PyQt5 import QtCore, QtGui, QtWidgets
11+
from PyQt6 import QtCore, QtGui, QtWidgets
1212

1313

1414
class Ui_Form(object):

‎SkinokBacktraderUI.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,12 @@
1717
#
1818
###############################################################################
1919

20-
import pandas
21-
2220
#import sys
2321
#sys.path.append('D:/perso/trading/anaconda3/backtrader2')
2422
import backtrader as bt
2523
from CerebroEnhanced import *
2624

2725
import sys, os
28-
from backtrader.order import BuyOrder, SellOrder
2926
sys.path.append(os.path.dirname(os.path.realpath(__file__)) + '/observers')
3027
sys.path.append(os.path.dirname(os.path.realpath(__file__)) + '/strategies')
3128
sys.path.append(os.path.dirname(os.path.realpath(__file__)) + '/../finplot')
@@ -69,7 +66,6 @@ def __init__(self):
6966

7067
pass
7168

72-
7369
def resetCerebro(self):
7470

7571
# create a "Cerebro" engine instance
@@ -101,7 +97,6 @@ def resetCerebro(self):
10197

10298
pass
10399

104-
105100
# Return True if loading is successfull & the error string if False
106101
def loadData(self, dataPath, datetimeFormat, separator):
107102

@@ -267,7 +262,6 @@ def run(self):
267262

268263
pass
269264

270-
271265
def displayStrategyResults(self):
272266
# Stats on trades
273267
#portfolio_stats = self.strat_results.analyzers.getbyname('PyFolio')

‎indicatorParametersUI.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from PyQt5 import QtCore, QtWidgets, QtGui, uic
1+
from PyQt6 import QtCore, QtWidgets, QtGui, uic
22

33
import os
44

‎loadDataFilesUI.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from PyQt5 import QtCore, QtWidgets, uic
1+
from PyQt6 import QtCore, QtWidgets, uic
22

33
import os
44

‎main.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@
1818
###############################################################################
1919

2020
from SkinokBacktraderUI import SkinokBacktraderUI
21-
2221
skinokTrader = SkinokBacktraderUI()
23-
skinokTrader.displayUI()
22+
skinokTrader.displayUI()

‎qt.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[Platforms]
2+
WindowsArguments = dpiawareness=2

‎strategyResultsUI.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from PyQt5 import QtCore, QtWidgets, uic
1+
from PyQt6 import QtCore, QtWidgets, uic
22

33
import os
44

‎strategyTesterUI.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from PyQt5 import QtCore, QtWidgets, uic
1+
from PyQt6 import QtCore, QtWidgets, uic
22

33
import os
44

‎userInterface.py

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,16 @@
1717
#
1818
###############################################################################
1919

20-
from PyQt5 import QtWidgets
20+
from PyQt6 import QtWidgets
21+
from PyQt6 import QtGui
22+
from PyQt6 import QtCore
2123

22-
from PyQt5 import QtGui
23-
from PyQt5 import QtCore
2424
from numpy import NaN
2525

2626
from pyqtgraph.dockarea import DockArea, Dock
2727

28-
import sys, os
28+
import os
2929

30-
sys.path.append('../finplot')
31-
import finplot as fplt
3230
import backtrader as bt
3331

3432
# Ui made with Qt Designer
@@ -40,20 +38,15 @@
4038
# Import Chart lib
4139
import finplotWindow
4240

43-
44-
import datetime
45-
4641
import qdarkstyle
47-
48-
import pandas as pd
4942
import functools
5043

5144
class UserInterface:
5245

5346
#########
5447
#
5548
#########
56-
def __init__(self,controller):
49+
def __init__(self, controller):
5750

5851
self.controller = controller
5952

@@ -78,7 +71,7 @@ def __init__(self,controller):
7871
self.win.setWindowTitle("Skinok Backtrader UI v0.3")
7972

8073
# Set width/height of QSplitter
81-
self.app.setStyleSheet(qdarkstyle.load_stylesheet_pyqt5())
74+
self.app.setStyleSheet(qdarkstyle._load_stylesheet())
8275

8376
pass
8477

@@ -196,25 +189,25 @@ def createUIs(self):
196189
def createActions(self):
197190

198191
# Data sources
199-
self.backtestDataActionGroup = QtWidgets.QActionGroup(self.win)
192+
self.backtestDataActionGroup = QtGui.QActionGroup(self.win)
200193

201-
self.openCSVAction = QtWidgets.QAction(QtGui.QIcon(""),"Open CSV File", self.backtestDataActionGroup)
194+
self.openCSVAction = QtGui.QAction(QtGui.QIcon(""),"Open CSV File", self.backtestDataActionGroup)
202195
self.openCSVAction.triggered.connect( self.loadDataFileUI.show )
203196

204197
# AI
205-
self.aiActionGroup = QtWidgets.QActionGroup(self.win)
198+
self.aiActionGroup = QtGui.QActionGroup(self.win)
206199

207-
self.loadTFModelAction = QtWidgets.QAction(QtGui.QIcon(""),"Load Tensorflow Model", self.aiActionGroup)
200+
self.loadTFModelAction = QtGui.QAction(QtGui.QIcon(""),"Load Tensorflow Model", self.aiActionGroup)
208201
self.loadTFModelAction.triggered.connect( self.loadTFModel )
209202

210203
#self.loadTorchModelAction = QtWidgets.QAction(QtGui.QIcon(""),"Load Torch Model", self.aiActionGroup)
211204
#self.loadTorchModelAction.triggered.connect( self.loadTorchModel )
212205

213-
self.loadStableBaselines3Action = QtWidgets.QAction(QtGui.QIcon(""),"Load Stable Baselines 3 Model", self.aiActionGroup)
206+
self.loadStableBaselines3Action = QtGui.QAction(QtGui.QIcon(""),"Load Stable Baselines 3 Model", self.aiActionGroup)
214207
self.loadStableBaselines3Action.triggered.connect( self.loadStableBaselinesModel )
215208

216209
# Options
217-
self.optionsActionGroup = QtWidgets.QActionGroup(self.win)
210+
self.optionsActionGroup = QtGui.QActionGroup(self.win)
218211

219212
pass
220213

@@ -252,13 +245,13 @@ def createTradesUI(self):
252245
self.tradeTableWidget.verticalHeader().setVisible(False)
253246

254247
self.tradeTableWidget.horizontalHeader().setStretchLastSection(True)
255-
self.tradeTableWidget.horizontalHeader().setSectionResizeMode(QtWidgets.QHeaderView.Stretch)
248+
self.tradeTableWidget.horizontalHeader().setSectionResizeMode(QtWidgets.QHeaderView.ResizeMode.Stretch)
256249

257250
#self.tradeTableWidget.setStyleSheet("alternate-background-color: #AAAAAA;background-color: #CCCCCC;")
258251
self.tradeTableWidget.setAlternatingRowColors(True)
259252
self.tradeTableWidget.setSortingEnabled(True)
260-
self.tradeTableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
261-
self.tradeTableWidget.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
253+
self.tradeTableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectionBehavior.SelectRows)
254+
self.tradeTableWidget.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
262255

263256
self.strategyResultsUI.ResultsTabWidget.widget(0).layout().addWidget(self.tradeTableWidget)
264257

@@ -546,7 +539,7 @@ def createControlPanel(self):
546539
self.controlPanelLayout.addWidget(self.ResetPB)
547540

548541
# Spacer
549-
spacer = QtWidgets.QSpacerItem(50,20,QtWidgets.QSizePolicy.Minimum)
542+
spacer = QtWidgets.QSpacerItem(50,20,QtWidgets.QSizePolicy.Policy.Minimum)
550543
self.controlPanelLayout.addSpacerItem(spacer)
551544

552545
# SMA
@@ -566,7 +559,7 @@ def createControlPanel(self):
566559
self.controlPanelLayout.addWidget(self.EmaPB)
567560

568561
# Spacer
569-
spacer = QtWidgets.QSpacerItem(50,20,QtWidgets.QSizePolicy.Minimum)
562+
spacer = QtWidgets.QSpacerItem(50,20,QtWidgets.QSizePolicy.Policy.Minimum)
570563
self.controlPanelLayout.addSpacerItem(spacer)
571564

572565
# RSI
@@ -602,7 +595,7 @@ def createControlPanel(self):
602595
self.controlPanelLayout.addWidget(self.IchimokuPB)
603596

604597
# Spacer
605-
spacer = QtWidgets.QSpacerItem(50,20,QtWidgets.QSizePolicy.Minimum)
598+
spacer = QtWidgets.QSpacerItem(50,20,QtWidgets.QSizePolicy.Policy.Minimum)
606599
self.controlPanelLayout.addSpacerItem(spacer)
607600

608601
# Dark mode
@@ -621,7 +614,7 @@ def createControlPanel(self):
621614
self.controlPanelLayout.addWidget(self.volumesCB)
622615

623616
# Spacer
624-
self.controlPanelLayout.insertSpacerItem(0, QtWidgets.QSpacerItem( 0,0, hPolicy=QtWidgets.QSizePolicy.Expanding, vPolicy=QtWidgets.QSizePolicy.Preferred) )
617+
self.controlPanelLayout.insertSpacerItem(0, QtWidgets.QSpacerItem( 0,0, hPolicy=QtWidgets.QSizePolicy.Policy.Expanding, vPolicy=QtWidgets.QSizePolicy.Policy.Preferred) )
625618

626619
return self.controlPanel
627620

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy