Merge branch 'xk' of http://10.83.36.188:3000/xuke/backtrader-pyqt-ui into xk

michael xu · michael xu · commit 369568490ab9 · 2023-05-10T08:36:52.000+08:00
diff --git a/SkinokBacktraderUI.py b/SkinokBacktraderUI.py
@@ -112,10 +112,18 @@ def loadData(self, dataPath, datetimeFormat, separator):
 
             # Python contains
             if not dataPath in self.dataframes: 
+                # 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)
                 self.dataframes[fileName] = pd.read_csv(dataPath, 
                                                     sep=separator, 
                                                     parse_dates=[0], 
-                                                    date_parser=lambda x: pd.to_datetime(x, format=datetimeFormat), 
+                                                    date_format=datetimeFormat, 
                                                     skiprows=0, 
                                                     header=0, 
                                                     names=["Time", "Open", "High", "Low", "Close", "Volume"],
diff --git a/finplotWindow.py b/finplotWindow.py
@@ -388,11 +388,11 @@ def zoomTo(self, dateStr1, dateStr2):
                 x2 = fplt._dateStr2x(ax,dateStr2)
 
                 # Do not zoom exactly on the trade, so take a little bit before & after
-                date1 = x1[0];
+                date1 = x1[0]
                 if date1 > 10:
                     date1 = date1 - 10
 
-                date2 = x2[0] + 10;
+                date2 = x2[0] + 10
 
                 ax.vb.update_y_zoom(date1,date2)
         
diff --git a/userInterface.py b/userInterface.py
@@ -55,7 +55,7 @@ class UserInterface:
     #########
     def __init__(self,controller):
 
-        self.controller = controller
+        self.controller = controller    # SkinokBacktraderUI
 
         # It does not finish by a "/"
         self.current_dir_path = os.path.dirname(os.path.realpath(__file__))
