Skip to content

Commit d89cd5a

Browse files
committed
draw curve fills while recording
1 parent fbcb170 commit d89cd5a

6 files changed

Lines changed: 93 additions & 32 deletions

File tree

src/artisanlib/canvas.py

Lines changed: 86 additions & 29 deletions
Large diffs are not rendered by default.

src/artisanlib/main.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14584,6 +14584,8 @@ def addDevice(self) -> None:
1458414584
if self.qmc.ax is not None:
1458514585
self.qmc.extratemp1lines.append(self.qmc.ax.plot(self.qmc.extratimex[l], self.qmc.extratemp1[l],color=self.qmc.extradevicecolor1[l],markersize=self.qmc.extramarkersizes1[l],marker=self.qmc.extramarkers1[l],linewidth=self.qmc.extralinewidths1[l],linestyle=self.qmc.extralinestyles1[l],drawstyle=self.qmc.extradrawstyles1[l],label=self.qmc.extraname1[l])[0])
1458614586
self.qmc.extratemp2lines.append(self.qmc.ax.plot(self.qmc.extratimex[l], self.qmc.extratemp2[l],color=self.qmc.extradevicecolor2[l],markersize=self.qmc.extramarkersizes2[l],marker=self.qmc.extramarkers2[l],linewidth=self.qmc.extralinewidths2[l],linestyle=self.qmc.extralinestyles2[l],drawstyle=self.qmc.extradrawstyles2[l],label=self.qmc.extraname2[l])[0])
14587+
self.qmc.extrafill1lines.append(None)
14588+
self.qmc.extrafill2lines.append(None)
1458714589

1458814590
self.updateLCDproperties()
1458914591
except Exception as e: # pylint: disable=broad-except
@@ -14904,6 +14906,7 @@ def resetExtraDevices(self) -> None:
1490414906
self.qmc.extractimex1,self.qmc.extractimex2 = [],[]
1490514907
self.qmc.extractemp1,self.qmc.extractemp2 = [],[]
1490614908
self.qmc.extratemp1lines,self.qmc.extratemp2lines = [],[]
14909+
self.qmc.extrafill1lines,self.qmc.extrafill2lines = [],[]
1490714910
self.qmc.extralinestyles1,self.qmc.extralinestyles2 = [],[]
1490814911
self.qmc.extradrawstyles1,self.qmc.extradrawstyles2 = [],[]
1490914912
self.qmc.extralinewidths1,self.qmc.extralinewidths2 = [],[]

src/includes/Machines/ROEST/100.aset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ extraCurveVisibility1=false, true, false, false, false, true, true, true, true,
2929
extraCurveVisibility2=true, true, false, false, false, false, true, true, true, true
3030
extraDelta1=false, false, false, false, false, false, false, false, false, false
3131
extraDelta2=false, false, false, false, false, false, false, false, false, false
32-
extraFill1=0, 0, 0, 0, 0, 0, 0, 0, 0, 0
32+
extraFill1=0, 0, 0, 0, 0, 10, 0, 0, 0, 0
3333
extraFill2=0, 0, 0, 0, 0, 0, 0, 0, 0, 0
3434
extraLCDvisibility1=true, true, false, false, false, false, false, false, false, false
3535
extraLCDvisibility2=true, true, false, false, false, false, false, false, false, false

src/includes/Machines/ROEST/200.aset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ extraCurveVisibility1=false, true, false, false, false, true, true, true, true,
2929
extraCurveVisibility2=true, true, false, false, false, false, true, true, true, true
3030
extraDelta1=false, false, false, false, false, false, false, false, false, false
3131
extraDelta2=false, false, false, false, false, false, false, false, false, false
32-
extraFill1=0, 0, 0, 0, 0, 0, 0, 0, 0, 0
32+
extraFill1=0, 0, 0, 0, 0, 10, 0, 0, 0, 0
3333
extraFill2=0, 0, 0, 0, 0, 0, 0, 0, 0, 0
3434
extraLCDvisibility1=true, true, false, false, false, false, false, false, false, false
3535
extraLCDvisibility2=true, true, false, false, false, false, false, false, false, false

src/includes/Machines/ROEST/P3000.aset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ extraCurveVisibility1=false, true, false, false, false, true, true, true, true,
3636
extraCurveVisibility2=true, true, false, false, false, false, true, true, true, true
3737
extraDelta1=false, false, false, false, false, false, false, false, false, false
3838
extraDelta2=false, false, false, false, false, false, false, false, false, false
39-
extraFill1=0, 0, 0, 0, 0, 0, 0, 0, 0, 0
39+
extraFill1=0, 0, 0, 0, 0, 10, 0, 0, 0, 0
4040
extraFill2=0, 0, 0, 0, 0, 0, 0, 0, 0, 0
4141
extraLCDvisibility1=true, true, false, false, false, false, false, false, false, false
4242
extraLCDvisibility2=true, true, false, false, false, false, false, false, false, false

wiki/ReleaseHistory.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ v4.0.4 (Mar XX, 2026)
1919
- added a popup explaining the reason the Roast Properties dialog is opened on START if plus is connected and disabled the OK button until beans are specified ([Issue #2133](../../../issues/2133))
2020
- adds hack to prevent dtr/rts signaling on connecting serial ports
2121
- preserves weight/volume unit setup on loading/importing profiles
22+
- enables extra device curve fills on recording
2223
* FIXES
2324
- fixes autosave as PDF on regular `Save` on macOS ([Issue #2118](../../../issues/2118))
2425
- fixes regression which led to large automatic x-axis extensions for larger sampling rates ([Issue #2142](../../../issues/2142))

0 commit comments

Comments
 (0)