Skip to content

Commit

Permalink
use walrus operator
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielhrisca
danielhrisca committed Oct 10, 2023
1 parent 7671fad commit a44669f
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 164 deletions.
2 changes: 1 addition & 1 deletion asammdf.spec
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- mode: python -*-
import os
import sys
from pathlib import Path
import sys

sys.setrecursionlimit(sys.getrecursionlimit() * 5)

Expand Down
18 changes: 3 additions & 15 deletions src/asammdf/gui/dialogs/advanced_search.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,12 +292,7 @@ def _add(self, event):
selection = set()

iterator = QtWidgets.QTreeWidgetItemIterator(self.selection)
while True:
item = iterator.value()

if item is None:
break

while item := iterator.value():
data = tuple(item.text(i) for i in range(self.columns))
selection.add(data)

Expand All @@ -321,21 +316,14 @@ def _apply(self, event=None):
self.result = set()

iterator = QtWidgets.QTreeWidgetItemIterator(self.selection)
while True:
item = iterator.value()
if item is None:
break
while item := iterator.value():
self.result.add(item.text(self.NameColumn))
iterator += 1
else:
self.result = {}

iterator = QtWidgets.QTreeWidgetItemIterator(self.selection)
while True:
item = iterator.value()
if item is None:
break

while item := iterator.value():
entry = int(item.text(self.GroupColumn)), int(item.text(self.ChannelColumn))
name = item.text(self.NameColumn)
self.result[entry] = name
Expand Down
16 changes: 3 additions & 13 deletions src/asammdf/gui/dialogs/simple_search.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,7 @@ def _match_double_clicked(self, new_item):
selection = set()

iterator = QtWidgets.QTreeWidgetItemIterator(self.selection)
while True:
item = iterator.value()
if item is None:
break

while item := iterator.value():
selection.add(item.text(0))

iterator += 1
Expand Down Expand Up @@ -117,10 +113,7 @@ def _add(self, event):
items = set()

iterator = QtWidgets.QTreeWidgetItemIterator(self.selection)
while True:
item = iterator.value()
if item is None:
break
while item := iterator.value():
items.add(item.text(0))
iterator += 1

Expand All @@ -137,10 +130,7 @@ def _add(self, event):
def _apply(self, event):
self.result = set()
iterator = QtWidgets.QTreeWidgetItemIterator(self.selection)
while True:
item = iterator.value()
if item is None:
break
while item := iterator.value():
self.result.add(item.text(0))
iterator += 1
self.close()
Expand Down
12 changes: 2 additions & 10 deletions src/asammdf/gui/widgets/batch.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1696,11 +1696,7 @@ def save_filter_list(self):

signals = []
if self.filter_view.currentText() == "Internal file structure":
while True:
item = iterator.value()
if item is None:
break

while item := iterator.value():
iterator += 1

if item.parent() is None:
Expand All @@ -1709,11 +1705,7 @@ def save_filter_list(self):
if item.checkState(0) == QtCore.Qt.Checked:
signals.append(item.text(0))
else:
while True:
item = iterator.value()
if item is None:
break

while item := iterator.value():
iterator += 1

if item.checkState(0) == QtCore.Qt.Checked:
Expand Down
23 changes: 4 additions & 19 deletions src/asammdf/gui/widgets/file.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1316,11 +1316,7 @@ def save_filter_list(self):

signals = []
if self.filter_view.currentText() == "Internal file structure":
while True:
item = iterator.value()
if item is None:
break

while item := iterator.value():
iterator += 1

if item.parent() is None:
Expand All @@ -1329,11 +1325,7 @@ def save_filter_list(self):
if item.checkState(0) == QtCore.Qt.Checked:
signals.append(item.text(0))
else:
while True:
item = iterator.value()
if item is None:
break

while item := iterator.value():
iterator += 1

if item.checkState(0) == QtCore.Qt.Checked:
Expand Down Expand Up @@ -1415,10 +1407,7 @@ def load_filter_list(self, event=None, file_name=None):
iterator = QtWidgets.QTreeWidgetItemIterator(self.filter_tree)

if self.filter_view.currentText() == "Internal file structure":
while True:
item = iterator.value()
if item is None:
break
while item := iterator.value():
iterator += 1

if item.parent() is None:
Expand All @@ -1432,11 +1421,7 @@ def load_filter_list(self, event=None, file_name=None):
item.setCheckState(0, QtCore.Qt.Unchecked)

elif self.filter_view.currentText() == "Natural sort":
while True:
item = iterator.value()
if item is None:
break

while item := iterator.value():
channel_name = item.text(0)
if channel_name in channels:
item.setCheckState(0, QtCore.Qt.Checked)
Expand Down
17 changes: 3 additions & 14 deletions src/asammdf/gui/widgets/mdi_area.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2387,10 +2387,7 @@ def _add_plot_window(self, signals, disable_new_channels=False):
self.set_subplots_link(self.subplots_link)

iterator = QtWidgets.QTreeWidgetItemIterator(plot.channel_selection)
while True:
item = iterator.value()
if item is None:
break
while item := iterator.value():
iterator += 1

