Skip to content

Commit

Permalink
V1.2.5
Browse files Browse the repository at this point in the history
gztss committed Sep 3, 2018
1 parent aa8cff3 commit bc37e84
Showing 18 changed files with 195 additions and 96 deletions.
31 changes: 29 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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) (不推荐😂😂)

## 项目信息

8 changes: 5 additions & 3 deletions SerialTool/SerialTool.pro
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion SerialTool/include/oscilloscope.h
Original file line number Diff line number Diff line change
@@ -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:
19 changes: 19 additions & 0 deletions SerialTool/include/plotview.h
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions SerialTool/include/version.h
Original file line number Diff line number Diff line change
@@ -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
Binary file removed SerialTool/resource/images/icon.ico
Binary file not shown.
Binary file added SerialTool/resource/images/logo.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion SerialTool/resource/serialtool.qrc
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion SerialTool/resource/serialtool.rc
Original file line number Diff line number Diff line change
@@ -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
130 changes: 68 additions & 62 deletions SerialTool/slave/sendwave.c
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
/*****************************************************************************
* 文件名: sendwave.c
* 版本: V1.1
* 版本: V1.2
* 作者: 官文亮
* 日期: 2017/11/2
* 日期: 2018/9/2
* 说明: 本文件属于SerialTool软件的波形显示功能的下位机参考代码, 作用是将数
* 值转换为SerialTool可以识别的帧, 用户需实现串口发送函数, 结合本程序
* 即可实现串口发送波形的显示, 本程序适合SerialTool v1.1.6及后续版本.
*
* SerialTool源码链接: https://github.com/Le-Seul/SerialTool
* SerialTool安装包链接: https://github.com/Le-Seul/SerialTool/releases
* SerialTool源码链接: https://github.com/gztss/SerialTool
* SerialTool安装包链接: https://github.com/gztss/SerialTool/releases
*
*****************************************************************************/

#include "sendwave.h"

