From d20e59d745124ee8351c2932ac2d38b844cf8594 Mon Sep 17 00:00:00 2001 From: Mika Fischer Date: Thu, 30 Jun 2011 17:06:49 +0200 Subject: [PATCH] Fix bug with scene receiving model change events when no image is displayed --- sloth/gui/annotationscene.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/sloth/gui/annotationscene.py b/sloth/gui/annotationscene.py index c076cf1..302d93f 100644 --- a/sloth/gui/annotationscene.py +++ b/sloth/gui/annotationscene.py @@ -267,26 +267,21 @@ class AnnotationScene(QGraphicsScene): # this is the implemenation of the scene as a view of the model #______________________________________________________________________________________________________ def dataChanged(self, indexFrom, indexTo): - if self.image_item_ is None: + if self.image_item_ is None or self.image_item_.index() != indexFrom.parent(): return - annotation_item_index = indexFrom.parent() - - if self.image_item_.index() != annotation_item_index.parent(): - return - - item = self.itemFromIndex(annotation_item_index) + item = self.itemFromIndex(indexFrom.parent()) if item is not None: item.dataChanged() def rowsInserted(self, index, first, last): - if self.image_item_.index() != index: + if self.image_item_ is None or self.image_item_.index() != index: return self.insertItems(first, last) def rowsAboutToBeRemoved(self, index, first, last): - if self.image_item_.index() != index: + if self.image_item_ is None or self.image_item_.index() != index: return for row in range(first, last+1):