if item.type() == item.Group:
Expand Down Expand Up @@ -2585,11 +2582,7 @@ def delete_functions(self, deleted_functions):
wid = mdi.widget()
if isinstance(wid, Plot):
iterator = QtWidgets.QTreeWidgetItemIterator(wid.channel_selection)
while True:
item = iterator.value()
if item is None:
break

while item := iterator.value():
if item.type() == item.Channel:
if item.signal.flags & item.signal.Flags.computed:
if item.signal.computation["function"] in deleted:
Expand Down Expand Up @@ -3746,11 +3739,7 @@ def update_functions(self, original_definitions, modified_definitions):
wid = mdi.widget()
if isinstance(wid, Plot):
iterator = QtWidgets.QTreeWidgetItemIterator(wid.channel_selection)
while True:
item = iterator.value()
if item is None:
break

while item := iterator.value():
if item.type() == item.Channel:
if item.signal.flags & item.signal.Flags.computed:
function = item.signal.computation["function"]
Expand Down
58 changes: 10 additions & 48 deletions src/asammdf/gui/widgets/plot.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1930,11 +1930,7 @@ def add_new_items(tree, root, items, items_pool):

enforce_y_axis = False
iterator = QtWidgets.QTreeWidgetItemIterator(self.channel_selection)
while True:
item = iterator.value()
if item is None:
break

while item := iterator.value():
if item.type() == item.Channel:
if item.checkState(item.CommonAxisColumn) == QtCore.Qt.Unchecked:
enforce_y_axis = False
Expand Down Expand Up @@ -2214,11 +2210,7 @@ def channel_selection_changed(self, update=False):
signal.enable = False

iterator = QtWidgets.QTreeWidgetItemIterator(self.channel_selection)
while True:
item = iterator.value()
if item is None:
break

while item := iterator.value():
if (
item.type() == item.Channel
and item.checkState(item.NameColumn) == QtCore.Qt.Checked
Expand Down Expand Up @@ -2363,11 +2355,7 @@ def close(self):
tree = self.channel_selection
tree.plot = None
iterator = QtWidgets.QTreeWidgetItemIterator(tree)
while True:
item = iterator.value()
if item is None:
break

while item := iterator.value():
item.signal = None

iterator += 1
Expand Down Expand Up @@ -2514,11 +2502,7 @@ def cursor_move_finished(self, cursor=None):

def cursor_removed(self):
iterator = QtWidgets.QTreeWidgetItemIterator(self.channel_selection)
while True:
item = iterator.value()
if item is None:
break

while item := iterator.value():
if item.type() == item.Channel and not self.plot.region:
self.cursor_info.update_value()
item.set_prefix()
Expand All @@ -2534,11 +2518,7 @@ def cursor_removed(self):

def curve_clicked(self, uuid):
iterator = QtWidgets.QTreeWidgetItemIterator(self.channel_selection)
while True:
item = iterator.value()
if item is None:
break

while item := iterator.value():
if item.type() == item.Channel and item.uuid == uuid:
self.channel_selection.clearSelection()
self.channel_selection.setCurrentItem(item)
Expand Down Expand Up @@ -2894,11 +2874,7 @@ def keyPressEvent(self, event):

elif key == QtCore.Qt.Key_R and modifiers == QtCore.Qt.NoModifier:
iterator = QtWidgets.QTreeWidgetItemIterator(self.channel_selection)
while True:
item = iterator.value()
if item is None:
break

while item := iterator.value():
if item.type() == item.Channel:
item.set_prefix()
item.set_value("")
Expand Down Expand Up @@ -3107,11 +3083,7 @@ def range_modified_finished(self):
def range_removed(self):
self._prev_region = None
iterator = QtWidgets.QTreeWidgetItemIterator(self.channel_selection)
while True:
item = iterator.value()
if item is None:
break

while item := iterator.value():
if item.type() == item.Channel:
item.set_prefix()
item.set_value("")
Expand Down Expand Up @@ -3375,10 +3347,7 @@ def toggle_region_values_display_mode(self, event=None, mode=None):
self.range_modified()

iterator = QtWidgets.QTreeWidgetItemIterator(self.channel_selection)
while True:
item = iterator.value()
if item is None:
break
while item := iterator.value():
if item.type() == ChannelsTreeItem.Channel:
item.set_value(update=True, force=True)

Expand Down Expand Up @@ -3422,10 +3391,7 @@ def _update_visibile_entries(self):
_visible_items = self._visible_items = {}
iterator = QtWidgets.QTreeWidgetItemIterator(self.channel_selection)

while True:
item = iterator.value()
if item is None:
break
while item := iterator.value():
iterator += 1
if item.type() == ChannelsTreeItem.Channel:
_item_cache[item.uuid] = item
Expand Down Expand Up @@ -4688,11 +4654,7 @@ def keyPressEvent(self, event):
uuids = []

iterator = QtWidgets.QTreeWidgetItemIterator(parent.channel_selection)
while True:
item = iterator.value()
if item is None:
break

while item := iterator.value():
if item.type() == ChannelsTreeItem.Channel and item.signal.enable:
uuids.append(item.uuid)

Expand Down
Loading

0 comments on commit a44669f

Please sign in to comment.