From b389ca4d6bd89d1a93079e584286ae1c33fb7dd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwangbo=E2=80=9D?= <“mailbowang@163.com”>
Date: Tue, 24 Dec 2024 15:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B=E8=AD=A6?=
 =?UTF-8?q?=E5=91=8A;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CableTool/common.cpp | 2 +-
 CableTool/common.h   | 4 ++--
 CableTool/form.ui    | 7 +++++--
 CableTool/widget.cpp | 1 +
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CableTool/common.cpp b/CableTool/common.cpp
index b5b0405..c58a295 100644
--- a/CableTool/common.cpp
+++ b/CableTool/common.cpp
@@ -76,7 +76,7 @@ int32_t stringToChar(QString str, char *buf, uint32_t len)
     QByteArray ba = str.toLatin1();
 
     if (ba.length() <= 0
-        || ba.length() >= len)
+        || ba.length() >= static_cast<int>(len))
     {
         return -2;
     }
diff --git a/CableTool/common.h b/CableTool/common.h
index 0e06d43..00a1ee1 100644
--- a/CableTool/common.h
+++ b/CableTool/common.h
@@ -33,8 +33,8 @@
  *
  ******************************************************************************/
 
-#ifndef __COMMON_H_
-#define __COMMON_H_
+#ifndef COMMON_H_
+#define COMMON_H_
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdint.h>
diff --git a/CableTool/form.ui b/CableTool/form.ui
index cb2f5e9..2b7eabe 100644
--- a/CableTool/form.ui
+++ b/CableTool/form.ui
@@ -17,7 +17,7 @@
    </size>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string>CableTool</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -413,7 +413,7 @@
       </font>
      </property>
      <property name="currentIndex">
-      <number>8</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="infoTab">
       <attribute name="title">
@@ -6046,6 +6046,9 @@
       </layout>
      </widget>
      <widget class="QWidget" name="frequencyTab">
+      <property name="enabled">
+       <bool>true</bool>
+      </property>
       <attribute name="title">
        <string>工频数据</string>
       </attribute>
diff --git a/CableTool/widget.cpp b/CableTool/widget.cpp
index e30be16..11f969d 100644
--- a/CableTool/widget.cpp
+++ b/CableTool/widget.cpp
@@ -2443,6 +2443,7 @@ void Widget::closeEvent(QCloseEvent* ev)
     worker->Stop();//终止工作函数
     m_thread->exit();//线程退出事件循环
     m_thread->wait();//等待线程退出
+    QWidget::closeEvent(ev); 
     qDebug()<<"线程退出了";
 }