[Add] this verison add the BCU select combox and next version I will delete some redundant info
This commit is contained in:
parent
27f3def00a
commit
8279590f38
|
@ -49,7 +49,7 @@ void AppSerial::setHWND(HWND hwnd)
|
||||||
this->m_hwnd = hwnd;
|
this->m_hwnd = hwnd;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool AppSerial::nativeEventFilter(const QByteArray &eventType, void *message, long *result)
|
bool AppSerial::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result)
|
||||||
{
|
{
|
||||||
Q_UNUSED(eventType);
|
Q_UNUSED(eventType);
|
||||||
Q_UNUSED(result);
|
Q_UNUSED(result);
|
||||||
|
|
|
@ -33,7 +33,7 @@ public:
|
||||||
void setHWND(HWND hwnd);
|
void setHWND(HWND hwnd);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
bool nativeEventFilter(const QByteArray &eventType, void *message, long *result);
|
bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -40,6 +40,7 @@ MainWindow::MainWindow(QWidget *parent)
|
||||||
m_AppProto = new AppProto;
|
m_AppProto = new AppProto;
|
||||||
m_AppProto_English = new Appproto_English;
|
m_AppProto_English = new Appproto_English;
|
||||||
connect(ui->tabWidget_paraset, SIGNAL(currentChanged(int)), this, SLOT(on_tabChanged(int)));
|
connect(ui->tabWidget_paraset, SIGNAL(currentChanged(int)), this, SLOT(on_tabChanged(int)));
|
||||||
|
connect(ui->comboBoxBCUSelect, &QComboBox::currentIndexChanged, this, &MainWindow::on_comBoxBCUSelect);
|
||||||
}
|
}
|
||||||
|
|
||||||
MainWindow::~MainWindow()
|
MainWindow::~MainWindow()
|
||||||
|
@ -111,12 +112,19 @@ void MainWindow::init()
|
||||||
statusBarConnectedIcon = new QLabel();
|
statusBarConnectedIcon = new QLabel();
|
||||||
statusBarConnectedType = new QLabel();
|
statusBarConnectedType = new QLabel();
|
||||||
statusBarCompany = new QLabel();
|
statusBarCompany = new QLabel();
|
||||||
|
statusBarBcu = new QLabel();
|
||||||
|
statusBarVersion = new QLabel();
|
||||||
statusBarConnectedIcon->setPixmap(QPixmap(QIcon(":/Image/connected1.png").pixmap(QSize(24, 24))));
|
statusBarConnectedIcon->setPixmap(QPixmap(QIcon(":/Image/connected1.png").pixmap(QSize(24, 24))));
|
||||||
statusBarConnectedType->setText("RS485");
|
statusBarConnectedType->setText("RS485");
|
||||||
statusBarCompany->setText("BLUESUN");
|
statusBarCompany->setText("BLUESUN");
|
||||||
|
|
||||||
|
statusBarBcu->setText("Current BCU: BCU01");
|
||||||
|
statusBarVersion->setText("UpperComputer Version : 1.0.0 ");
|
||||||
|
|
||||||
ui->statusbar->addWidget(statusBarConnectedIcon);
|
ui->statusbar->addWidget(statusBarConnectedIcon);
|
||||||
ui->statusbar->addWidget(statusBarConnectedType);
|
ui->statusbar->addWidget(statusBarConnectedType);
|
||||||
|
ui->statusbar->addWidget(statusBarVersion);
|
||||||
|
ui->statusbar->addWidget(statusBarBcu);
|
||||||
ui->statusbar->addPermanentWidget(statusBarCompany);
|
ui->statusbar->addPermanentWidget(statusBarCompany);
|
||||||
|
|
||||||
/* 菜单栏设置 */
|
/* 菜单栏设置 */
|
||||||
|
@ -202,6 +210,12 @@ void MainWindow::init()
|
||||||
ui->groupBox_trouble_control->setStyleSheet("background-color: #FFFFFF;");
|
ui->groupBox_trouble_control->setStyleSheet("background-color: #FFFFFF;");
|
||||||
// ui->groupBox_chart->setStyleSheet("background-color: #FFFFFF;");
|
// ui->groupBox_chart->setStyleSheet("background-color: #FFFFFF;");
|
||||||
ui->groupBox_class_color->setStyleSheet("QGroupBox { border: none; }");
|
ui->groupBox_class_color->setStyleSheet("QGroupBox { border: none; }");
|
||||||
|
ui->widget_historyAlarm->setStyleSheet("background-color: #FFFFFF;");
|
||||||
|
// ui->widget_BCUSelect->setStyleSheet("background-color: #FFFFFF;");
|
||||||
|
ui->pageHome->setStyleSheet("background-color: #FFFFFF;");
|
||||||
|
ui->comboBoxBCUSelect->setStyleSheet("background-color: #F8F8FF;");
|
||||||
|
// ui->comboBoxBCUSelect->setStyleSheet("QComboBox QAbstractItemView { background-color: #f0f0f0;}");
|
||||||
|
|
||||||
|
|
||||||
ui->BCU_DIDO->setStyleSheet("background-color: #FFFFFF;");
|
ui->BCU_DIDO->setStyleSheet("background-color: #FFFFFF;");
|
||||||
ui->BCU_alarm->setStyleSheet("background-color: #FFFFFF;");
|
ui->BCU_alarm->setStyleSheet("background-color: #FFFFFF;");
|
||||||
|
@ -210,6 +224,7 @@ void MainWindow::init()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//设置按钮的提示文本
|
//设置按钮的提示文本
|
||||||
ui->btnHome->setToolTip("概述信息(Overview Information)");
|
ui->btnHome->setToolTip("概述信息(Overview Information)");
|
||||||
ui->btnBattery->setToolTip("详细信息(Detailed Information)");
|
ui->btnBattery->setToolTip("详细信息(Detailed Information)");
|
||||||
|
@ -3126,34 +3141,32 @@ void MainWindow::pageParaSetInit_other_setting()
|
||||||
|
|
||||||
void MainWindow::slot_getBcuNumberFromDialoglogin(int number)
|
void MainWindow::slot_getBcuNumberFromDialoglogin(int number)
|
||||||
{
|
{
|
||||||
|
Q_UNUSED(number);
|
||||||
// QTreeView treeView;
|
// QTreeView treeView;
|
||||||
// 创建模型
|
// 创建模型
|
||||||
QStandardItemModel *model = new QStandardItemModel(ui->treeViewBCUbmu);
|
modelBCU = new QStandardItemModel(ui->treeViewBCUbmu);
|
||||||
// QMap<QModelIndex, int> indexTopPageMap;
|
// QMap<QModelIndex, int> indexTopPageMap;
|
||||||
|
|
||||||
//创建一级目录项数为可变的
|
//创建一级目录项数为可变的
|
||||||
QStringList bcuNames;
|
// QStringList bcuNames;
|
||||||
|
|
||||||
qDebug() << "number: " << number;
|
// qDebug() << "number: " << number;
|
||||||
for (int i = 1; i <= number; ++i) {
|
// for (int i = 1; i <= number; ++i) {
|
||||||
QString bcuName = QString("BCU%1").arg(i);
|
// QString bcuName = QString("BCU%1").arg(i);
|
||||||
bcuNames.append(bcuName);
|
// bcuNames.append(bcuName);
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
// qDebug() << "BCUNames" << bcuNames;
|
||||||
|
|
||||||
qDebug() << "BCUNames" << bcuNames;
|
|
||||||
|
|
||||||
// 创建一级目录项
|
// 创建一级目录项
|
||||||
int count = 0;
|
|
||||||
for (const QString &name : bcuNames)
|
rootItem = new QStandardItem("BCU01");
|
||||||
{
|
|
||||||
QStandardItem *rootItem = new QStandardItem(name);
|
|
||||||
// 设置一级目录项的字体为加粗
|
// 设置一级目录项的字体为加粗
|
||||||
QFont boldFont = rootItem->font();
|
QFont boldFont = rootItem->font();
|
||||||
boldFont.setBold(true);
|
boldFont.setBold(true);
|
||||||
rootItem->setFont(boldFont);
|
rootItem->setFont(boldFont);
|
||||||
count++;
|
modelBCU->appendRow(rootItem);
|
||||||
model->appendRow(rootItem);
|
|
||||||
|
|
||||||
for (int i = 1; i <= 26; ++i)
|
for (int i = 1; i <= 26; ++i)
|
||||||
{
|
{
|
||||||
|
@ -3161,7 +3174,7 @@ void MainWindow::slot_getBcuNumberFromDialoglogin(int number)
|
||||||
QStandardItem *bmuItem = new QStandardItem(bmuName);
|
QStandardItem *bmuItem = new QStandardItem(bmuName);
|
||||||
rootItem->appendRow(bmuItem);
|
rootItem->appendRow(bmuItem);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
ui->tabWidgetBCU->setCurrentIndex(0);
|
ui->tabWidgetBCU->setCurrentIndex(0);
|
||||||
ui->tabWidgetBMU->setCurrentIndex(0);
|
ui->tabWidgetBMU->setCurrentIndex(0);
|
||||||
|
@ -3183,7 +3196,7 @@ void MainWindow::slot_getBcuNumberFromDialoglogin(int number)
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
ui->treeViewBCUbmu->setModel(model);
|
ui->treeViewBCUbmu->setModel(modelBCU);
|
||||||
ui->treeViewBCUbmu->setHeaderHidden(true);
|
ui->treeViewBCUbmu->setHeaderHidden(true);
|
||||||
ui->treeViewBCUbmu->setAnimated(true);
|
ui->treeViewBCUbmu->setAnimated(true);
|
||||||
ui->treeViewBCUbmu->expandAll();
|
ui->treeViewBCUbmu->expandAll();
|
||||||
|
@ -4001,3 +4014,16 @@ void MainWindow::on_tabChanged(int index)
|
||||||
tabWidget_paraset_index = index;
|
tabWidget_paraset_index = index;
|
||||||
ui->pageParaSetCheck->setCheckState(Qt::Unchecked);
|
ui->pageParaSetCheck->setCheckState(Qt::Unchecked);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void MainWindow::on_comBoxBCUSelect()
|
||||||
|
{
|
||||||
|
QString BCUText = ui->comboBoxBCUSelect->currentText();
|
||||||
|
QString statusBarBCULabel = "Current BCU: ";
|
||||||
|
|
||||||
|
statusBarBcu->setText(statusBarBCULabel + BCUText);
|
||||||
|
rootItem->setText(BCUText);
|
||||||
|
|
||||||
|
//当改变BCU选择时,改变当前BCU读取的地址
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
|
@ -43,7 +43,13 @@ public:
|
||||||
QLabel *statusBarConnectedIcon;
|
QLabel *statusBarConnectedIcon;
|
||||||
QLabel *statusBarConnectedType;
|
QLabel *statusBarConnectedType;
|
||||||
QLabel *statusBarCompany;
|
QLabel *statusBarCompany;
|
||||||
|
QLabel *statusBarBcu;
|
||||||
|
QLabel *statusBarVersion;
|
||||||
ChartPaint *chartPat;
|
ChartPaint *chartPat;
|
||||||
|
|
||||||
|
QStandardItemModel *modelBCU; //设置BCU目录
|
||||||
|
QStandardItem *rootItem;
|
||||||
|
|
||||||
int BCUNumbers;
|
int BCUNumbers;
|
||||||
// QGridLayout *gridLayout;
|
// QGridLayout *gridLayout;
|
||||||
// QHBoxLayout *hBoxLayout;
|
// QHBoxLayout *hBoxLayout;
|
||||||
|
@ -144,6 +150,7 @@ private slots:
|
||||||
void on_pageParaSetRead_clicked();
|
void on_pageParaSetRead_clicked();
|
||||||
void on_pageParaSetWrite_clicked();
|
void on_pageParaSetWrite_clicked();
|
||||||
void on_tabChanged(int index);
|
void on_tabChanged(int index);
|
||||||
|
void on_comBoxBCUSelect();
|
||||||
// void on_horizontalSlider_valueChanged(int value);
|
// void on_horizontalSlider_valueChanged(int value);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
1856
mainwindow.ui
1856
mainwindow.ui
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue