Skip to content

Commit

Permalink
新增发送文本处理器,新增拖放文件功能
Browse files Browse the repository at this point in the history
  • Loading branch information
changfeng1050 committed Jun 18, 2021
1 parent 9641b23 commit 697984e
Show file tree
Hide file tree
Showing 14 changed files with 1,526 additions and 187 deletions.
8 changes: 7 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,13 @@ set(SOURCE_FILES
serial/LineSerialController.h
data/TcpClientReadWriter.cpp
data/TcpClientReadWriter.h
data/SerialBridgeReadWriter.cpp data/SerialBridgeReadWriter.h)
data/SerialBridgeReadWriter.cpp
data/SerialBridgeReadWriter.h
DataProcessDialog.cpp
DataProcessDialog.h
utils/FileUtil.cpp
utils/FileUtil.h
)

#add_executable(SerialWizard ${SOURCE_FILES})
add_executable(SerialWizard WIN32 ${SOURCE_FILES})
Expand Down
1 change: 0 additions & 1 deletion CalculateCheckSumDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@


CalculateCheckSumDialog::CalculateCheckSumDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f) {

createUi();
createConnect();
}
Expand Down
4 changes: 1 addition & 3 deletions ConvertDataDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
const QString GBK = "GBK";
const QString UTF8 = "UTF8";

ConvertDataDialog::ConvertDataDialog(QWidget *parent, Qt::WindowFlags f) {

ConvertDataDialog::ConvertDataDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f) {
createUi();
createConnect();
}
Expand Down Expand Up @@ -166,6 +165,5 @@ void ConvertDataDialog::createConnect() {
}
resultTextEdit->setText(resultText);
}

});
}
3 changes: 0 additions & 3 deletions ConvertDataDialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#ifndef SERIALWIZARD_CALCULATECHECKSUMDIALOG_H
#define SERIALWIZARD_CALCULATECHECKSUMDIALOG_H


#include <QtWidgets/QDialog>

class QLineEdit;
Expand All @@ -25,7 +24,6 @@ Q_OBJECT
public:
explicit ConvertDataDialog(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());


private:
void createUi();

Expand All @@ -45,5 +43,4 @@ Q_OBJECT
QPushButton *convertButton;
};


#endif //SERIALWIZARD_CALCULATECHECKSUMDIALOG_H
Loading

0 comments on commit 697984e

Please sign in to comment.