pybaseutils 2.5.0__tar.gz → 2.5.2__tar.gz

{pybaseutils-2.5.0 → pybaseutils-2.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pybaseutils
-Version: 2.5.0
+Version: 2.5.2
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan

{pybaseutils-2.5.0 → pybaseutils-2.5.2}/pybaseutils/__init__.py

@@ -8,4 +8,4 @@
 # --------------------------------------------------------
 """
 
-__version__ = '2.5.0'
+__version__ = '2.5.2'

{pybaseutils-2.5.0 → pybaseutils-2.5.2}/pybaseutils/converter/build_coco.py

@@ -211,6 +211,7 @@ class COCOBuilder():
                 keypoints[1::3] = np.clip(keypoints[1::3], 1, height - 1)
         :return:
         """
+        if isinstance(keypoints, np.ndarray): keypoints = keypoints.tolist()
         self.annotation_id += 1
         annotation_item = dict()
         annotation_item['segmentation'] = seg
@@ -274,24 +275,21 @@ class COCOBuilder():
         if area < min_area: segs, area = [], []
         return segs, area
 
-    def addObjects(self, filename, objects: dict, width, height, num_joints, ignore_tiny=False):
+    def addObjects(self, filename, objects: dict, width, height, ignore_tiny=False):
         """
         :param filename: os.path.basename(filename)
         :param objects:
-                        boxes  is [[xmin,ymin,xmax,ymax],[xmin,ymin,xmax,ymax],...]
-                        labels is [目标1,目标2,...]
-                        contours is [目标1的轮廓,目标2的轮廓,...]
-                        keypoints is [目标1的关键点,目标2的关键点,...],格式：
-                        keypoints=num_joints*3,x,y,visibility
-                        keypoints关节点的格式 : [x_1, y_1, v_1,...,x_k, y_k, v_k]
-                        其中x,y为Keypoint的坐标，v为可见标志
-                            v = 0 : 未标注点
-                            v = 1 : 标注了但是图像中不可见（例如遮挡）
-                            v = 2 : 标注了并图像可见
+                        boxes     [[xmin,ymin,xmax,ymax],[xmin,ymin,xmax,ymax],...]
+                        labels    [目标1,目标2,...]
+                        contours  [目标1[seg1,seg2,...],目标2[seg1,seg2,...],...]
+                        keypoints [目标1[x1, y1, v1,x2, y2, v2,...],目标1[x1, y1, v1,x2, y2, v2,...],...]
+                                  其中x,y为Keypoint的坐标，v为可见标志
+                                        v = 0 : 未标注点
+                                        v = 1 : 标注了但是图像中不可见（例如遮挡）
+                                        v = 2 : 标注了并图像可见
         实际预测时，不要求预测每个关节点的可见性
         :param width:
         :param height:
-        :param num_joints:
         :param ignore_tiny: 是否去除segment很细小的目标
         :return:
         """

pybaseutils-2.5.2/pybaseutils/converter/convert_labelme2coco.py

@@ -0,0 +1,122 @@
+# -*- coding: utf-8 -*-
+"""
+# --------------------------------------------------------
+# @Project:
+# @Author : panjq
+# @Date   : 2020-02-12 18:28:16
+# @url    :
+# --------------------------------------------------------
+"""
+
+import argparse
+import sys
+import os
+import numpy as np
+import json
+import cv2
+import time
+from tqdm import tqdm
+from pybaseutils.dataloader import parser_labelme
+from pybaseutils.converter import build_coco
+
+
+class Labelme2COCO(build_coco.COCOBuilder):
+    """Convert Labelme to COCO dataset format"""
+
+    def __init__(self, anno_dir, image_dir, class_name=[], init_id=None, use_kpt=False, kpt_names=[],
+                 kpt_shape=[]):
+        """
+        :param anno_dir:
+        :param image_dir:
+        :param class_name:
+        :param init_id:
+        :param use_kpt:
+        :param kpt_names: 关键点名称列表，
+                          当kpt_names.ndim=1时，要求所有类别且所有目标的关键点名称必须一致
+                          当kpt_names.ndim=2时，仅要求相同类别目标的关键点名称必须一致，且len(kpt_names)==len(self.class_name)
+        :param kpt_shape: 关键点的维度，默认是(17, 3)，对于coco-person,有17个关键点，3表示(x,y,v)）
+        """
+        super(Labelme2COCO, self).__init__(init_id=init_id)
+        print(anno_dir)
+        print(image_dir)
+        self.anno_dir = anno_dir
+        self.image_dir = image_dir
+        self.kpt_names = kpt_names
+        self.kpt_shape = kpt_shape
+        self.labelme = parser_labelme.LabelMeDataset(anno_dir=anno_dir,
+                                                     image_dir=image_dir,
+                                                     class_name=class_name,
+                                                     check_kpt=True,
+                                                     use_kpt=use_kpt,
+                                                     kpt_names=kpt_names,
+                                                     kpt_shape=kpt_shape,
+                                                     use_rgb=False,
+                                                     shuffle=False,
+                                                     check=False
+                                                     )
+
+    def build_instances_dataset(self, save_file, ):
+        """
+        构建COCO的目标检测和实例分割数据集
+        :param save_file: 输出COCO格式的文件
+        :return:
+        """
+        for index in tqdm(range(len(self.labelme))):
+            data_info = self.labelme.__getitem__(index)
+            contours = [[c] for c in data_info["points"]]
+            info = {"boxes": data_info["boxes"], "labels": data_info["names"],
+                    "contours": contours}
+            width, height = data_info["size"]
+            filename = data_info["image_file"]
+            self.addObjects(filename, info, width, height, num_joints=0)
+        build_coco.COCOTools.check_coco(self.coco)
+        self.save_coco(save_file)
+
+    def build_keypoints_dataset(self, save_file, skeleton=[]):
+        """
+        构建COCO的目标检测和实例分割数据集
+        :param save_file: 输出COCO格式的文件
+        :return:
+        """
+        for index in tqdm(range(len(self.labelme))):
+            data_info = self.labelme.__getitem__(index)
+            contours = [[c] for c in data_info["points"]]
+            keypoints = [c.reshape(-1) for c in data_info["keypoints"]]
+            info = {"boxes": data_info["boxes"], "labels": data_info["names"],
+                    "contours": contours, "keypoints": keypoints}
+            width, height = data_info["size"]
+            filename = data_info["image_file"]
+            self.addObjects(filename, info, width, height)
+        # 设置关键点的名称和skeleton
+        self.set_keypoints_category(kps_name=self.kpt_names[0], skeleton=skeleton, cat_id=0)
+        build_coco.COCOTools.check_coco(self.coco)
+        self.save_coco(save_file)
+
+    def save_coco(self, json_file):
+        """保存COCO数据集"""
+        super(Labelme2COCO, self).save_coco(json_file)
+
+
+def demo():
+    class_name = ["person"]
+    kpt_names = [["p0", "p1", "p2", "p3", "p4"]]
+    skeleton = [[0, 2], [2, 1], [2, 3], [3, 4]]
+    kpt_shape = [5, 3]
+    anno_dir = "/media/PKing/dev2/SDK/base-utils/data/labelme/images"
+    coco_ins_file = os.path.join(os.path.dirname(anno_dir), "coco_ins.json")
+    coco_kps_file = os.path.join(os.path.dirname(anno_dir), "coco_kps.json")
+    build = Labelme2COCO(image_dir=anno_dir,
+                         anno_dir=anno_dir,
+                         class_name=class_name,
+                         use_kpt=True,
+                         kpt_names=kpt_names,
+                         kpt_shape=kpt_shape
+                         )
+    # TODO 构建关键点检测数据集
+    build.build_keypoints_dataset(coco_kps_file, skeleton=skeleton)
+    # TODO 构建实例分割数据集
+    # build.build_instances_dataset(coco_ins_file)
+
+
+if __name__ == '__main__':
+    demo()

{pybaseutils-2.5.0 → pybaseutils-2.5.2}/pybaseutils/dataloader/parser_labelme.py

@@ -53,6 +53,10 @@ class LabelMeDataset(Dataset):
         :param check: 当class_name=None且check=True,将自动获取所有class
         :param check_kpt: True会检查关键点的完整性,图像中仅当所有目标都标注和对应的关键点(无漏标注),才返回数据
                            False不会检查关键点的完整性,,图像中只要标注的目标和对应的关键点(漏标注),会返回数据
+        :param kpt_names: 关键点名称列表，
+                          当kpt_names.ndim=1时，要求所有类别且所有目标的关键点名称必须一致
+                          当kpt_names.ndim=2时，仅要求相同类别目标的关键点名称必须一致，且len(kpt_names)==len(self.class_name)
+        :param kpt_shape: 关键点的维度，默认是(17, 3)，对于coco-person,有17个关键点，3表示(x,y,v)
         :param min_points: 当标注的轮廓点的个数小于min_points，会被剔除；负数不剔除
         :param kwargs: read_image: 是否读取图片，否则image=None
         """
@@ -619,9 +623,9 @@ def example_for_keypoints():
                               image_dir=None,
                               class_name=class_name,
                               use_kpt=True,
+                              check_kpt=True,
                               kpt_names=kpt_names,
                               kpt_shape=kpt_shape,
-                              check_kpt=False,
                               check=False,
                               phase="val",
                               shuffle=False)

{pybaseutils-2.5.0 → pybaseutils-2.5.2}/pybaseutils/dict_uils.py

@@ -7,4 +7,5 @@
 # @Brief  :
 # --------------------------------------------------------
 """
+# TODO 兼容之前dict_uils.py的异常
 from pybaseutils.dict_utils import *

{pybaseutils-2.5.0 → pybaseutils-2.5.2}/pybaseutils/dict_utils.py

@@ -14,8 +14,9 @@ from collections import defaultdict
 
 
 class Objects(object):
-    def __init__(self, boxes, label, score, names=[], size=[], segms=None, masks=None, keypt=None,
-                 traid=None, trace=None, color=[], image=None, file=""):
+    def __init__(self, boxes, label, score, names=[], size=[],
+                 segms=[], masks=None, keypt=[], value=[],
+                 traid=[], trace: defaultdict = None, color=[], image=None, file=""):
         self.boxes = boxes  # 目标框(xmin,ymin,xmax,ymax)
         self.score = score  # 目标框置信度
         self.label = label  # 目标框类别
@@ -25,12 +26,14 @@ class Objects(object):
         self.masks = masks  # 目标轮廓掩码
         self.segms = segms  # 目标轮廓[np.shape(n,2)]
         self.traid = traid  # 轨迹ID
-        self.trace = trace  # 轨迹的历史boxes
+        self.trace = trace  # 轨迹的历史数据
+        self.value = value  # 一些数值
+        self.depth = None  # 深度图
+        self.dists = []  # 深度值(segms/boxes区域)
         self.color = [(255, 0, 0)] * len(boxes)  # 目标框颜色
+        self.metas = defaultdict()  # 其他信息
         self.size = size  # 原始图像大小
         self.file = file  # 文件路径
-        self.depth = None  # 深度图
-        self.metas = defaultdict()  # 其他信息
 
     def update(self, **kwargs):
         """更新属性值"""

{pybaseutils-2.5.0 → pybaseutils-2.5.2}/pybaseutils/geometry_tools.py

@@ -7,6 +7,7 @@
 # @Brief  :
 # --------------------------------------------------------
 """
+import math
 import numpy as np
 from scipy.spatial.distance import cdist
 
@@ -221,6 +222,48 @@ def compute_vector_angle(a, b, minangle=True):
     return angle
 
 
+def image2math_coord(pts, height=None):
+    """
+    将图像坐标系（x 向右，y 向下）转换为数学坐标系（x 向右，y 向上）笛卡尔坐标系。
+    :param pts: 形如 (N, 2) 的数组/列表，图像坐标点
+    :param height: 可选，图像高度。给出时按 (x, height - y) 翻转，
+                   结果仍落在图像矩形范围内；不给出时按 (x, -y) 翻转。
+    :return: (N, 2) 的 numpy 数组，数学坐标点
+    """
+    pts = np.asarray(pts, dtype=float)
+    if pts.ndim != 2 or pts.shape[1] != 2:  raise ValueError("pts 必须是形如 (N, 2) 的数组")
+    out = pts.copy()
+    if height is None:
+        out[:, 1] = -out[:, 1]  # y 取反，原点不变
+    else:
+        out[:, 1] = height - out[:, 1]  # 以图像底边为 y=0
+    return out
+
+
+def get_vector_angle(v1, v2, clockwise=True):
+    """
+    坐标系约定: 标准的数学坐标系（x 轴向右，y 轴向上）
+    计算从向量 v1 旋转到向量 v2 的角度。
+    :param v1: 形如 (x, y) 的元组/列表，表示平面向量
+    :param v2: 形如 (x, y) 的元组/列表，表示平面向量
+    :param clockwise: True 顺时针角度，False 逆时针角度
+    :return: 角度（度），范围 [0, 360)
+             注意: 0 和 360 是同一个方向，函数统一返回 0
+    """
+    x1, y1 = v1
+    x2, y2 = v2
+    # 零向量无法定义方向
+    if (x1 == 0 and y1 == 0) or (x2 == 0 and y2 == 0): return 0
+    dot = x1 * x2 + y1 * y2  # 点积
+    cross = x1 * y2 - y1 * x2  # 叉积（z 分量）
+    # 叉积 > 0 表示 v2 在 v1 的逆时针方向
+    # 顺时针：用 -cross；逆时针：用 +cross
+    signed_cross = -cross if clockwise else cross
+    angle = math.degrees(math.atan2(signed_cross, dot))
+    # 把 (-180, 180] 映射到 [0, 360)
+    return angle % 360
+
+
 def line_test():
     '''
     angle: 56.789092174788685

{pybaseutils-2.5.0 → pybaseutils-2.5.2}/pybaseutils/image_utils.py

@@ -1440,12 +1440,14 @@ def show_landmark(title, image, landmarks, vis_id=False, delay=0):
     return image
 
 
-def draw_points_texts(image, points, texts=None, color=(255, 0, 0), thickness=0, fontScale=0, drawType="simple"):
+def draw_points_texts(image, points, texts=None, color=(255, 0, 0), thickness=0, fontScale=0, vis_pt=True,
+                      drawType="simple"):
     """
     :param image:
     :param points:
     :param texts:
     :param color:
+    :param vis_pt: 是否绘制点
     :param drawType: custom or simple
     :return:
     """
@@ -1457,7 +1459,7 @@ def draw_points_texts(image, points, texts=None, color=(255, 0, 0), thickness=0,
         point = (int(point[0]), int(point[1]))
         c = color[index]
         text = str(text)
-        cv2.circle(image, point, thickness * 3, tuple(c), -1, lineType=cv2.LINE_AA)
+        if vis_pt: cv2.circle(image, point, thickness * 3, tuple(c), -1, lineType=cv2.LINE_AA)
         if text: draw_text(image, point, text, color=c, fontScale=fontScale, thickness=thickness, drawType=drawType)
     return image
 
@@ -1539,7 +1541,7 @@ def draw_bbox_text_ch(image, bbox, text, color, thickness=2, fontScale=0.8):
     cv2.rectangle(image, bg1, bg2, color, thickness)  # 先绘制框，避免断裂
     cv2.rectangle(image, bg1, bg2, color, -1)  # 绘制底纹
     if len(bbox) == 4: cv2.rectangle(image, (bbox[0], bbox[1]), (bbox[2], bbox[3]), color, thickness)  # 绘制bbox
-    text_loc = (text_loc[0], int(text_loc[1] * 1.0)) # 调整字体位置
+    text_loc = (text_loc[0], int(text_loc[1] * 1.0))  # 调整字体位置
     cv2_putText(image, str(text), text_loc, color=(255, 255, 255), fontScale=fontScale, thickness=abs(thickness))
     return image
 
@@ -1558,7 +1560,7 @@ def draw_bbox_text_en(image, bbox, text, color, thickness=2, fontScale=0.8):
     cv2.rectangle(image, bg1, bg2, color, thickness)  # 先绘制框，避免断裂
     cv2.rectangle(image, bg1, bg2, color, -1)  # 绘制底纹
     if len(bbox) == 4: cv2.rectangle(image, (bbox[0], bbox[1]), (bbox[2], bbox[3]), color, thickness)  # 绘制bbox
-    text_loc = (text_loc[0], int(text_loc[1] * 0.95)) # 调整字体位置
+    # text_loc = (text_loc[0], int(text_loc[1] * 0.95))  # 调整字体位置
     cv2.putText(image, str(text), (text_loc[0], text_loc[1]), fontFace=cv2.FONT_HERSHEY_SIMPLEX,
                 fontScale=fontScale, color=(255, 255, 255), thickness=abs(thickness))
     return image
@@ -1627,6 +1629,7 @@ def get_font_type(size, font=""):
 
 
 def cv2_putText(img, text, point, fontFace=None, fontScale=0.8, color=(255, 0, 0), thickness=None):
+    if not text: return img
     # cv2.putText(img, str(text), point, fontFace, fontScale, color=color, thickness=thickness)
     text_wh, baseline = cv2.getTextSize(str(text), cv2.FONT_HERSHEY_COMPLEX, fontScale, abs(thickness))
     pilimg = Image.fromarray(img)  # Image.fromarray()将数组类型转成图片格式，与np.array()相反
@@ -1636,15 +1639,19 @@ def cv2_putText(img, text, point, fontFace=None, fontScale=0.8, color=(255, 0, 0
     font = get_font_type(size=size)
     draw.text(point, text, color, font)
     img[:] = np.asarray(pilimg)
+    return img
 
 
-def draw_key_point_in_image(image, key_points, pointline=[], boxes=[], colors=None, vis_id=False, thickness=2):
+def draw_key_point_in_image(image, key_points, pointline=[], boxes=[], colors=None,
+                            vis_id=False, vis_pt=True, thickness=2):
     """
     :param image:
     :param key_points: list(ndarray(19,2)) or ndarray(n_person,19,2)
     :param pointline: `auto`->pointline = circle_line(len(points), iscircle=True)
     :param boxes: 目标框
     :param colors: 每个点的颜色
+    :param vis_id: 是否绘制ID
+    :param vis_pt: 是否绘制点
     :return:
     """
     nums = max(len(key_points), len(boxes))
@@ -1657,22 +1664,35 @@ def draw_key_point_in_image(image, key_points, pointline=[], boxes=[], colors=No
             # 可视化(x,y,v)的v
             # if vis_id and len(points[0]) == 3: texts = [f"{t}[{int(points[i][2])}]" for i, t in enumerate(texts)]
             image = draw_image_points_lines(image, points, pointline, circle_color=color, line_color=color,
-                                            texts=texts, thickness=thickness)
+                                            texts=texts, thickness=thickness, vis_pt=vis_pt)
         if len(boxes) > 0:
             image = draw_image_boxes(image, boxes=[boxes[i]], color=color, thickness=thickness)
     return image
 
 
-def draw_key_point_arrowed_in_image(image, key_points, pointline=[], color=None):
+def draw_key_point_arrowed_in_image(image, key_points, pointline=[], boxes=[], colors=None,
+                                    vis_id=False, vis_pt=True, thickness=2):
     """
     :param key_points: list(ndarray(19,2)) or ndarray(n_person,19,2)
     :param image:
     :param pointline:[[start-->end]]
+    :param vis_id: 是否绘制ID
+    :param vis_pt: 是否绘制点
     :return:
     """
-    for person_id, points in enumerate(key_points):
-        if points is None or len(points) == 0: continue
-        image = draw_image_points_arrowed_lines(image, points, pointline)
+    nums = max(len(key_points), len(boxes))
+    for i in range(nums):
+        color = color_table[(i + 1) % 20] if not colors else colors
+        if len(key_points) > 0:
+            points = key_points[i]
+            if points is None or len(points) == 0: continue
+            texts = list(range(len(points))) if vis_id else [""] * len(points)
+            # 可视化(x,y,v)的v
+            # if vis_id and len(points[0]) == 3: texts = [f"{t}[{int(points[i][2])}]" for i, t in enumerate(texts)]
+            image = draw_image_points_arrowed_lines(image, points, pointline, circle_color=color, line_color=color,
+                                                    texts=texts, thickness=thickness, vis_pt=vis_pt)
+        if len(boxes) > 0:
+            image = draw_image_boxes(image, boxes=[boxes[i]], color=color, thickness=thickness)
     return image
 
 
@@ -1683,7 +1703,8 @@ def draw_image_points_lines(image,
                             fontScale=0.8,
                             circle_color=(255, 0, 0),
                             line_color=(0, 0, 255),
-                            thickness=2):
+                            thickness=2,
+                            vis_pt=True):
     """
     在图像中画点和连接线
     :param image:
@@ -1691,6 +1712,7 @@ def draw_image_points_lines(image,
     :param pointline: `auto`->pointline = circle_line(len(points), iscircle=True)
     :param color:
     :param texts:
+    :param vis_pt: 是否绘制点
     :param drawType: simple or custom
     :param check:
     :return:
@@ -1700,19 +1722,25 @@ def draw_image_points_lines(image,
         texts = list(range(len(points)))
     draw_image_lines(image, points, pointline, color=line_color, thickness=thickness)
     thickness_ = max(int(thickness * 1), 1)
-    image = draw_points_text(image, points,
-                             texts=texts,
-                             color=circle_color,
-                             fontScale=fontScale,
-                             thickness=thickness_,
-                             drawType="simple")
+    image = draw_points_texts(image, points,
+                              texts=texts,
+                              color=circle_color,
+                              fontScale=fontScale,
+                              thickness=thickness_,
+                              vis_pt=vis_pt,
+                              drawType="simple")
     return image
 
 
-def draw_image_points_arrowed_lines(image, points,
+def draw_image_points_arrowed_lines(image,
+                                    points,
                                     pointline=[],
                                     texts=None,
-                                    drawType="simple",
+                                    fontScale=0.8,
+                                    circle_color=(255, 0, 0),
+                                    line_color=(0, 0, 255),
+                                    thickness=2,
+                                    vis_pt=True,
                                     reverse=False):
     """
     在图像中画点箭头线
@@ -1721,16 +1749,23 @@ def draw_image_points_arrowed_lines(image, points,
     :param pointline: `auto`->pointline = circle_line(len(points), iscircle=True)
     :param color:
     :param texts:
+    :param vis_pt: 是否绘制点
     :param drawType: simple or custom
     :param check:
     :return:
     """
     points = np.asarray(points, dtype=np.int32)
-    thickness = 2
     if texts is None:
         texts = list(range(len(points)))
-    image = draw_points_text(image, points, texts=texts, thickness=thickness, drawType=drawType)
-    draw_image_arrowed_lines(image, points, pointline, thickness=thickness, reverse=reverse)
+    draw_image_arrowed_lines(image, points, pointline, color=line_color, thickness=thickness, reverse=reverse)
+    thickness_ = max(int(thickness * 1), 1)
+    image = draw_points_texts(image, points,
+                              texts=texts,
+                              color=circle_color,
+                              fontScale=fontScale,
+                              thickness=thickness_,
+                              vis_pt=vis_pt,
+                              drawType="simple")
     return image
 
 
@@ -1755,7 +1790,7 @@ def arrowed_line(image, pt1, pt2, color, arrow_length=20, **kwargs):
     """
     cv2.arrowedLine 的 tipLength 参数是相对于线段总长的比例，这导致箭头大小会随着线段长度变化
     使用fixed_arrowedLine可以修复这个问题
-    绘制一条带有固定长度箭头的线段。
+    绘制一条带有固定长度箭头的线段（pt1-->pt2）。
     :param image: 目标图像
     :param pt1: 箭尾/起点坐标 (x1, y1)
     :param pt2: 箭头/终点坐标 (x2, y2)
@@ -1780,24 +1815,22 @@ def arrowed_line(image, pt1, pt2, color, arrow_length=20, **kwargs):
     return image
 
 
-def draw_image_arrowed_lines(image,
-                             points,
-                             pointline=[],
-                             color=(0, 0, 255),
-                             thickness=2,
-                             reverse=False):
-    points = np.asarray(points, dtype=np.int32)
-    if pointline == "auto":
+def draw_image_arrowed_lines(image, points, pointline=[], color=(0, 0, 255), thickness=2, reverse=False):
+    if pointline == "auto" or pointline == []:
         pointline = circle_line(len(points), iscircle=True)
-    for point_index in pointline:
-        point1 = tuple(points[point_index[0]])
-        point2 = tuple(points[point_index[1]])
+    if isinstance(color[0], numbers.Number): color = [color] * len(points)
+    for index in pointline:
+        if not index: continue
+        point1 = tuple(points[index[0]])
+        point2 = tuple(points[index[1]])
         if (not check_point(point1)) or (not check_point(point2)):
             continue
+        point1 = (int(point1[0]), int(point1[1]))
+        point2 = (int(point2[0]), int(point2[1]))
         if reverse:
-            cv2.arrowedLine(image, point1, point2, color, thickness=thickness, tipLength=thickness)
+            arrowed_line(image, point2, point1, color=color[index[1]], thickness=thickness)
         else:
-            cv2.arrowedLine(image, point2, point1, color, thickness=thickness, tipLength=thickness)
+            arrowed_line(image, point1, point2, color=color[index[1]], thickness=thickness)
     return image
 
 

{pybaseutils-2.5.0 → pybaseutils-2.5.2}/pybaseutils/pose/bones_utils.py

@@ -57,6 +57,14 @@ BONES = {
                    [0, 127, 255], [102, 0, 102], [153, 0, 153], [178, 0, 204], [255, 0, 255]],
         "describe": "手部关键点信息"
     },
+    "pressure_meter": {
+        "skeleton": [[2, 0], [2, 1], [2, 3]],
+        "keypoint": [],
+        "num_joints": 4,
+        "names": {},
+        "colors": [[255, 0, 0], [255, 0, 0], [0, 255, 0], [0, 255, 0]],
+        "describe": "压力计"
+    },
     "points": {
         "skeleton": [[]],
         "keypoint": [],

{pybaseutils-2.5.0 → pybaseutils-2.5.2}/pybaseutils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pybaseutils
-Version: 2.5.0
+Version: 2.5.2
 Summary: pybaseutils
 Home-page: https://github.com/PanJinquan/base-utils
 Author: PanJinquan

{pybaseutils-2.5.0 → pybaseutils-2.5.2}/pybaseutils.egg-info/SOURCES.txt

@@ -259,6 +259,7 @@ test_py/converter/convert_coco2voc.py
 test_py/converter/convert_cvat2labelme.py
 test_py/converter/convert_gesture2hand.py
 test_py/converter/convert_labelme2coco.py
+test_py/converter/convert_labelme2coco_pen.py
 test_py/converter/convert_labelme2cvat.py
 test_py/converter/convert_labelme2labelme.py
 test_py/converter/convert_labelme2voc.py

pybaseutils-2.5.2/test_py/converter/convert_labelme2coco.py

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+"""
+    @Author : Pan
+    @E-mail : 390737991@qq.com
+    @Date   : 2022-10-12 16:21:55
+    @Brief  :
+"""
+import sys
+import os
+
+sys.path.insert(0, os.getcwd())
+import cv2
+import argparse
+import sys
+import os
+import numpy as np
+import json
+import cv2
+import time
+from tqdm import tqdm
+from pybaseutils import file_utils, json_utils, image_utils
+from pybaseutils.dataloader import parser_labelme
+from pybaseutils.converter import convert_labelme2coco
+
+
+def demo():
+    class_name = ["pressure_meter"]
+    kpt_names = [ [ "range_start", "range_end",'pointer_start', 'pointer_end', ] ]
+    skeleton =  [[2, 0], [2, 1], [2, 3]]
+    kpt_shape = [4, 3]
+    anno_dir = "/home/PKing/nasdata/tmp/tmp/pressure_meter/dataset-v1/train/images"
+    coco_ins_file = os.path.join(os.path.dirname(anno_dir), "coco_ins.json")
+    coco_kps_file = os.path.join(os.path.dirname(anno_dir), "coco_kps.json")
+    build = convert_labelme2coco.Labelme2COCO(image_dir=anno_dir,
+                                              anno_dir=anno_dir,
+                                              class_name=class_name,
+                                              use_kpt=True,
+                                              kpt_names=kpt_names,
+                                              kpt_shape=kpt_shape
+                                              )
+    # TODO 构建关键点检测数据集
+    build.build_keypoints_dataset(coco_kps_file, skeleton=skeleton)
+    # TODO 构建实例分割数据集
+    # build.build_instances_dataset(coco_ins_file)
+
+
+if __name__ == '__main__':
+    demo()

{pybaseutils-2.5.0 → pybaseutils-2.5.2}/test_py/demo_coco_vis.py

@@ -36,6 +36,7 @@ def demo_vis_CocoInstances():
 
     # anno_file = "../data/coco/coco_ins.json"
     anno_file = "/home/PKing/Downloads/labeled_trainval/SSLAD-2D/labeled/val/instance_val.json"
+    anno_file = "/media/PKing/dev2/SDK/base-utils/data/labelme/coco_ins.json"
     class_name = None
     dataset = parser_coco_ins.CocoInstances(anno_file=[anno_file], image_dir="", decode=True,
                                             class_name=class_name, use_rgb=False, shuffle=True)
@@ -54,11 +55,11 @@ def demo_vis_CocoKeypoints():
     # anno_file = "/home/PKing/nasdata/dataset/tmp/hand-pose/HandPose-v2/train/train_anno.json"
     # class_name = ['hand']
     # anno_file = "/home/PKing/nasdata/dataset/tmp/pen/dataset-pen2/train/coco_kps.json"
-    anno_file = "/home/PKing/nasdata/tmp/tmp/pen/dataset-pen1/train/coco_kps.json"
-    # class_name = ['pen_tip']
-    class_name = []
-    class_name = ["hand_pen"]
-    # class_name = {"pen": "hand"}
+    anno_file = "/media/PKing/dev2/SDK/base-utils/data/labelme/coco_kps.json"
+    class_name = ["person"]
+
+    anno_file = "/home/PKing/nasdata/tmp/tmp/pressure_meter/dataset-v1/train/coco_kps.json"
+    class_name = ["pressure_meter"]
     dataset = parser_coco_kps.CocoKeypoints(anno_file, image_dir="", class_name=class_name, shuffle=True)
     bones = dataset.bones
     for i in range(len(dataset)):
@@ -66,7 +67,7 @@ def demo_vis_CocoKeypoints():
         data = dataset.__getitem__(i)
         image, boxes, labels, keypoints = data['image'], data["boxes"], data["labels"], data["keypoints"]
         h, w = image.shape[:2]
-        kpts = [s / (w, h) for s in keypoints] if len(keypoints) > 0 else []
+        kpts = [s / (w, h, 1) for s in keypoints] if len(keypoints) > 0 else []
         kpts = np.asarray(kpts)
         keypoints = np.asarray(keypoints)
         print("i={},image_file={}".format(i, data['image_file']))
@@ -90,6 +91,6 @@ def demo_vis_CocoDetections():
 
 
 if __name__ == "__main__":
-    demo_vis_CocoDetections()
+    # demo_vis_CocoDetections()
     # demo_vis_CocoInstances()
-    # demo_vis_CocoKeypoints()
+    demo_vis_CocoKeypoints()