fix when running strat again

Skinok · Skinok · commit ece699978283 · 2021-11-30T16:32:23.000+01:00
diff --git a/Controller.py b/Controller.py
@@ -59,7 +59,6 @@ def __init__(self):
         global wallet
         wallet = Wallet(self.startingcash )
         self.wallet = wallet
-        
 
         # Then add obersers and analyzers
         self.cerebro.addanalyzer(bt.analyzers.TradeAnalyzer, _name = "ta")
@@ -147,6 +146,11 @@ def strategyParametersSave(self, parameterName, parameterValue):
 
     def run(self):
 
+        # UI label
+        self.interface.strategyTesterUI.runLabel.setText("Running strategy...")
+
+        self.interface.resetChart()
+
         # Add strategy here to get modified parameters
         test = self.strategyParameters
         self.strategyIndex = self.cerebro.addstrategy(self.strategyClass, test)
@@ -161,6 +165,10 @@ def run(self):
 
         # Display results
         self.displayStrategyResults()
+
+        # UI label
+        self.interface.strategyTesterUI.runLabel.setText("Strategy backtest completed.")
+        
         pass
 
 
diff --git a/finplotWindow.py b/finplotWindow.py
@@ -286,6 +286,11 @@ def resetPlots(self):
 
         pass
 
+    def refreshChart(self):
+
+        fplt.refresh()
+        pass
+
     def setChartData(self, data):
         self.data = data
         pass
diff --git a/observers/SkinokObserver.py b/observers/SkinokObserver.py
@@ -36,6 +36,10 @@ def __init__(self):
         self.progressBar.setMaximum(self.datas[0].close.buflen())
         self.progressBar.setValue(0)
 
+        Controller.wallet.value_list = []
+        Controller.wallet.equity_list = []
+        Controller.wallet.cash_list = []
+
     def next(self):
 
         # Watch trades
diff --git a/ui/strategyTester.ui b/ui/strategyTester.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
-    <widget class="QGroupBox" name="groupBox">
+    <widget class="QGroupBox" name="backTestingGroupBox">
      <property name="title">
       <string>Back testing</string>
      </property>
@@ -37,7 +37,25 @@
        </widget>
       </item>
       <item row="7" column="0">
-       <widget class="QScrollArea" name="scrollArea">
+       <widget class="QScrollArea" name="parametersScrollArea">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>50</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>250</height>
+         </size>
+        </property>
         <property name="widgetResizable">
          <bool>true</bool>
         </property>
@@ -47,7 +65,7 @@
            <x>0</x>
            <y>0</y>
            <width>192</width>
-           <height>210</height>
+           <height>69</height>
           </rect>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout">
diff --git a/userInterface.py b/userInterface.py
@@ -429,7 +429,6 @@ def setOrders(self, orders):
         self.fpltWindow.drawOrders(orders)
         pass
 
-
     #########
     # Draw PnL chart
     # A python expert could do waaaaay better optimized on this function
@@ -469,6 +468,14 @@ def createControlPanel(self):
         layout.setColumnMinimumWidth(3, 30)
         '''
 
+        # Rest
+        self.ResetPB = QtWidgets.QPushButton(self.panel)
+        self.ResetPB.setText("Reset")
+        self.ResetPB.setCheckable(True)
+        self.ResetPB.setMaximumWidth(100)
+        self.ResetPB.toggled.connect(self.resetChart)
+        layout.addWidget(self.ResetPB)
+
         # Ichimoku
         self.IchimokuPB = QtWidgets.QPushButton(self.panel)
         self.IchimokuPB.setText("Ichimoku")
@@ -507,13 +514,22 @@ def dark_mode_toggle(self):
     ##########
     # INDICATORS
     ##########
+    def resetChart(self):
+        self.fpltWindow.updateChart()
+        #self.fpltWindow.resetPlots()
+        #self.fpltWindow.drawCandles()
+        #self.fpltWindow.refreshChart()
+        pass
+
     def addIchimoku(self):
         self.fpltWindow.setIndicator("Ichimoku", self.IchimokuPB.isChecked() )
         pass
     def volumes_toggle(self):
         self.fpltWindow.setIndicator("Volumes", self.volumesCB.isChecked())
         pass
 
+    
+
     #########
     #  Obsolete (Strategy results : transcations tab)
     #########
@@ -571,6 +587,10 @@ def fillStrategyParameters(self, strategy):
             row = row + 1
             pass
 
+        # Parameter box size
+        self.strategyTesterUI.parametersLayout.update()
+        self.strategyTesterUI.parametersScrollArea.adjustSize()
+
         pass
 
 
