fix some bugs

CVHub520 · May 25, 2023 · 341ee1b · 341ee1b
1 parent fca0220
commit 341ee1b
Show file tree

Hide file tree

Showing 15 changed files with 754 additions and 351 deletions.
diff --git a/anylabeling.spec b/anylabeling.spec
@@ -7,7 +7,7 @@ sys.setrecursionlimit(5000)  # required on Windows
 
 a = Analysis(
     ['anylabeling/app.py'],
-    pathex=['anylabeling'],
+    pathex=['anylabeling','D:\\software\\miniconda3\\envs\\x-anylabeling\\lib\\site-packages'],
     binaries=[],
     datas=[
        ('anylabeling/configs/auto_labeling/*.yaml', 'anylabeling/configs/auto_labeling'),
@@ -26,7 +26,7 @@ exe = EXE(
     a.binaries,
     a.zipfiles,
     a.datas,
-    name='anylabeling',
+    name='x-anylabeling',
     debug=False,
     strip=False,
     upx=False,
@@ -36,7 +36,7 @@ exe = EXE(
 )
 app = BUNDLE(
     exe,
-    name='AnyLabeling.app',
+    name='X-AnyLabeling.app',
     icon='anylabeling/resources/images/icon.icns',
     bundle_identifier=None,
     info_plist={'NSHighResolutionCapable': 'True'},

diff --git a/anylabeling/app.py b/anylabeling/app.py
@@ -2,6 +2,7 @@
 import codecs
 import logging
 import os
+
 import sys
 sys.path.append('.')
 

diff --git a/anylabeling/configs/auto_labeling/yolov5l.yaml b/anylabeling/configs/auto_labeling/yolov5l.yaml
@@ -4,7 +4,7 @@ display_name: YOLOv5l Ultralytics
 model_path: https://github.com/CVHub520/X-AnyLabeling/releases/download/v0.1.0/yolov5l.onnx
 input_width: 640
 input_height: 640
-score_threshold: 0.5
+stride: 32
 nms_threshold: 0.45
 confidence_threshold: 0.45
 classes:

diff --git a/anylabeling/configs/auto_labeling/yolov5m.yaml b/anylabeling/configs/auto_labeling/yolov5m.yaml
@@ -4,7 +4,7 @@ display_name: YOLOv5m Ultralytics
 model_path: https://github.com/CVHub520/X-AnyLabeling/releases/download/v0.1.0/yolov5m.onnx
 input_width: 640
 input_height: 640
-score_threshold: 0.5
+stride: 32
 nms_threshold: 0.45
 confidence_threshold: 0.45
 classes:

diff --git a/anylabeling/configs/auto_labeling/yolov5n.yaml b/anylabeling/configs/auto_labeling/yolov5n.yaml
@@ -4,7 +4,7 @@ display_name: YOLOv5n Ultralytics
 model_path: https://github.com/CVHub520/X-AnyLabeling/releases/download/v0.1.0/yolov5n.onnx
 input_width: 640
 input_height: 640
-score_threshold: 0.5
+stride: 32
 nms_threshold: 0.45
 confidence_threshold: 0.45
 classes:

diff --git a/anylabeling/configs/auto_labeling/yolov5s.yaml b/anylabeling/configs/auto_labeling/yolov5s.yaml
@@ -4,7 +4,7 @@ display_name: YOLOv5s Ultralytics
 model_path: https://github.com/CVHub520/X-AnyLabeling/releases/download/v0.1.0/yolov5s.onnx
 input_width: 640
 input_height: 640
-score_threshold: 0.5
+stride: 32
 nms_threshold: 0.45
 confidence_threshold: 0.45
 classes:

diff --git a/anylabeling/configs/auto_labeling/yolov5s_resnet50.yaml b/anylabeling/configs/auto_labeling/yolov5s_resnet50.yaml
@@ -7,8 +7,8 @@ det_input_width: 640
 det_input_height: 640
 cls_input_width: 224
 cls_input_height: 224
-det_score_threshold: 0.5
 cls_score_threshold: 0.5
+stride: 32
 nms_threshold: 0.45
 confidence_threshold: 0.45
 det_classes:

diff --git a/anylabeling/configs/auto_labeling/yolov5x.yaml b/anylabeling/configs/auto_labeling/yolov5x.yaml
@@ -4,7 +4,7 @@ display_name: YOLOv5x Ultralytics
 model_path: https://github.com/CVHub520/X-AnyLabeling/releases/download/v0.1.0/yolov5x.onnx
 input_width: 640
 input_height: 640
-score_threshold: 0.5
+stride: 32
 nms_threshold: 0.45
 confidence_threshold: 0.45
 classes:

diff --git a/anylabeling/configs/auto_labeling/yolov7.yaml b/anylabeling/configs/auto_labeling/yolov7.yaml
@@ -4,7 +4,7 @@ display_name: YOLOv7 WongKinYiu
 model_path: https://github.com/CVHub520/X-AnyLabeling/releases/download/v0.1.0/yolov7.onnx
 input_width: 640
 input_height: 640
-score_threshold: 0.5
+stride: 32
 nms_threshold: 0.45
 confidence_threshold: 0.45
 classes:

diff --git a/anylabeling/resources/translations/en_US.ts b/anylabeling/resources/translations/en_US.ts
@@ -846,17 +846,17 @@ Polygons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../services/auto_labeling/yolov7.py" line="34"/>
+        <location filename="../../services/auto_labeling/yolov7.py" line="37"/>
         <source>Rectangle</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../services/auto_labeling/yolov7.py" line="44"/>
+        <location filename="../../services/auto_labeling/yolov7.py" line="47"/>
         <source>Could not download or initialize YOLOv7 model.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../services/auto_labeling/yolovx.py" line="36"/>
+        <location filename="../../services/auto_labeling/yolox.py" line="36"/>
         <source>Rectangle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -881,7 +881,7 @@ Polygons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../services/auto_labeling/yolov5.py" line="34"/>
+        <location filename="../../services/auto_labeling/yolov5.py" line="37"/>
         <source>Rectangle</source>
         <translation type="unfinished"></translation>
     </message>
@@ -921,7 +921,7 @@ Polygons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../services/auto_labeling/yolov5.py" line="44"/>
+        <location filename="../../services/auto_labeling/yolov5.py" line="47"/>
         <source>Could not download or initialize YOLOv5 model.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/anylabeling/resources/translations/zh_CN.ts b/anylabeling/resources/translations/zh_CN.ts
@@ -846,12 +846,12 @@ Polygons</source>
         <translation>无法下载或初始化YOLOv6模型。</translation>
     </message>
     <message>
-        <location filename="../../services/auto_labeling/yolov7.py" line="34"/>
+        <location filename="../../services/auto_labeling/yolov7.py" line="37"/>
         <source>Rectangle</source>
         <translation>矩形</translation>
     </message>
     <message>
-        <location filename="../../services/auto_labeling/yolov7.py" line="44"/>
+        <location filename="../../services/auto_labeling/yolov7.py" line="47"/>
         <source>Could not download or initialize YOLOv7 model.</source>
         <translation>无法下载或初始化YOLOv7模型。</translation>
     </message>
@@ -881,7 +881,7 @@ Polygons</source>
         <translation>无法下载或初始化ResNet50模型。</translation>
     </message>
     <message>
-        <location filename="../../services/auto_labeling/yolov5.py" line="34"/>
+        <location filename="../../services/auto_labeling/yolov5.py" line="37"/>
         <source>Rectangle</source>
         <translation>矩形</translation>
     </message>
@@ -931,7 +931,7 @@ Polygons</source>
         <translation type="obsolete">无法下载或初始化Segment Anything的解码器。</translation>
     </message>
     <message>
-        <location filename="../../services/auto_labeling/yolov5.py" line="44"/>
+        <location filename="../../services/auto_labeling/yolov5.py" line="47"/>
         <source>Could not download or initialize YOLOv5 model.</source>
         <translation>无法下载或初始化YOLOv5模型。</translation>
     </message>