Fix unicode string issues

Author: tzutalin

HISTORY.rst

@@ -2,6 +2,19 @@
 History
 =======
 
+
+1.7.0 (2018-05-18)
+------------------
+
+* Support YOLO
+* Fix minor issues
+
+
+1.6.1 (2018-04-17)
+------------------
+
+* Fix issue
+
 1.6.0 (2018-01-29)
 ------------------
 

labelImg.py

@@ -374,7 +374,7 @@ def __init__(self, defaultFilename=None, defaultPrefdefClassFile=None, defaultSa
  self.paintLabelsOption = QAction("Paint Labels", self)
  self.paintLabelsOption.setShortcut("Ctrl+Shift+P")
  self.paintLabelsOption.setCheckable(True)
- self.paintLabelsOption.setChecked(False)
+ self.paintLabelsOption.setChecked(settings.get(SETTING_PAINT_LABEL, False))
  self.paintLabelsOption.triggered.connect(self.togglePaintLabelsOption)
 
  addActions(self.menus.file,
@@ -482,23 +482,23 @@ def xbool(x):
 
  ## Support Functions ##
  def set_format(self, save_format):
- if save_format == 'PascalVOC':
- self.actions.save_format.setText("PascalVOC")
+ if save_format == FORMAT_PASCALVOC:
+ self.actions.save_format.setText(FORMAT_PASCALVOC)
  self.actions.save_format.setIcon(newIcon("format_voc"))
  self.usingPascalVocFormat = True
  self.usingYoloFormat = False
  LabelFile.suffix = XML_EXT
 
- elif save_format == 'YOLO':
- self.actions.save_format.setText("YOLO")
+ elif save_format == FORMAT_YOLO:
+ self.actions.save_format.setText(FORMAT_YOLO)
  self.actions.save_format.setIcon(newIcon("format_yolo"))
  self.usingPascalVocFormat = False
  self.usingYoloFormat = True
  LabelFile.suffix = TXT_EXT
 
  def change_format(self):
- if self.usingPascalVocFormat: self.set_format("YOLO")
- elif self.usingYoloFormat: self.set_format("PascalVOC")
+ if self.usingPascalVocFormat: self.set_format(FORMAT_YOLO)
+ elif self.usingYoloFormat: self.set_format(FORMAT_PASCALVOC)
 
  def noShapes(self):
  return not self.itemsToShapes
@@ -778,7 +778,7 @@ def format_shape(s):
  # Can add differrent annotation formats here
  try:
  if self.usingPascalVocFormat is True:
- if str(annotationFilePath[-4:]) != ".xml":
+ if ustr(annotationFilePath[-4:]) != ".xml":
  annotationFilePath += XML_EXT
  print ('Img: ' + self.filePath + ' -> Its xml: ' + annotationFilePath)
  self.labelFile.savePascalVocFormat(annotationFilePath, shapes, self.filePath, self.imageData,
@@ -951,7 +951,7 @@ def loadFile(self, filePath=None):
  filePath = self.settings.get(SETTING_FILENAME)
 
  # Make sure that filePath is a regular python string, rather than QString
- filePath = str(filePath)
+ filePath = ustr(filePath)
 
  unicodeFilePath = ustr(filePath)
  # Tzutalin 20160906 : Add file list and dock to move faster
@@ -1098,6 +1098,7 @@ def closeEvent(self, event):
 
  settings[SETTING_AUTO_SAVE] = self.autoSaving.isChecked()
  settings[SETTING_SINGLE_CLASS] = self.singleClassMode.isChecked()
+ settings[SETTING_PAINT_LABEL] = self.paintLabelsOption.isChecked()
  settings.save()
  ## User Dialogs ##
 
@@ -1289,7 +1290,7 @@ def saveFileDialog(self):
  dlg.selectFile(filenameWithoutExtension)
  dlg.setOption(QFileDialog.DontUseNativeDialog, False)
  if dlg.exec_():
- fullFilePath = dlg.selectedFiles()[0]
+ fullFilePath = ustr(dlg.selectedFiles()[0])
  return os.path.splitext(fullFilePath)[0] # Return file path without the extension.
  return ''
 
@@ -1387,7 +1388,7 @@ def loadPascalXMLByFilename(self, xmlPath):
  if os.path.isfile(xmlPath) is False:
  return
 
- self.set_format("PascalVOC")
+ self.set_format(FORMAT_PASCALVOC)
 
  tVocParseReader = PascalVocReader(xmlPath)
  shapes = tVocParseReader.getShapes()
@@ -1400,7 +1401,7 @@ def loadYOLOTXTByFilename(self, txtPath):
  if os.path.isfile(txtPath) is False:
  return
 
- self.set_format("YOLO")
+ self.set_format(FORMAT_YOLO)
  tYoloParseReader = YoloReader(txtPath, self.image)
  shapes = tYoloParseReader.getShapes()
  print (shapes)

libs/constants.py

@@ -8,6 +8,9 @@
 SETTING_ADVANCE_MODE = 'advanced'
 SETTING_WIN_STATE = 'window/state'
 SETTING_SAVE_DIR = 'savedir'
+SETTING_PAINT_LABEL = 'paintlabel'
 SETTING_LAST_OPEN_DIR = 'lastOpenDir'
 SETTING_AUTO_SAVE = 'autosave'
-SETTING_SINGLE_CLASS = 'singleclass'
+SETTING_SINGLE_CLASS = 'singleclass'
+FORMAT_PASCALVOC='PscalVOC'
+FORMAT_YOLO='YOLO'

libs/version.py

@@ -1,2 +1,2 @@
-__version_info__ = ('1', '6', '1')
+__version_info__ = ('1', '7', '0')
 __version__ = '.'.join(__version_info__)