Orders and Profit chart is now well displayed in multi-timeframes

Skinok · Skinok · commit cf7cf579d9e4 · 2022-01-08T23:14:09.000+01:00
diff --git a/Controller.py b/Controller.py
@@ -289,7 +289,7 @@ def displayStrategyResults(self):
         pnl_data['time'] = list(self.dataframes.values())[0].index
 
         # draw charts
-        df = pd.DataFrame(pnl_data)
+        df = pd.DataFrame(pnl_data) 
         self.interface.displayPnL( df )
 
         pass
diff --git a/indicatorParametersUI.py b/indicatorParametersUI.py
@@ -29,8 +29,9 @@ def __init__(self, parent = None):
         py = parent.y()
 
         myH = self.height()
+        mySzH=self.sizeHint().height()
 
-        self.move( parent.sizeHint().width() - (self.width() / 2), (parent.sizeHint().height() / 2) - (self.height() / 2))
+        self.move( parent.sizeHint().width() - (self.sizeHint().width() / 2), (parent.sizeHint().height() / 2) - (self.sizeHint().height() / 2))
 
         self.layout().setSizeConstraint( QtWidgets.QLayout.SetFixedSize )
 
diff --git a/userInterface.py b/userInterface.py
@@ -75,7 +75,7 @@ def __init__(self,controller):
 
         # Resize windows properties
         self.win.resize(1600,1100)
-        self.win.setWindowTitle("Skinok Backtrader UI")
+        self.win.setWindowTitle("Skinok Backtrader UI v0.3")
         
         # Set width/height of QSplitter
         self.app.setStyleSheet(qdarkstyle.load_stylesheet_pyqt5())
@@ -477,20 +477,21 @@ def drawChart(self, data, timeframe):
     #########
     # Draw orders on chart
     #########
-    def setOrders(self, orders, timeframe):
-        #self.fillOrdersUI(self.myOrders)
-        self.fpltWindow[timeframe].drawOrders(orders)
+    def setOrders(self, orders):
+        for timeframe,fpltWindow in self.fpltWindow.items():
+            fpltWindow.drawOrders(orders)
         pass
 
     #########
     # Draw PnL chart
     # A python expert could do waaaaay better optimized on this function
     # But anyway... it works...
     #########
-    def displayPnL(self, pnl_dataframe, timeframe):
+    def displayPnL(self, pnl_dataframe):
 
         # draw charts
-        self.fpltWindow[timeframe].drawPnL(pnl_dataframe)
+        for timeframe, fpltwindow in self.fpltWindow.items():
+            fpltwindow.drawPnL(pnl_dataframe)
         pass
 
     #########
