Fix: The correct chart was not loaded by default in cas of multiple files loaded

Skinok · Skinok · commit e248d8a9f248 · 2022-01-12T13:55:28.000+01:00
diff --git a/Controller.py b/Controller.py
@@ -38,6 +38,8 @@
 from observers.SkinokObserver import SkinokObserver
 from wallet import Wallet
 
+
+
 class Controller:
 
     def __init__(self):
@@ -64,6 +66,9 @@ def __init__(self):
         # Once everything is created, initialize data
         self.interface.initialize()
 
+        # Timeframes
+        self.timeFrameIndex = {"M1" : 0, "M5" : 10, "M15": 20, "M30": 30, "H1":40, "H4":50, "D":60, "W":70}
+
         pass
 
 
@@ -127,12 +132,16 @@ def loadData(self, dataPath, datetimeFormat, separator):
 
         return True, ""
 
-    def importData(self, fileNamesOrdered):
+    def importData(self, fileNames):
 
         try:
+                
+            # Sort data by timeframe
+            # For cerebro, we need to add lower timeframes first
+            fileNames.sort( key=lambda x: self.timeFrameIndex[self.findTimeFrame(self.dataframes[x])])
 
             # Files should be loaded in the good order
-            for fileName in fileNamesOrdered:
+            for fileName in fileNames:
                 
                 df = self.dataframes[fileName]
 
@@ -145,7 +154,7 @@ 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
+                # Find timeframe
                 timeframe = self.findTimeFrame(df)
 
                 # Create the chart window for the good timeframe (if it does not already exists?)
@@ -159,14 +168,16 @@ def importData(self, fileNamesOrdered):
 
             return True
 
+        except AttributeError as e:
+            print("AttributeError error:" + str(e))
+        except KeyError as e:
+            print("KeyError error:" + str(e))
         except:
-            
             print("Unexpected error:" + str(sys.exc_info()[0]))
             return False
-
         pass
 
-    def findTimeFrame(self,df):
+    def findTimeFrame(self, df):
 
         if len(df.index) > 2:
             dtDiff = df.index[1] - df.index[0]
diff --git a/loadDataFilesUI.py b/loadDataFilesUI.py
@@ -81,6 +81,9 @@ def importFiles(self):
         for x in range(self.dataFilesListWidget.count()):
             items.append(self.dataFilesListWidget.item(x).text())
 
+        # Sort item by timeframe
+        
+
         # Give all ordered data path to the controller
         if self.controller.importData(items):
             self.dataFilesListWidget.clear()
diff --git a/userInterface.py b/userInterface.py
@@ -139,9 +139,9 @@ def createChartDock(self, timeframe):
         self.timeFramePB[timeframe].setCheckable(True)
         self.timeFramePB[timeframe].setMaximumWidth(100)
         self.timeFramePB[timeframe].toggled.connect(lambda: self.toogleTimeframe(timeframe) )
-        self.controlPanelLayout.insertWidget(0,self.timeFramePB[timeframe])
+        self.timeFramePB[timeframe].toggle()
 
-        self.stackedCharts.setCurrentIndex(0)
+        self.controlPanelLayout.insertWidget(0,self.timeFramePB[timeframe])
 
         # init checked after connecting the slot
         if self.darkmodeCB.isChecked():
@@ -625,13 +625,13 @@ def dark_mode_toggle(self):
     ##########
     def toogleTimeframe(self, timeframe):
 
-        print("Display " + timeframe)
-        self.current_timeframe = timeframe
-
-        self.stackedCharts.setCurrentIndex( self.stackedCharts.indexOf( self.dockAreaTimeframes[timeframe]) )
+        if self.timeFramePB[timeframe].isChecked():
+            print("Display " + timeframe)
+            self.current_timeframe = timeframe
+            index = self.stackedCharts.indexOf( self.dockAreaTimeframes[timeframe])
+            self.stackedCharts.setCurrentIndex( index )
+            self.togglePnLWidget()
 
-        self.togglePnLWidget()
-        
         pass
 
     def togglePnLWidget(self):
