From 79e28a8cb0983c22440e05e38605ad23fd26bbb5 Mon Sep 17 00:00:00 2001
From: wangchunlin <wangchunin666@gmail.com>
Date: Thu, 10 Feb 2022 18:20:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=A4=9A=E7=A7=8D=E7=89=A9?=
 =?UTF-8?q?=E4=BD=93=E6=A3=80=E6=B5=8B=EF=BC=8C=E5=B9=B6=E4=B8=94=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=E4=B9=9F=E5=8A=A0=E5=85=A5=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 learn/templates/home.html | 94 +++++++++++++++++----------------------
 learn/views.py            | 35 ++++++++++-----
 2 files changed, 66 insertions(+), 63 deletions(-)
diff --git a/learn/templates/home.html b/learn/templates/home.html
index db889b9..61c56d5 100644
--- a/learn/templates/home.html
+++ b/learn/templates/home.html
@@ -10,10 +10,10 @@
 </head>
 <body>
 {% csrf_token %} {#如果不加这个，程序会报错#}
-<button type="button" class="layui-btn" id="test1">{#调用layui的上传文件组件#}
+<button type="button" class="layui-btn" id="upload">{#调用layui的上传文件组件#}
   <i class="layui-icon">&#xe67c;</i>上传图片
 </button>
-<button type="button" class="my-btn" id="test2" onclick="GetImgfromClip()">{#调用layui的上传文件组件#}
+<button type="button" class="my-btn" id="getclip" onclick="GetImgfromClip()">{#调用layui的上传文件组件#}
     <i class="layui-icon">&#xe67c;</i>获取剪切板
 </button>
 <b><font size="4">获取剪切板在无https情况下失败，直接Ctrl+V即可</b>
@@ -23,16 +23,15 @@
       <option value="1">小模型</option>
       <option value="2">大模型</option>
   </select>
+  <select id="class", style="width: 300px; font-size:30px;">
+    <option value="1">火焰与烟雾</option>
+    <option value="2">一般物体80类</option>
+    <option value="3">外破（暂未提供）</option>
+</select>
 </h1>
   </p>
 <p id="img"></p>
-<script>
-    function GetImgfromClip()
-    {
-        var promise = navigator.clipboard.readText();
-        alert(promise);
-    }  
-</script>
+
 <script>
 document.addEventListener("paste", function () {
     if (event.clipboardData || event.originalEvent) {
@@ -41,38 +40,9 @@ document.addEventListener("paste", function () {
         event.preventDefault();
         // 字典 dict
         var model = $('#model option:selected').val();
-        $.getJSON('/dlurl/', {'url':val, 'model':model},function(res){
-            if(res.flag == false)
-            {
-                alert("图片地址错误。")
-                return
-            }
-          var i = new Image(); //新建image对象，从而将文件url转换为图片
-          i.src = res.img_name;
-            // 判断是否有缓存
-            if(i.complete){
-            // 打印
-            alert('from:complete : width:'+i.width+',height:'+i.height);
-            }else{
-            // 加载完成执行
-            i.onload = function(){
-            // 打印
-            if(i.width>1280)
-            {
-                i.height=i.height*1280/i.width;
-                i.width=1280;
-            }
-            };  
-            }
-        $("#img").prepend(i);
-        $("#img").prepend('<br>' +'<br>' + '<b>'+'<font size="4">'+"检测图片："+res.code+'</font> '+"</b>"+'<br>');
-        })
+        var model_class = $('#class option:selected').val();
+        $.getJSON('/dlurl/', {'url':val, 'model':model, 'class':model_class},function(res){ShowResult(res);});
     }
-    //var h = $(document).height()-$(window).height();
-    // var h = $(document).height();
-    // setTimeout(function(){
-    //   $(document).scrollTop(h); 
-    // },1000);  //由于使用了从前往后的插入，就不需要跳转
 });
 </script>
 <script>
@@ -81,16 +51,43 @@ layui.use('upload', function(){
   $ = layui.$   //注意要定义$,该符号不是jQuery中的$
   //执行实例
   var uploadInst = upload.render({
-    elem: '#test1' //绑定元素
+    elem: '#upload' //绑定元素
     ,url: '/upload/' //上传接口,需要在views.py中配置这个接口
     ,data:{ //需要上传这个data，不然程序也会报错
         'csrfmiddlewaretoken':function(){
             return $(':input:first').val()
         }
+        , 'model':function(){
+          var model = $('#model option:selected').val();
+          return model;
+        }
+        , 'class':function(){
+          var model_class = $('#class option:selected').val();
+          return model_class;
+        }
       }
       ,done: function(res){
-      //上传完毕回调
-          console.log(res);
+      ShowResult(res);
+    }
+    ,error: function(){
+    }
+  });
+});
+</script>
+<script>
+  function GetImgfromClip()
+  {
+      var promise = navigator.clipboard.readText();
+      alert(promise);
+  }  
+</script>
+<script type="text/javascript">
+  function ShowResult(res){
+            if(res.flag == false)
+            {
+                alert("图片地址错误。")
+                return
+            }
           var i = new Image(); //新建image对象，从而将文件url转换为图片
           i.src = res.img_name;
             // 判断是否有缓存
@@ -106,18 +103,11 @@ layui.use('upload', function(){
                 i.height=i.height*1280/i.width;
                 i.width=1280;
             }
-            };
+            };  
             }
         $("#img").prepend(i);
         $("#img").prepend('<br>' +'<br>' + '<b>'+'<font size="4">'+"检测图片："+res.code+'</font> '+"</b>"+'<br>');
-    }
-    ,error: function(){
-      //请求异常回调
-    }
-  });
-});
-</script>
-<script type="text/javascript">
+        }
     function AutoResizeImage(maxWidth,maxHeight,objImg){
     var img = new Image();
     img.src = objImg.src;
diff --git a/learn/views.py b/learn/views.py
index f4c1072..981c4be 100644
--- a/learn/views.py
+++ b/learn/views.py
@@ -1,3 +1,4 @@
+import re
 from django.shortcuts import render
 from django.http import HttpResponse, JsonResponse
 import os
@@ -9,9 +10,8 @@ import requests, os, json
 def upload(request):
     if request.method == 'POST':
         file = request.FILES.get('file') #获取前端上传的文件
-        print("************")
-        print(file)
-        print("************")
+        m_model=request.POST.get('model')
+        m_class=request.POST.get('class')
         fix = datetime.now().strftime('%Y%m%d%H%M%S%f')+'1' #给文件加前缀防止文件名重复
 		#以下用绝对路径存储文件，之前我用相对路径一直写不对
         curPath = os.path.abspath( os.path.dirname( __file__ ) )
@@ -23,13 +23,22 @@ def upload(request):
         for i in file.chunks():
             f.write(i)
         f.close()
-        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})
+        if(int(m_class)==1):
+            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})
+        if(int(m_class)==2):
+            RR = DL.run(weights=(curPath+"/yolov5/yolov5s.pt"), source=img_path, project=(curPath+"/static/detected"))
+            return JsonResponse({'img_name':img_path_res,'code':"【一般物体检测】"+RR, 'flag': True})
 
 def dlurl(request):
     if request.method == 'GET':
         url = request.GET["url"] #获取前端上传的文件
         m_model=request.GET["model"]
+        m_class=request.GET["class"]
         print(m_model)
         print(url)
         name = url.split(r'/')[-1]
@@ -46,12 +55,16 @@ def dlurl(request):
             f.close
         #返回给前端的图片路径用相对路径，前端用绝对路径反而加载不了图片
         img_path_res = '/static/detected/'+fix+name
-        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})
+        if(int(m_class)==1):
+            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})
+        if(int(m_class)==2):
+            RR = DL.run(weights=(curPath+"/yolov5/yolov5s.pt"), source=img_path, project=(curPath+"/static/detected"))
+            return JsonResponse({'img_name':img_path_res,'code':"【一般物体检测】"+RR, 'flag': True})
 
 
 
