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

Fix incorrect path handling (#731)

Browse Source 
* Fix incorrect save dir path handling for ML format.

Save dir path was split by incorrect os.dependent separator '/'
which was the cause of labels being saved to parent folder.

* Implement path normalization for command arguments.

Renamed 'predefined_classes_file' parameter to 'class_file'.
This commit is contained in:
Denis 2021-04-08 08:01:55 +03:00 committed by GitHub
parent 0573a39ec3
commit 62585531ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
labelImg.py
View File

@ -1109,10 +1109,9 @@ class MainWindow(QMainWindow, WindowMixin):
def show_bounding_box_from_annotation_file(self, file_path): def show_bounding_box_from_annotation_file(self, file_path):
if self.default_save_dir is not None: if self.default_save_dir is not None:
basename = os.path.basename(os.path.splitext(file_path)[0]) basename = os.path.basename(os.path.splitext(file_path)[0])
file_dir = file_path.split(basename)[0].split(os.path.sep)[-2:-1][0]
xml_path = os.path.join(self.default_save_dir, basename + XML_EXT) xml_path = os.path.join(self.default_save_dir, basename + XML_EXT)
txt_path = os.path.join(self.default_save_dir, basename + TXT_EXT) txt_path = os.path.join(self.default_save_dir, basename + TXT_EXT)
json_path = os.path.join(self.default_save_dir, file_dir + JSON_EXT) json_path = os.path.join(self.default_save_dir, basename + JSON_EXT)
"""Annotation file priority: """Annotation file priority:
PascalXML > YOLO PascalXML > YOLO
@ -1584,14 +1583,19 @@ def get_main_app(argv=[]):
# Tzutalin 201705+: Accept extra agruments to change predefined class file # Tzutalin 201705+: Accept extra agruments to change predefined class file
argparser = argparse.ArgumentParser() argparser = argparse.ArgumentParser()
argparser.add_argument("image_dir", nargs="?") argparser.add_argument("image_dir", nargs="?")
argparser.add_argument("predefined_classes_file", argparser.add_argument("class_file",
default=os.path.join(os.path.dirname(__file__), "data", "predefined_classes.txt"), default=os.path.join(os.path.dirname(__file__), "data", "predefined_classes.txt"),
nargs="?") nargs="?")
argparser.add_argument("save_dir", nargs="?") argparser.add_argument("save_dir", nargs="?")
args = argparser.parse_args(argv[1:]) args = argparser.parse_args(argv[1:])
# Usage : labelImg.py image predefClassFile saveDir
args.image_dir = args.image_dir and os.path.normpath(args.image_dir)
args.class_file = args.class_file and os.path.normpath(args.class_file)
args.save_dir = args.save_dir and os.path.normpath(args.save_dir)
# Usage : labelImg.py image classFile saveDir
win = MainWindow(args.image_dir, win = MainWindow(args.image_dir,
args.predefined_classes_file, args.class_file,
args.save_dir) args.save_dir)
win.show() win.show()
return app, win return app, win

2
libs/create_ml_io.py
View File

@ -97,7 +97,7 @@ class CreateMLReader:
self.json_path = json_path self.json_path = json_path
self.shapes = [] self.shapes = []
self.verified = False self.verified = False
self.filename = file_path.split("/")[-1:][0] self.filename = os.path.basename(file_path)
try: try:
self.parse_json() self.parse_json()
except ValueError: except ValueError:

7
libs/labelFile.py
View File

@ -39,18 +39,15 @@ class LabelFile(object):
self.verified = False self.verified = False
def save_create_ml_format(self, filename, shapes, image_path, image_data, class_list, line_color=None, fill_color=None, database_src=None): def save_create_ml_format(self, filename, shapes, image_path, image_data, class_list, line_color=None, fill_color=None, database_src=None):
img_folder_path = os.path.dirname(image_path) img_folder_name = os.path.basename(os.path.dirname(image_path))
img_folder_name = os.path.split(img_folder_path)[-1]
img_file_name = os.path.basename(image_path) img_file_name = os.path.basename(image_path)
output_file_path = "/".join(filename.split("/")[:-1])
output_file = output_file_path + "/" + img_folder_name + JSON_EXT
image = QImage() image = QImage()
image.load(image_path) image.load(image_path)
image_shape = [image.height(), image.width(), image_shape = [image.height(), image.width(),
1 if image.isGrayscale() else 3] 1 if image.isGrayscale() else 3]
writer = CreateMLWriter(img_folder_name, img_file_name, writer = CreateMLWriter(img_folder_name, img_file_name,
image_shape, shapes, output_file, local_img_path=image_path) image_shape, shapes, filename, local_img_path=image_path)
writer.verified = self.verified writer.verified = self.verified
writer.write() writer.write()