From f55618d5b6f76e352e9043930486b79629329fc0 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Thu, 9 May 2024 20:36:49 +0800
Subject: [PATCH] V3

---
 .gitignore     |   2 +-
 CMakeLists.txt |   1 +
 app.rc         |   1 +
 logo.ico       | Bin 0 -> 4286 bytes
 mainwindow.ui  |  62 ++++++++++++++++++++++++---------------------------------
 5 files changed, 29 insertions(+), 37 deletions(-)
 create mode 100644 app.rc
 create mode 100644 logo.ico

diff --git a/.gitignore b/.gitignore
index 8b88018..569483a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,7 +31,7 @@ ui_*.h
 qrc_*.cpp
 Thumbs.db
 *.res
-*.rc
+
 /.qmake.cache
 /.qmake.stash
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 632ff68..487c3ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,7 @@ set(PROJECT_SOURCES
         libzqt/qcustomplot.cpp
 
         src/algo/iflytop_simple_filter.cpp
+        app.rc
 
 )
 
diff --git a/app.rc b/app.rc
new file mode 100644
index 0000000..c309aa1
--- /dev/null
+++ b/app.rc
@@ -0,0 +1 @@
+IDI_ICON1       ICON      "logo.ico" 
\ No newline at end of file
diff --git a/logo.ico b/logo.ico
new file mode 100644
index 0000000000000000000000000000000000000000..7bd8b7a9a5864f43cd7738d8d8cfc493da914971
GIT binary patch
literal 4286
zcmeI0ONdlQ6o#v(r~6J!Wa1+(B;9wC7#JTA(I~o*3BjF`2!S907l9E)e4=6^itS3=
z2tpzwC@29*Viqd+2yQwdqM(8i$L{tyn#71N+8A*(>h=3?y0Q9tZ}*)UvrEfo-8yyZ
zoO+x(Rg5tS{<XCk{cpZ~-Ix)^n07#9J^;!6A8iBurL#rjj4T<-G4KN%gvrgB?gZsP
z%}4it`?7JckB`^jb2tM}!GlY%7+O>4w7leTq+I6J-Ywtb;5&E#@@w;u`T>{<O%Oeo
zKD5XVw7?uFf$cNw`ww)M!w~3$r&`s@TFdvF&;|D)%wL%7A9VM@dk$+yS!=vOP5P;}
zqT*=^<e|FHVZQ3g&eHeebhZ?GKhW2Bo8eQq4E5~CX}gJy1(1fiGgmt#VIJIpIQHY{
z+{4xih#W&YTflcg>ogzA5M@_;dkhrsQ95DrztLX>DX3Wo)l=D$_FLz=(Y!C9GYb^w
zVSeh#{-V#KROb2lOlQbtuI65x3D+%~iaCur7<(I$Ij{@r`HE`0O+R8wKK(o@-{YYe
zu&1%^hbNZ&2Hz7weL5|9l&>iHdCSgFzLmFvx&>s4TRYcvrLqN`4f!7nzd^8Hu&%tZ
z4HVN~f#xNhLof_R!I!WGR>Kz+W>dZk7eV@W;lp(1oN-+LuF*KEdvK8NWfhiC>MmGV
zL9y}*Xv~Vebs&3+<Fz$`XjT5*o087Uo{Ii%WU6bgMuP0g&oy{o^+rGGfbIv)MPtzV
zxsVMY*&87J&7iaP2{EHH@(pNT)Yc9gK=CLtVB3-%?XN#Hl`sSBJ-tf(N`T*~?{cyQ
z<s#*SJm}sX4Ql%lS{M&|P#Dg)>~=yA*tRr3=}rRefnr8=&Ak!b=!^i}xgUXitONDa
zIhYKR39Z#H5M@)j;%B%7!Sfu|=RUgA)2@F;l@}GON1&>&b+7uL%lBiet*SH7a;@cq
z{jbTnN2zOXHFtYl1NCY5-|?z@QFBbe4zSx4liaPv&p>C%ZhKkZ$FbWA6F_?&w7V18
z;ShOHufO#&wx@z}QkV_JNN+@2n0{YnidE&rlmDTQMq~OF-?|4I>HXi{zco?}^>^)*
z1H$g^xb}1pYy$g@5x1}25IP&Wa}Gh=epNmB+yc5kw!<T+w$&?jCQd;I@3?CI%~Jm!
z;@Z%>w}NuIYzzjyA4*VfE&inaYk0@W_-{u0ULAs5HcmrSK9pSTx+@2P-CuW%?pNI_
zKfx`K{vFUhcfmAJE`H&uA(`X)?*pyHO3-@9PB)x@y`VRi%bPbr>D%ynUC%4GdR{*1
zdAWq=8RI=RrlZ#ww`@#nk1<Z(n54)x^QVMny0w_Lr%fH@M3Y(S|ApbLoH6SGrC7g2
N&g7E$MBeF1J_A^V9Q*(P

literal 0
HcmV?d00001

diff --git a/mainwindow.ui b/mainwindow.ui
index 6acbd19..32e8669 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -819,45 +819,11 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;注意事项:&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;1.当检查上传数据的CHECKSUM(检验和)时，需要先复位下蓝牙主机开发板清空统计信息&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; color:#ff0000;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;版本:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;V2：支持原始数据保存&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;	&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QGroupBox" name="groupBox_5">
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>100</height>
-             </size>
-            </property>
-            <property name="title">
-             <string>GroupBox</string>
-            </property>
-            <widget class="QLabel" name="label_20">
-             <property name="geometry">
-              <rect>
-               <x>110</x>
-               <y>50</y>
-               <width>147</width>
-               <height>1</height>
-              </rect>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>16777215</width>
-               <height>1</height>
-              </size>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </widget>
-          </item>
-          <item>
            <spacer name="verticalSpacer">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
@@ -2252,6 +2218,30 @@ p, li { white-space: pre-wrap; }
               </item>
              </layout>
             </widget>
+            <widget class="QWidget" name="tab_3">
+             <attribute name="title">
+              <string>版本说明</string>
+             </attribute>
+             <widget class="QTextBrowser" name="textBrowser_2">
+              <property name="geometry">
+               <rect>
+                <x>20</x>
+                <y>10</y>
+                <width>341</width>
+                <height>311</height>
+               </rect>
+              </property>
+              <property name="html">
+               <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'SimSun'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;V3:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;   1.支持M1003 单导心电记录仪2代&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;	&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              </property>
+             </widget>
+            </widget>
            </widget>
           </item>
           <item>
@@ -2400,7 +2390,7 @@ p, li { white-space: pre-wrap; }
    </property>
    <widget class="QMenu" name="menu123">
     <property name="title">
-     <string>心电上位机V2</string>
+     <string>心电上位机V3</string>
     </property>
    </widget>
    <addaction name="menu123"/>