chore: update files of project

This commit is contained in:
x-tools-author 2024-03-20 09:13:34 +08:00
parent c49e507b38
commit fd6f2e1cf7
12 changed files with 48 additions and 47 deletions

View File

@ -37,7 +37,7 @@
#include "xToolsToolFactory.h"
#include "sakudptransmittertoolui.h"
#include "sakuiinterface.h"
#include "sakwebsockettransmittertoolui.h"
#include "xToolsWebSocketTransmitterToolUi.h"
#ifdef SAK_IMPORT_MODULE_BLUETOOTH
#include "sakblecentraltoolui.h"
@ -593,7 +593,7 @@ void xToolsToolBoxUi::initTools()
m_udpTransmitterUi = new SAKUdpTransmitterToolUi(this);
m_udpTransmitterUi->initialize(m_toolBox->getUdpTransmitterTool(),
settingsGroup() + "/udpTransmitter");
m_webSocketTransmitterUi = new SAKWebSocketTransmitterToolUi(this);
m_webSocketTransmitterUi = new xToolsWebSocketTransmitterToolUi(this);
m_webSocketTransmitterUi->initialize(m_toolBox->getWebSocketTransmitterTool(),
settingsGroup() + "/webSocketTransmitter");
m_serialPortTransmitterUi = new SAKSerialPortTransmitterToolUi(this);

View File

