improves tooltip rendering

fixes redraw issue with active crosslines in Comparator

Author: MAKOMO

src/artisanlib/canvas.py

@@ -2663,12 +2663,12 @@ def updateBackground(self) -> None:
             finally:
                 if self.updateBackgroundSemaphore.available() < 1:
                     self.updateBackgroundSemaphore.release(1)
+                self.block_update = False
 
     def doUpdate(self) -> None:
         if not self.designerflag:
             self.resetlinecountcaches() # ensure that the line counts are up to date
             self.resetlines() # get rid of projection, cross lines and AUC line
-
             try:
                 with warnings.catch_warnings():
                     warnings.simplefilter('ignore')
@@ -2691,8 +2691,6 @@ def doUpdate(self) -> None:
                     self.update_additional_artists()
                     self.fig.canvas.blit(axfig.bbox)
 
-        self.block_update = False
-
     def device_name_subst(self, device_name:str) -> str:
         try:
             return device_name.format(self.etypes[0],self.etypes[1],self.etypes[2],self.etypes[3],self.mode)
@@ -3006,7 +3004,7 @@ def onpick(self, event:'PickEvent') -> None:
                 self.segmentpickflag = True
 
             # toggle visibility of graph lines by clicking on the legend
-            elif self.legend is not None and event_artist != self.legend and isinstance(event_artist, (Line2D, Text)) \
+            elif not bool(self.aw.comparator) and self.legend is not None and event_artist != self.legend and isinstance(event_artist, (Line2D, Text)) \
                 and event_artist not in [self.l_backgroundeventtype1dots,self.l_backgroundeventtype2dots,self.l_backgroundeventtype3dots,self.l_backgroundeventtype4dots] \
                 and event_artist not in [self.l_eventtype1dots,self.l_eventtype2dots,self.l_eventtype3dots,self.l_eventtype4dots]:
                 idx = None
@@ -3069,7 +3067,7 @@ def onpick(self, event:'PickEvent') -> None:
                                 pass
 
             # show event information by clicking on event lines in step, step+ and combo modes
-            elif isinstance(event_artist, Line2D):
+            elif not bool(self.aw.comparator) and isinstance(event_artist, Line2D):
                 event_type:Optional[int] = None
                 if isinstance(event.ind, int): # type: ignore[attr-defined] # "PickEvent" has no attribute "ind"
                     ind = event.ind # type: ignore[attr-defined] # "PickEvent" has no attribute "ind"
@@ -3124,7 +3122,7 @@ def onpick(self, event:'PickEvent') -> None:
                                         self.background_event_last_picked_ind = i
                                         self.background_event_last_picked_pos = ind
                                     break
-                elif event_artist in [self.l_eventtype1dots,self.l_eventtype2dots,self.l_eventtype3dots,self.l_eventtype4dots]:
+                elif not bool(self.aw.comparator) and event_artist in [self.l_eventtype1dots,self.l_eventtype2dots,self.l_eventtype3dots,self.l_eventtype4dots]:
                     tx = event_artist.get_xdata()[ind]
                     timex = self.time2index(tx)
                     if event_artist is not None and abs(tx - event.mouseevent.xdata)<3: # allow a slightly different mouse position, but close enough to the point on the line
@@ -3626,7 +3624,8 @@ def disconnect_draggableannotations_motion_notifiers(self) -> None:
                             cids.append(cid)
             # disconnecting all established motion_notify_event_handlers of DraggableAnnotations
             for cid in cids:
-                self.fig.canvas.mpl_disconnect(cid)
+                if cid != self.onmove_cid: # don't disconnect the general motion notify event used to move the cross lines
+                    self.fig.canvas.mpl_disconnect(cid)
         except Exception: # pylint: disable=broad-except
             pass
 
@@ -3951,6 +3950,7 @@ def onclick(self, event:'MouseEvent') -> None:
                             self.redraw_keep_view(recomputeAllDeltas=True)
                         return
 
