From b2e45144864d96994165ba71ee7f0bb8e8f5c34e Mon Sep 17 00:00:00 2001
From: wangchunlin <wangchunin666@gmail.com>
Date: Thu, 10 Feb 2022 13:39:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=A8=A1=E5=9E=8B=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__pycache__/__init__.cpython-38.pyc         | Bin 144 -> 143 bytes
 learn/templates/home.html                       |  16 ++++++++++++++--
 learn/views.py                                  |  12 ++++++++++--
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/learn/migrations/__pycache__/__init__.cpython-38.pyc b/learn/migrations/__pycache__/__init__.cpython-38.pyc
index 9fe1e909481258656f6582873a7df9c4acf89946..0810cec64a0982f036f9642fd46d284bcf304467 100644
GIT binary patch
delta 43
xcmbQh*w4rn%FD~e00eteCUV(|n&@Zb=cekHC+4LmXO!mUWajC+_)Ls71_0@N3~T@Z

delta 44
ycmeBYoWRHx%FD~e00hde6S-`~O!YJJb5r%p6Z6uOGfMMvGV}CZd~_$q7y|&`VhiB_

diff --git a/learn/templates/home.html b/learn/templates/home.html
index cd8ac15..d95cc69 100644
--- a/learn/templates/home.html
+++ b/learn/templates/home.html
@@ -4,7 +4,7 @@
     {% load static %}
     <link rel="stylesheet" href="{% static 'layui/css/layui.css' %}"  media="all">
     <meta charset="UTF-8">
-    <title>Title</title>
+    <title>WildFire</title>
     <script src="../static/layui/layui.js"></script>
     <script src="http://apps.bdimg.com/libs/jquery/1.11.1/jquery.min.js"></script>
 </head>
@@ -17,6 +17,17 @@
     <i class="layui-icon">&#xe67c;</i>获取剪切板
   </button>
 获取剪切板在无https情况下失败，直接Ctrl+V即可
+<p>
+<h2>模型选择</h2>
+</p>
+
+<div>
+    <!-- 下拉框 -->
+    <select id="model">
+        <option value="1">小模型</option>
+        <option value="2">大模型</option>
+    </select>
+</div>
 
 
 <script>
@@ -33,7 +44,8 @@ document.addEventListener("paste", function () {
         var val = clipboardData.getData('text');
         event.preventDefault();
         // 字典 dict
-        $.getJSON('/dlurl/', {'url':val},function(res){
+        var model = $('#model option:selected').val();
+        $.getJSON('/dlurl/', {'url':val, 'model':model},function(res){
             if(res.flag == false)
             {
                 alert("图片地址错误。")
diff --git a/learn/views.py b/learn/views.py
index 75b324a..397e370 100644
--- a/learn/views.py
+++ b/learn/views.py
@@ -33,6 +33,8 @@ def upload(request):
 def dlurl(request):
     if request.method == 'GET':
         url = request.GET["url"] #获取前端上传的文件
+        m_model=request.GET["model"]
+        print(m_model)
         print(url)
         name = url.split(r'/')[-1]
         if not (name.endswith(".jpg") or name.endswith(".jpeg") or name.endswith(".png") or name.endswith(".bmp")):
@@ -48,8 +50,14 @@ def dlurl(request):
             f.close
         #返回给前端的图片路径用相对路径，前端用绝对路径反而加载不了图片
         img_path_res = '/static/detected/'+fix+name
-        RR = DL.run(weights=(curPath+"/yolov5/v6m6.pt"), source=img_path, project=(curPath+"/static/detected"))
-        return JsonResponse({'img_name':img_path_res,'code':RR, 'flag': True})
+        if(int(m_model)==1): #小模型
+            RR = DL.run(weights=(curPath+"/yolov5/v3s.pt"), source=img_path, project=(curPath+"/static/detected"))
+            return JsonResponse({'img_name':img_path_res,'code':"【小模型】"+RR, 'flag': True})
+        if(int(m_model)==2): #大模型
+            RR = DL.run(weights=(curPath+"/yolov5/v6m6.pt"), source=img_path, imgsz=(1280, 1280), project=(curPath+"/static/detected"))
+            return JsonResponse({'img_name':img_path_res,'code':"【大模型】"+RR, 'flag': True})
+
+
 
 def home(request):
     return render(request, 'home.html')
\ No newline at end of file