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.

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

Edit label on double click on shape in canvas #1361

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions labelme/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ def __init__(
double_click=self._config["canvas"]["double_click"],
num_backups=self._config["canvas"]["num_backups"],
crosshair=self._config["canvas"]["crosshair"],
edit_label_method=self.editLabel,
)
self.canvas.zoomRequest.connect(self.zoomRequest)

Expand Down
28 changes: 18 additions & 10 deletions labelme/widgets/canvas.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import time

import gdown
from qtpy import QtCore
from qtpy import QtGui
Expand Down Expand Up @@ -40,7 +42,7 @@ class Canvas(QtWidgets.QWidget):

_fill_drawing = False

def __init__(self, *args, **kwargs):
def __init__(self, edit_label_method, *args, **kwargs):
self.epsilon = kwargs.pop("epsilon", 10.0)
self.double_click = kwargs.pop("double_click", "close")
if self.double_click not in [None, "close"]:
Expand Down Expand Up @@ -95,6 +97,8 @@ def __init__(self, *args, **kwargs):
self.hShapeIsSelected = False
self._painter = QtGui.QPainter()
self._cursor = CURSOR_DEFAULT
self._lastMouseReleaseTime = 0
self._editLabelMethod = edit_label_method
# Menus:
# 0: right-click without selection and dragging of shapes
# 1: right-click with selection and dragging of shapes
Expand Down Expand Up @@ -235,10 +239,7 @@ def selectedEdge(self):
def mouseMoveEvent(self, ev):
"""Update line with last point and current coordinates."""
try:
if QT5:
pos = self.transformPos(ev.localPos())
else:
pos = self.transformPos(ev.posF())
pos = self.getMousePos(ev)
except AttributeError:
return

Expand Down Expand Up @@ -409,13 +410,9 @@ def removeSelectedPoint(self):
self.movingShape = True # Save changes

def mousePressEvent(self, ev):
if QT5:
pos = self.transformPos(ev.localPos())
else:
pos = self.transformPos(ev.posF())
pos = self.getMousePos(ev)

is_shift_pressed = ev.modifiers() & QtCore.Qt.ShiftModifier

if ev.button() == QtCore.Qt.LeftButton:
if self.drawing():
if self.current:
Expand Down Expand Up @@ -500,7 +497,14 @@ def mousePressEvent(self, ev):
self.repaint()
self.prevPoint = pos

def getMousePos(self, ev):
return self.transformPos(ev.localPos() if QT5 else ev.posF())

def mouseReleaseEvent(self, ev):
tm = time.time()
is_double_click = (tm - self._lastMouseReleaseTime) < .4
self._lastMouseReleaseTime = tm

if ev.button() == QtCore.Qt.RightButton:
menu = self.menus[len(self.selectedShapesCopy) > 0]
self.restoreCursor()
Expand Down Expand Up @@ -533,6 +537,10 @@ def mouseReleaseEvent(self, ev):

self.movingShape = False

if is_double_click:
if ev.button() == QtCore.Qt.LeftButton and self.editing() and len(self.selectedShapes or []) == 1:
self._editLabelMethod()

def endMove(self, copy):
assert self.selectedShapes and self.selectedShapesCopy
assert len(self.selectedShapesCopy) == len(self.selectedShapes)
Expand Down