software/x-tools
1
0
Fork 0
mirror of https://github.com/x-tools-author/x-tools.git synced 2025-09-15 15:28:40 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

chore: update files of project

Browse Source
This commit is contained in:
x-tools-author 2024-03-26 11:58:09 +08:00
parent bbdf0408f4
commit f48b441805
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/Tools/ToolsUI/xToolsBleCentralToolUi.cpp
View File

@ -1,5 +1,5 @@
/***************************************************************************************************
* Copyright 2023 x-tools-author(x-tools@outlook.com). All rights reserved.
* Copyright 2023-2024 x-tools-author(x-tools@outlook.com). All rights reserved.
*
* The file is encoded using "utf8 with bom", it is a part of xTools project.
*
@ -19,8 +19,6 @@
#include "xToolsLineEdit.h"
#include "xToolsSpinBox.h"
#define SAK_CB_I_C &QComboBox::currentIndexChanged
xToolsBleCentralToolUi::xToolsBleCentralToolUi(QWidget* parent)
: xToolsCommunicationToolUi{parent}
, ui(new Ui::xToolsBleCentralToolUi)
@ -33,19 +31,19 @@ xToolsBleCentralToolUi::xToolsBleCentralToolUi(QWidget* parent)
this,
&xToolsBleCentralToolUi::onPushButtonScanClicked);
connect(ui->comboBoxDevices,
static_cast<void (QComboBox::*)(int)>(SAK_CB_I_C),
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
this,
&xToolsBleCentralToolUi::onComboBoxDevicesActived);
connect(ui->comboBoxServices,
static_cast<void (QComboBox::*)(int)>(SAK_CB_I_C),
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
this,
&xToolsBleCentralToolUi::onComboBoxServicesCurrentIndexChanged);
connect(ui->comboBoxCharacteristics,
static_cast<void (QComboBox::*)(int)>(SAK_CB_I_C),
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
this,
&xToolsBleCentralToolUi::onComboBoxCharacteristicsActived);
connect(ui->comboBoxWriteWay,
static_cast<void (QComboBox::*)(int)>(SAK_CB_I_C),
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
this,
&xToolsBleCentralToolUi::onComboBoxWriteWayCurrentIndexChanged);
connect(ui->pushButtonNotify,
@ -78,7 +76,8 @@ xToolsBleCentralToolUi::~xToolsBleCentralToolUi()
delete ui;
}
void xToolsBleCentralToolUi::onBaseToolUiInitialized(xToolsBaseTool* tool, const QString& settingsGroup)
void xToolsBleCentralToolUi::onBaseToolUiInitialized(xToolsBaseTool* tool,
const QString& settingsGroup)
{
xToolsCommunicationToolUi::onBaseToolUiInitialized(tool, settingsGroup);
@ -120,10 +119,9 @@ void xToolsBleCentralToolUi::initSettingsMenu(const QString& settingsGroup)
sp->setValue(120);
sp->setGroupKey(settingsGroup, "timeoutInterval");
gl->addWidget(sp, rowIndex, 1, 1, 1);
connect(sp,
QOverload<int>::of(&QSpinBox::valueChanged),
this,
[=](int v) { ui->comboBoxDevices->setTimeoutInterval(v); });
connect(sp, QOverload<int>::of(&QSpinBox::valueChanged), this, [=](int v) {
ui->comboBoxDevices->setTimeoutInterval(v);
});
rowIndex += 1;
gl->addWidget(new QLabel(tr("Name filtter"), w), rowIndex, 0, 1, 1);
@ -175,7 +173,6 @@ void xToolsBleCentralToolUi::onServiceDiscoveryFinished()
for (auto& service : services) {
auto cookedSerivce = service.value<QLowEnergyService*>();
ui->comboBoxServices->addItem(cookedSerivce->serviceName(), service);
#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
connect(cookedSerivce,
&QLowEnergyService::stateChanged,
this,
@ -184,13 +181,12 @@ void xToolsBleCentralToolUi::onServiceDiscoveryFinished()
onComboBoxServicesCurrentIndexChanged();
}
});
#endif
}
ui->progressBar->hide();
}
void xToolsBleCentralToolUi::onDescriptorWritten(const QLowEnergyDescriptor& descriptor,
const QByteArray& newValue)
const QByteArray& newValue)
{
Q_UNUSED(descriptor)
Q_UNUSED(newValue)

2
Source/Tools/ToolsUI/xToolsBleCentralToolUi.h
View File

@ -1,5 +1,5 @@
/***************************************************************************************************
* Copyright 2023 x-tools-author(x-tools@outlook.com). All rights reserved.
* Copyright 2023-2024 x-tools-author(x-tools@outlook.com). All rights reserved.
*
* The file is encoded using "utf8 with bom", it is a part of xTools project.
*