/* 此处定义一些常量, 请勿修改! */
enum {
Ch_Num = 16,
Ch_Num = 16, // 通道数量
Frame_MaxBytes = 80, // 最大帧长度
Frame_Head = 0xA3, // 帧头识别字
Frame_PointMode = 0xA8, // 点模式识别字
Frame_SyncMode = 0xA9, // 同步模式识别字
@@ -29,73 +30,74 @@ enum {

/* 函数功能: 发送int8类型数据
* 函数参数:
* buffer : 输入缓冲区, 需要4byte
* buffer : 帧缓冲区, 需要4byte
* channel: 通道, 取值范围为0~15
* value : 通道数据值, 8bit有符号整数
* 返回值 : 数据帧长度(单位为byte)
**/
char ws_point_int8(char *buffer, char channel, int8_t value)
{
if (channel > Ch_Num) { // 通道值不合法直接返回
return 0;
if ((uint8_t)channel < Ch_Num) { // 通道验证
// 帧头
*buffer++ = Frame_Head;
*buffer++ = Frame_PointMode;
*buffer++ = channel | Format_Int8; // 通道及数据格式信息
*buffer = value; // 数据添加到帧
return 4; // 数据帧长度
}
// 帧头
*buffer++ = Frame_Head;
*buffer++ = Frame_PointMode;
*buffer++ = channel | Format_Int8; // 通道及数据格式信息
*buffer = value; // 数据添加到帧
return 4; // 数据帧长度
return 0;
}

/* 函数功能: 发送int16类型数据
* 函数参数:
* buffer : 输入缓冲区, 需要5byte
* buffer : 帧缓冲区, 需要5byte
* channel: 通道, 取值范围为0~15
* value : 通道数据值, 16bit有符号整数
* 返回值 : 数据帧长度(单位为byte)
**/
char ws_point_int16(char *buffer, char channel, int16_t value)
{
if (channel > Ch_Num) { // 通道值不合法直接返回
return 0;
if ((uint8_t)channel < Ch_Num) { // 通道验证
// 帧头
*buffer++ = Frame_Head;
*buffer++ = Frame_PointMode;
*buffer++ = channel | Format_Int16; // 通道及数据格式信息
// 数据添加到帧
*buffer++ = (value >> 8) & 0xFF;
*buffer = value & 0xFF;
return 5; // 数据帧长度
}
// 帧头
*buffer++ = Frame_Head;
*buffer++ = Frame_PointMode;
*buffer++ = channel | Format_Int16; // 通道及数据格式信息
// 数据添加到帧
*buffer++ = (value >> 8) & 0xFF;
*buffer = value & 0xFF;
return 5; // 数据帧长度
return 0;
}

/* 函数功能: 发送int32类型数据
* 函数参数:
* buffer : 输入缓冲区, 需要7byte
* buffer : 帧缓冲区, 需要7byte
* channel: 通道, 取值范围为0~15
* value : 通道数据值, 32bit有符号整数
* 返回值 : 数据帧长度(单位为byte)
**/
char ws_point_int32(char *buffer, char channel, int32_t value)
{
if ((uint8_t)channel > Ch_Num) { // 通道值不合法直接返回
return 0;
if ((uint8_t)channel < Ch_Num) { // 通道验证
// 帧头
*buffer++ = Frame_Head;
*buffer++ = Frame_PointMode;
*buffer++ = channel | Format_Int32; // 通道及数据格式信息
// 数据添加到帧
*buffer++ = (value >> 24) & 0xFF;
*buffer++ = (value >> 16) & 0xFF;
*buffer++ = (value >> 8) & 0xFF;
*buffer = value & 0xFF;
return 7; // 数据帧长度
}
// 帧头
*buffer++ = Frame_Head;
*buffer++ = Frame_PointMode;
*buffer++ = channel | Format_Int32; // 通道及数据格式信息
// 数据添加到帧
*buffer++ = (value >> 24) & 0xFF;
*buffer++ = (value >> 16) & 0xFF;
*buffer++ = (value >> 8) & 0xFF;
*buffer = value & 0xFF;
return 7; // 数据帧长度
return 0;

}

/* 函数功能: 发送float类型数据
* 函数参数:
* buffer : 输入缓冲区, 需要7byte
* buffer : 帧缓冲区, 需要7byte
* channel: 通道, 取值范围为0~15
* value : 通道数据值, 类型为单精度浮点(32bit)
* 返回值 : 数据帧长度(单位为byte)
@@ -108,25 +110,25 @@ char ws_point_float(char *buffer, char channel, float value)
uint32_t i;
} temp;

if (channel > Ch_Num) { // 通道值不合法直接返回
return 0;
if ((uint8_t)channel < Ch_Num) { // 通道验证
temp.f = value;
// 帧头
*buffer++ = Frame_Head;
*buffer++ = Frame_PointMode;
*buffer++ = channel | Format_Float; // 通道及数据格式信息
// 数据添加到帧
*buffer++ = (temp.i >> 24) & 0xFF;
*buffer++ = (temp.i >> 16) & 0xFF;
*buffer++ = (temp.i >> 8) & 0xFF;
*buffer = temp.i & 0xFF;
return 7; // 数据帧长度
}
temp.f = value;
// 帧头
*buffer++ = Frame_Head;
*buffer++ = Frame_PointMode;
*buffer++ = channel | Format_Float; // 通道及数据格式信息
// 数据添加到帧
*buffer++ = (temp.i >> 24) & 0xFF;
*buffer++ = (temp.i >> 16) & 0xFF;
*buffer++ = (temp.i >> 8) & 0xFF;
*buffer = temp.i & 0xFF;
return 7; // 数据帧长度
return 0;
}

/* 函数功能: 同步发送模式缓冲区初始化
* 函数参数:
* buffer : 输入缓冲区, 同步模式最多占用83bytes
* buffer : 帧缓冲区, 最多需要(Frame_MaxBytes + 3) bytes
**/
void ws_frame_init(char *buffer)
{
@@ -149,15 +151,16 @@ char ws_frame_length(const char *buffer)
* buffer : 已经初始化的帧缓冲区
* channel: 通道, 取值范围为0~15
* value : 通道数据值, 类型为int8
* 返回值 : 0, 加入成功, 1, 帧长度已经达到上限
* 返回值 : 0, 加入成功, 1, 帧长度已经达到上限或通道错误
**/
char ws_add_int8(char *buffer, char channel, int8_t value)
{
char count = buffer[2];
char *p = buffer + count + 3; // 跳过前面数据

count += 2;
if (count <= 80) { // 帧最大字节数
// 帧长度及通道验证
if (count <= Frame_MaxBytes && (uint8_t)channel < Ch_Num) {
buffer[2] = count;
*p++ = channel | Format_Int8; // 通道及数据格式信息
*p = value; // 数据添加到帧
@@ -171,15 +174,16 @@ char ws_add_int8(char *buffer, char channel, int8_t value)
* buffer : 已经初始化的帧缓冲区
* channel: 通道, 取值范围为0~15
* value : 通道数据值, 类型为int16
* 返回值 : 0, 加入成功, 1, 帧长度已经达到上限
* 返回值 : 0, 加入成功, 1, 帧长度已经达到上限或通道错误
**/
char ws_add_int16(char *buffer, char channel, int16_t value)
{
char count = buffer[2];
char *p = buffer + count + 3; // 跳过前面数据

count += 3;
if (count <= 80) { // 帧最大字节数
// 帧长度及通道验证
if (count <= Frame_MaxBytes && (uint8_t)channel < Ch_Num) {
buffer[2] = count;
*p++ = channel | Format_Int16; // 通道及数据格式信息
// 数据添加到帧
@@ -195,15 +199,16 @@ char ws_add_int16(char *buffer, char channel, int16_t value)
* buffer : 已经初始化的帧缓冲区
* channel: 通道, 取值范围为0~15
* value : 通道数据值, 类型为int32
* 返回值 : 0, 加入成功, 1, 帧长度已经达到上限
* 返回值 : 0, 加入成功, 1, 帧长度已经达到上限或通道错误
**/
char ws_add_int32(char *buffer, char channel, int32_t value)
{
char count = buffer[2];
char *p = buffer + count + 3; // 跳过前面数据

count += 5;
if (count <= 80) { // 帧最大字节数
// 帧长度及通道验证
if (count <= Frame_MaxBytes && (uint8_t)channel < Ch_Num) {
buffer[2] = count;
*p++ = channel | Format_Int32; // 通道及数据格式信息
// 数据添加到帧
@@ -221,15 +226,16 @@ char ws_add_int32(char *buffer, char channel, int32_t value)
* buffer : 已经初始化的帧缓冲区
* channel: 通道, 取值范围为0~15
* value : 通道数据值, 类型为float
* 返回值 : 0, 加入成功, 1, 帧长度已经达到上限
* 返回值 : 0, 加入成功, 1, 帧长度已经达到上限或通道错误
**/
char ws_add_float(char *buffer, char channel, float value)
{
char count = buffer[2];
char *p = buffer + count + 3; // 跳过前面数据

count += 5;
if (count <= 80) { // 帧最大字节数
// 帧长度及通道验证
if (count <= Frame_MaxBytes && (uint8_t)channel < Ch_Num) {
union {
float f;
uint32_t i;
@@ -249,7 +255,7 @@ char ws_add_float(char *buffer, char channel, float value)

/* 函数功能: 发送时间戳
* 函数参数:
* buffer : 输入缓冲区
* buffer : 帧缓冲区
* ts : 时间戳
* 返回值 : 数据帧长度, (单位: bytes)
**/
10 changes: 5 additions & 5 deletions SerialTool/slave/sendwave.h
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/*****************************************************************************
* 文件名: sendwave.c
* 版本: V1.1
* 版本: V1.2
* 作者: 官文亮
* 日期: 2017/11/2
* 日期: 2018/9/2
* 说明: 本文件属于SerialTool软件的波形显示功能的下位机参考代码, 作用是将数
* 值转换为SerialTool可以识别的帧, 用户需实现串口发送函数, 结合本程序
* 即可实现串口发送波形的显示, 本程序适合SerialTool v1.1.6及后续版本.
*
* SerialTool源码链接: https://github.com/Le-Seul/SerialTool
* SerialTool安装包链接: https://github.com/Le-Seul/SerialTool/releases
* SerialTool源码链接: https://github.com/gztss/SerialTool
* SerialTool安装包链接: https://github.com/gztss/SerialTool/releases
*
*****************************************************************************/

@@ -50,7 +50,7 @@ typedef struct {
uint8_t min; // 0 ~ 59, 6 bit
uint8_t sec; // 0 ~ 59, 6 bit
uint16_t msec; // 0 ~ 999, 10 bit
uint32_t sampleRate; // 0 ~ 2000000,21 bit
uint32_t sampleRate; // 0 ~ 2000000, 21 bit
} ws_timestamp_t;

/* 公共函数声明 */
2 changes: 1 addition & 1 deletion SerialTool/source/aboutbox.cpp
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ AboutBox::AboutBox(QWidget *parent) :
ui->buttonBox->setCenterButtons(true); // 按钮居中
ui->textBrowser->setFrameStyle(QFrame::NoFrame); // 无边框

QPixmap pix(":/SerialTool/images/icon.ico");
QPixmap pix(":/SerialTool/images/logo.ico");
pix = pix.scaledToWidth(64, Qt::SmoothTransformation);
ui->label1->setPixmap(pix);
ui->label2->setText(
2 changes: 2 additions & 0 deletions SerialTool/source/filetransmitview.cpp
Original file line number Diff line number Diff line change
@@ -24,6 +24,8 @@ FileTransmitView::FileTransmitView(QWidget *parent) :
FileTransmitView::~FileTransmitView()
{
delete ui;
thread.terminate();
thread.wait();
}

void FileTransmitView::retranslate()
29 changes: 16 additions & 13 deletions SerialTool/source/oscilloscope.cpp
Original file line number Diff line number Diff line change
@@ -39,7 +39,8 @@ Oscilloscope::Oscilloscope(QWidget *parent) :

m_timer->setInterval(25);

connect(ui->horizontalScrollBar, &QAbstractSlider::sliderMoved, this, &Oscilloscope::horzScrollBarChanged);
connect(ui->horizontalScrollBar, &QAbstractSlider::sliderMoved, this, &Oscilloscope::horzScrollBarMoved);
connect(ui->horizontalScrollBar, &QAbstractSlider::actionTriggered, this, &Oscilloscope::horzScrollBarActionTriggered);
connect(ui->yOffsetBox, static_cast<void (QDoubleSpinBox::*)(double)>
(&QDoubleSpinBox::valueChanged), this, &Oscilloscope::yOffsetChanged);
connect(ui->yRangeBox, static_cast<void (QDoubleSpinBox::*)(double)>
@@ -114,15 +115,11 @@ void Oscilloscope::saveConfig(QSettings *config)
// 初始化示波器界面
void Oscilloscope::setupPlot()
{
ui->chartView->setChart(m_chart);
ui->plotView->setChart(m_chart);
m_chart->createDefaultAxes();
QValueAxis *xAxis = new QValueAxis;
QValueAxis *yAxis = new QValueAxis;
xAxis->setLabelFormat("%d");
xAxis->setTickCount(6);
xAxis->setMinorTickCount(1);
yAxis->setTickCount(5);
yAxis->setMinorTickCount(1);
xAxis->setLabelFormat("%g");
// 初始化通道
for (int i = 0; i < CH_NUM; ++i) {
QLineSeries *series = new QLineSeries(this);
@@ -194,7 +191,7 @@ void Oscilloscope::setUseOpenGL(bool status)
void Oscilloscope::setUseAntialiased(bool status)
{
status &= !m_series[0]->useOpenGL(); // 不适用OpenGL时才可以打开抗锯齿
ui->chartView->setRenderHint(QPainter::Antialiasing, status);
ui->plotView->setRenderHint(QPainter::Antialiasing, status);
}

// 设置背景颜色
@@ -210,11 +207,11 @@ void Oscilloscope::setGridColor(QColor color)
m_chart->axisX()->setLinePen(QPen(color));
m_chart->axisX()->setGridLineColor(color);
m_chart->axisX()->setLabelsColor(color);
m_chart->axisX()->setMinorGridLineColor(color);
m_chart->axisX()->setMinorGridLinePen(QPen(color, 0.35));
m_chart->axisY()->setLinePen(QPen(color));
m_chart->axisY()->setGridLineColor(color);
m_chart->axisY()->setLabelsColor(color);
m_chart->axisY()->setMinorGridLineColor(color);
m_chart->axisY()->setMinorGridLinePen(QPen(color, 0.35));
}

// 设置更新时间
@@ -251,7 +248,7 @@ void Oscilloscope::savePng(const QString &fileName)
{
QScreen *screen = QGuiApplication::primaryScreen();

QPixmap p = screen->grabWindow(ui->chartView->winId());
QPixmap p = screen->grabWindow(ui->plotView->winId());
QImage image = p.toImage();
image.save(fileName);
}
@@ -261,7 +258,7 @@ void Oscilloscope::saveBmp(const QString &fileName)
{
QScreen *screen = QGuiApplication::primaryScreen();

QPixmap p = screen->grabWindow(ui->chartView->winId());
QPixmap p = screen->grabWindow(ui->plotView->winId());
QImage image = p.toImage();
image.save(fileName);
}
@@ -275,7 +272,7 @@ void Oscilloscope::channelStyleChanged(ChannelItem *item)
}

// 滚动条滑块移动时触发
void Oscilloscope::horzScrollBarChanged(int value)
void Oscilloscope::horzScrollBarMoved(int value)
{
if (ui->horizontalScrollBar->maximum() == value) {
replotFlag = true;
@@ -285,6 +282,12 @@ void Oscilloscope::horzScrollBarChanged(int value)
m_chart->axisX()->setRange(value, value + m_xRange);
}

// 滚动条按钮点击时触发
void Oscilloscope::horzScrollBarActionTriggered(void)
{
horzScrollBarMoved(ui->horizontalScrollBar->value());
}

// Y轴偏置改变
void Oscilloscope::yOffsetChanged(double offset)
{
39 changes: 39 additions & 0 deletions SerialTool/source/plotview.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#include "plotview.h"
#include <QChart>
#include <QValueAxis>
#include <qDebug>

QT_CHARTS_USE_NAMESPACE

PlotView::PlotView(QWidget *parent) : QtCharts::QChartView(parent)
{

}

int PlotView::xTickCount(int width)
{
int i, tab[] = { 10, 5, 4 };

for (i = 0; i < (int)sizeof(tab) - 1 && width / tab[i] < 80; ++i);
return tab[i] + 1;
}

int PlotView::yTickCount(int height)
{
int i, tab[] = { 10, 5, 4 };

for (i = 0; i < (int)sizeof(tab) - 1 && height / tab[i] < 50; ++i);
return tab[i] + 1;
}

void PlotView::resizeEvent(QResizeEvent *event)
{
QValueAxis *xAxis = (QValueAxis *)chart()->axisX();
QValueAxis *yAxis = (QValueAxis *)chart()->axisY();

QtCharts::QChartView::resizeEvent(event);
xAxis->setTickCount(xTickCount(event->size().width()));
yAxis->setTickCount(yTickCount(event->size().height()));
xAxis->setMinorTickCount(4);
yAxis->setMinorTickCount(4);
}
2 changes: 1 addition & 1 deletion SerialTool/ui/mainwindow.ui
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
</property>
<property name="windowIcon">
<iconset resource="../resource/serialtool.qrc">
<normaloff>:/SerialTool/images/icon.ico</normaloff>:/SerialTool/images/icon.ico</iconset>
<normaloff>:/SerialTool/images/logo.ico</normaloff>:/SerialTool/images/logo.ico</iconset>
</property>
<widget class="QWidget" name="centralWidget">
<property name="sizePolicy">
6 changes: 3 additions & 3 deletions SerialTool/ui/oscilloscope.ui
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@
<number>0</number>
</property>
<item>
<widget class="QtCharts::QChartView" name="chartView" native="true"/>
<widget class="PlotView" name="plotView" native="true"/>
</item>
<item>
<widget class="QScrollBar" name="horizontalScrollBar">
@@ -252,9 +252,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QtCharts::QChartView</class>
<class>PlotView</class>
<extends>QWidget</extends>
<header location="global">QtCharts/QChartView</header>
<header>plotview.h</header>
<container>1</container>
</customwidget>
</customwidgets>
2 changes: 1 addition & 1 deletion SerialTool/ver_temp.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#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"

0 comments on commit bc37e84

Please sign in to comment.