diff --git a/labelme/app.py b/labelme/app.py index cdb0bef12..dbc0920ee 100644 --- a/labelme/app.py +++ b/labelme/app.py @@ -1206,7 +1206,7 @@ def loadLabels(self, shapes): points = shape["points"] shape_type = shape["shape_type"] flags = shape["flags"] - description = shape["description"] + description = shape.get("description", "") group_id = shape["group_id"] other_data = shape["other_data"] @@ -1349,6 +1349,7 @@ def newShape(self): text = items[0].data(Qt.UserRole) flags = {} group_id = None + description = "" if self._config["display_label_popup"] or not text: previous_text = self.labelDialog.edit.text() text, flags, group_id, description = self.labelDialog.popUp(text) diff --git a/tests/labelme_tests/widgets_tests/test_label_dialog.py b/tests/labelme_tests/widgets_tests/test_label_dialog.py index 25c66f6e4..ce0ebdb68 100644 --- a/tests/labelme_tests/widgets_tests/test_label_dialog.py +++ b/tests/labelme_tests/widgets_tests/test_label_dialog.py @@ -61,10 +61,11 @@ def interact(): qtbot.keyClick(widget.edit, QtCore.Qt.Key_Enter) # NOQA QtCore.QTimer.singleShot(500, interact) - label, flags, group_id = widget.popUp("cat") + label, flags, group_id, description = widget.popUp("cat") assert label == "person" assert flags == {} assert group_id is None + assert description == "" # popUp() @@ -73,10 +74,11 @@ def interact(): qtbot.keyClick(widget.edit, QtCore.Qt.Key_Enter) # NOQA QtCore.QTimer.singleShot(500, interact) - label, flags, group_id = widget.popUp() + label, flags, group_id, description = widget.popUp() assert label == "person" assert flags == {} assert group_id is None + assert description == "" # popUp() + key_Up @@ -88,7 +90,8 @@ def interact(): qtbot.keyClick(widget.edit, QtCore.Qt.Key_Enter) # NOQA QtCore.QTimer.singleShot(500, interact) - label, flags, group_id = widget.popUp() + label, flags, group_id, description = widget.popUp() assert label == "dog" assert flags == {} assert group_id is None + assert description == ""