From 2c50267b466483e64823a5786a6fb414caca0b33 Mon Sep 17 00:00:00 2001
From: vc4 <287920192@qq.com>
Date: Tue, 24 Aug 2021 12:24:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8F=91=E9=80=81=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=AF=8F=E6=AC=A1=E5=8F=AA=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=B1=BB=E5=9E=8B=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data.ui      | 6 ------
 pack.ui      | 6 ------
 scomm.py     | 9 +++------
 unpack.ui    | 6 ------
 usercfg.json | 8 ++++++++
 5 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/data.ui b/data.ui
index d4bfe04..e506d7d 100644
--- a/data.ui
+++ b/data.ui
@@ -39,12 +39,6 @@
         "row": 3
     },
     "Button":[
-        {
-            "name":"btn-dsend",
-            "text":"发送",
-            "column": 9,
-            "row": 3
-        },
         {
             "name":"btn-dsave",
             "text":"保存",
diff --git a/pack.ui b/pack.ui
index 63b3e3c..9a9d755 100644
--- a/pack.ui
+++ b/pack.ui
@@ -32,12 +32,6 @@
         "row": 2
     },
     "Button":[
-        {
-            "name":"btn-pexec",
-            "text":"执行",
-            "column": 9,
-            "row": 3
-        },
         {
             "name":"btn-psave",
             "text":"保存",
diff --git a/scomm.py b/scomm.py
index cc0b828..7b87a75 100755
--- a/scomm.py
+++ b/scomm.py
@@ -267,7 +267,7 @@ class TopWin():
             dat['hex'] = self.root.get('ckbtn-dhex').var.get() and 1 or 0
             self.save_cfg(w, dat)
             self.WinData.destroy()
-        if self.WinData: return
+        if self.WinData: self.WinData.destroy()
         self.WinData = self.root.toplevel('data.ui', title='预置数据')
         self.WinData.configure(bg='#e8e8e8')
         btn = event.widget._name
@@ -276,14 +276,13 @@ class TopWin():
         self.root.get('text-dsetting').insert('end', _cfg.get('value',''))
         self.root.checkbox('ckbtn-dhex').set(_cfg.get('hex') and 1 or 0)
         self.root.button('btn-dsave', cmd=lambda x=btn:_save(x), focus=True)
-        self.root.button('btn-dsend', cmd=lambda x=btn:self.set_send_data(x))
     def win_pack(self, event):
         def _save(w):
             dat = {'title':self.root.get('entry-pfile').var.get()}
             dat['value'] = self.root.get('text-psetting').get('1.0','end -1 chars')
             self.save_cfg(w,dat)
             self.WinPack.destroy()
-        if self.WinPack: return
+        if self.WinPack: self.WinPack.destroy()
         self.WinPack = self.root.toplevel('pack.ui', title='组帧脚本')
         self.WinPack.configure(bg='#e8e8e8')
         btn = event.widget._name
@@ -291,14 +290,13 @@ class TopWin():
         self.root.entry('entry-pfile').set(_cfg.get('title', btn))
         self.root.get('text-psetting').insert('end', _cfg.get('value',''))
         self.root.button('btn-psave', cmd=lambda x=btn:_save(x), focus=True)
-        self.root.button('btn-pexec', cmd=lambda x=btn:self.set_pack(x))
     def win_unpack(self, event):
         def _save(w):
             dat = {'title':self.root.get('entry-ufile').var.get()}
             dat['value'] = self.root.get('text-usetting').get('1.0','end -1 chars')
             self.save_cfg(w,dat)
             self.WinUnpack.destroy()
-        if self.WinUnpack: return
+        if self.WinUnpack: self.WinUnpack.destroy()
         self.WinUnpack = self.root.toplevel('unpack.ui', title='解析脚本')
         self.WinUnpack.configure(bg='#e8e8e8')
         btn = event.widget._name
@@ -306,7 +304,6 @@ class TopWin():
         self.root.entry('entry-ufile').set(_cfg.get('title', btn))
         self.root.get('text-usetting').insert('end', _cfg.get('value',''))
         self.root.button('btn-usave', cmd=lambda x=btn:_save(x), focus=True)
-        self.root.button('btn-uexec', cmd=lambda x=btn:self.set_unpack(x))
 
 
 if __name__ == '__main__':
diff --git a/unpack.ui b/unpack.ui
index 6725250..f13ba3b 100644
--- a/unpack.ui
+++ b/unpack.ui
@@ -32,12 +32,6 @@
         "row": 2
     },
     "Button":[
-        {
-            "name":"btn-uexec",
-            "text":"执行",
-            "column": 9,
-            "row": 3
-        },
         {
             "name":"btn-usave",
             "text":"保存",
diff --git a/usercfg.json b/usercfg.json
index 87b37e0..1dcb6fc 100644
--- a/usercfg.json
+++ b/usercfg.json
@@ -22,8 +22,16 @@
         "title": "btn-pack03",
         "value": ""
     },
+    "btn-pack04": {
+        "title": "btn-pack04",
+        "value": ""
+    },
     "btn-unpack01": {
         "title": "btn-unpack01",
         "value": ""
+    },
+    "btn-unpack03": {
+        "title": "btn-unpack03",
+        "value": ""
     }
 }
\ No newline at end of file