apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #60 from des0ps/master

Browse Source 
Fasten user labelling
This commit is contained in:
darrenl 2017-03-01 19:21:26 +08:00 committed by GitHub
commit a81bc381f7
12 changed files with 271 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
_init_path.py
View File

@ -1,6 +1,7 @@
"""Set up paths"""
import sys
def add_path(path):
if path not in sys.path:
sys.path.insert(0, path)

105
labelImg.py
View File

@ -17,7 +17,8 @@ try:
except ImportError:
# needed for py3+qt4
# ref: http://pyqt.sourceforge.net/Docs/PyQt4/incompatible_apis.html
# ref: http://stackoverflow.com/questions/21217399/pyqt4-qtcore-qvariant-object-instead-of-a-string
# ref:
# http://stackoverflow.com/questions/21217399/pyqt4-qtcore-qvariant-object-instead-of-a-string
if sys.version_info.major >= 3:
import sip
sip.setapi('QVariant', 2)
@ -39,7 +40,8 @@ from pascal_voc_io import XML_EXT
__appname__ = 'labelImg'
### Utility functions and classes.
# Utility functions and classes.
def u(x):
'''py2/py3 unicode helper'''
@ -52,6 +54,7 @@ def u(x):
else:
return x # py3
def have_qstring():
'''p3/qt5 get rid of QString wrapper as py3 has native unicode str type'''
return not (sys.version_info.major >= 3 or QT_VERSION_STR.startswith('5.'))
@ -62,6 +65,7 @@ def util_qt_strlistclass():
class WindowMixin(object):
def menu(self, title, actions=None):
menu = self.menuBar().addMenu(title)
if actions:
@ -81,8 +85,10 @@ class WindowMixin(object):
# PyQt5: TypeError: unhashable type: 'QListWidgetItem'
class HashableQListWidgetItem(QListWidgetItem):
def __init__(self, *args):
super(HashableQListWidgetItem, self).__init__(*args)
def __hash__(self):
return hash(id(self))
@ -138,14 +144,14 @@ class MainWindow(QMainWindow, WindowMixin):
listLayout.addWidget(self.editButton) # , 0, Qt.AlignCenter)
listLayout.addWidget(self.labelList)
self.dock = QDockWidget(u'Box Labels', self)
self.dock.setObjectName(u'Labels')
self.dock.setWidget(self.labelListContainer)
# Tzutalin 20160906 : Add file list and dock to move faster
self.fileListWidget = QListWidget()
self.fileListWidget.itemDoubleClicked.connect(self.fileitemDoubleClicked)
self.fileListWidget.itemDoubleClicked.connect(
self.fileitemDoubleClicked)
filelistLayout = QVBoxLayout()
filelistLayout.setContentsMargins(0, 0, 0, 0)
filelistLayout.addWidget(self.fileListWidget)
@ -248,7 +254,7 @@ class MainWindow(QMainWindow, WindowMixin):
zoom = QWidgetAction(self)
zoom.setDefaultWidget(self.zoomWidget)
self.zoomWidget.setWhatsThis(
u"Zoom in or out of the image. Also accessible with"\
u"Zoom in or out of the image. Also accessible with"
" %s and %s from the canvas." % (fmtShortcut("Ctrl+[-+]"),
fmtShortcut("Ctrl+Wheel")))
self.zoomWidget.setEnabled(False)
@ -266,7 +272,8 @@ class MainWindow(QMainWindow, WindowMixin):
'Ctrl+Shift+F', 'fit-width', u'Zoom follows window width',
checkable=True, enabled=False)
# Group zoom controls into a list for easier toggling.
zoomActions = (self.zoomWidget, zoomIn, zoomOut, zoomOrg, fitWindow, fitWidth)
zoomActions = (self.zoomWidget, zoomIn, zoomOut,
zoomOrg, fitWindow, fitWidth)
self.zoomMode = self.MANUAL_ZOOM
self.scalers = {
self.FIT_WINDOW: self.scaleFitWindow,
@ -295,7 +302,8 @@ class MainWindow(QMainWindow, WindowMixin):
labelMenu = QMenu()
addActions(labelMenu, (edit, delete))
self.labelList.setContextMenuPolicy(Qt.CustomContextMenu)
self.labelList.customContextMenuRequested.connect(self.popLabelListMenu)
self.labelList.customContextMenuRequested.connect(
self.popLabelListMenu)
# Store actions for further handling.
self.actions = struct(save=save, saveAs=saveAs, open=open, close=close,
@ -306,13 +314,16 @@ class MainWindow(QMainWindow, WindowMixin):
zoom=zoom, zoomIn=zoomIn, zoomOut=zoomOut, zoomOrg=zoomOrg,
fitWindow=fitWindow, fitWidth=fitWidth,
zoomActions=zoomActions,
fileMenuActions=(open,opendir,save,saveAs,close,quit),
fileMenuActions=(
open, opendir, save, saveAs, close, quit),
beginner=(), advanced=(),
editMenu=(edit, copy, delete, None, color1, color2),
editMenu=(edit, copy, delete,
None, color1, color2),
beginnerContext=(create, edit, copy, delete),
advancedContext=(createMode, editMode, edit, copy,
delete, shapeLineColor, shapeFillColor),
onLoadActive=(close, create, createMode, editMode),
onLoadActive=(
close, create, createMode, editMode),
onShapesPresent=(saveAs, hideAll, showAll))
self.menus = struct(
@ -406,7 +417,8 @@ class MainWindow(QMainWindow, WindowMixin):
self.lastOpenDir = u(settings.get('lastOpenDir', None))
if os.path.exists(saveDir):
self.defaultSaveDir = saveDir
self.statusBar().showMessage('%s started. Annotation will be saved to %s' %(__appname__, self.defaultSaveDir))
self.statusBar().showMessage('%s started. Annotation will be saved to %s' %
(__appname__, self.defaultSaveDir))
self.statusBar().show()
# or simply:
@ -428,7 +440,8 @@ class MainWindow(QMainWindow, WindowMixin):
# Populate the File menu dynamically.
self.updateFileMenu()
# Since loading the file may take some time, make sure it runs in the background.
# Since loading the file may take some time, make sure it runs in the
# background.
self.queueEvent(partial(self.loadFile, self.filePath))
# Callbacks:
@ -436,7 +449,6 @@ class MainWindow(QMainWindow, WindowMixin):
self.populateModeActions()
## Support Functions ##
def noShapes(self):
@ -560,11 +572,13 @@ class MainWindow(QMainWindow, WindowMixin):
def updateFileMenu(self):
currFilePath = self.filePath
def exists(filename):
return os.path.exists(filename)
menu = self.menus.recentFiles
menu.clear()
files = [f for f in self.recentFiles if f != currFilePath and exists(f)]
files = [f for f in self.recentFiles if f !=
currFilePath and exists(f)]
for i, f in enumerate(files):
icon = newIcon('labels')
action = QAction(
@ -642,11 +656,12 @@ class MainWindow(QMainWindow, WindowMixin):
def saveLabels(self, annotationFilePath):
annotationFilePath = u(annotationFilePath)
lf = LabelFile()
def format_shape(s):
return dict(label=s.label,
line_color=s.line_color.getRgb()\
line_color=s.line_color.getRgb()
if s.line_color != self.lineColor else None,
fill_color=s.fill_color.getRgb()\
fill_color=s.fill_color.getRgb()
if s.fill_color != self.fillColor else None,
points=[(p.x(), p.y()) for p in s.points])
@ -654,7 +669,8 @@ class MainWindow(QMainWindow, WindowMixin):
# Can add differrent annotation formats here
try:
if self.usingPascalVocFormat is True:
print ('Img: ' + self.filePath + ' -> Its xml: ' + annotationFilePath)
print ('Img: ' + self.filePath +
' -> Its xml: ' + annotationFilePath)
lf.savePascalVocFormat(annotationFilePath, shapes, self.filePath, self.imageData,
self.lineColor.getRgb(), self.fillColor.getRgb())
else:
@ -687,14 +703,15 @@ class MainWindow(QMainWindow, WindowMixin):
else: # User probably changed item visibility
self.canvas.setShapeVisible(shape, item.checkState() == Qt.Checked)
## Callback functions:
# Callback functions:
def newShape(self):
"""Pop-up and give focus to the label editor.
position MUST be in global coordinates.
"""
if len(self.labelHist) > 0:
self.labelDialog = LabelDialog(parent=self, listItem=self.labelHist)
self.labelDialog = LabelDialog(
parent=self, listItem=self.labelHist)
text = self.labelDialog.popUp(text=self.prevLabelText)
if text is not None:
@ -707,7 +724,6 @@ class MainWindow(QMainWindow, WindowMixin):
self.actions.editMode.setEnabled(True)
self.setDirty()
if text not in self.labelHist:
self.labelHist.append(text)
else:
@ -771,7 +787,7 @@ class MainWindow(QMainWindow, WindowMixin):
except LabelFileError as e:
self.errorMessage(u'Error opening file',
(u"<p><b>%s</b></p>"
u"<p>Make sure <i>%s</i> is a valid label file.") \
u"<p>Make sure <i>%s</i> is a valid label file.")
% (e, unicodeFilePath))
self.status("Error reading %s" % unicodeFilePath)
return False
@ -802,10 +818,11 @@ class MainWindow(QMainWindow, WindowMixin):
self.addRecentFile(self.filePath)
self.toggleActions(True)
## Label xml file and show bound box according to its filename
# Label xml file and show bound box according to its filename
if self.usingPascalVocFormat is True and \
self.defaultSaveDir is not None:
basename = os.path.basename(os.path.splitext(self.filePath)[0]) + XML_EXT
basename = os.path.basename(
os.path.splitext(self.filePath)[0]) + XML_EXT
xmlPath = os.path.join(self.defaultSaveDir, basename)
self.loadPascalXMLByFilename(xmlPath)
@ -905,7 +922,8 @@ class MainWindow(QMainWindow, WindowMixin):
if dirpath is not None and len(dirpath) > 1:
self.defaultSaveDir = dirpath
self.statusBar().showMessage('%s . Annotation will be saved to %s' %('Change saved folder', self.defaultSaveDir))
self.statusBar().showMessage('%s . Annotation will be saved to %s' %
('Change saved folder', self.defaultSaveDir))
self.statusBar().show()
def openAnnotation(self, _value=False):
@ -915,7 +933,7 @@ class MainWindow(QMainWindow, WindowMixin):
path = os.path.dirname(u(self.filePath))\
if self.filePath else '.'
if self.usingPascalVocFormat:
formats = ['*.%s' % str(fmt).lower()\
formats = ['*.%s' % str(fmt).lower()
for fmt in QImageReader.supportedImageFormats()]
filters = "Open Annotation XML file (%s)" % \
' '.join(formats + ['*.xml'])
@ -968,7 +986,7 @@ class MainWindow(QMainWindow, WindowMixin):
def openNextImg(self, _value=False):
# Proceding next image without dialog if having any label
if self.autoSaving is True and self.defaultSaveDir is not None:
if self.dirty is True and self.hasLabels():
if self.dirty is True:
self.saveFile()
if not self.mayContinue():
@ -993,7 +1011,7 @@ class MainWindow(QMainWindow, WindowMixin):
return
path = os.path.dirname(str(self.filePath))\
if self.filePath else '.'
formats = ['*.%s' % str(fmt).lower()\
formats = ['*.%s' % str(fmt).lower()
for fmt in QImageReader.supportedImageFormats()]
filters = "Image & Label files (%s)" % \
' '.join(formats + ['*%s' % LabelFile.suffix])
@ -1003,21 +1021,20 @@ class MainWindow(QMainWindow, WindowMixin):
self.loadFile(filename)
def saveFile(self, _value=False):
assert not self.image.isNull(), "cannot save empty image"
if self.hasLabels():
if self.defaultSaveDir is not None and len(str(self.defaultSaveDir)):
# print('handle the image:' + self.filePath)
imgFileName = os.path.basename(self.filePath)
savedFileName = os.path.splitext(imgFileName)[0] + LabelFile.suffix
savedPath = os.path.join(str(self.defaultSaveDir), savedFileName)
savedFileName = os.path.splitext(
imgFileName)[0] + LabelFile.suffix
savedPath = os.path.join(
str(self.defaultSaveDir), savedFileName)
self._saveFile(savedPath)
else:
self._saveFile(self.filePath if self.labelFile\
self._saveFile(self.filePath if self.labelFile
else self.saveFileDialog())
def saveFileAs(self, _value=False):
assert not self.image.isNull(), "cannot save empty image"
if self.hasLabels():
self._saveFile(self.saveFileDialog())
def saveFileDialog(self):
@ -1049,14 +1066,6 @@ class MainWindow(QMainWindow, WindowMixin):
self.canvas.setEnabled(False)
self.actions.saveAs.setEnabled(False)
# Message Dialogs. #
def hasLabels(self):
if not self.itemsToShapes:
self.errorMessage(u'No objects labeled',
u'You must label at least one object to save the file.')
return False
return True
def mayContinue(self):
return not (self.dirty and not self.discardChangesDialog())
@ -1092,9 +1101,6 @@ class MainWindow(QMainWindow, WindowMixin):
self.setDirty()
def deleteSelectedShape(self):
yes, no = QMessageBox.Yes, QMessageBox.No
msg = u'You are about to permanently delete this Box, proceed anyway?'
if yes == QMessageBox.warning(self, u'Attention', msg, yes|no):
self.remLabel(self.canvas.deleteSelected())
self.setDirty()
if self.noShapes():
@ -1127,7 +1133,8 @@ class MainWindow(QMainWindow, WindowMixin):
self.setDirty()
def loadPredefinedClasses(self):
predefined_classes_path = os.path.join('data', 'predefined_classes.txt')
predefined_classes_path = os.path.join(
'data', 'predefined_classes.txt')
if os.path.exists(predefined_classes_path) is True:
with codecs.open(predefined_classes_path, 'r', 'utf8') as f:
for line in f:
@ -1147,8 +1154,10 @@ class MainWindow(QMainWindow, WindowMixin):
shapes = tVocParseReader.getShapes()
self.loadLabels(shapes)
class Settings(object):
"""Convenience dict-like wrapper around QSettings."""
def __init__(self, types=None):
self.data = QSettings()
self.types = defaultdict(lambda: QVariant, types if types else {})
@ -1172,7 +1181,8 @@ class Settings(object):
return str(value)
else:
try:
method = getattr(QVariant, re.sub('^Q', 'to', t.__name__, count=1))
method = getattr(QVariant, re.sub(
'^Q', 'to', t.__name__, count=1))
return method(value)
except AttributeError as e:
# print(e)
@ -1183,6 +1193,7 @@ class Settings(object):
def inverted(color):
return QColor(*[255 - v for v in color.getRgb()])
def read(filename, default=None):
try:
with open(filename, 'rb') as f:
@ -1190,6 +1201,7 @@ def read(filename, default=None):
except:
return default
def get_main_app(argv=[]):
"""
Standard boilerplate Qt application code.
@ -1202,6 +1214,7 @@ def get_main_app(argv=[]):
win.show()
return app, win
def main(argv):
'''construct main app and run it'''
app, _win = get_main_app(argv)

34
libs/canvas.py
View File

@ -19,6 +19,8 @@ CURSOR_MOVE = Qt.ClosedHandCursor
CURSOR_GRAB = Qt.OpenHandCursor
# class Canvas(QGLWidget):
class Canvas(QWidget):
zoomRequest = pyqtSignal(int)
scrollRequest = pyqtSignal(int, int)
@ -106,7 +108,8 @@ class Canvas(QWidget):
# Project the point to the pixmap's edges.
pos = self.intersectionPoint(self.current[-1], pos)
elif len(self.current) > 1 and self.closeEnough(pos, self.current[0]):
# Attract line to starting point and colorise to alert the user:
# Attract line to starting point and colorise to alert the
# user:
pos = self.current[0]
color = self.current.line_color
self.overrideCursor(CURSOR_POINT)
@ -164,7 +167,8 @@ class Canvas(QWidget):
if self.selectedVertex():
self.hShape.highlightClear()
self.hVertex, self.hShape = None, shape
self.setToolTip("Click & drag to move shape '%s'" % shape.label)
self.setToolTip(
"Click & drag to move shape '%s'" % shape.label)
self.setStatusTip(self.toolTip())
self.overrideCursor(CURSOR_GRAB)
self.update()
@ -221,6 +225,29 @@ class Canvas(QWidget):
self.repaint()
elif ev.button() == Qt.LeftButton and self.selectedShape:
self.overrideCursor(CURSOR_GRAB)
elif ev.button() == Qt.LeftButton:
if self.drawing():
if self.current and self.current.reachMaxPoints() is False:
initPos = self.current[0]
minX = initPos.x()
minY = initPos.y()
targetPos = self.line[1]
maxX = targetPos.x()
maxY = targetPos.y()
self.current.addPoint(QPointF(maxX, minY))
self.current.addPoint(targetPos)
self.current.addPoint(QPointF(minX, maxY))
self.current.addPoint(initPos)
self.line[0] = self.current[-1]
if self.current.isClosed():
self.finalise()
elif not self.outOfPixmap(pos):
self.current = Shape()
self.current.addPoint(pos)
self.line.points = [pos, pos]
self.setHiding()
self.drawingPolygon.emit(True)
self.update()
def endMove(self, copy=False):
assert self.selectedShape and self.selectedShapeCopy
@ -507,7 +534,7 @@ class Canvas(QWidget):
self.zoomRequest.emit(ev.delta())
else:
self.scrollRequest.emit(ev.delta(),
Qt.Horizontal if (Qt.ShiftModifier == int(mods))\
Qt.Horizontal if (Qt.ShiftModifier == int(mods))
else Qt.Vertical)
else:
self.scrollRequest.emit(ev.delta(), Qt.Horizontal)
@ -571,4 +598,3 @@ class Canvas(QWidget):
self.restoreCursor()
self.pixmap = None
self.update()

5
libs/colorDialog.py
View File

@ -8,13 +8,15 @@ except ImportError:
BB = QDialogButtonBox
class ColorDialog(QColorDialog):
def __init__(self, parent=None):
super(ColorDialog, self).__init__(parent)
self.setOption(QColorDialog.ShowAlphaChannel)
# The Mac native dialog does not support our restore button.
self.setOption(QColorDialog.DontUseNativeDialog)
## Add a restore defaults button.
# Add a restore defaults button.
# The default is set at invocation time, so that it
# works across dialogs for different elements.
self.default = None
@ -33,4 +35,3 @@ class ColorDialog(QColorDialog):
def checkRestore(self, button):
if self.bb.buttonRole(button) & BB.ResetRole and self.default:
self.setCurrentColor(self.default)

1
libs/labelDialog.py
View File

@ -10,6 +10,7 @@ from lib import newIcon, labelValidator
BB = QDialogButtonBox
class LabelDialog(QDialog):
def __init__(self, text="Enter object label", parent=None, listItem=None):

10
libs/labelFile.py
View File

@ -11,9 +11,11 @@ from pascal_voc_io import PascalVocWriter
import os.path
import sys
class LabelFileError(Exception):
pass
class LabelFile(object):
# It might be changed as window creates
suffix = '.lif'
@ -35,18 +37,16 @@ class LabelFile(object):
# Pascal format
image = QImage()
image.load(imagePath)
imageShape = [image.height(), image.width(), 1 if image.isGrayscale() else 3]
writer = PascalVocWriter(imgFolderName, imgFileNameWithoutExt,\
imageShape = [image.height(), image.width(),
1 if image.isGrayscale() else 3]
writer = PascalVocWriter(imgFolderName, imgFileNameWithoutExt,
imageShape, localImgPath=imagePath)
bSave = False
for shape in shapes:
points = shape['points']
label = shape['label']
bndbox = LabelFile.convertPoints2BndBox(points)
writer.addBndBox(bndbox[0], bndbox[1], bndbox[2], bndbox[3], label)
bSave = True
if bSave:
writer.save(targetFile=filename)
return

7
libs/lib.py
View File

@ -12,6 +12,7 @@ except ImportError:
def newIcon(icon):
return QIcon(':/' + icon)
def newButton(text, icon=None, slot=None):
b = QPushButton(text)
if icon is not None:
@ -20,6 +21,7 @@ def newButton(text, icon=None, slot=None):
b.clicked.connect(slot)
return b
def newAction(parent, text, slot=None, shortcut=None, icon=None,
tip=None, checkable=False, enabled=True):
"""Create a new action and assign callbacks, shortcuts, etc."""
@ -51,18 +53,21 @@ def addActions(widget, actions):
else:
widget.addAction(action)
def labelValidator():
return QRegExpValidator(QRegExp(r'^[^ \t].+'), None)
class struct(object):
def __init__(self, **kwargs):
self.__dict__.update(kwargs)
def distance(p):
return sqrt(p.x() * p.x() + p.y() * p.y())
def fmtShortcut(text):
mod, key = text.split('+', 1)
return '<b>%s</b>+<b>%s</b>' % (mod, key)

7
libs/pascal_voc_io.py
View File

@ -9,6 +9,7 @@ import codecs
XML_EXT = '.xml'
class PascalVocWriter:
def __init__(self, foldername, filename, imgSize, databaseSrc='Unknown', localImgPath=None):
@ -34,8 +35,7 @@ class PascalVocWriter:
# Check conditions
if self.filename is None or \
self.foldername is None or \
self.imgSize is None or \
len(self.boxlist) <= 0:
self.imgSize is None:
return None
top = Element('annotation')
@ -102,7 +102,8 @@ class PascalVocWriter:
self.appendObjects(root)
out_file = None
if targetFile is None:
out_file = codecs.open(self.filename + XML_EXT, 'w', encoding='utf-8')
out_file = codecs.open(
self.filename + XML_EXT, 'w', encoding='utf-8')
else:
out_file = codecs.open(targetFile, 'w', encoding='utf-8')

6
libs/shape.py
View File

@ -18,13 +18,14 @@ DEFAULT_SELECT_FILL_COLOR = QColor(0, 128, 255, 155)
DEFAULT_VERTEX_FILL_COLOR = QColor(0, 255, 0, 255)
DEFAULT_HVERTEX_FILL_COLOR = QColor(255, 0, 0)
class Shape(object):
P_SQUARE, P_ROUND = range(2)
MOVE_VERTEX, NEAR_VERTEX = range(2)
## The following class variables influence the drawing
## of _all_ shape objects.
# The following class variables influence the drawing
# of _all_ shape objects.
line_color = DEFAULT_LINE_COLOR
fill_color = DEFAULT_FILL_COLOR
select_line_color = DEFAULT_SELECT_LINE_COLOR
@ -181,4 +182,3 @@ class Shape(object):
def __setitem__(self, key, value):
self.points[key] = value

3
libs/toolBar.py
View File

@ -8,6 +8,7 @@ except ImportError:
class ToolBar(QToolBar):
def __init__(self, title):
super(ToolBar, self).__init__(title)
layout = self.layout()
@ -29,10 +30,10 @@ class ToolBar(QToolBar):
class ToolButton(QToolButton):
"""ToolBar companion class which ensures all buttons have the same size."""
minSize = (60, 60)
def minimumSizeHint(self):
ms = super(ToolButton, self).minimumSizeHint()
w1, h1 = ms.width(), ms.height()
w2, h2 = self.minSize
ToolButton.minSize = max(w1, w2), max(h1, h2)
return QSize(*ToolButton.minSize)

3
libs/zoomWidget.py
View File

@ -6,7 +6,9 @@ except ImportError:
from PyQt4.QtGui import *
from PyQt4.QtCore import *
class ZoomWidget(QSpinBox):
def __init__(self, value=100):
super(ZoomWidget, self).__init__()
self.setButtonSymbols(QAbstractSpinBox.NoButtons)
@ -22,4 +24,3 @@ class ZoomWidget(QSpinBox):
fm = QFontMetrics(self.font())
width = fm.width(str(self.maximum()))
return QSize(width, height)

1
tests/test.py
View File

@ -18,4 +18,3 @@ class TestMainWindow(TestCase):
def test_noop(self):
pass