V1.2.3

.gitignore

@@ -246,3 +246,6 @@ ModelManifest.xml
 
 *-Debug/
 *-Release/
+
+.qmake.stash
+*/.vscode/

SerialTool/SerialTool.pro

@@ -3,10 +3,11 @@
 # Project created by QtCreator 2017-02-01T17:03:23
 #
 #-------------------------------------------------
-
 QT       += core gui widgets serialport network charts
+QT       -= console
 
 TARGET = SerialTool
+
 TEMPLATE = app
 
 # The following define makes your compiler emit warnings if you use
@@ -20,7 +21,9 @@ DEFINES += QT_DEPRECATED_WARNINGS QSCINTILLA_DLL
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
-QMAKE_CFLAGS +=
+unix {
+    QMAKE_LFLAGS += -fno-pie -no-pie # create executable file
+}
 
 TRANSLATIONS += language/serialtool_zh_CN.ts
 
@@ -37,7 +40,6 @@ SOURCES += \
     source/textedit.cpp \
     source/wavedecode.cpp \
     source/oscilloscope.cpp \
-    source/filetransferview.cpp \
     source/filethread.cpp \
     source/xmodem.cpp \
     source/vediobox.cpp \
@@ -48,7 +50,8 @@ SOURCES += \
     source/serialport.cpp \
     source/pointdatabuffer.cpp \
     source/valuedisplay.cpp \
-    source/mainwindow.cpp
+    source/mainwindow.cpp \
+    source/filetransmitview.cpp
 
 HEADERS  += \
     include/aboutbox.h \
@@ -60,7 +63,6 @@ HEADERS  += \
     include/wavedecode.h \
     include/oscilloscope.h \
     include/filethread.h \
-    include/filetransferview.h \
     include/xmodem.h \
     include/xmodem_crc16.h \
     include/vediobox.h \
@@ -71,7 +73,8 @@ HEADERS  += \
     include/serialport.h \
     include/pointdatabuffer.h \
     include/valuedisplay.h \
-    include/mainwindow.h
+    include/mainwindow.h \
+    include/filetransmitview.h
 
 DISTFILES += \
     resource/images/clear.png \
@@ -93,12 +96,12 @@ FORMS += \
     ui/optionsbox.ui \
     ui/portsetbox.ui \
     ui/oscilloscope.ui \
-    ui/filetransferview.ui \
     ui/vediobox.ui \
     ui/tcpudpport.ui \
     ui/terminalview.ui \
     ui/valuedisplay.ui \
     ui/serialport.ui \
-    ui/mainwindow.ui
+    ui/mainwindow.ui \
+    ui/filetransmitview.ui
 
 LIBS += -lqscintilla2_qt5

SerialTool/include/filetransmitview.h

@@ -0,0 +1,47 @@
+#ifndef __FILETRANSFERVIEW_H
+#define __FILETRANSFERVIEW_H
+
+#include <QWidget>
+#include "filethread.h"
+
+namespace Ui {
+    class FileTransmitView;
+}
+class QSettings;
+
+class FileTransmitView : public QWidget
+{
+    Q_OBJECT
+
+public:
+    FileTransmitView(QWidget *parent = Q_NULLPTR);
+    ~FileTransmitView();
+    void retranslate();
+    void loadConfig(QSettings *config);
+    void saveConfig(QSettings *config);
+
+public slots:
+    void readData(const QByteArray &array);
+    void cancelTransfer();
+    void logOut(const QString &string, QColor color = Qt::black);
+
+private:
+    void beforceSend();
+
+private slots:
+    void browseButtonClicked();
+    void portSendData(const QByteArray &array);
+    void sendFile();
+    void onTransFinsh();
+    void onTimeoutError();
+
+signals:
+    void sendData(const QByteArray &);
+
+private:
+    Ui::FileTransmitView *ui;
+    FileThread thread;
+    QByteArray receiveArray; // 接收缓冲区
+};
+
+#endif

SerialTool/include/optionsbox.h

@@ -25,8 +25,6 @@ private slots:
     void processOptions(QAbstractButton *button);
     void setTextFontAnsi();
     void setTextFontMulti();
