From 589abac2101f8d1362b73c1427f67d51ea79b3b5 Mon Sep 17 00:00:00 2001 From: Martin Baeuml Date: Tue, 6 Dec 2011 15:37:23 +0100 Subject: [PATCH] allow ids to be in the range 0-35 ids 0-9 are labeled using keys 0-9, ids 10-35 are labeled using keys a-z --- sloth/items/inserters.py | 8 ++++++-- sloth/items/items.py | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sloth/items/inserters.py b/sloth/items/inserters.py index 07ac350..031c092 100644 --- a/sloth/items/inserters.py +++ b/sloth/items/inserters.py @@ -259,8 +259,12 @@ class BBoxFaceInserter(SequenceItemInserter): if event.key() == Qt.Key_O and self._state > 0: self.toggleOccludedForCurrentInserter() return - elif Qt.Key_0 <= event.key() <= Qt.Key_9: - self._ann['id'] = int(str(event.text())) + elif Qt.Key_0 <= event.key() <= Qt.Key_9 or \ + Qt.Key_A <= event.key() <= Qt.Key_Z: + if Qt.Key_0 <= event.key() <= Qt.Key_9: + self._ann['id'] = int(str(event.text())) + else: + self._ann['id'] = ord(str(event.text()).upper()) - 65 + 10 message = self._scene._message if message is None: message = "" diff --git a/sloth/items/items.py b/sloth/items/items.py index ea48185..c0c6577 100644 --- a/sloth/items/items.py +++ b/sloth/items/items.py @@ -453,8 +453,9 @@ class OccludablePointItem(PointItem): class IDRectItem(RectItem): cycleValuesOnKeypress = dict( - [('i', (IgnorePrefix('id'), range(10)))] + - [(str(i), (IgnorePrefix('id'), [i])) for i in range(10)] + [('i', (IgnorePrefix('id'), range(36)))] + + [(str(i), (IgnorePrefix('id'), [i])) for i in range(10)] + + [(chr(i-10+65).lower(), (IgnorePrefix('id'), [i])) for i in range(10, 36)] ) defaultAutoTextKeys = ['id']