fixes long standing regression which broke the Rubasse importer (Issue #1958)

Author: MAKOMO

src/artisanlib/canvas.py

@@ -7220,14 +7220,14 @@ def eval_math_expression(self,mathexpression:str, t:float, equeditnumber:int|Non
                                         else:
                                             delta_readings = self.delta2B
                                         if k == 0:
-                                            val, evalsign = self.shiftValueEvalsign(delta_readings,index,sign,Yshiftval)
+                                            val, evalsign = self.shiftValueEvalsign(delta_readings,index,sign,Yshiftval) # pyright:ignore[reportUnknownArgumentType]
                                         else:
                                             #if sampling
                                             if RTsname is not None and RTsname != '':
                                                 idx = index + 1
                                             else:
                                                 idx = index
-                                            val, evalsign = self.shiftValueEvalsignBackground(sample_timex, self.timeB,delta_readings,idx,sign,Yshiftval)
+                                            val, evalsign = self.shiftValueEvalsignBackground(sample_timex, self.timeB,delta_readings,idx,sign,Yshiftval)  # pyright:ignore[reportUnknownArgumentType]
 
                                         #add expression and values found
                                         evaltimeexpression = ''.join((c,mathexpression[i+k+1],evalsign*2,mathexpression[i+k+4],seconddigitstr,evalsign))

src/artisanlib/main.py

@@ -14239,19 +14239,19 @@ def loadbackground(self, filename:str) -> None:
                 f.close()
                 profile = deserialize(filename)
                 self.plusAddPath(profile, filename)
-                self.qmc.backgroundprofile = cast('ProfileData',profile)
-                tb = profile['timex']
-                t1 = profile['temp1']
-                t2 = profile['temp2']
+                self.qmc.backgroundprofile = cast('ProfileData', profile)
+                tb:list[float] = profile['timex']
+                t1:list[float] = profile['temp1']
+                t2:list[float] = profile['temp2']
                 # ensure that timex, temp1 and temp2 are all of the same (minimal-)length
                 data_len:int = min(len(tb), len(t1), len(t2))
                 tb = tb[:data_len]
                 t1 = t1[:data_len]
                 t2 = t2[:data_len]
 
-                timex = profile['extratimex']
-                t1x = profile['extratemp1']
-                t2x = profile['extratemp2']
+                timex:list[list[float]] = profile['extratimex']
+                t1x:list[list[float]] = profile['extratemp1']
+                t2x:list[list[float]] = profile['extratemp2']
                 # ensure that number of extra device data is consistent
                 number_extra_devices = min(len(timex), len(t1x), len(t2x))
                 timex = timex[:number_extra_devices]
@@ -14265,9 +14265,9 @@ def loadbackground(self, filename:str) -> None:
                     if len(timex[c]) != data_len:
                         timex[c] = tb[:]
                     if len(t1x[c]) != data_len:
-                        t1x[c] = [-1]*data_len
+                        t1x[c] = [-1.]*data_len
                     if len(t2x[c]) != data_len:
-                        t2x[c] = [-1]*data_len
+                        t2x[c] = [-1.]*data_len
 
 
                 # reset the movebackground cache:
@@ -14300,7 +14300,7 @@ def loadbackground(self, filename:str) -> None:
 
                 names1x = [decodeLocalStrict(x) for x in profile['extraname1']]
                 names2x = [decodeLocalStrict(x) for x in profile['extraname2']]
-                self.qmc.temp1B,self.qmc.temp2B,self.qmc.timeB, self.qmc.temp1BX, self.qmc.temp2BX = t1,t2,tb,t1x,t2x
+                self.qmc.temp1B,self.qmc.temp2B,self.qmc.timeB, self.qmc.temp1BX, self.qmc.temp2BX = t1,t2,tb,[numpy.array(tx) for tx in t1x],[numpy.array(tx) for tx in t2x]
                 self.qmc.abs_timeB = tb.copy()  #invariant copy of timeB
                 self.qmc.extratimexB = timex
 
@@ -14325,7 +14325,7 @@ def loadbackground(self, filename:str) -> None:
 
                 # we resample the temperatures to regular interval timestamps
                 tb_lin:numpy.ndarray[tuple[Literal[1]],numpy.dtype[numpy.double]]|None = None
-                if tb is not None and tb:
+                if tb:
                     tb_lin = cast(numpy.ndarray[tuple[Literal[1]]], numpy.linspace(tb[0],tb[-1],len(tb)))
                 decay_smoothing_p = not self.qmc.optimalSmoothing
                 b1 = self.qmc.smooth_list(tb,t1,window_len=self.qmc.curvefilter,decay_smoothing=decay_smoothing_p,a_lin=tb_lin)
@@ -14344,7 +14344,7 @@ def loadbackground(self, filename:str) -> None:
                     if (self.qmc.xtcurveidx > 0 and n3 == i) or (self.qmc.ytcurveidx > 0 and n4 == i): # this is the 3rd or 4th background curve to be drawn, we smooth it
                         tx=timex[i]
                         tx_lin:numpy.ndarray[tuple[Literal[1]],numpy.dtype[numpy.double]]|None = None
-                        if tx is not None and tx:
+                        if tx:
                             tx_lin = cast(numpy.ndarray[tuple[Literal[1]],numpy.dtype[numpy.double]], numpy.linspace(tx[0],tx[-1],len(tx)))
                         if (self.qmc.xtcurveidx > 0 and n3 == i and self.qmc.xtcurveidx % 2) or (self.qmc.ytcurveidx > 0 and n4 == i and self.qmc.ytcurveidx % 2):
                             b1x.append(self.qmc.smooth_list(tx,t1x[i],window_len=self.qmc.curvefilter,decay_smoothing=decay_smoothing_p,a_lin=tx_lin))

src/artisanlib/notifications.py

@@ -125,13 +125,15 @@ def sendPlusNotificationSeen(hr_id:str, date:datetime.datetime) -> None:
 
 class NotificationManager(QObject):
 
-    __slots__ = ( 'notification_timeout', 'notification_queue_max_length', 'notification_queue_max_age',
+    __slots__ = ( 'tray_icon_configured', 'notification_timeout', 'notification_queue_max_length', 'notification_queue_max_age',
                 'tray_menu', 'tray_icon', 'notifications_available', 'notifications_enabled', 'notifications_visible',
                 'notifications_queue', 'active_notification', 'notification_menu_actions' )
 
     def __init__(self) -> None:
         super().__init__()
 
+        self.tray_icon_configured:bool = False
+
         # time to display a notification
         self.notification_timeout: Final = 12000 # 6000 # in ms
         # we keep the last n notifications in the tray icon menu
@@ -156,12 +158,14 @@ def __init__(self) -> None:
         self.active_notification:Notification|None = None
 
     def configTrayIcon(self) -> None:
-        # the tray icon is displayed only if notifications are supported by the system
-        self.tray_icon.setIcon(self.artisanTrayIcon())
-        self.tray_icon.setToolTip('Artisan Notifications')
-        self.tray_icon.messageClicked.connect(self.messageClicked)
-        #self.tray_icon.show() # if try_icon is not visible, notifications are not delivered
-        self.tray_icon.setContextMenu(self.tray_menu)
+        if not self.tray_icon_configured:
+            # the tray icon is displayed only if notifications are supported by the system
+            self.tray_icon.setIcon(self.artisanTrayIcon())
+            self.tray_icon.setToolTip('Artisan Notifications')
+            self.tray_icon.messageClicked.connect(self.messageClicked)
+            #self.tray_icon.show() # if try_icon is not visible, notifications are not delivered
+            self.tray_icon.setContextMenu(self.tray_menu)
+            self.tray_icon_configured = True
 
     @staticmethod
     def artisanTrayIcon() -> QIcon:
@@ -228,12 +232,16 @@ def messageClicked(self) -> None:
         except Exception as e: # pylint: disable=broad-except
             _log.exception(e)
 
+    def show_tray_icon(self) -> None:
+        self.configTrayIcon()
+        self.tray_icon.show()
+
     def showNotifications(self) -> None:
         try:
             if self.notifications_available:
                 self.notifications_visible = True
                 if len(self.notifications_queue)>0:
-                    self.tray_icon.show()
+                    self.show_tray_icon()
                     self.updateNotificationMenu()
         except Exception as e: # pylint: disable=broad-except
             _log.exception(e)
@@ -291,7 +299,7 @@ def updateNotificationMenu(self) -> None:
             self.tray_menu.clear()
             self.notification_menu_actions = []
             if len(self.notifications_queue)>0 and self.notifications_visible:
-                self.tray_icon.show()
+                self.show_tray_icon()
 
                 for n in reversed(self.notifications_queue):
                     title = n.formatedTitle()
@@ -325,7 +333,7 @@ def showNotification(self, notification: Notification) -> None:
                     NotificationType.PLUS_SYSTEM,
                     NotificationType.PLUS_REMINDER,
                     NotificationType.PLUS_ADMIN,
-                    NotificationType.PLUS_ADMIN]:
+                    NotificationType.PLUS_ADVERT]:
                 icon = self.notificationPlusIcon()
             self.tray_icon.showMessage(notification.formatedTitle(), notification.message, icon, self.notification_timeout)
         except Exception as e: # pylint: disable=broad-except

src/artisanlib/rubasse.py

@@ -78,6 +78,10 @@ def extractProfileRubasseCSV(file:str,
             temp1.append(et)
 
             bt:float = -1.0
+            try:
+                bt = float(item['BT'])
+            except Exception: # pylint: disable=broad-except
+                pass
             temp2.append(bt)
 
             heaterV:float = -1.0
@@ -174,7 +178,7 @@ def extractProfileRubasseCSV(file:str,
                                 specialeventsvalue.append(eventsExternal2InternalValue(int(round(v))))
                                 specialevents.append(i)
                                 specialeventstype.append(3)
-                                specialeventsStrings.append(f"{float(item['Heater'])}%")
+                                specialeventsStrings.append(f"{float(item['Heater']):.0f}%")
                         else:
                             heater_last = None
                 except Exception as e: # pylint: disable=broad-except
@@ -230,8 +234,8 @@ def extractProfileRubasseCSV(file:str,
     res['extratemp2'] = [extra2,extra4,extra6]
     res['extramathexpression2'] = ['','','']
 
-    res['extraCurveVisibility1'] = [False, True, False, False, True, True, True, True, True, True]
-    res['extraCurveVisibility2'] = [False, False, False, False, True, True, True, True, True, True]
+    res['extraCurveVisibility1'] = [False, False, False, False, True, True, True, True, True, True]
+    res['extraCurveVisibility2'] = [False, True, True, False, True, True, True, True, True, True]
     res['extraDelta1'] = [False]*10
     res['extraDelta2'] = [False]*10
     res['extraNoneTempHint1'] = [True, True, True]