-    void setRxFontColor();
-    void setTxFontColor();
     void setPlotBackgroundColor();
     void setAxisColor();
     void onCmdNewClick();

SerialTool/include/serialport.h

@@ -41,6 +41,10 @@ private slots:
     void onTimerUpdate();
     void setBaudRate(const QString &string);
 
+#if defined(Q_OS_LINUX)
+    void onPortTextEdited();
+#endif
+
 private:
     Ui::SerialPort *ui;
     QSerialPort *serialPort;

SerialTool/include/terminalview.h

@@ -27,6 +27,8 @@ class TerminalView : public QWidget
     void setFontFamily(QString fonts, int size, QString style);
     void setEnabled(bool status);
     void setPaused(bool status);
+    void setHighlight(const QString &language);
+    void setTextCodec(const QString &name);
     void saveText(const QString &fname);
 
 signals:
@@ -36,10 +38,15 @@ class TerminalView : public QWidget
     void keyPressEvent(QKeyEvent  *event);
     void setSendButtonEnabled(bool status);
     void arrayToHex(QString &str, const QByteArray &arr, int countOfLine);
-    void arrayToAscii(QString &str, const QByteArray &arr);
+    void arrayToString(QString &str, const QByteArray &arr);
     void loadHistory(QSettings *config);
     void saveHistory(QSettings *config);
 
+    void arrayToUTF8(QString &str, const QByteArray &array);
+    void arrayToUTF16(QString &str, const QByteArray &array);
+    void arrayToDualByte(QString &str, const QByteArray &array);
+    void arrayToASCII(QString &str, const QByteArray &array);
+
 private slots:
     void sendData();
     void onWrapBoxChanged(int status);
@@ -49,10 +56,20 @@ private slots:
     void onHistoryBoxChanged(const QString &string);
 
 private:
+    enum TextCodec {
+        ASCII,
+        GB2312,
+        GB18030,
+        UTF8,
+        UTF16
+    };
+
     Ui::TerminalView *ui;
-    bool sendEnabled = false,  paused = false;
-    QTimer *resendTimer;
-    QByteArray *asciiBuf;
+    bool m_sendEnabled = false,  m_paused = false;
+    QTimer *m_resendTimer;
+    QByteArray *m_asciiBuf;
+    enum TextCodec m_textCodec;
+    QByteArray m_codecName;
 };
 
 #endif // TERMINALVIEW_H

SerialTool/include/textedit.h

@@ -11,13 +11,18 @@ class TextEdit : public QsciScintilla
     TextEdit(QWidget *parent = NULL);
     void append(const QString &text);
     void setFonts(QString fonts, int size, QColor color = Qt::black, QString style = "");
-    void setHighLight(bool mode);
+    void setHighLight(const QString &language);
 
 public slots:
     void setWrap(bool wrap);
 
 private:
     void setMarginsWidth();
+    void highlightNone();
+    void highlightCpp();
+    void highlightBash();
+    void highlightLua();
+    void highlightJSON();
 
 private slots:
     void onTextChanged();
@@ -26,13 +31,12 @@ private slots:
     void onVScrollBarValueChanged();
 
 private:
-    QString fontFamily;
+    QString fontFamily, m_language;
     QFont lineNumFont;
     int fontSize;
     int lineCount = 1;
     bool isWrap = false;
     bool scrollEnd = true;
-    bool highLight = false;
 };
 
 #endif

SerialTool/include/version.h

@@ -1,15 +1,15 @@
 #ifndef __VERSION_H
 #define __VERSION_H
 
-#define MAIN_VERSION      1.2.2
+#define MAIN_VERSION      1.2.3
 
 #define SOFTWARE_NAME     "SerialTool"
-#define COPYRIGHT         "Copyleft  2017 by Wenliang"
+#define COPYRIGHT         "Copyleft  2017-2018, Wenliang Guan"
 
 #define _STR_(s)           #s
 #define __STR(s)          _STR_(s)
 
-#define BUILD_VERSION     _STR_(45248M)
+#define BUILD_VERSION     _STR_(492de)
 #define SOFTWARE_VERSION  __STR(MAIN_VERSION)
 
 #endif