Skip to content

Commit 1b51b83

Browse files
committed
better fix for background extraDelta1/2
1 parent ffb39b7 commit 1b51b83

2 files changed

Lines changed: 13 additions & 10 deletions

File tree

src/artisanlib/canvas.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9772,7 +9772,7 @@ def redraw(self, recomputeAllDeltas:bool = True, re_smooth_foreground:bool = Tru
97729772
# re-smooth the extra background curve
97739773
tx_lin = numpy.linspace(tx[0],tx[-1],len(tx))
97749774
if self.xtcurveidx % 2:
9775-
if len(self.aw.extraDelta1)>n3 and self.aw.extraDelta1[n3] and self.delta_ax is not None:
9775+
if len(self.aw.extraDelta1b)>n3 and self.aw.extraDelta1b[n3] and self.delta_ax is not None:
97769776
trans = self.delta_ax.transData
97779777
else:
97789778
trans = self.ax.transData
@@ -9784,7 +9784,7 @@ def redraw(self, recomputeAllDeltas:bool = True, re_smooth_foreground:bool = Tru
97849784
else:
97859785
stemp3B = self.stemp1BX[n3]
97869786
else:
9787-
if len(self.aw.extraDelta2)>n3 and self.aw.extraDelta2[n3] and self.delta_ax is not None:
9787+
if len(self.aw.extraDelta2b)>n3 and self.aw.extraDelta2b[n3] and self.delta_ax is not None:
97889788
trans = self.delta_ax.transData
97899789
else:
97909790
trans = self.ax.transData
@@ -9829,7 +9829,7 @@ def redraw(self, recomputeAllDeltas:bool = True, re_smooth_foreground:bool = Tru
98299829
else:
98309830
tx_lin = None
98319831
if self.ytcurveidx % 2:
9832-
if len(self.aw.extraDelta1)>n4 and self.aw.extraDelta1[n4] and self.delta_ax is not None:
9832+
if len(self.aw.extraDelta1b)>n4 and self.aw.extraDelta1b[n4] and self.delta_ax is not None:
98339833
trans = self.delta_ax.transData
98349834
else:
98359835
trans = self.ax.transData
@@ -9841,7 +9841,7 @@ def redraw(self, recomputeAllDeltas:bool = True, re_smooth_foreground:bool = Tru
98419841
else:
98429842
stemp4B = self.stemp1BX[n4]
98439843
else:
9844-
if len(self.aw.extraDelta2)>n4 and self.aw.extraDelta2[n4] and self.delta_ax is not None:
9844+
if len(self.aw.extraDelta2b)>n4 and self.aw.extraDelta2b[n4] and self.delta_ax is not None:
98459845
trans = self.delta_ax.transData
98469846
else:
98479847
trans = self.ax.transData

src/artisanlib/main.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,6 +1493,7 @@ class ApplicationWindow(QMainWindow):
14931493
'lcd6', 'lcd7', 'label2', 'label3', 'label4', 'label5', 'label6', 'label7', 'extraLCD1', 'extraLCD2', 'extraLCDlabel1', 'extraLCDlabel2',
14941494
'extraLCDframe1', 'extraLCDframe2', 'extraLCDvisibility1', 'extraLCDvisibility2', 'extraCurveVisibility1', 'extraCurveVisibility2',
14951495
'extraDelta1', 'extraDelta2', 'extraFill1', 'extraFill2', 'channel_tare_values', 'messagehist', 'eventlabel', 'eNumberSpinBox',
1496+
'extraDelta1b', 'extraDelta2b',
14961497
'lineEvent', 'etypeComboBox', 'valueEdit', 'etimeline', 'buttonminiEvent', 'buttonlist', 'buttonStates', 'lastbuttonpressed', 'buttonlistmaxlen',
14971498
'buttonpalette_default_label', 'buttonpalette_label', 'buttonpalettemaxlen_min', 'buttonpalettemaxlen_max',
14981499
'buttonpalettemaxlen_default', 'buttonpalettemaxlen', 'buttonpalette_shortcuts', 'buttonsize_default', 'buttonsize',
@@ -3432,6 +3433,8 @@ def __init__(self, parent:QWidget|None = None, *, locale:str, WebEngineSupport:b
34323433
self.extraCurveVisibility2: list[bool] = [True]*self.nLCDS
34333434
self.extraDelta1: list[bool] = [False]*self.nLCDS
34343435
self.extraDelta2: list[bool] = [False]*self.nLCDS
3436+
self.extraDelta1b: list[bool] = [False]*self.nLCDS # background curves
3437+
self.extraDelta2b: list[bool] = [False]*self.nLCDS # background curves
34353438
self.extraFill1: list[int] = [0]*self.nLCDS # alpha values 0-100 in % of fill between extra curve and x-axis
34363439
self.extraFill2: list[int] = [0]*self.nLCDS # alpha values 0-100 in % of fill between extra curve and x-axis
34373440
for i in range(self.nLCDS):
@@ -14180,15 +14183,15 @@ def loadbackground(self, filename:str) -> None:
1418014183
self.qmc.extratimexB = timex
1418114184

1418214185
if 'extraDelta1' in profile:
14183-
self.extraDelta1 = profile['extraDelta1'][:self.nLCDS]
14184-
self.extraDelta1 = self.extraDelta1 + [False]*max(0,self.nLCDS-len(self.extraDelta1))
14186+
self.extraDelta1b = profile['extraDelta1'][:self.nLCDS]
14187+
self.extraDelta1b = self.extraDelta1b + [False]*max(0,self.nLCDS-len(self.extraDelta1b))
1418514188
else:
14186-
self.extraDelta1 = [False]*self.nLCDS
14189+
self.extraDelta1b = self.extraDelta1[:] # by default use the same y-axis as the foreground extra devices
1418714190
if 'extraDelta2' in profile:
14188-
self.extraDelta2 = profile['extraDelta2'][:self.nLCDS]
14189-
self.extraDelta2 = self.extraDelta2 + [False]*max(0,self.nLCDS-len(self.extraDelta2))
14191+
self.extraDelta2b = profile['extraDelta2'][:self.nLCDS]
14192+
self.extraDelta2b = self.extraDelta2b + [False]*max(0,self.nLCDS-len(self.extraDelta2b))
1419014193
else:
14191-
self.extraDelta2 = [False]*self.nLCDS
14194+
self.extraDelta2b = self.extraDelta2[:] # by default use the same y-axis as the foreground extra devices
1419214195

1419314196
# we fill_gaps for all background curves on load, not to have to re-compute those on most redraws
1419414197
if self.qmc.interpolateDropsflag:

0 commit comments

Comments
 (0)