perf(battery_history): fix incorrect x ticks

Author: Ladbaby

app/components/battery_history_card.py

@@ -73,39 +73,52 @@ def calculate_x_ticks(self, unix_timestamp):
         return timestamp_xx00, timestamp_xx30
 
     def updateBatteryHistory(self, battery_history_dic):
+        self.battery_history_dic = battery_history_dic
         system_theme = str(cfg.get(cfg.themeMode))
         background_color = self.background_color_dic[system_theme]
         front_color = self.front_color_dic[system_theme]
         self.graphWidget.axes.set_facecolor(background_color)
         self.graphWidget.figure.patch.set_facecolor(background_color)
 
-        x_list = [int(x / 60) for x in battery_history_dic["time"]]
+        x_list = [int(x) for x in battery_history_dic["time"]]
         y_labels_list = [10 * x for x in range(11)]
         battery_history_time_list = []
         x_ticks = []
-        for x, y, charging, time in zip(x_list, battery_history_dic["battery"], battery_history_dic["charging"], battery_history_dic["time"]):
+        stride = 15
+        previous_timestamp = 0
+        i = 0
+        linewidth = min(5, self.width() / (len(x_list)) * 3)
+        for x, y, charging in zip(x_list, battery_history_dic["battery"], battery_history_dic["charging"]):
             # vertical lines with color indicating charging status
-            if charging:
-                # green
-                color = (0 / 255, 255 / 255, 54 / 255)
-            else:
-                # blue
-                color = (53 / 255, 193 / 255, 241 / 255)
-            self.graphWidget.axes.axvline(x=x, color=color, linestyle='-', linewidth=1, ymax=y / 100)
+            # if consecutive records less than `stride`, then ignore
+            if (x - previous_timestamp <= 20 and i % stride == 0) or x - previous_timestamp > 20:
+                i += 1
+                if charging:
+                    # green
+                    color = (0 / 255, 255 / 255, 54 / 255)
+                else:
+                    # blue
+                    color = (53 / 255, 193 / 255, 241 / 255)
+                self.graphWidget.axes.axvline(x=x, color=color, linestyle='-', linewidth=linewidth, ymin=0.05, ymax=y / 100, solid_capstyle='round')
+            elif x - previous_timestamp <= 20 and i % stride != 0:
+                i += 1
+
+            previous_timestamp = x
 
             # calculate x ticks
-            timestamp_xx00, timestamp_xx30 = self.calculate_x_ticks(time)
-            if timestamp_xx00 not in battery_history_dic["time"]:
+            timestamp_xx00, timestamp_xx30 = self.calculate_x_ticks(x)
+            if timestamp_xx00 not in x_ticks:
                 battery_history_time_list.append(self.convert_time(timestamp_xx00))
                 battery_history_time_list.append(self.convert_time(timestamp_xx30))
-                x_ticks.append(int(timestamp_xx00 / 60))
-                x_ticks.append(int(timestamp_xx30 / 60))
-        self.graphWidget.axes.plot(x_list, battery_history_dic["battery"], color=front_color)
+                x_ticks.append(int(timestamp_xx00))
+                x_ticks.append(int(timestamp_xx30))
 
         self.graphWidget.axes.set_xticks(x_ticks)
         self.graphWidget.axes.set_xticklabels(battery_history_time_list, rotation=45, ha='right', color=front_color)
 
         self.graphWidget.axes.set_ylim(0, 100)
+        padding = 1800
+        self.graphWidget.axes.set_xlim(x_list[-1] - padding, x_list[0] + padding)
 
         # Customize y-axis tick labels.
         self.graphWidget.axes.set_yticks(range(0, 101, 10))
@@ -121,6 +134,11 @@ def updateBatteryHistory(self, battery_history_dic):
 
         self.graphWidget.draw()
 
+    def resizeEvent(self, event):
+        # Call your custom function when the window is resized
+        self.updateBatteryHistory(self.battery_history_dic)
+        event.accept()
+
 class MplCanvas(FigureCanvasQTAgg):
 
     def __init__(self, parent=None, width=5, height=4, dpi=100):

app/view/main_window.py

@@ -41,14 +41,16 @@ def __init__(self, router):
     def update_monitoring_status(self):
         self.homeInterface.update_monitoring_status()
         self.monitoringStatusInterface.update_monitoring_status()
-        self.batteryHistoryInterface.update_monitoring_status()
 
     def update_traffic_statistics(self):
         self.homeInterface.update_traffic_statistics()
 
     def update_month_statistics(self):
         self.homeInterface.update_month_statistics()
 
+    def update_battery_history(self):
+        self.batteryHistoryInterface.update_monitoring_status()
+
     def initLayout(self):
         signalBus.switchToSampleCard.connect(self.switchToSample)
 

main.py

@@ -84,35 +84,45 @@ def show_window(button):
 
     w.show()
 
-    async def update():
+    def update():
         router.update_monitoring_status()
         icon = QIcon(router.get_battery_icon_path())
         tray.setIcon(icon)
         if w.isVisible():
             w.update_monitoring_status()
             w.update_month_statistics()
 
-    async def update_traffic_statistics():
+    def update_traffic_statistics():
         if w.isVisible():
             router.update_traffic_statistics()
             w.update_traffic_statistics()
 
+    def update_battery_history():
+        if w.isVisible():
+            w.update_battery_history()
+
     async def main():
         while True:
-            await update()
+            update()
             await asyncio.sleep(15)  # Run update every 15 seconds
 
     async def traffic_statistics_main():
         while True:
-            await update_traffic_statistics()
+            update_traffic_statistics()
             await asyncio.sleep(1)  # Run update_traffic_statistics every 1 second
 
+    async def battery_history_main():
+        while True:
+            update_battery_history()
+            await asyncio.sleep(15 * 60) # run every 15 mins
+
     # Start the main and traffic statistics tasks
     loop = QEventLoop(app)
     asyncio.set_event_loop(loop)
 
     loop.create_task(main())
     loop.create_task(traffic_statistics_main())
+    loop.create_task(battery_history_main())
 
     # Start the application event loop
     with loop: