Add Multi-timeframes with multiple charts

Skinok · Skinok · commit fff96fb255fb · 2022-01-02T20:25:28.000+01:00
diff --git a/Controller.py b/Controller.py
@@ -99,13 +99,22 @@ def resetCerebro(self):
         pass
 
 
+    # Return True if loading is successfull & the error string if False
     def loadData(self, dataPath, datetimeFormat, separator):
 
         # Try importing data file
         # We should code a widget that ask for options as : separators, date format, and so on...
         try:
             fileName = os.path.basename(dataPath)
-            self.dataframes[fileName] = pd.read_csv(dataPath, sep=separator, parse_dates=[0], date_parser=lambda x: pd.to_datetime(x, format=datetimeFormat), skiprows=0, header=0, index_col=0)
+            self.dataframes[fileName] = pd.read_csv(dataPath, 
+            sep=separator, 
+            parse_dates=[0], 
+            date_parser=lambda x: pd.to_datetime(x, format=datetimeFormat), 
+            skiprows=0, 
+            header=0, 
+            names=["Time", "Open", "High", "Low", "Close", "Volume"],
+            index_col=0)
+
         except ValueError as err:
             return False, "ValueError error:" + str(err)
         except AttributeError as err:
@@ -131,14 +140,44 @@ def importData(self, fileNamesOrdered):
             # Add data to cerebro : only add data when all files have been selected for multi-timeframes
             self.cerebro.adddata(self.data)  # Add the data feed
 
+            # find the time frame
+            timeframe = self.findTimeFrame(df)
+
+            # Create the chart window for the good timeframe (if it does not already exists?)
+            self.interface.createChartDock(timeframe)
+
             # Draw charts based on input data
-            self.interface.drawChart(df)
+            self.interface.drawChart(df, timeframe)
 
         # Enable run button
         self.interface.strategyTesterUI.runBacktestPB.setEnabled(True)
 
         pass
 
+    def findTimeFrame(self,df):
+
+        if len(df.index) > 2:
+            dtDiff = df.index[1] - df.index[0]
+
+            if dtDiff.seconds == 60:
+                return "M1"
+            elif dtDiff.seconds == 300:
+                return "M5"
+            elif dtDiff.seconds == 900:
+                return "M15"
+            elif dtDiff.seconds == 1800:
+                return "M30"
+            elif dtDiff.seconds == 3600:
+                return "H1"
+            elif dtDiff.seconds == 14400:
+                return "H4"
+            elif dtDiff.seconds == 86400:
+                return "D"
+            elif dtDiff.seconds == 604800:
+                return "W"
+
+        pass
+
 
     def addStrategy(self, strategyName):
         
@@ -254,4 +293,5 @@ def cashChanged(self, cashString):
             self.startingcash = float(cashString)
             self.cerebro.broker.setcash(self.startingcash)
 
-        pass
+        pass
+
diff --git a/finplotWindow.py b/finplotWindow.py
@@ -35,7 +35,7 @@ def __init__(self, dockArea, dockChart, interface):
     #########
     #  Prepare the plot widgets
     #########
-    def createPlotWidgets(self):
+    def createPlotWidgets(self, timeframe):
 
         # fin plot
         self.ax0, self.ax_rsi, self.ax_stochasticRsi, self.ax_stochastic, self.axPnL = fplt.create_plot_widget(master=self.dockArea, rows=5, init_zoom_periods=200)
@@ -47,9 +47,9 @@ def createPlotWidgets(self):
         self.dockChart.addWidget(self.ax2.ax_widget, 3, 0, 1, 1)
         '''
 
-        self.interface.dock_rsi.layout.addWidget(self.ax_rsi.ax_widget)
-        self.interface.dock_stochasticRsi.layout.addWidget(self.ax_stochasticRsi.ax_widget)
-        self.interface.dock_stochastic.layout.addWidget(self.ax_stochastic.ax_widget)
+        self.interface.dock_rsi[timeframe].layout.addWidget(self.ax_rsi.ax_widget)
+        self.interface.dock_stochasticRsi[timeframe].layout.addWidget(self.ax_stochasticRsi.ax_widget)
+        self.interface.dock_stochastic[timeframe].layout.addWidget(self.ax_stochastic.ax_widget)
 
         # Ax Profit & Loss
         self.interface.strategyResultsUI.ResultsTabWidget.widget(1).layout().addWidget(self.axPnL.ax_widget)
@@ -67,6 +67,7 @@ def drawCandles(self):
         # Inside plot widget controls
         #self.createControlPanel(self.ax0.ax_widget)
         pass
+    
 
     def drawSma(self, period):
         self.sma_indicator = sma.Sma(self.data, period)
diff --git a/solution.code-workspace b/solution.code-workspace
@@ -0,0 +1,8 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {}
+}
diff --git a/userInterface.py b/userInterface.py
