- fixes fill artifact during recording caused by None values

- Orbiter roast time on export excludes cooling

Author: MAKOMO

src/artisanlib/canvas.py

@@ -4833,10 +4833,10 @@ def sample_processing(self, local_flagstart:bool, temp1_readings:list[float], te
                                 # update extra lines
                                 if local_flagstart:
                                     if self.aw.extraCurveVisibility1[i] and len(self.extratemp1lines) > xtra_dev_lines1 and self.extratemp1lines[xtra_dev_lines1] is not None:
-                                        self.extratemp1lines[xtra_dev_lines1].set_data(sample_extractimex1[i], numpy.array(sample_extractemp1[i]))
+                                        self.extratemp1lines[xtra_dev_lines1].set_data(numpy.array(sample_extractimex1[i]), numpy.array(sample_extractemp1[i]))
                                         xtra_dev_lines1 = xtra_dev_lines1 + 1
                                     if self.aw.extraCurveVisibility2[i] and len(self.extratemp2lines) > xtra_dev_lines2 and self.extratemp2lines[xtra_dev_lines2] is not None:
-                                        self.extratemp2lines[xtra_dev_lines2].set_data(sample_extractimex2[i], numpy.array(sample_extractemp2[i]))
+                                        self.extratemp2lines[xtra_dev_lines2].set_data(numpy.array(sample_extractimex2[i]), numpy.array(sample_extractemp2[i]))
                                         xtra_dev_lines2 = xtra_dev_lines2 + 1
                         #ERROR FOUND
                         else:
@@ -5696,7 +5696,15 @@ def updategraphics(self) -> None:
                                                     try:
                                                         fill1 = self.extrafill1lines[xtra_dev_lines1]
                                                         if fill1 is not None:
-                                                            fill1.set_verts([self.vertices_between(line1.get_xdata(), line1.get_ydata(), 0)])
+                                                            l1x = line1.get_xdata()
+                                                            l1y = line1.get_ydata()
+                                                            assert isinstance(l1x, numpy.ndarray)
+                                                            assert isinstance(l1y, numpy.ndarray)
+                                                            fill1.set_verts([self.vertices_between(
+                                                                # we need to filter out None values from the (temp) data to avoid collapses of the fill
+                                                                l1x[l1y != None], # noqa: E711 # pylint: disable=singleton-comparison
+                                                                l1y[l1y != None], # noqa: E711 # pylint: disable=singleton-comparison
+                                                                0)])
                                                             self.ax.draw_artist(fill1)
                                                     except Exception as e: # pylint: disable=broad-except
                                                         _log.exception(e)
@@ -5710,7 +5718,15 @@ def updategraphics(self) -> None:
                                                     try:
                                                         fill2 = self.extrafill2lines[xtra_dev_lines2]
                                                         if fill2 is not None:
-                                                            fill2.set_verts([self.vertices_between(line2.get_xdata(), line2.get_ydata(), 0)])
+                                                            l2x = line2.get_xdata()
+                                                            l2y = line2.get_ydata()
+                                                            assert isinstance(l2x, numpy.ndarray)
+                                                            assert isinstance(l2y, numpy.ndarray)
+                                                            fill2.set_verts([self.vertices_between(
+                                                                # we need to filter out None values from the (temp) data to avoid collapses of the fill
+                                                                l2x[l2y != None], # noqa: E711 # pylint: disable=singleton-comparison
+                                                                l2y[l2y != None], # noqa: E711 # pylint: disable=singleton-comparison
+                                                                0)])
                                                             self.ax.draw_artist(fill2)
                                                     except Exception as e: # pylint: disable=broad-except
                                                         _log.exception(e)
@@ -6563,7 +6579,6 @@ def last_registered_foreground_event(event_type:int) -> int|None:
                                         next_event_temp:float|None = None
                                         current_temp:float|None = None
 
-                                        # for ramp by BT only after TP
                                         if (last_event_temp2 is not None and (self.replayType == 1 or (self.replayType == 3 and value_decreasing)) and len(self.temp2)>1 and self.temp2[-1] != -1 and
                                                 self.temp2[-2] != -1 and self.temp2[-1] >= self.temp2[-2] and
                                                 len(self.temp2B) > bge):
@@ -11188,7 +11203,7 @@ def redraw(self, recomputeAllDeltas:bool = True, re_smooth_foreground:bool = Tru
                                             sketch_params=None))
                                 else:
                                     self.extrafill1lines.append(None)
