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
This commit is contained in:
Martin Baeuml
2011-12-06 15:37:23 +01:00
parent 76bc73440c
commit 589abac210
2 changed files with 9 additions and 4 deletions
+6 -2
View File
@@ -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 = ""
+3 -2
View File
@@ -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']