Skip to content

Commit 6bf6a72

Browse files
committed
stack refinement
1 parent d29a2ad commit 6bf6a72

File tree

2 files changed

+19
-34
lines changed

2 files changed

+19
-34
lines changed

src/asammdf/gui/widgets/plot.py

Lines changed: 18 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4844,23 +4844,17 @@ def keyPressEvent(self, event):
48444844
1 for sig in self.signals if sig.min != "n.a." and sig.enable and sig.uuid not in self.common_axis_items
48454845
)
48464846

4847-
if any(sig.min != "n.a." and sig.enable and sig.uuid in self.common_axis_items for sig in self.signals):
4847+
common_axis_signals = [
4848+
sig
4849+
for sig in self.signals
4850+
if sig.min != "n.a." and sig.enable and sig.uuid in self.common_axis_items
4851+
]
4852+
4853+
if common_axis_signals:
48484854
count += 1
48494855

4850-
common_min_ = np.nanmin(
4851-
[
4852-
self.signal_by_uuid(uuid)[0].min
4853-
for uuid in self.common_axis_items
4854-
if len(self.signal_by_uuid(uuid)[0].plot_samples) and self.signal_by_uuid(uuid)[0].enable
4855-
]
4856-
)
4857-
common_max_ = np.nanmax(
4858-
[
4859-
self.signal_by_uuid(uuid)[0].max
4860-
for uuid in self.common_axis_items
4861-
if len(self.signal_by_uuid(uuid)[0].plot_samples) and self.signal_by_uuid(uuid)[0].enable
4862-
]
4863-
)
4856+
common_min_ = np.nanmin([sig.min for sig in common_axis_signals])
4857+
common_max_ = np.nanmax([sig.max for sig in common_axis_signals])
48644858

48654859
if count:
48664860
position = 0
@@ -4948,6 +4942,7 @@ def keyPressEvent(self, event):
49484942
)
49494943

49504944
if count:
4945+
49514946
common_axis_handled = False
49524947
position = 0
49534948
for uuid in uuids:
@@ -4958,24 +4953,14 @@ def keyPressEvent(self, event):
49584953
if common_axis_handled:
49594954
continue
49604955

4961-
min_ = np.nanmin(
4962-
[
4963-
self.signal_by_uuid(uuid)[0].min
4964-
for uuid in self.common_axis_items
4965-
if uuid in uuids_set
4966-
and len(self.signal_by_uuid(uuid)[0].plot_samples)
4967-
and self.signal_by_uuid(uuid)[0].enable
4968-
]
4969-
)
4970-
max_ = np.nanmax(
4971-
[
4972-
self.signal_by_uuid(uuid)[0].max
4973-
for uuid in self.common_axis_items
4974-
if uuid in uuids_set
4975-
and len(self.signal_by_uuid(uuid)[0].plot_samples)
4976-
and self.signal_by_uuid(uuid)[0].enable
4977-
]
4978-
)
4956+
common_axis_signals = [
4957+
sig
4958+
for sig in self.signals
4959+
if sig.uuid in uuids_set and sig.min != "n.a." and sig.enable and sig.uuid in self.common_axis_items
4960+
]
4961+
4962+
min_ = np.nanmin([sig.min for sig in common_axis_signals])
4963+
max_ = np.nanmax([sig.max for sig in common_axis_signals])
49794964

49804965
else:
49814966
min_ = signal.min

src/asammdf/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
"""asammdf version module"""
22

3-
__version__ = "8.8.0.dev32"
3+
__version__ = "8.8.0.dev33"

0 commit comments

Comments
 (0)