-                                self.extratemp1lines.append(self.ax.plot(self.extratimex[i],visible_extratemp1,transform=trans,color=self.extradevicecolor1[i],
+                                self.extratemp1lines.append(self.ax.plot(numpy.array(self.extratimex[i]),visible_extratemp1,transform=trans,color=self.extradevicecolor1[i],
                                     sketch_params=None,
                                     path_effects=self.line_path_effects(self.glow, self.patheffects, self.aw.light_background_p, self.extralinewidths1[i],self.extradevicecolor1[i]),
                                     markersize=self.extramarkersizes1[i],
@@ -11244,7 +11259,7 @@ def redraw(self, recomputeAllDeltas:bool = True, re_smooth_foreground:bool = Tru
                                             sketch_params=None))
                                 else:
                                     self.extrafill2lines.append(None)
-                                self.extratemp2lines.append(self.ax.plot(self.extratimex[i],visible_extratemp2,transform=trans,color=self.extradevicecolor2[i],
+                                self.extratemp2lines.append(self.ax.plot(numpy.array(self.extratimex[i]),visible_extratemp2,transform=trans,color=self.extradevicecolor2[i],
                                     sketch_params=None,
                                     path_effects=self.line_path_effects(self.glow, self.patheffects, self.aw.light_background_p, self.extralinewidths2[i],self.extradevicecolor2[i]),
                                     markersize=self.extramarkersizes2[i],

src/artisanlib/orbiter.py

@@ -203,6 +203,7 @@ async def read_msg(self, stream: asyncio.StreamReader|IteratorReader) -> None:
                         dashboard_state = data[3:5]
                         dashboard_state_low = dashboard_state[0]
                         #
+#                        self.isRoaster_Cooling = self.test_bit(dashboard_state_low, 3)
                         self.isRoaster_Roasting = self.test_bit(dashboard_state_low, 2)
 #                        if self.isRoaster_Roasting:
 #                            _log.debug("isRoaster_Roasting")
@@ -565,7 +566,8 @@ def saveOrbiter(filename:str, outfile:IO[bytes], profile:ProfileData) -> bool:
         FCs:bool = False
         SCs:bool = False
         DROP:bool = False
-        CHARGE_idx = (timeindex[0] if timeindex[0]>=0 else 0)
+        CHARGE_idx = max(0, (timeindex[0] if timeindex[0]>=0 else 0))
+        DROP_idx = max(0, (timeindex[6] if timeindex[6]>0 else len(timex) - 1))
         for idx,tx in enumerate(timex):
             if not (DROP or (timeindex[0] > -1 and tx < timex[timeindex[0]])): # ignore all readings before CHARGE and after DROP
                 if len(specialevents)>0 and idx >= specialevents[0]:
@@ -623,7 +625,7 @@ def saveOrbiter(filename:str, outfile:IO[bytes], profile:ProfileData) -> bool:
         title_length:int = 30
         title_bytes = to_ascii(title).encode('utf-8')[:title_length].ljust(title_length, b'\00')
         preheat_temperature = int(round(temp2[CHARGE_idx] if len(temp2)>CHARGE_idx else 0))
-        total_time_seconds:int = int(round((timex[-1] if len(timex)>0 else 0) - (timex[CHARGE_idx] if len(timex)>CHARGE_idx else 0)))
+        total_time_seconds:int = (int(round(timex[DROP_idx] - timex[CHARGE_idx])) if len(timex)>DROP_idx and len(timex)>CHARGE_idx and DROP_idx>CHARGE_idx else 0)
         header = b'\xff\xff'
         # header
         header_data = b'\x00\x00' + \

src/requirements-dev.txt

@@ -16,7 +16,7 @@ types-qrcode>=8.2.0.20260408
 lxml-stubs>=0.5.1
 mypy==1.20.0
 pyright==1.1.408
-ruff>=0.15.9
+ruff>=0.15.10
 pylint==4.0.5
 pre-commit>=4.5.1
 pytest>=9.0.3

src/requirements.txt

@@ -29,7 +29,7 @@
 setuptools==82.0.1
 wheel==0.46.3
 pyserial==3.5
-pymodbus==3.12.0
+pymodbus==3.13.0
 python-snap7==2.1.0
 Phidget22==1.25.20260408
 Unidecode==1.4.0
@@ -99,8 +99,8 @@ SecretStorage==3.5.0; platform_system=='Linux'
 ########
 ### Windows specific packages
 ###
-build==1.4.0; platform_system=='Windows'
+build==1.4.3; platform_system=='Windows'
 pywin32==311; platform_system=='Windows'
-pyinstaller-versionfile==3.0.1; platform_system=='Windows'
+pyinstaller-versionfile==3.1.0; platform_system=='Windows'
 #libusb-package==1.0.26.3; platform_system=='Windows'  # temp removed for Py 3.14, monkey patched into .appveyor.yml until a Py3.14 wheel is available on pypi
 tzdata==2026.1; platform_system=='Windows' # to prevent pyinstaller WARNING: Hidden import "tzdata" not found!

wiki/HowToRunFromSource.md

@@ -1,12 +1,12 @@
 # How to run Artisan from source
 
 ____
-**Important: Artisan is licensed under [The GNU General Public License](https://www.gnu.org/licenses/gpl-3.0.html).  Copies of Artisan and derivative works are subject to this license.  Be sure to review the license to understand your legal obligations and please respect them.**  
+**Important: Artisan is licensed under [The GNU General Public License](https://www.gnu.org/licenses/gpl-3.0.html).  Copies of Artisan and derivative works are subject to this license.  Be sure to review the license to understand your legal obligations and please respect them.**
 ____
 
 ### Introduction
 
-Artisan provides install packages for all supported platforms on [GitHub](https://github.com/artisan-roaster-scope/artisan/releases).  However, some users may desire to run Artisan directly from the source code.  This document explains how to do so on macOS, Linux and Windows. 
+Artisan provides install packages for all supported platforms on [GitHub](https://github.com/artisan-roaster-scope/artisan/releases).  However, some users may desire to run Artisan directly from the source code.  This document explains how to do so on macOS, Linux and Windows.
 
 While this document is presumed free of errors as of January 2024, there is no guarantee that it is correct as you read it.  If you find an error or discrepancy please start a [new general discussion](https://github.com/artisan-roaster-scope/artisan/discussions/new?category=general) on GitHub.
 
@@ -15,7 +15,7 @@ While this document is presumed free of errors as of January 2024, there is no g
 
 1. Install git from [scm-git.com](https://git-scm.com/downloads)
 
-2. Install Python 3.11 from [python.org](https://www.python.org/)
+2. Install Python 3.12 from [python.org](https://www.python.org/)
 
    >*Note for Windows: Python may be installed from the Microsoft Store or by direct download from the link above.  When installed from the Microsoft Store it is normally started using `python3` as shown below.  When Python is installed by direct download it is normally started with the command `python`. Also note, the Windows command prompt is '>' where the macOS/Linux prompt is '#' as shown below.*
 
@@ -71,7 +71,7 @@ While this document is presumed free of errors as of January 2024, there is no g
 
 [comment]: # (When restoring change the nu,ber below to '7')
 
-6. Start Artisan from the artisan/src directory. 
+6. Start Artisan from the artisan/src directory.
 
    ```
    # python3 artisan.py
@@ -136,5 +136,3 @@ Coverage (types, tests)
 # coverage run -m pytest
 # coverage-badge -o coverage.svg
 ```
-
-