Skip to content

Commit 9f21477

Browse files
committed
Lot of changes in UI stylesheet and colors
1 parent f00c65b commit 9f21477

File tree

8 files changed

+1338
-70
lines changed

8 files changed

+1338
-70
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pip install requests
1515
pip install websocket
1616
pip install websocket-client
1717
pip install oandapy
18+
pip install qdarkstyle
1819
pip install git+https://github.com/blampe/IbPy.git
1920
pip install git+https://github.com/oanda/oandapy.git
2021
pip install git+https://github.com/Skinok/finplot.git

indicators/ichimoku.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ def __init__(self, dataFrames, tenkan = 9, kijun = 26, senkou = 52, senkou_lead
6363

6464
def draw(self, ax, tenkan_color = "magenta", kijun_color = "blue", senkou_a_color = "gray", senkou_b_color = "gray", chikou_color = "yellow"):
6565

66-
self.tenkan_sen_plot = fplt.plot(self.tenkan_sen, ax = ax, color=tenkan_color, width=2 )
67-
self.kijun_sen_plot = fplt.plot(self.kijun_sen, ax = ax, color=kijun_color, width=3 )
66+
self.tenkan_sen_plot = fplt.plot(self.tenkan_sen, ax = ax, color=tenkan_color, width=1 )
67+
self.kijun_sen_plot = fplt.plot(self.kijun_sen, ax = ax, color=kijun_color, width=2 )
6868
self.senkou_span_a_plot = fplt.plot(self.senkou_span_a, ax = ax, color=senkou_a_color )
6969
self.senkou_span_b_plot = fplt.plot(self.senkou_span_b, ax = ax, color=senkou_b_color )
70-
self.chikou_span_plot = fplt.plot(self.chikou_span, ax = ax, color=chikou_color, width=3 )
70+
self.chikou_span_plot = fplt.plot(self.chikou_span, ax = ax, color=chikou_color, width=2 )
7171

7272
fplt.fill_between( self.senkou_span_a_plot, self.senkou_span_b_plot, color = Color("darkGray") )
7373

strategyTesterUI.py

-11
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,9 @@ def __init__(self, controller):
1414

1515
uic.loadUi( self.current_dir_path + "/ui/strategyTester.ui", self)
1616

17-
# find and connect the widgets in the XML file
18-
self.openDataPB = self.findChild(QtWidgets.QPushButton, "openDataPB")
19-
self.openDataPB.clicked.connect(self.openDataFile)
20-
2117
self.runBacktestPB = self.findChild(QtWidgets.QPushButton, "runBacktestPB")
2218
self.runBacktestPB.clicked.connect(self.run)
2319

24-
self.loadDataFileLE = self.findChild(QtWidgets.QLineEdit, "loadDataFileLE")
25-
2620
self.runningStratPB = self.findChild(QtWidgets.QProgressBar, "runningStratPB")
2721

2822
self.strategyNameCB = self.findChild(QtWidgets.QComboBox, "strategyNameCB")
@@ -38,11 +32,6 @@ def __init__(self, controller):
3832

3933
self.strategyNameCB.addItems(self.strategyBaseName)
4034

41-
def openDataFile(self):
42-
dataFileName = QtWidgets.QFileDialog.getOpenFileName(self, 'Open data file', self.current_dir_path + "/data","CSV files (*.csv)")[0]
43-
self.loadDataFileLE.setText(dataFileName)
44-
self.controller.loadData(dataFileName)
45-
4635
def run(self):
4736
self.controller.run()
4837

0 commit comments

Comments
 (0)