Strategy parameters modifications

Skinok · Skinok · commit 18b0659ef0a2 · 2021-11-27T17:05:11.000+01:00
diff --git a/Controller.py b/Controller.py
@@ -54,7 +54,7 @@ def __init__(self):
         self.startingcash = 10000.0
 
         global wallet
-        wallet = Wallet(self.startingcash)
+        wallet = Wallet(self.startingcash )
         self.wallet = wallet
         
 
@@ -106,12 +106,14 @@ def addStrategy(self, strategyName):
         self.cerebro.clearStrategies()
 
         mod = __import__(strategyName, fromlist=[strategyName]) # first strategyName is the file name, and second (fromlist) is the class name
-        klass = getattr(mod, strategyName) # class name in the file
+        self.strategyClass = getattr(mod, strategyName) # class name in the file
 
         # Add strategy parameters
-        self.interface.fillStrategyParameters(klass.params._getitems())
+        self.interface.fillStrategyParameters(self.strategyClass.params)
+
+        # Add strategy to the cerebro
+        self.cerebro.addstrategy(self.strategyClass)
 
-        self.cerebro.addstrategy(klass)
         pass
 
 
diff --git a/userInterface.py b/userInterface.py
@@ -40,6 +40,7 @@
 import qdarkstyle
 
 import pandas as pd
+import functools
 
 class UserInterface:
 
@@ -543,21 +544,38 @@ def createTransactionsUI(self, trades):
 
         pass
     
-    def fillStrategyParameters(self, items):
+    def fillStrategyParameters(self, parameters):
 
         # Rest widget rows
         for indexRow in range(self.strategyTesterUI.parametersLayout.rowCount()):
             self.strategyTesterUI.parametersLayout.removeRow(0)
 
         # Insert parameters
         row = 0
-        for parameterName, parameterValue in items:
+        for parameterName, parameterValue in parameters._getitems():
             label = QtWidgets.QLabel(parameterName)
             lineEdit = QtWidgets.QLineEdit(str(parameterValue))
+            lineEdit.textChanged.connect(functools.partial(self.parameterChanged, lineEdit, parameters, parameterName, parameterValue))
+
             self.strategyTesterUI.parametersLayout.addRow(label, lineEdit )
             row = row + 1
             pass
 
         pass
 
+
+    def parameterChanged(self, lineEdit, parameters, parameterName, parameterOldValue):
+
+        # todo something
+        if len(lineEdit.text()) > 0:
+
+            try:
+                setattr(parameters,parameterName,float(lineEdit.text()))
+            except ValueError:
+                try:
+                    setattr(parameters,parameterName,int(lineEdit.text()))
+                except ValueError:
+                    setattr(parameters,parameterName,lineEdit.text())
+
+        pass
     