+
             event_xdata = event.xdata
             event_ydata = event.ydata
             if (event_xdata is not None and event_xdata not in (float('-inf'),float('inf')) and
@@ -3961,13 +3961,13 @@ def onclick(self, event:'MouseEvent') -> None:
                         # Mark starting point of click-and-drag with a marker
                         self.base_horizontalcrossline, = self.ax.plot(numpy.array(self.baseX), numpy.array(self.baseY), 'r+', markersize=20)
                         self.base_verticalcrossline, = self.ax.plot(numpy.array(self.baseX), numpy.array(self.baseY), 'wo', markersize = 2)
-                elif event.button == 3 and event.inaxes and not self.designerflag and not self.wheelflag and self.aw.ntb.mode not in ['pan/zoom', 'zoom rect']:# and not self.flagon:
+                elif not bool(self.aw.comparator) and event.button == 3 and event.inaxes and not self.designerflag and not self.wheelflag and self.aw.ntb.mode not in ['pan/zoom', 'zoom rect']:# and not self.flagon:
                     # popup not available if pan/zoom or zoom rect is active as it interacts
                     timex = self.time2index(event_xdata)
                     if timex > 0:
                         # reset the zoom rectangles
                         menu = QMenu(self.aw) # if we bind this to self, we inherit the background-color: transparent from self.fig
-    #                    menu.setStyleSheet("QMenu::item {background-color: palette(window); selection-color: palette(window); selection-background-color: darkBlue;}")
+        #                menu.setStyleSheet("QMenu::item {background-color: palette(window); selection-color: palette(window); selection-background-color: darkBlue;}")
                         # populate menu
                         ac = QAction(menu)
                         bt = self.temp2[timex]
@@ -5739,19 +5739,35 @@ def resetlinecountcaches(self) -> None:
     # ATTENTION: all lines that should be populated need to established in self.ax.lines thus for example delta lines should be established (with empty point lists)
     #   even if they are not drawn before CHARGE to ensure that the linecount corresponds to the fixes lines in self.ax.lines!!
     def resetlines(self) -> None:
-        if self.ax is not None and not bool(self.aw.comparator):
-            #note: delta curves are now in self.delta_ax and have been removed from the count of resetlines()
-            if self.linecount is None:
-                self.linecount = self.lenaxlines()
-            if self.deltalinecount is None:
-                self.deltalinecount = self.lendeltaaxlines()
-            total_linecount = self.linecount+self.deltalinecount
-            # remove lines beyond the max limit of self.linecount)
-            for i in range(len(self.ax.lines)-1,-1,-1):
-                if i >= total_linecount:
-                    self.ax.lines[i].remove()
-                else:
-                    break
+        if self.ax is not None:
+            if bool(self.aw.comparator):
+                if self.l_horizontalcrossline is not None:
+                    try:
+                        i = self.ax.lines.index(self.l_horizontalcrossline)
+                        self.ax.lines[i].remove()
+                        self.l_horizontalcrossline = None
+                    except ValueError:
+                        pass
+                if self.l_verticalcrossline is not None:
+                    try:
+                        i = self.ax.lines.index(self.l_verticalcrossline)
+                        self.ax.lines[i].remove()
+                        self.l_verticalcrossline = None
+                    except ValueError:
+                        pass
+            else:
+                #note: delta curves are now in self.delta_ax and have been removed from the count of resetlines()
+                if self.linecount is None:
+                    self.linecount = self.lenaxlines()
+                if self.deltalinecount is None:
+                    self.deltalinecount = self.lendeltaaxlines()
+                total_linecount = self.linecount+self.deltalinecount
+                # remove lines beyond the max limit of self.linecount)
+                for i in range(len(self.ax.lines)-1,-1,-1):
+                    if i >= total_linecount:
+                        self.ax.lines[i].remove()
+                    else:
+                        break
 
     @pyqtSlot(int)
     def getAlarmSet(self, n:int) -> 'Optional[AlarmSet]':

src/artisanlib/comparator.py

@@ -1419,6 +1419,7 @@ def drawLegend(self) -> None:
                         pass
                     try:
                         self.legend.set_draggable(state=True,use_blit=True)  #,update='bbox')
+                        self.legend.set_picker(self.aw.draggable_text_box_picker)
                     except Exception: # not available in mpl<3.x # pylint: disable=broad-except
                         self.legend.draggable(state=True) # type: ignore # for mpl 2.x
                     frame = self.legend.get_frame()

src/artisanlib/phases_canvas.py

@@ -127,14 +127,14 @@ def hover(self, event:'Event') -> None:
                             ror_end_temp:float = float2float(phases_data['BT_ROR_end_temp'], self.aw.qmc.LCDdecimalplaces)
                             ror_delta_temp:float = phases_data['BT_ROR_end_temp'] - phases_data['BT_ROR_start_temp']
                             ror_delta_temp_str:str = f"{('+' if ror_delta_temp>0 else '')}{float2float(ror_delta_temp, self.aw.qmc.LCDdecimalplaces)}"
-                            text = f"{ror_start_temp}°{self.aw.qmc.mode}/min => {ror_end_temp}°{self.aw.qmc.mode}/min  {ror_delta_temp_str}°{self.aw.qmc.mode}/min"
+                            text = f"{ror_start_temp}°{self.aw.qmc.mode}/min   {ror_delta_temp_str}°{self.aw.qmc.mode}/min   {ror_end_temp}°{self.aw.qmc.mode}/min"
                         elif phases_data['BT_start_temp'] != -1 and phases_data['BT_start_temp'] != -1:
                             # BT temperature
                             start_temp:float = float2float(phases_data['BT_start_temp'], self.aw.qmc.LCDdecimalplaces)
                             end_temp:float = float2float(phases_data['BT_end_temp'], self.aw.qmc.LCDdecimalplaces)
                             delta_temp:float = phases_data['BT_end_temp'] - phases_data['BT_start_temp']
                             delta_temp_str:str = f"{('+' if delta_temp>0 else '')}{float2float(delta_temp, self.aw.qmc.LCDdecimalplaces)}"
-                            text = f"{start_temp}°{self.aw.qmc.mode} => {end_temp}°{self.aw.qmc.mode}  {delta_temp_str}°{self.aw.qmc.mode}"
+                            text = f"{start_temp}°{self.aw.qmc.mode}   {delta_temp_str}°{self.aw.qmc.mode}   {end_temp}°{self.aw.qmc.mode}"
                         if text != '':
                             if self.tooltip_anno is None:
                                 self.tooltip_anno = self.ax.annotate('', xy=(0,0), xytext=(0,0), textcoords='offset points', ha='center', va='center',

wiki/ReleaseHistory.md

@@ -12,18 +12,19 @@ v3.2.1
 * CHANGES
   - updated Spanish localizations (thanks to Juan Carlos Bonilla)
   - updates libs (scipy, bleak, lxml, pillow)
-  - Breaking feature only when hidden buttons are first at the top of the Events Buttons table.  Hidden buttons at the top of the Events Buttons table are no longer counted in the first row's button count, which is limited by the Max Buttons per Row setting.  All other hidden buttons continue to be counted in each row's button count.
-  - Unlimited number of buttons can be created while display is limited to maximum 10 rows with maximum 50 buttons each.
-  - Palette load uses and updates the user selected profile path.
+  - Breaking change only when hidden buttons are first at the top of the Events Buttons table: hidden buttons at the top of the Events Buttons table are no longer counted in the first row's button count, which is limited by the Max Buttons per Row setting.  All other hidden buttons continue to be counted in each row's button count.
+  - unlimited number of buttons can be created while display is limited to maximum 10 rows with maximum 50 buttons each
+  - palette load uses and updates the user selected profile path
 
 * FIXES
   - fixes regression which broke the designer such that points could not be moved ([Discussion #1905](../../../discussions/1905) and [Issue #1916](../../../issues/1916))
   - fixes support for second scale
-  - fixes rendering of special characters like quotes in task displays
+  - fixes rendering of special characters like quotes in task displays of the Batch Manager
   - fixes regression which broke the import of roast profiles exported from Cropster, Giesen, IKAWA, Loring, Petroncini, RoastLog, RoastPath, ROEST, Rubasse, and Stronghold
   - fixes event buttons bottom row not rendered properly in all cases
   - fixes number of rendered event buttons rows
   - fixes graph bounce and jitter when moving the cursor in the designer
+  - fixes redraw issue with active crosslines in Comparator
 
 ----
 v3.2.0 (June 23, 2025)