@ -31,7 +31,7 @@ class SAKCommunicationToolUi;
class SAKTcpTransmitterToolUi;
class SAKUdpTransmitterToolUi;
class xToolsToolBoxUiCommunicationMenu;
class SAKWebSocketTransmitterToolUi;
class xToolsWebSocketTransmitterToolUi;
class SAKSerialPortTransmitterToolUi;
class xToolsToolBoxUi : public QWidget
{
@ -55,7 +55,7 @@ private:
SAKPrestorerToolUi *m_prestorerUi{nullptr};
SAKTcpTransmitterToolUi *m_tcpTransmitterUi{nullptr};
SAKUdpTransmitterToolUi *m_udpTransmitterUi{nullptr};
SAKWebSocketTransmitterToolUi *m_webSocketTransmitterUi{nullptr};
xToolsWebSocketTransmitterToolUi *m_webSocketTransmitterUi{nullptr};
SAKSerialPortTransmitterToolUi *m_serialPortTransmitterUi{nullptr};
QTimer *m_cycleSendingTimer{nullptr};
int m_communicationType;

View File

@ -356,7 +356,7 @@
</widget>
</item>
<item>
<widget class="SAKVelometerToolUi" name="widgetRxVelometer" native="true">
<widget class="xToolsVelometerToolUi" name="widgetRxVelometer" native="true">
<property name="minimumSize">
<size>
<width>20</width>
@ -388,7 +388,7 @@
</widget>
</item>
<item>
<widget class="SAKVelometerToolUi" name="widgetTxVelometer" native="true">
<widget class="xToolsVelometerToolUi" name="widgetTxVelometer" native="true">
<property name="minimumSize">
<size>
<width>20</width>
@ -519,9 +519,9 @@
<header location="global">sakcombobox.h</header>
</customwidget>
<customwidget>
<class>SAKVelometerToolUi</class>
<class>xToolsVelometerToolUi</class>
<extends>QWidget</extends>
<header location="global">sakvelometertoolui.h</header>
<header location="global">xToolsVelometerToolUi.h</header>
<container>1</container>
</customwidget>
<customwidget>

View File

@ -10,7 +10,7 @@
#include <QCoreApplication>
#include "sakanalyzertoolui.h"
#include "xToolsAnalyzerToolUi.h"
#include "sakcrccalculatortoolui.h"
#include "sakemittertoolui.h"
#include "sakmaskertoolui.h"
@ -26,8 +26,8 @@
#include "saktcptransmittertoolti.h"
#include "xToolsToolFactory.h"
#include "sakudptransmittertoolui.h"
#include "sakvelometertoolui.h"
#include "sakwebsockettransmittertoolui.h"
#include "xToolsVelometerToolUi.h"
#include "xToolsWebSocketTransmitterToolUi.h"
#ifdef SAK_IMPORT_MODULE_BLUETOOTH
#include "sakblecentraltoolui.h"
@ -51,7 +51,7 @@ SAKBaseToolUi *SAKToolUiFactory::createToolUi(int type)
{
switch (type) {
case xToolsToolFactory::AnalyzerTool:
return new SAKAnalyzerToolUi();
return new xToolsAnalyzerToolUi();
case xToolsToolFactory::SerialportTool:
return new SAKSerialPortToolUi();
case xToolsToolFactory::EmitterTool:
@ -65,7 +65,7 @@ SAKBaseToolUi *SAKToolUiFactory::createToolUi(int type)
case xToolsToolFactory::PrestoreTool:
return new SAKPrestorerToolUi();
case xToolsToolFactory::VelometerTool:
return new SAKVelometerToolUi();
return new xToolsVelometerToolUi();
case xToolsToolFactory::UdpClientTool:
return new SAKSocketClientToolUi();
case xToolsToolFactory::UdpServerTool:
@ -91,7 +91,7 @@ SAKBaseToolUi *SAKToolUiFactory::createToolUi(int type)
case xToolsToolFactory::TcpTransmitterTool:
return new SAKTcpTransmitterToolUi();
case xToolsToolFactory::WebSocketTransmitterTool:
return new SAKWebSocketTransmitterToolUi();
return new xToolsWebSocketTransmitterToolUi();
case xToolsToolFactory::CrcCalculatorTool:
return new SAKCrcCalculatorToolUi();
default:

View File

@ -6,27 +6,27 @@
* xTools is licensed according to the terms in the file LICENCE(GPL V3) in the root of the source
* code directory.
**************************************************************************************************/
#include "sakanalyzertoolui.h"
#include "xToolsAnalyzerToolUi.h"
#include "ui_xToolsAnalyzerToolUi.h"
#include "xToolsAnalyzerTool.h"
#include "sakdatastructure.h"
#include "sakinterface.h"
#include "sakuiinterface.h"
#include "ui_sakanalyzertoolui.h"
SAKAnalyzerToolUi::SAKAnalyzerToolUi(QWidget *parent)
xToolsAnalyzerToolUi::xToolsAnalyzerToolUi(QWidget *parent)
: SAKBaseToolUi{parent}
, ui(new Ui::SAKAnalyzerToolUi)
, ui(new Ui::xToolsAnalyzerToolUi)
{
ui->setupUi(this);
}
void SAKAnalyzerToolUi::setToolName(const QString &name)
void xToolsAnalyzerToolUi::setToolName(const QString &name)
{
ui->groupBox->setTitle(name);
}
void SAKAnalyzerToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool, const QString &settingsGroup)
void xToolsAnalyzerToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool, const QString &settingsGroup)
{
int format = SAKDataStructure::TextFormatHex;
SAKUiInterface::setValidator(ui->lineEditSeparationMark, format);

View File

@ -11,18 +11,18 @@
#include "sakbasetoolui.h"
namespace Ui {
class SAKAnalyzerToolUi;
class xToolsAnalyzerToolUi;
}
class xToolsAnalyzerTool;
class SAKAnalyzerToolUi : public SAKBaseToolUi
class xToolsAnalyzerToolUi : public SAKBaseToolUi
{
Q_OBJECT
public:
explicit SAKAnalyzerToolUi(QWidget *parent = nullptr);
explicit xToolsAnalyzerToolUi(QWidget *parent = nullptr);
void setToolName(const QString &name);
virtual void onBaseToolUiInitialized(xToolsBaseTool *tool, const QString &settingsGroup) final;
private:
Ui::SAKAnalyzerToolUi *ui;
Ui::xToolsAnalyzerToolUi *ui;
};

View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SAKAnalyzerToolUi</class>
<widget class="QWidget" name="SAKAnalyzerToolUi">
<class>xToolsAnalyzerToolUi</class>
<widget class="QWidget" name="xToolsAnalyzerToolUi">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>270</width>
<width>298</width>
<height>144</height>
</rect>
</property>

View File

@ -6,23 +6,24 @@
* xTools is licensed according to the terms in the file LICENCE(GPL V3) in the root of the source
* code directory.
**************************************************************************************************/
#include "sakvelometertoolui.h"
#include "xToolsVelometerTool.h"
#include "ui_sakvelometertoolui.h"
#include "xToolsVelometerToolUi.h"
#include "ui_xToolsVelometerToolUi.h"
SAKVelometerToolUi::SAKVelometerToolUi(QWidget *parent)
#include "xToolsVelometerTool.h"
xToolsVelometerToolUi::xToolsVelometerToolUi(QWidget *parent)
: SAKBaseToolUi(parent)
, ui(new Ui::SAKVelometerToolUi)
, ui(new Ui::xToolsVelometerToolUi)
{
ui->setupUi(this);
}
SAKVelometerToolUi::~SAKVelometerToolUi()
xToolsVelometerToolUi::~xToolsVelometerToolUi()
{
delete ui;
}
void SAKVelometerToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool, const QString &settingsGroup)
void xToolsVelometerToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool, const QString &settingsGroup)
{
Q_UNUSED(settingsGroup)

View File

@ -12,20 +12,20 @@
#include <QLoggingCategory>
namespace Ui {
class SAKVelometerToolUi;
class xToolsVelometerToolUi;
}
class SAKVelometerToolUi : public SAKBaseToolUi
class xToolsVelometerToolUi : public SAKBaseToolUi
{
Q_OBJECT
public:
SAKVelometerToolUi(QWidget *parent = nullptr);
~SAKVelometerToolUi();
xToolsVelometerToolUi(QWidget *parent = nullptr);
~xToolsVelometerToolUi();
protected:
virtual void onBaseToolUiInitialized(xToolsBaseTool *tool, const QString &settingsGroup) final;
private:
const QLoggingCategory mLoggingCategory{"sak.velometertoolui"};
Ui::SAKVelometerToolUi *ui;
Ui::xToolsVelometerToolUi *ui;
};

View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SAKVelometerToolUi</class>
<widget class="QWidget" name="SAKVelometerToolUi">
<class>xToolsVelometerToolUi</class>
<widget class="QWidget" name="xToolsVelometerToolUi">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>116</width>
<width>124</width>
<height>17</height>
</rect>
</property>

View File

@ -6,13 +6,13 @@
* xTools is licensed according to the terms in the file LICENCE(GPL V3) in the root of the source
* code directory.
**************************************************************************************************/
#include "sakwebsockettransmittertoolui.h"
#include "xToolsWebSocketTransmitterToolUi.h"
SAKWebSocketTransmitterToolUi::SAKWebSocketTransmitterToolUi(QWidget *parent)
xToolsWebSocketTransmitterToolUi::xToolsWebSocketTransmitterToolUi(QWidget *parent)
: SAKSocketClientTransmitterToolUi("SAK.WebSocketTransmitterToolUi", parent)
{}
void SAKWebSocketTransmitterToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool,
void xToolsWebSocketTransmitterToolUi::onBaseToolUiInitialized(xToolsBaseTool *tool,
const QString &settingGroup)
{
SAKSocketClientTransmitterToolUi::onBaseToolUiInitialized(tool, settingGroup);

View File

@ -10,11 +10,11 @@
#include "saksocketclienttransmittertoolui.h"
class SAKWebSocketTransmitterToolUi : public SAKSocketClientTransmitterToolUi
class xToolsWebSocketTransmitterToolUi : public SAKSocketClientTransmitterToolUi
{
Q_OBJECT
public:
SAKWebSocketTransmitterToolUi(QWidget *parent = nullptr);
xToolsWebSocketTransmitterToolUi(QWidget *parent = nullptr);
protected:
virtual void onBaseToolUiInitialized(xToolsBaseTool *tool, const QString &settingGroup) override;