Skip to content

Commit 316fdf1

Browse files
committed
small fixes
1 parent e31b773 commit 316fdf1

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

src/artisanlib/canvas.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8306,6 +8306,7 @@ def reset(self,redraw:bool = True, soundOn:bool = True, keepProperties:bool = Fa
83068306

83078307
self.aw.updatePlusStatus()
83088308

8309+
self.aw.set_ui_mode(self.aw.ui_mode)
83098310
self.aw.announce_current_ui_mode()
83108311

83118312
### REDRAW ##
@@ -13223,8 +13224,8 @@ def generateNoneTempHints(self) -> None:
1322313224
self.extraNoneTempHint1.append(not bool(self.aw.ws.channel_modes[8]))
1322413225
self.extraNoneTempHint2.append(not bool(self.aw.ws.channel_modes[9]))
1322513226
elif d == 150: # +MODBUS 910
13226-
self.extraNoneTempHint1.append(not bool(self.aw.s7.mode[8]))
13227-
self.extraNoneTempHint2.append(not bool(self.aw.s7.mode[9]))
13227+
self.extraNoneTempHint1.append(self.aw.modbus.inputModes[8] == '')
13228+
self.extraNoneTempHint2.append(self.aw.modbus.inputModes[9] == '')
1322813229
elif d == 151: # +S7 1112
1322913230
self.extraNoneTempHint1.append(not bool(self.aw.s7.mode[10]))
1323013231
self.extraNoneTempHint2.append(not bool(self.aw.s7.mode[11]))

src/artisanlib/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7638,7 +7638,7 @@ def curveSimilarity(self) -> tuple[float|None, float|None]: # pylint: disable=no
76387638
try:
76397639
# we masked the -1 error values
76407640
np_etb_masked = numpy.ma.masked_equal(np_etb, -1)
7641-
np_timeB_etb_masked = numpy.ma.masked_array(np_timeB, np_etb_masked.mask) # type:ignore[operator] # ty:ignore[call-non-callable] # pylint:disable=no-member
7641+
np_timeB_etb_masked = numpy.ma.masked_array(np_timeB, np_etb_masked.mask) # type:ignore[operator,unused-ignore] # ty:ignore[call-non-callable] # pylint:disable=no-member
76427642
# ignore the masked error values on computing the interpolation and fill (especially on the left) with -1 values
76437643
interp_np_etb = numpy.interp(np_timex,np_timeB_etb_masked.compressed(),np_etb_masked.compressed(),left=-1,right=-1) # pyright:ignore[reportUnknownArgumentType] # pylint:disable=no-member
76447644

@@ -7663,7 +7663,7 @@ def curveSimilarity(self) -> tuple[float|None, float|None]: # pylint: disable=no
76637663
try:
76647664
# we masked the -1 error values
76657665
np_btb_masked = numpy.ma.masked_equal(np_btb, -1)
7666-
np_timeB_btb_masked = numpy.ma.masked_array(np_timeB, np_btb_masked.mask) # type:ignore[operator] # ty:ignore[call-non-callable] # pylint:disable=no-member
7666+
np_timeB_btb_masked = numpy.ma.masked_array(np_timeB, np_btb_masked.mask) # type:ignore[operator,unused-ignore] # ty:ignore[call-non-callable] # pylint:disable=no-member
76677667
# ignore the masked error values on computing the interpolation and fill (especially on the left) with -1 values
76687668
interp_np_btb = numpy.interp(np_timex,np_timeB_btb_masked.compressed(),np_btb_masked.compressed(),left=-1,right=-1) # pyright:ignore[reportUnknownArgumentType] # pylint:disable=no-member
76697669

0 commit comments

Comments
 (0)