Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issues around the newly added description #1270

Merged
merged 2 commits into from
Apr 29, 2023
Merged

Fix issues around the newly added description #1270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f365b83
Fix tests for the newly added description
wkentaro Apr 29, 2023
464e572
Fix undefined description when display_label_popup=False
wkentaro Apr 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion labelme/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down Expand Up @@ -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)
Expand Down
9 changes: 6 additions & 3 deletions tests/labelme_tests/widgets_tests/test_label_dialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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

Expand All @@ -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 == ""