FEAT: Localize Datetimes

Author: joshuaRiefman

diagnostic_interface/canvas/plot_canvas.py

@@ -8,9 +8,10 @@
 from diagnostic_interface import settings
 from typing import Optional
 import mplcursors
-
+from dateutil import tz
 
 plt.style.use("seaborn-v0_8-darkgrid")
+local_tz = tz.tzlocal()
 
 
 class PlotCanvas(FigureCanvas):
@@ -42,8 +43,13 @@ def plot(self, ts: TimeSeries, title: str, y_label: str) -> None:
             self.ax.set_title(title)
             self.ax.set_xlabel("Time")
             self.ax.set_ylabel(y_label)
-            self.ax.xaxis.set_major_formatter(mdates.DateFormatter("%H:%M"))
-            self.ax.xaxis.set_major_locator(mdates.HourLocator())
+
+            locator = mdates.AutoDateLocator()
+            formatter = mdates.DateFormatter("%H:%M", tz=local_tz)
+
+            self.ax.xaxis.set_major_formatter(formatter)
+            self.ax.xaxis.set_major_locator(locator)
+
             self.figure.autofmt_xdate()
 
         else:
@@ -59,7 +65,7 @@ def plot(self, ts: TimeSeries, title: str, y_label: str) -> None:
         @cursor.connect("add")
         def _(sel):
             x, y = sel.target  # x is a float (matplotlib date), y is the y-value
-            dt = mdates.num2date(x)
+            dt = mdates.num2date(x, tz=local_tz)
             sel.annotation.set_text(
                 f"{y:.2f} {ts.units} at {dt.strftime('%H:%M')}"
             )
@@ -129,9 +135,10 @@ def plot(self, data, data2):
                 self.ax.legend([self.line1, self.line2], ["Wind Speed", "Precipitation Rate"])
 
                 locator = mdates.AutoDateLocator()
-                formatter = mdates.ConciseDateFormatter(locator)
-                self.ax.xaxis.set_major_locator(locator)
+                formatter = mdates.DateFormatter("%H:%M", tz=local_tz)
+
                 self.ax.xaxis.set_major_formatter(formatter)
+                self.ax.xaxis.set_major_locator(locator)
 
             else:
                 # Only update data
@@ -154,7 +161,7 @@ def plot(self, data, data2):
             @cursor.connect("add")
             def _(sel):
                 x, y = sel.target  # x is a float (matplotlib date), y is the y-value
-                dt = mdates.num2date(x)
+                dt = mdates.num2date(x, tz=local_tz)
                 sel.annotation.set_text(
                     f"{y:.2f} at {dt.strftime('%H:%M')}"
                 )
@@ -238,9 +245,10 @@ def plot(self, data, plot_title, ylabel):
 
                 # Improve datetime formatting
                 locator = mdates.AutoDateLocator()
-                formatter = mdates.ConciseDateFormatter(locator)
-                self.ax.xaxis.set_major_locator(locator)
+                formatter = mdates.DateFormatter("%H:%M", tz=local_tz)
+
                 self.ax.xaxis.set_major_formatter(formatter)
+                self.ax.xaxis.set_major_locator(locator)
 
             else:
                 # Only update data
@@ -259,7 +267,7 @@ def plot(self, data, plot_title, ylabel):
             @cursor.connect("add")
             def _(sel):
                 x, y = sel.target  # x is a float (matplotlib date), y is the y-value
-                dt = mdates.num2date(x)
+                dt = mdates.num2date(x, tz=local_tz)
                 sel.annotation.set_text(
                     f"{y/1e6:.2f} MJ/m^2 at {dt.strftime('%H:%M')}"
                 )

diagnostic_interface/canvas/realtime_canvas.py

@@ -68,7 +68,7 @@ def plot(self, ts: TimeSeries, title: str, y_label: str) -> None:
         def _(sel):
             xdate, yval = sel.target
             # Interpret xdate as UTC, then convert to local
-            dt_utc = mdates.num2date(xdate, tz=timezone.utc)
+            dt_utc = mdates.num2date(xdate, tz=local_tz)
             dt_local = dt_utc.astimezone(local_tz)
             sel.annotation.set_text(
                 f"{yval:.2f} {ts.units} at {dt_local.strftime('%H:%M:%S')}"

diagnostic_interface/start_application.py

@@ -19,8 +19,7 @@
     window.show()
 
     window._splash.showMessage("Loading...")
-    QTimer.singleShot(500, lambda: window._splash.showMessage("Crimping connectors..."))
-    QTimer.singleShot(1500, lambda: window._splash.showMessage("Recrimping connectors..."))
+    QTimer.singleShot(1500, lambda: window._splash.showMessage("Loading..."))
     QTimer.singleShot(2000, window.finishSplash)
 
     sys.exit(app.exec_())

diagnostic_interface/tabs/array_tab.py

@@ -10,6 +10,10 @@
 from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
 from data_tools import SunbeamClient
 import mplcursors
+from dateutil import tz
+
+
+local_tz = tz.tzlocal()
 
 
 class PlotRefreshWorkerSignals(QObject):
@@ -58,8 +62,8 @@ def plot(self, data, data2):
 
                 self.ax.legend([self.line1, self.line2], ["Array Power", "GHI"])
 
-                locator = mdates.AutoDateLocator()
-                formatter = mdates.ConciseDateFormatter(locator)
+                locator = mdates.AutoDateLocator(tz=local_tz)
+                formatter = mdates.ConciseDateFormatter(locator, tz=local_tz)
                 self.ax.xaxis.set_major_locator(locator)
                 self.ax.xaxis.set_major_formatter(formatter)
 
@@ -84,7 +88,7 @@ def plot(self, data, data2):
             @cursor.connect("add")
             def _(sel):
                 x, y = sel.target  # x is a float (matplotlib date), y is the y-value
-                dt = mdates.num2date(x)
+                dt = mdates.num2date(x, tz=local_tz)
                 sel.annotation.set_text(
                     f"{y:.2f} at {dt.strftime('%H:%M')}"
                 )

prescriptive_interface/prescriptive_ui.py

@@ -265,7 +265,7 @@ def update_output(self, message):
     window.show()
 
     window._splash.showMessage("Crimping connectors...")
-    QTimer.singleShot(500, lambda: window._splash.showMessage("Recrimping connectors..."))
+    QTimer.singleShot(500, lambda: window._splash.showMessage("Loading..."))
     QTimer.singleShot(1500, window.finishSplash)
 
     sys.exit(app.exec_())