加入塔吊

ImageDetect/ImageDetectConfig.h

@@ -0,0 +1,3 @@
+// the configured options and settings for ImageDetect
+#define ImageDetect_VERSION_MAJOR 6
+#define ImageDetect_VERSION_MINOR 0

learn/templates/home.html

@@ -27,7 +27,8 @@
   <select id="class", style="width: 300px; font-size:30px;">
     <option value="1">火焰与烟雾</option>
     <option value="2">一般物体80类</option>
-    <option value="3">外破（暂未提供）</option>
+    <option value="3">烟火与塔吊</option>
+    <option value="4">外破（暂未提供）</option>
 </select>
 </h1>
   </p>

learn/views.py

@@ -83,6 +83,9 @@ def upload(request):
         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+' <br/> '+mesg, 'flag': True})
+        if(int(m_class)==3):
+            RR = DL.run(weights=(curPath+"/yolov5/fire_smoke_towercrane.pt"), source=img_path, project=(curPath+"/static/detected"))
+            return JsonResponse({'img_name':img_path_res,'code':"【烟火+塔吊】"+RR+' <br/> '+mesg, 'flag': True})
 
 def dlurl(request):
     if request.method == 'GET':
@@ -132,6 +135,9 @@ def dlurl(request):
         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+' <br/> '+mesg, 'flag': True})
+        if(int(m_class)==3):
+            RR = DL.run(weights=(curPath+"/yolov5/fire_smoke_towercrane.pt"), source=img_path, project=(curPath+"/static/detected"))
+            return JsonResponse({'img_name':img_path_res,'code':"【烟火+塔吊】"+RR+' <br/> '+mesg, 'flag': True})
 
 
 

learn/yolov5

@@ -1 +1 @@
-Subproject commit 52ab9417e60e436fbfe93d377a5845bbae78fb51
+Subproject commit dd0e0749fb8110bc202dfb7e9a77babec6a7097b