wassname/sloth
1
0
Fork 0
mirror of https://github.com/wassname/sloth.git synced 2026-07-23 13:10:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary iterator function

Browse Source
This commit is contained in:
Mika Fischer
2011-06-30 18:58:24 +02:00
parent dcf653833b
commit 4fe9c9a62b
1 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sloth/annotations/model.py
+22 -25
View File
@@ -574,33 +574,30 @@ class AnnotationModel(QAbstractItemModel):
return self._root
def iterator(self, _class=None, predicate=None, start=None):
return model_iterator(self, _class, predicate)
# Visit all nodes
item = start if start is not None else self.root()
while item is not None:
# Return item
if _class is None or isinstance(item, _class):
if predicate is None or predicate(item):
yield item
def model_iterator(model, _class=None, predicate=None, start=None):
# Visit all nodes
item = start if start is not None else model.root()
while item is not None:
# Return item
if _class is None or isinstance(item, _class):
if predicate is None or predicate(item):
yield item
# Get next item
if len(item.children()) > 0:
item = item.children()[0]
else:
next_sibling = item.getNextSibling()
if next_sibling is not None:
item = next_sibling
# Get next item
if len(item.children()) > 0:
item = item.children()[0]
else:
ancestor = item.parent()
item = None
while ancestor is not None:
ancestor_sibling = ancestor.getNextSibling()
if ancestor_sibling is not None:
item = ancestor_sibling
break
ancestor = ancestor.parent()
next_sibling = item.getNextSibling()
if next_sibling is not None:
item = next_sibling
else:
ancestor = item.parent()
item = None
while ancestor is not None:
ancestor_sibling = ancestor.getNextSibling()
if ancestor_sibling is not None:
item = ancestor_sibling
break
ancestor = ancestor.parent()
#######################################################################################