From 820fdc2abe5a4b257cac102b81e855060b72765f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E8=BD=BB=E7=8B=82?= <1677568218@qq.com>
Date: Thu, 8 Dec 2022 20:09:35 +0800
Subject: [PATCH] feat: toggle

---
 app/api/api.py                   |  7 +++++--
 app/api/config.json              | 18 +++++++++---------
 app/main.py                      |  1 -
 src/components/Setting.vue       | 10 ++++++++--
 src/components/daisy/DSelect.vue | 28 ++++++++++++----------------
 src/pages/AdvancedSettings.vue   |  1 -
 6 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/app/api/api.py b/app/api/api.py
index aa843a3..a26d1a5 100644
--- a/app/api/api.py
+++ b/app/api/api.py
@@ -6,6 +6,7 @@ import json
 import datetime
 import  os
 import sys
+from utils.utils import send_notifycation
 
 def getFile(ruleFile):
     if getattr(sys, 'frozen', False):
@@ -84,8 +85,8 @@ class API:
         self.net = PicoDet(
             get_settings_status_name(self.args,"ModelSetting","模型版本设置"),
             self.args['classfile'],
-            prob_threshold=get_setting_status(self.args,"ModelSetting",'confThreshold'),
-            iou_threshold=get_setting_status(self.args,"ModelSetting",'nmsThreshold'))
+            prob_threshold=float(get_setting_status(self.args,"ModelSetting",'confThreshold')),
+            iou_threshold=float(get_setting_status(self.args,"ModelSetting",'nmsThreshold')))
 
         # net.detect_folder(args['img_fold'], args['result_fold'])
 
@@ -93,6 +94,8 @@ class API:
         self.cap = cv2.VideoCapture(0)           # 开启摄像头
         
         # cv2.namedWindow('Video Cam', cv2.WINDOW_NORMAL)
+        if(self.args['toggle'] and self.args['tip']):
+            send_notifycation("功能已开启")
 
     
 
diff --git a/app/api/config.json b/app/api/config.json
index d7dd5fe..ea926fd 100644
--- a/app/api/config.json
+++ b/app/api/config.json
@@ -2,12 +2,12 @@
     "classfile": "coco_label.txt",
     "img_fold": "./imgs",
     "result_fold": "results",
-    "toggle": false,
-    "tip": false,
+    "toggle": true,
+    "tip": true,
     "control": [
         {
             "name": "嘴控",
-            "status": false
+            "status": true
         },
         {
             "name": "眼控",
@@ -15,7 +15,7 @@
         },
         {
             "name": "嘴/眼控",
-            "status": true
+            "status": false
         }
     ],
     "ControlSetting": [
@@ -24,7 +24,7 @@
             "status": [
                 {
                     "name": "开/关/开",
-                    "status": true
+                    "status": false
                 },
                 {
                     "name": "关/开/关",
@@ -32,7 +32,7 @@
                 },
                 {
                     "name": "闭上持续2S",
-                    "status": false
+                    "status": true
                 },
                 {
                     "name": "张开持续2S",
@@ -69,15 +69,15 @@
         },
         {
             "name": "置信度",
-            "status": 0.5
+            "status": "0.5"
         },
         {
             "name": "confThreshold",
-            "status": 0.5
+            "status": "0.5"
         },
         {
             "name": "nmsThreshold",
-            "status": 0.6
+            "status": "0.6"
         },
         {
             "name": "图片载入方式",
diff --git a/app/main.py b/app/main.py
index 601093b..3a0aa04 100644
--- a/app/main.py
+++ b/app/main.py
@@ -42,6 +42,5 @@ if __name__ == "__main__":
         default='False',
         help="开发模式")
     args = parser.parse_args()
-    send_notifycation('EMC程序已启动')
     WebViewApp(args.port,args.dev=='True')
     
diff --git a/src/components/Setting.vue b/src/components/Setting.vue
index 555983e..b2f276f 100644
--- a/src/components/Setting.vue
+++ b/src/components/Setting.vue
@@ -17,6 +17,10 @@ watch(() => props.settingData, () => {
   deep: true,
 })
 
+const handleChange = () => {
+
+}
+
 const { t } = useI18n()
 </script>
 
@@ -38,11 +42,13 @@ const { t } = useI18n()
           </select> -->
           <d-select v-model:options="item.status" class="select select-sm  max-w-xs" />
         </div>
-        <div v-else-if="typeof (item.status) == 'number'" class="flex justify-between mx-8 items-center">
+        <div v-else class="flex justify-between mx-8 items-center">
           <div class="setting-item-title self-center flex justify-center items-center " :data-tip="item.description" :class="!!item.description ? 'tooltip tooltip-primary tooltip-right' : ''">
             {{ t(item.name) }}<div v-if="!!item.description" i-carbon-information class="ml-1 " />
           </div>
-          <input type="range" min="0" max="1" :value="item.status" class="range range-xs" step="0.05">
+          <div class="tooltip tooltip-primary tooltip-left">
+            <input v-model="item.status" type="range" min="0" max="1" class="range range-xs" step="0.05">
+          </div>
         </div>
       </div>
     </div>
diff --git a/src/components/daisy/DSelect.vue b/src/components/daisy/DSelect.vue
index 6952dae..19f08e7 100644
--- a/src/components/daisy/DSelect.vue
+++ b/src/components/daisy/DSelect.vue
@@ -6,23 +6,19 @@ const props = defineProps({
   },
 })
 const emit = defineEmits(['update:options'])
-let selectedOption = $ref(!!props.options && props.options.find(option => option.status === true)?.name)
-
-const handleChange = () => {
-  props.options.forEach((option) => {
-    if (option.name === selectedOption)
-      option.status = true
-    else
-      option.status = false
+const selectedOption = computed(
+  {
+    get() {
+      const opt = !!props.options && props.options.find(option => option.status === true)
+      return opt ? opt.name : ''
+    },
+    set(newVal) {
+      props.options.forEach((option) => {
+        option.status = option.name === newVal
+      })
+      emit('update:options', props.options)
+    },
   })
-  emit('update:options', props.options)
-}
-watch(() => props.options, () => { // 无延时props不起作用
-  if (selectedOption === false)
-    selectedOption = props.options.find(option => option.status === true).name
-}, {
-  deep: true,
-})
 </script>
 
 <template>
diff --git a/src/pages/AdvancedSettings.vue b/src/pages/AdvancedSettings.vue
index 37fa2e3..b047db1 100644
--- a/src/pages/AdvancedSettings.vue
+++ b/src/pages/AdvancedSettings.vue
@@ -8,7 +8,6 @@ const settings = reactive({
 })
 const getAdvanceSetting = async () => {
   [settings.ControlSetting, settings.ModelSetting, settings.otherSetting] = await window.pywebview.api.getAdvanceSetting()
-  console.log(settings)
 }
 
 watch(() => settings, async () => {