From a86093ca60134ef0b5cce61e288eebe86cf3fa82 Mon Sep 17 00:00:00 2001 From: tzutalin Date: Sat, 14 Nov 2020 22:51:44 -0800 Subject: [PATCH] Updated README --- README.rst | 24 +++--------------------- labelImg.py | 2 +- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/README.rst b/README.rst index 7ddfca14..8ed8bb75 100644 --- a/README.rst +++ b/README.rst @@ -41,17 +41,8 @@ Linux/Ubuntu/Mac requires at least `Python Ubuntu Linux ^^^^^^^^^^^^ -Python 2 + Qt4 -.. code:: shell - - sudo apt-get install pyqt4-dev-tools - sudo pip install lxml - make qt4py2 - python labelImg.py - python labelImg.py [IMAGE_PATH] [PRE-DEFINED CLASS FILE] - -Python 3 + Qt5 (Recommended) +Python 3 + Qt5 .. code:: shell @@ -63,17 +54,8 @@ Python 3 + Qt5 (Recommended) macOS ^^^^^ -Python 2 + Qt4 -.. code:: shell - - brew install qt qt4 - brew install libxml2 - make qt4py2 - python labelImg.py - python labelImg.py [IMAGE_PATH] [PRE-DEFINED CLASS FILE] - -Python 3 + Qt5 (Recommended) +Python 3 + Qt5 .. code:: shell @@ -97,7 +79,7 @@ Virtualenv can avoid a lot of the QT / Python version issues brew install python3 pip3 install pipenv - pipenv run pip install pyqt5==5.13.2 lxml + pipenv run pip install pyqt5==5.12.1 lxml pipenv run make qt5py3 python3 labelImg.py [Optional] rm -rf build dist; python setup.py py2app -A;mv "dist/labelImg.app" /Applications diff --git a/labelImg.py b/labelImg.py index 60176eb3..3db26f6a 100755 --- a/labelImg.py +++ b/labelImg.py @@ -1109,7 +1109,7 @@ class MainWindow(QMainWindow, WindowMixin): def showBoundingBoxFromAnnotationFile(self, filePath): if self.defaultSaveDir is not None: basename = os.path.basename(os.path.splitext(filePath)[0]) - filedir = os.path.basename(os.path.dirname(filePath)) + filedir = filePath.split(basename)[0].split(os.path.sep)[-2:-1][0] xmlPath = os.path.join(self.defaultSaveDir, basename + XML_EXT) txtPath = os.path.join(self.defaultSaveDir, basename + TXT_EXT) jsonPath = os.path.join(self.defaultSaveDir, filedir + JSON_EXT)