try fix zoom bug

michael xu · michael xu · commit 714b07f11b57 · 2023-05-11T15:46:12.000+08:00
diff --git a/finplotWindow.py b/finplotWindow.py
@@ -33,6 +33,9 @@ def __init__(self, dockArea, dockChart, interface):
 
         self.IndVolumesActivated = False
 
+        self.last_zoom_x = []
+        self.last_zoom_date = []
+
         pass
 
     #########
@@ -383,16 +386,30 @@ def setIndicator(self, indicatorName, activated):
         pass
 
     def _date_str2x(self, ax, date_str):
-        df = ax.getAxis('bottom').vb.datasrc.df
-        dftime = np.array(df.iloc[:, 0])
-        lsttime = dftime.tolist()
-        # print(dftime)
-        # print(lsttime)
-
-        xtime = dt.strptime(date_str, '%Y-%m-%d %H:%M:%S')
-        xint = int((xtime.timestamp()+8*3600)*1e9)
-        print(xint,lsttime[0])
-        x = lsttime.index(xint)
+        print(type(ax.getAxis('bottom').vb.datasrc))
+        if ax.getAxis('bottom').vb.datasrc is None:
+            x=self.last_zoom_x[self.last_zoom_date.index(date_str)]
+        else:
+            if self.last_zoom_date is not None and  len(self.last_zoom_date) == 2:
+                self.last_zoom_date = []
+                self.last_zoom_x = []
+
+            df = ax.getAxis('bottom').vb.datasrc.df
+            dftime = np.array(df.iloc[:, 0])
+            lsttime = dftime.tolist()
+            # print(dftime)
+            # print(lsttime)
+
+            xtime = dt.strptime(date_str, '%Y-%m-%d %H:%M:%S')
+            xint = int((xtime.timestamp()+8*3600)*1e9)
+            print(xint,lsttime[0])
+            x = lsttime.index(xint)
+            if self.last_zoom_date is None:
+                self.last_zoom_date = [date_str]
+                self.last_zoom_x = [x]
+            else:
+                self.last_zoom_date = self.last_zoom_date.append(date_str)
+                self.last_zoom_x = self.last_zoom_x.append(x)
         return [x]
 
     def zoomTo(self, dateStr1, dateStr2):
diff --git a/strategyTesterUI.py b/strategyTesterUI.py
@@ -32,10 +32,11 @@ def initialize(self):
         # Remove straty .py file name
         self.strategyBaseName = []
         for stratName in self.strategyNames:
+            # here remove file extension
             self.strategyBaseName.append(QtCore.QFileInfo(stratName).baseName())
 
         self.strategyNameCB.addItems(self.strategyBaseName)
-        
+        self.strategyNameCB.setCurrentIndex(self.strategyNameCB.count()-1)
         pass
  
     def run(self):
