From 2af24e2f035fa1c68e2a3fac4568579091e3e599 Mon Sep 17 00:00:00 2001
From: "552068321@qq.com" <mn920129>
Date: Mon, 7 Nov 2022 20:42:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/AlgorithmController.py | 4 ++--
 app/yolov5/train_server.py            | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controller/AlgorithmController.py b/app/controller/AlgorithmController.py
index 75cddd1..9feaf62 100644
--- a/app/controller/AlgorithmController.py
+++ b/app/controller/AlgorithmController.py
@@ -248,7 +248,7 @@ def train_R0DY(params_str, id):
     params = TrainParams()
     params.read_from_str(params_str)
     print(params.get('device').default)
-    data_list = file_tool.get_file(ori_path=params.get('DatasetDir').value, type_list=params.get('classname').value)
+    data_list = file_tool.get_file(ori_path=params.get('DatasetDir').value, type_list=params.get('CLASS_NAMES').value)
     print('---------------------',data_list)
     weights = params.get('resumeModPath').value  # 初始化模型绝对路径
     img_size = params.get('img_size').value
@@ -336,7 +336,7 @@ def returnTrainParams():
          'show': False},
         {"index": 6, "name": "resumeMod", "value": '', "description": '继续训练模型', "default": '', "type": "E", "items": '',
          'show': True},
-        {"index": 7, "name": "classname", "value": ['hole', '456'], "description": '类别名称', "default": '', "type": "L",
+        {"index": 7, "name": "CLASS_NAMES", "value": ['hole', '456'], "description": '类别名称', "default": '', "type": "L",
          "items": '',
          'show': False},
         {"index": 8, "name": "DatasetDir", "value": "E:/aicheck/data_set/11442136178662604800/ori/",
diff --git a/app/yolov5/train_server.py b/app/yolov5/train_server.py
index 37ae4c6..44873f9 100644
--- a/app/yolov5/train_server.py
+++ b/app/yolov5/train_server.py
@@ -501,6 +501,7 @@ def parse_opt(weights,savemodel,epoches,img_size,batch_size,device,known=False):
 
     if weights == None:
         weights = ROOT /'yolov5s.pt'
+    print('ROOT###############',ROOT)
     parser = argparse.ArgumentParser()
     parser.add_argument('--weights', type=str, default=weights, help='initial weights path')
     parser.add_argument('--savemodel', type=str, default=savemodel, help='initial weights path')