diff --git a/appserial.cpp b/appserial.cpp
index 9947200..f79b337 100644
--- a/appserial.cpp
+++ b/appserial.cpp
@@ -49,7 +49,7 @@ void AppSerial::setHWND(HWND hwnd)
this->m_hwnd = hwnd;
}
-bool AppSerial::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result)
+bool AppSerial::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
{
Q_UNUSED(eventType);
Q_UNUSED(result);
diff --git a/appserial.h b/appserial.h
index 554d1b8..335b879 100644
--- a/appserial.h
+++ b/appserial.h
@@ -33,7 +33,7 @@ public:
void setHWND(HWND hwnd);
protected:
- bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result);
+ bool nativeEventFilter(const QByteArray &eventType, void *message, long *result);
signals:
/**
diff --git a/dialoglogin.ui b/dialoglogin.ui
index 297468b..01bf0d8 100644
--- a/dialoglogin.ui
+++ b/dialoglogin.ui
@@ -35,6 +35,12 @@
-
+
+
+ 黑体
+ 10
+
+
Connect
@@ -42,12 +48,24 @@
-
+
+
+ 黑体
+ 11
+
+
Communication
-
+
+
+ 黑体
+ 10
+
+
-
5
@@ -71,10 +89,23 @@
-
-
+
+
+
+ 黑体
+ 10
+
+
+
-
+
+
+ 黑体
+ 10
+
+
-
1
@@ -89,6 +120,12 @@
-
+
+
+ 黑体
+ 10
+
+
-
1
@@ -173,6 +210,12 @@
-
+
+
+ 黑体
+ 10
+
+
-
1200
@@ -217,6 +260,12 @@
-
+
+
+ 黑体
+ 10
+
+
Baud Rate
@@ -224,6 +273,12 @@
-
+
+
+ 黑体
+ 10
+
+
Stop Bits
@@ -231,6 +286,12 @@
-
+
+
+ 黑体
+ 10
+
+
BCU Quantity
@@ -238,6 +299,12 @@
-
+
+
+ 黑体
+ 10
+
+
Serial Port
@@ -245,6 +312,12 @@
-
+
+
+ 黑体
+ 10
+
+
Parity
@@ -252,6 +325,12 @@
-
+
+
+ 黑体
+ 10
+
+
Data Bits
@@ -259,6 +338,12 @@
-
+
+
+ 黑体
+ 10
+
+
-
None
@@ -278,6 +363,12 @@
-
+
+
+ 黑体
+ 10
+
+
Language
@@ -285,6 +376,12 @@
-
+
+
+ 黑体
+ 10
+
+
-
Chinese
diff --git a/main.cpp b/main.cpp
index acb8baa..d978a69 100644
--- a/main.cpp
+++ b/main.cpp
@@ -4,6 +4,16 @@
int main(int argc, char *argv[])
{
+ // 设置高DPI
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+ QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+ QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+ QGuiApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
+ QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
+#endif
+#endif
+
QApplication a(argc, argv);
a.setStyleSheet("QToolTip { font-size: 18px; font-family: 'SimHei'; }");
DialogLogin loginWidget;
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 883533a..bf8e39c 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -41,7 +41,7 @@ MainWindow::MainWindow(QWidget *parent)
m_AppProto = new AppProto;
m_AppProto_English = new Appproto_English;
connect(ui->tabWidget_paraset, SIGNAL(currentChanged(int)), this, SLOT(on_tabChanged(int)));
- connect(ui->comboBoxBCUSelect, &QComboBox::currentIndexChanged, this, &MainWindow::on_comBoxBCUSelect);
+ connect(ui->comboBoxBCUSelect, SIGNAL(currentIndexChanged(int)), this, SLOT(on_comBoxBCUSelect(int)));
}
MainWindow::~MainWindow()
@@ -1494,6 +1494,7 @@ void MainWindow::pageHomeHistoryAlarm()
ui->tableView_history_alarm->setSortingEnabled(false);
/*设置是否显示网格线*/
ui->tableView_history_alarm->setShowGrid(true);
+ ui->tableView_history_alarm->sizePolicy();
/*设置垂直表头是否可见*/
ui->tableView_history_alarm->verticalHeader()->setVisible(false);
/*设置选中一行表头是否加粗--不加粗*/
@@ -1503,7 +1504,7 @@ void MainWindow::pageHomeHistoryAlarm()
/*设置行标题最小宽度尺寸*/
ui->tableView_history_alarm->horizontalHeader()->setMinimumSectionSize(0);
/*设置行标题最小高度*/
- ui->tableView_history_alarm->horizontalHeader()->setFixedHeight(35);
+ ui->tableView_history_alarm->horizontalHeader()->setFixedHeight(30);
/*设置表头是否可以单击--不可单击*/
ui->tableView_history_alarm->horizontalHeader()->setSectionsClickable(false);
ui->tableView_history_alarm->verticalHeader()->setHidden(false);
@@ -1522,12 +1523,12 @@ void MainWindow::pageHomeHistoryAlarm()
QStringList columnNames;
QList columnWidths;
columnNames << "时间" << "告警名称" << "BCUId" << "状态";
- columnWidths << 240 << 240 << 240 << 240;
+ columnWidths << 360 << 240 << 240 << 240;
QStringList columnNames_english;
QList columnWidths_english;
columnNames_english << "Time" << "Alarm Name" << "BCUId" << "Status";
- columnWidths_english << 240 << 240 << 240 << 240;
+ columnWidths_english << 360 << 240 << 240 << 240;
if(lan == 0)
{
@@ -1638,12 +1639,12 @@ void MainWindow::pageFlashGetVersion()
QStringList columnNames;
QList columnWidths;
columnNames << "ID" << "升级前版本号" << "升级后版本号" ;
- columnWidths << 120 << 240 << 240 ;
+ columnWidths << 120 << 360 << 360 ;
QStringList columnNames_english;
QList columnWidths_english;
columnNames_english << "ID" << "Version before upgrade" << "Version after upgrade" ;
- columnWidths_english << 120 << 240 << 240 ;
+ columnWidths_english << 120 << 360 << 360 ;
if(lan == 0)
{
@@ -3776,7 +3777,14 @@ void MainWindow::slot_pageHomeFault(QByteArray byteArray, int dataType, uint16_t
model_history_alarm->setItem(count_history_alarm, 0, new QStandardItem(timeStr));
model_history_alarm->setItem(count_history_alarm, 1, new QStandardItem(trouble_list[i]->text()));
model_history_alarm->setItem(count_history_alarm, 2, new QStandardItem(currentBCU));
- model_history_alarm->setItem(count_history_alarm, 3, new QStandardItem("一级报警"));
+ if (lan == 0)
+ {
+ model_history_alarm->setItem(count_history_alarm, 3, new QStandardItem("Level 1 Alarm"));
+ }
+ else if (lan == 1)
+ {
+ model_history_alarm->setItem(count_history_alarm, 3, new QStandardItem("一级报警"));
+ }
count_history_alarm++;
}
else if (list_result[i] == "10")
@@ -3786,7 +3794,14 @@ void MainWindow::slot_pageHomeFault(QByteArray byteArray, int dataType, uint16_t
model_history_alarm->setItem(count_history_alarm, 0, new QStandardItem(timeStr));
model_history_alarm->setItem(count_history_alarm, 1, new QStandardItem(trouble_list[i]->text()));
model_history_alarm->setItem(count_history_alarm, 2, new QStandardItem(currentBCU));
- model_history_alarm->setItem(count_history_alarm, 3, new QStandardItem("二级报警"));
+ if (lan == 0)
+ {
+ model_history_alarm->setItem(count_history_alarm, 3, new QStandardItem("Level 2 Alarm"));
+ }
+ else if (lan == 1)
+ {
+ model_history_alarm->setItem(count_history_alarm, 3, new QStandardItem("二级报警"));
+ }
count_history_alarm++;
}
else if (list_result[i] == "11")
@@ -3796,7 +3811,14 @@ void MainWindow::slot_pageHomeFault(QByteArray byteArray, int dataType, uint16_t
model_history_alarm->setItem(count_history_alarm, 0, new QStandardItem(timeStr));
model_history_alarm->setItem(count_history_alarm, 1, new QStandardItem(trouble_list[i]->text()));
model_history_alarm->setItem(count_history_alarm, 2, new QStandardItem(currentBCU));
- model_history_alarm->setItem(count_history_alarm, 3, new QStandardItem("三级报警"));
+ if (lan == 0)
+ {
+ model_history_alarm->setItem(count_history_alarm, 3, new QStandardItem("Level 3 Alarm"));
+ }
+ else if (lan == 1)
+ {
+ model_history_alarm->setItem(count_history_alarm, 3, new QStandardItem("三级报警"));
+ }
count_history_alarm++;
}
else
@@ -4223,7 +4245,7 @@ void MainWindow::on_tabChanged(int index)
ui->pageParaSetCheck->setCheckState(Qt::Unchecked);
}
-void MainWindow::on_comBoxBCUSelect()
+void MainWindow::on_comBoxBCUSelect(int index)
{
QString BCUText = ui->comboBoxBCUSelect->currentText();
QString statusBarBCULabel = "Current BCU: ";
diff --git a/mainwindow.h b/mainwindow.h
index 82981c9..2e8ef3f 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -173,7 +173,7 @@ private slots:
void on_pageParaSetRead_clicked();
void on_pageParaSetWrite_clicked();
void on_tabChanged(int index);
- void on_comBoxBCUSelect();
+ void on_comBoxBCUSelect(int index);
// void on_horizontalSlider_valueChanged(int value);
void on_btn_close_pos_clicked();
diff --git a/mainwindow.ui b/mainwindow.ui
index 8578f84..89fd8ad 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -281,7 +281,7 @@ background-color: rgba(255, 255, 255, 0);
- 4
+ 0
@@ -2017,6 +2017,12 @@ background-color: rgba(255, 255, 255, 0);
-
+
+
+ 黑体
+ 12
+
+
继电器状态
@@ -2029,8 +2035,8 @@ background-color: rgba(255, 255, 255, 0);
- 微软雅黑
- 9
+ 黑体
+ 10
@@ -2048,8 +2054,8 @@ background-color: rgba(255, 255, 255, 0);
- 微软雅黑
- 9
+ 黑体
+ 10
@@ -2064,8 +2070,8 @@ background-color: rgba(255, 255, 255, 0);
- 微软雅黑
- 9
+ 黑体
+ 10
@@ -2080,8 +2086,8 @@ background-color: rgba(255, 255, 255, 0);
- 微软雅黑
- 9
+ 黑体
+ 10
@@ -2282,6 +2288,12 @@ background-color: rgba(255, 255, 255, 0);
0
+
+
+ 黑体
+ 10
+
+
-
BCU01
@@ -2372,6 +2384,12 @@ background-color: rgba(255, 255, 255, 0);
0
+
+
+ 黑体
+ 10
+
+
BCU选择：
@@ -2444,7 +2462,7 @@ background-color: rgba(255, 255, 255, 0);
-
- 0
+ 1