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

added delete image button

Browse Source
This commit is contained in:
Kirill Kalashnikov 2020-06-12 17:15:03 +03:00 committed by darrenl
parent 7cc5241664
commit 9fca0b5e92
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored Normal file
View File

Binary file not shown.

19
labelImg.py
View File

@ -51,8 +51,11 @@ __appname__ = 'labelImg'
class WindowMixin(object): class WindowMixin(object):
def menu(self, title, actions=None): def menu(self, title, actions=None):
menu = self.menuBar().addMenu(title) menu = self.menuBar().addMenu(title)
if actions: if actions:
addActions(menu, actions) addActions(menu, actions)
return menu return menu
@ -236,6 +239,8 @@ class MainWindow(QMainWindow, WindowMixin):
close = action(getStr('closeCur'), self.closeFile, 'Ctrl+W', 'close', getStr('closeCurDetail')) close = action(getStr('closeCur'), self.closeFile, 'Ctrl+W', 'close', getStr('closeCurDetail'))
deleteImg = action(getStr('deleteImg'), self.deleteImg, 'Ctrl+D', 'close', getStr('deleteImgDetail'))
resetAll = action(getStr('resetAll'), self.resetAll, None, 'resetall', getStr('resetAllDetail')) resetAll = action(getStr('resetAll'), self.resetAll, None, 'resetall', getStr('resetAllDetail'))
color1 = action(getStr('boxLineColor'), self.chooseColor1, color1 = action(getStr('boxLineColor'), self.chooseColor1,
@ -330,7 +335,7 @@ class MainWindow(QMainWindow, WindowMixin):
self.drawSquaresOption.triggered.connect(self.toogleDrawSquare) self.drawSquaresOption.triggered.connect(self.toogleDrawSquare)
# Store actions for further handling. # Store actions for further handling.
self.actions = struct(save=save, save_format=save_format, saveAs=saveAs, open=open, close=close, resetAll = resetAll, self.actions = struct(save=save, save_format=save_format, saveAs=saveAs, open=open, close=close, resetAll = resetAll, deleteImg = deleteImg,
lineColor=color1, create=create, delete=delete, edit=edit, copy=copy, lineColor=color1, create=create, delete=delete, edit=edit, copy=copy,
createMode=createMode, editMode=editMode, advancedMode=advancedMode, createMode=createMode, editMode=editMode, advancedMode=advancedMode,
shapeLineColor=shapeLineColor, shapeFillColor=shapeFillColor, shapeLineColor=shapeLineColor, shapeFillColor=shapeFillColor,
@ -375,7 +380,7 @@ class MainWindow(QMainWindow, WindowMixin):
self.displayLabelOption.triggered.connect(self.togglePaintLabelsOption) self.displayLabelOption.triggered.connect(self.togglePaintLabelsOption)
addActions(self.menus.file, addActions(self.menus.file,
(open, opendir, changeSavedir, openAnnotation, self.menus.recentFiles, save, save_format, saveAs, close, resetAll, quit)) (open, opendir, changeSavedir, openAnnotation, self.menus.recentFiles, save, save_format, saveAs, close, resetAll, deleteImg, quit))
addActions(self.menus.help, (help, showInfo)) addActions(self.menus.help, (help, showInfo))
addActions(self.menus.view, ( addActions(self.menus.view, (
self.autoSaving, self.autoSaving,
@ -410,6 +415,7 @@ class MainWindow(QMainWindow, WindowMixin):
# Application state. # Application state.
self.image = QImage() self.image = QImage()
self.filePath = ustr(defaultFilename) self.filePath = ustr(defaultFilename)
self.lastOpenDir= None
self.recentFiles = [] self.recentFiles = []
self.maxRecent = 7 self.maxRecent = 7
self.lineColor = None self.lineColor = None
@ -1217,7 +1223,7 @@ class MainWindow(QMainWindow, WindowMixin):
QFileDialog.ShowDirsOnly | QFileDialog.DontResolveSymlinks)) QFileDialog.ShowDirsOnly | QFileDialog.DontResolveSymlinks))
else: else:
targetDirPath = ustr(defaultOpenDirPath) targetDirPath = ustr(defaultOpenDirPath)
self.lastOpenDir = targetDirPath
self.importDirImages(targetDirPath) self.importDirImages(targetDirPath)
def importDirImages(self, dirpath): def importDirImages(self, dirpath):
@ -1367,6 +1373,13 @@ class MainWindow(QMainWindow, WindowMixin):
self.toggleActions(False) self.toggleActions(False)
self.canvas.setEnabled(False) self.canvas.setEnabled(False)
self.actions.saveAs.setEnabled(False) self.actions.saveAs.setEnabled(False)
def deleteImg(self):
deletePath = self.filePath
if self.filePath is not None:
self.openNextImg()
os.remove(deletePath)
self.importDirImages(self.lastOpenDir)
def resetAll(self): def resetAll(self):
self.settings.reset() self.settings.reset()

2
resources/strings/strings.properties
View File

@ -20,6 +20,8 @@ saveAs=Save As
saveAsDetail=Save the labels to a different file saveAsDetail=Save the labels to a different file
closeCur=Close closeCur=Close
closeCurDetail=Close the current file closeCurDetail=Close the current file
deleteImg = Delete Current Image
deleteImgDetail = Delete current image
resetAll=Reset All resetAll=Reset All
resetAllDetail=Reset All resetAllDetail=Reset All
boxLineColor=Box Line Color boxLineColor=Box Line Color