From 95af7a0ba45a690785516c42d0767c42f6bafb5e Mon Sep 17 00:00:00 2001 From: xiecl Date: Wed, 24 Apr 2019 11:22:14 +0800 Subject: [PATCH] fix the label and changed the color according to label --- .gitignore | 1 + labelme/app.py | 2 ++ labelme/main.py | 2 ++ labelme/widgets/canvas.py | 12 ++++++++++++ 4 files changed, 17 insertions(+) diff --git a/.gitignore b/.gitignore index 0495fc6d1..01ac3e6ea 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ *.py[cdo] .DS_Store +.idea diff --git a/labelme/app.py b/labelme/app.py index 64cbf080c..9f5f18555 100644 --- a/labelme/app.py +++ b/labelme/app.py @@ -1018,6 +1018,8 @@ def labelItemChanged(self, item): label = str(item.text()) if label != shape.label: shape.label = str(item.text()) + shape.line_color = self.canvas.labelToColor.get(shape.label, QtGui.QColor(0, 0, 0, 255)) + shape.fill_color = self.canvas.labelToColor.get(shape.label, QtGui.QColor(0, 0, 0, 255)) self.setDirty() else: # User probably changed item visibility self.canvas.setShapeVisible(shape, item.checkState() == Qt.Checked) diff --git a/labelme/main.py b/labelme/main.py index bd7e763ea..051fa7b55 100644 --- a/labelme/main.py +++ b/labelme/main.py @@ -123,6 +123,8 @@ def _main(): else: args.labels = [l for l in args.labels.split(',') if l] + args.labels = ['free_space', 'park_free', 'park_occupy', 'lever', 'corner', 'bucket', 'lock', 'unlock'] + config_from_args = args.__dict__ config_from_args.pop('version') reset_config = config_from_args.pop('reset_config') diff --git a/labelme/widgets/canvas.py b/labelme/widgets/canvas.py index 2a8838c8d..33d2b2116 100644 --- a/labelme/widgets/canvas.py +++ b/labelme/widgets/canvas.py @@ -71,6 +71,16 @@ def __init__(self, *args, **kwargs): # Set widget options. self.setMouseTracking(True) self.setFocusPolicy(QtCore.Qt.WheelFocus) + self.labelToColor = { + 'free_space': QtGui.QColor(0, 128, 128, 128), + 'park_free': QtGui.QColor(255, 0, 0, 128), + 'park_occupy': QtGui.QColor(255, 0, 255, 128), + 'lever': QtGui.QColor(0, 0, 255, 128), + 'corner': QtGui.QColor(0, 255, 0, 128), + 'bucket': QtGui.QColor(0, 255, 255, 128), + 'lock': QtGui.QColor(255, 255, 0, 128), + 'unlock': QtGui.QColor(128, 0, 0, 128), + } def fillDrawing(self): return self._fill_drawing @@ -646,6 +656,8 @@ def keyPressEvent(self, ev): def setLastLabel(self, text): assert text self.shapes[-1].label = text + self.shapes[-1].fill_color = self.labelToColor.get(text, QtGui.QColor(0, 0, 0, 255)) + self.shapes[-1].line_color = self.labelToColor.get(text, QtGui.QColor(0, 0, 0, 255)) self.shapesBackups.pop() self.storeShapes() return self.shapes[-1]