V1.2.5

README.md

@@ -1,6 +1,33 @@
 
+<p align="center">
+  <a>
+    <img src="https://github.com/gztss/SerialTool/blob/master/SerialTool/resource/images/logo.ico" alt="logo" width=64 height=64>
+  </a>
+  <h2 align="center">SerialTool</h2>
+  <p align="center">
+    <a href="https://github.com/gztss/SerialTool/blob/master/LICENSE">
+      <img src="https://img.shields.io/github/license/gztss/SerialTool.svg" alt="license" />
+    </a>
+    <a href="https://github.com/gztss/SerialTool/issues">
+      <img src="https://img.shields.io/github/issues/gztss/SerialTool.svg" alt="issues">
+    </a>
+    <a>
+      <img src="https://img.shields.io/github/repo-size/gztss/SerialTool.svg" alt="Repo Size" />
+    </a>
+    <a href="https://github.com/gztss/SerialTool/archive/master.zip">
+      <img src="https://img.shields.io/github/languages/code-size/gztss/SerialTool.svg" alt="Code Size" />
+    </a>
+    <a href="https://github.com/gztss/SerialTool/releases">
+      <img src="https://img.shields.io/github/downloads/gztss/SerialTool/total.svg" alt="All Downloads" />
+    </a>
+    <a href="https://github.com/gztss/SerialTool/releases">
+      <img src="https://img.shields.io/github/release/gztss/SerialTool/all.svg" alt="Last Release">
+    </a>
+  </p>
+  <p align="center">A practical Serial-Port/TCP/UDP debugging tool.</p>
+</p>
 
-# SerialTool
+## 简介
 
 SerialTool是一个实用的串口调试工具，这款工具支持串口调试助手、波形显示和文件传输等功能。该工具软件使用GPL许可证发布。用户可以将波形文件保存为文本文件，然后使用Matlab等工具进行数据分析。如果您支持本软件，欢迎贡献源代码或者向作者提出建议。
 
@@ -23,7 +50,7 @@ SerialTool是一个实用的串口调试工具，这款工具支持串口调试
 ## 下载地址
 * [Latest release](https://github.com/gztss/SerialTool/releases/latest)
 * [GitHub](https://github.com/Le-Seul/SerialTool/releases)
-* [百度网盘](http://pan.baidu.com/s/1c18ZXW8)
+* [百度网盘](http://pan.baidu.com/s/1c18ZXW8) (不推荐😂😂)
 
 ## 项目信息
 

SerialTool/SerialTool.pro

@@ -51,7 +51,8 @@ SOURCES += \
     source/pointdatabuffer.cpp \
     source/valuedisplay.cpp \
     source/mainwindow.cpp \
-    source/filetransmitview.cpp
+    source/filetransmitview.cpp \
+    source/plotview.cpp
 
 HEADERS  += \
     include/aboutbox.h \
@@ -74,7 +75,8 @@ HEADERS  += \
     include/pointdatabuffer.h \
     include/valuedisplay.h \
     include/mainwindow.h \
-    include/filetransmitview.h
+    include/filetransmitview.h \
+    include/plotview.h
 
 DISTFILES += \
     resource/images/clear.png \
@@ -83,7 +85,7 @@ DISTFILES += \
     resource/images/port config.png \
     resource/images/config.ico \
     resource/images/exit.ico \
-    resource/images/icon.ico \
+    resource/images/logo.ico \
     resource/images/pause.ico \
     resource/images/save.ico \
     resource/images/start.ico

SerialTool/include/oscilloscope.h

@@ -62,7 +62,8 @@ private slots:
     void yRangeChanged(double range);
     void xRangeChanged(const QString &str);
     void channelStyleChanged(ChannelItem *item);
-    void horzScrollBarChanged(int value);
+    void horzScrollBarMoved(int value);
+    void horzScrollBarActionTriggered(void);
     void timeUpdata();
 
 private:

SerialTool/include/plotview.h

@@ -0,0 +1,19 @@
+#ifndef PLOTVIEW_H
+#define PLOTVIEW_H
+
+#include <QtCharts/QChartView>
+
+class PlotView : public QtCharts::QChartView
+{
+public:
+    PlotView(QWidget *parent);
+
+protected:
+    void resizeEvent(QResizeEvent *event);
+
+private:
+    int xTickCount(int width);
+    int yTickCount(int height);
+};
+
+#endif // PLOTVIEW_H

SerialTool/include/version.h

@@ -1,15 +1,15 @@
 #ifndef __VERSION_H
 #define __VERSION_H
 
-#define MAIN_VERSION      1.2.4
+#define MAIN_VERSION      1.2.5
 
 #define SOFTWARE_NAME     "SerialTool"
 #define COPYRIGHT         "Copyleft  2017-2018, Wenliang Guan"
 
 #define _STR_(s)           #s
 #define __STR(s)          _STR_(s)
 
-#define BUILD_VERSION     _STR_(48b44)
+#define BUILD_VERSION     _STR_(54e45)
 #define SOFTWARE_VERSION  __STR(MAIN_VERSION)
 
 #endif

SerialTool/resource/serialtool.qrc

@@ -2,7 +2,7 @@
     <qresource prefix="/SerialTool">
         <file>images/config.ico</file>
         <file>images/exit.ico</file>
-        <file>images/icon.ico</file>
+        <file>images/logo.ico</file>
         <file>images/pause.ico</file>
         <file>images/save.ico</file>
         <file>images/start.ico</file>

SerialTool/resource/serialtool.rc

@@ -5,7 +5,7 @@
 #endif
 #include "../include/version.h"
 
-IDI_ICON1 ICON DISCARDABLE "./images/icon.ico"
+IDI_ICON1 ICON DISCARDABLE "./images/logo.ico"
 VS_VERSION_INFO VERSIONINFO
     FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG