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 0000000..7bd8b7a Binary files /dev/null and b/logo.ico differ 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; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;">注意事项:</span></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;">1.当检查上传数据的CHECKSUM(检验和)时,需要先复位下蓝牙主机开发板清空统计信息</span></p> <p style="-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;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;">版本:</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;">V2:支持原始数据保存</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;"> </span></p></body></html> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> - - - - 0 - 100 - - - - GroupBox - - - - - 110 - 50 - 147 - 1 - - - - - 16777215 - 1 - - - - - - - - - Qt::Vertical @@ -2252,6 +2218,30 @@ p, li { white-space: pre-wrap; } + + + 版本说明 + + + + + 20 + 10 + 341 + 311 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'SimSun'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;">V3:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;"> 1.支持M1003 单导心电记录仪2代</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;"> </span></p></body></html> + + + @@ -2400,7 +2390,7 @@ p, li { white-space: pre-wrap; } - 心电上位机V2 + 心电上位机V3