Fix label tools bug (#224)

PaddlePaddle · Apr 21, 2020 · a7ba98a · a7ba98a
1 parent cd51ed6
commit a7ba98a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/pdseg/tools/jingling2seg.py b/pdseg/tools/jingling2seg.py
@@ -17,10 +17,8 @@
 
 def parse_args():
     parser = argparse.ArgumentParser(
-        formatter_class=argparse.ArgumentDefaultsHelpFormatter
-    )
-    parser.add_argument('input_dir',
-                        help='input annotated directory')
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+    parser.add_argument('input_dir', help='input annotated directory')
     return parser.parse_args()
 
 
@@ -62,8 +60,7 @@ def main(args):
         print('Generating dataset from:', label_file)
         with open(label_file) as f:
             base = osp.splitext(osp.basename(label_file))[0]
-            out_png_file = osp.join(
-                output_dir, base + '.png')
+            out_png_file = osp.join(output_dir, base + '.png')
 
             data = json.load(f)
 
@@ -77,16 +74,22 @@ def main(args):
                         # convert jingling format to labelme format
                         points = []
                         for i in range(1, int(len(polygon) / 2) + 1):
-                            points.append([polygon['x' + str(i)], polygon['y' + str(i)]])
-                        shape = {'label': name, 'points': points, 'shape_type': 'polygon'}
+                            points.append(
+                                [polygon['x' + str(i)], polygon['y' + str(i)]])
+                        shape = {
+                            'label': name,
+                            'points': points,
+                            'shape_type': 'polygon'
+                        }
                         data_shapes.append(shape)
 
             if 'size' not in data:
                 continue
             data_size = data['size']
-            img_shape = (data_size['height'], data_size['width'], data_size['depth'])
+            img_shape = (data_size['height'], data_size['width'],
+                         data_size['depth'])
 
-            lbl = labelme.utils.shapes_to_label(
+            lbl, _ = labelme.utils.shapes_to_label(
                 img_shape=img_shape,
                 shapes=data_shapes,
                 label_name_to_value=class_name_to_id,
@@ -102,8 +105,7 @@ def main(args):
             else:
                 raise ValueError(
                     '[%s] Cannot save the pixel-wise class label as PNG. '
-                    'Please consider using the .npy format.' % out_png_file
-                )
+                    'Please consider using the .npy format.' % out_png_file)
 
 
 if __name__ == '__main__':

diff --git a/pdseg/tools/labelme2seg.py b/pdseg/tools/labelme2seg.py
@@ -17,10 +17,8 @@
 
 def parse_args():
     parser = argparse.ArgumentParser(
-        formatter_class=argparse.ArgumentDefaultsHelpFormatter
-    )
-    parser.add_argument('input_dir',
-                        help='input annotated directory')
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+    parser.add_argument('input_dir', help='input annotated directory')
     return parser.parse_args()
 
 
@@ -61,15 +59,14 @@ def main(args):
         print('Generating dataset from:', label_file)
         with open(label_file) as f:
             base = osp.splitext(osp.basename(label_file))[0]
-            out_png_file = osp.join(
-                output_dir, base + '.png')
+            out_png_file = osp.join(output_dir, base + '.png')
 
             data = json.load(f)
 
             img_file = osp.join(osp.dirname(label_file), data['imagePath'])
             img = np.asarray(PIL.Image.open(img_file))
 
-            lbl = labelme.utils.shapes_to_label(
+            lbl, _ = labelme.utils.shapes_to_label(
                 img_shape=img.shape,
                 shapes=data['shapes'],
                 label_name_to_value=class_name_to_id,
@@ -85,8 +82,7 @@ def main(args):
             else:
                 raise ValueError(
                     '[%s] Cannot save the pixel-wise class label as PNG. '
-                    'Please consider using the .npy format.' % out_png_file
-                )
+                    'Please consider using the .npy format.' % out_png_file)
 
 
 if __name__ == '__main__':