Starting cash is now OK

Skinok · Skinok · commit d05b62ddf4d5 · 2021-11-25T17:43:27.000+01:00
diff --git a/Controller.py b/Controller.py
@@ -77,11 +77,9 @@ def __init__(self):
 
         # Once everything is created, initialize data
         self.interface.initialize()
-
-
-
         pass
 
+
     def loadData(self, dataPath):
 
         self.dataframe = pd.read_csv(dataPath, sep='\t', parse_dates=[0], date_parser=lambda x: pd.to_datetime(x, format='%Y-%m-%d %H:%M:%S'),skiprows=0,header=0,index_col=0)
@@ -96,9 +94,9 @@ def loadData(self, dataPath):
 
         # Draw charts based on input data
         self.interface.drawChart(self.dataframe)
-
         pass
 
+
     def addStrategy(self, strategyName):
         
         #For now, only one strategy is allowed at a time
@@ -113,6 +111,7 @@ def addStrategy(self, strategyName):
         self.cerebro.addstrategy(klass)
         pass
 
+
     def run(self):
 
         # Compute strategy results
@@ -123,6 +122,7 @@ def run(self):
         self.displayStrategyResults()
         pass
 
+
     def displayStrategyResults(self):
         # Stats on trades
         #portfolio_stats = self.strat_results.analyzers.getbyname('PyFolio')
@@ -157,8 +157,15 @@ def displayStrategyResults(self):
         self.interface.displayPnL( pd.DataFrame(pnl_data) )
 
         pass
+
     
     def displayUI(self):
         
         self.interface.show()
+        pass
+
+    
+    def cashChanged(self, cash):
+        if len(cash) > 0:
+            self.cerebro.broker.setcash(float(cash))
         pass
diff --git a/userInterface.py b/userInterface.py
@@ -305,6 +305,13 @@ def createStrategyTesterUI(self):
 
         #
         self.strategyTesterUI.startingCashLE.setText(str(self.controller.cerebro.broker.cash))
+
+        validator = QtGui.QDoubleValidator(-9999999, 9999999, 6, self.strategyTesterUI.startingCashLE)
+        validator.setLocale(QtCore.QLocale("en"))
+        self.strategyTesterUI.startingCashLE.setValidator( validator )
+        
+        self.strategyTesterUI.startingCashLE.textChanged.connect( self.controller.cashChanged )
+
         # self.interface.tradesSizeLE.setValue(self.cerebro.broker.cash)
 
         pass
@@ -339,28 +346,31 @@ def fillSummaryUI(self, brokerCash, brokerValue, tradeAnalysis):
         self.summaryTableWidget.setItem(1,0,QtWidgets.QTableWidgetItem("Value"))
         self.summaryTableWidget.setItem(1,1,QtWidgets.QTableWidgetItem(str(brokerValue)))
 
-        self.summaryTableWidget.setItem(2,0,QtWidgets.QTableWidgetItem("Profit total"))
-        self.summaryTableWidget.setItem(2,1,QtWidgets.QTableWidgetItem(str(tradeAnalysis["pnl"]["net"]["total"])))
+        # if there are some trades
+        if len(tradeAnalysis) > 1:
+
+            self.summaryTableWidget.setItem(2,0,QtWidgets.QTableWidgetItem("Profit total"))
+            self.summaryTableWidget.setItem(2,1,QtWidgets.QTableWidgetItem(str(tradeAnalysis["pnl"]["net"]["total"])))
 
-        self.summaryTableWidget.setItem(3,0,QtWidgets.QTableWidgetItem("Number of trades"))
-        self.summaryTableWidget.setItem(3,1,QtWidgets.QTableWidgetItem(str(tradeAnalysis["total"]["total"])))
+            self.summaryTableWidget.setItem(3,0,QtWidgets.QTableWidgetItem("Number of trades"))
+            self.summaryTableWidget.setItem(3,1,QtWidgets.QTableWidgetItem(str(tradeAnalysis["total"]["total"])))
 
-        self.summaryTableWidget.setItem(4,0,QtWidgets.QTableWidgetItem("Won"))
-        self.summaryTableWidget.setItem(4,1,QtWidgets.QTableWidgetItem(str(tradeAnalysis["won"]['total'])))
+            self.summaryTableWidget.setItem(4,0,QtWidgets.QTableWidgetItem("Won"))
+            self.summaryTableWidget.setItem(4,1,QtWidgets.QTableWidgetItem(str(tradeAnalysis["won"]['total'])))
 
-        self.summaryTableWidget.setItem(5,0,QtWidgets.QTableWidgetItem("Lost"))
-        self.summaryTableWidget.setItem(5,1,QtWidgets.QTableWidgetItem(str(tradeAnalysis["lost"]['total'])))
+            self.summaryTableWidget.setItem(5,0,QtWidgets.QTableWidgetItem("Lost"))
+            self.summaryTableWidget.setItem(5,1,QtWidgets.QTableWidgetItem(str(tradeAnalysis["lost"]['total'])))
 
-        self.summaryTableWidget.setItem(6,0,QtWidgets.QTableWidgetItem("Long"))
-        self.summaryTableWidget.setItem(6,1,QtWidgets.QTableWidgetItem(str(tradeAnalysis["long"]["total"])))
+            self.summaryTableWidget.setItem(6,0,QtWidgets.QTableWidgetItem("Long"))
+            self.summaryTableWidget.setItem(6,1,QtWidgets.QTableWidgetItem(str(tradeAnalysis["long"]["total"])))
 
-        self.summaryTableWidget.setItem(7,0,QtWidgets.QTableWidgetItem("Short"))
-        self.summaryTableWidget.setItem(7,1,QtWidgets.QTableWidgetItem(str(tradeAnalysis["short"]["total"])))
+            self.summaryTableWidget.setItem(7,0,QtWidgets.QTableWidgetItem("Short"))
+            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().setStretchLastSection(True)
+            self.summaryTableWidget.horizontalHeader().setSectionResizeMode(QtWidgets.QHeaderView.Stretch)
 
-        self.summaryTableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
+            self.summaryTableWidget.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
 
         pass
 
