[ref]同步711

This commit is contained in:
shi_jq 2025-03-17 10:24:26 +08:00
parent c7f3b4c49a
commit 65ca8f4a92
30 changed files with 31 additions and 32 deletions

View File

@ -1,4 +1,4 @@
#include "CAlarmCompare.h" #include "CAlarmCompare.h"
#include "ui_CAlarmCompare.h" #include "ui_CAlarmCompare.h"
CAlarmCompare::CAlarmCompare(QWidget *parent) : CAlarmCompare::CAlarmCompare(QWidget *parent) :

View File

@ -1,4 +1,4 @@
#ifndef CALARMCOMPARE_H #ifndef CALARMCOMPARE_H
#define CALARMCOMPARE_H #define CALARMCOMPARE_H
#include <QMainWindow> #include <QMainWindow>

View File

@ -1,4 +1,4 @@
#ifndef CALARMLEVELCOMBOBOX_H #ifndef CALARMLEVELCOMBOBOX_H
#define CALARMLEVELCOMBOBOX_H #define CALARMLEVELCOMBOBOX_H
#include <QVariant> #include <QVariant>

View File

@ -1,4 +1,4 @@
#include "CAlarmModel.h" #include "CAlarmModel.h"
CAlarmModel::CAlarmModel() CAlarmModel::CAlarmModel()
{ {

View File

@ -1,4 +1,4 @@
#ifndef CALARMMODEL_H #ifndef CALARMMODEL_H
#define CALARMMODEL_H #define CALARMMODEL_H
#include <QObject> #include <QObject>

View File

@ -1,4 +1,4 @@
#include "CAlarmReport.h" #include "CAlarmReport.h"
#include "ui_CAlarmReport.h" #include "ui_CAlarmReport.h"
#include "CommonFunction.h" #include "CommonFunction.h"

View File

@ -1,4 +1,4 @@
#ifndef CALARMREPORT_H #ifndef CALARMREPORT_H
#define CALARMREPORT_H #define CALARMREPORT_H
#include <QDialog> #include <QDialog>

View File

@ -1,4 +1,4 @@
#include "CAlarmStatistics.h" #include "CAlarmStatistics.h"
#include "ui_CAlarmStatistics.h" #include "ui_CAlarmStatistics.h"
#include "pub_utility_api/I18N.h" #include "pub_utility_api/I18N.h"
#include "pub_utility_api/FileStyle.h" #include "pub_utility_api/FileStyle.h"
@ -87,7 +87,6 @@ CAlarmStatistics::~CAlarmStatistics()
delete m_pProcessDialog; delete m_pProcessDialog;
m_pProcessDialog = NULL; m_pProcessDialog = NULL;
m_pQueryThread->wait();
delete m_pQueryThread; delete m_pQueryThread;
m_pQueryThread = NULL; m_pQueryThread = NULL;

View File

@ -1,4 +1,4 @@
#ifndef CALARMSTATISTICS_H #ifndef CALARMSTATISTICS_H
#define CALARMSTATISTICS_H #define CALARMSTATISTICS_H
#include <QMainWindow> #include <QMainWindow>

View File

@ -1,4 +1,4 @@
#include <QWidget> #include <QWidget>
#include "CAlarmStatisticsPluginWidget.h" #include "CAlarmStatisticsPluginWidget.h"
#include "CAlarmStatistics.h" #include "CAlarmStatistics.h"

View File

@ -1,4 +1,4 @@
#ifndef CALARMSTATISTICSPLUGINWIDGET_H #ifndef CALARMSTATISTICSPLUGINWIDGET_H
#define CALARMSTATISTICSPLUGINWIDGET_H #define CALARMSTATISTICSPLUGINWIDGET_H
#include <QObject> #include <QObject>
@ -8,7 +8,7 @@
class CAlarmStatisticsPluginWidget : public QWidget, public CPluginWidgetInterface class CAlarmStatisticsPluginWidget : public QWidget, public CPluginWidgetInterface
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0") Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
Q_INTERFACES(CPluginWidgetInterface) Q_INTERFACES(CPluginWidgetInterface)
public: public:

View File

@ -1,4 +1,4 @@
#include "CCompareQueryThread.h" #include "CCompareQueryThread.h"
using namespace iot_public; using namespace iot_public;
using namespace iot_dbms; using namespace iot_dbms;

View File

@ -1,4 +1,4 @@
#ifndef CCOMPAREQUERYTHREAD_H #ifndef CCOMPAREQUERYTHREAD_H
#define CCOMPAREQUERYTHREAD_H #define CCOMPAREQUERYTHREAD_H
#include <QObject> #include <QObject>

View File

@ -1,4 +1,4 @@
#include "CProcessDialog.h" #include "CProcessDialog.h"
#include "ui_CProcessDialog.h" #include "ui_CProcessDialog.h"
#include <QDebug> #include <QDebug>

View File

@ -1,4 +1,4 @@
#ifndef CPROCESSDIALOG_H #ifndef CPROCESSDIALOG_H
#define CPROCESSDIALOG_H #define CPROCESSDIALOG_H
#include <QDialog> #include <QDialog>

View File

@ -1,4 +1,4 @@
#include "CStatisticsQueryThread.h" #include "CStatisticsQueryThread.h"
using namespace iot_public; using namespace iot_public;
using namespace iot_dbms; using namespace iot_dbms;

View File

@ -1,4 +1,4 @@
#ifndef CSTATISTICSQUERYTHREAD_H #ifndef CSTATISTICSQUERYTHREAD_H
#define CSTATISTICSQUERYTHREAD_H #define CSTATISTICSQUERYTHREAD_H
#include <QObject> #include <QObject>

View File

@ -1,4 +1,4 @@
#include "CTableWidget.h" #include "CTableWidget.h"
#include <QHeaderView> #include <QHeaderView>
CTableWidget::CTableWidget(QWidget *parent) CTableWidget::CTableWidget(QWidget *parent)

View File

@ -1,4 +1,4 @@
#ifndef CTABLEWIDGET_H #ifndef CTABLEWIDGET_H
#define CTABLEWIDGET_H #define CTABLEWIDGET_H
#include <QTableWidget> #include <QTableWidget>

View File

@ -1,4 +1,4 @@
#include <QProcess> #include <QProcess>
#include "CWaveListDialog.h" #include "CWaveListDialog.h"
#include "ui_CWaveListDialog.h" #include "ui_CWaveListDialog.h"
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"

View File

@ -1,4 +1,4 @@
#ifndef CWAVELISTDIALOG_H #ifndef CWAVELISTDIALOG_H
#define CWAVELISTDIALOG_H #define CWAVELISTDIALOG_H
#include <QDialog> #include <QDialog>

View File

@ -1,4 +1,4 @@
#ifndef COMMONDEFINE_H #ifndef COMMONDEFINE_H
#define COMMONDEFINE_H #define COMMONDEFINE_H
#define CN_MAXBARSERIES 5 // 最多柱状图组数 #define CN_MAXBARSERIES 5 // 最多柱状图组数

View File

@ -1,4 +1,4 @@
#include "CommonFunction.h" #include "CommonFunction.h"
void resizeColumnsToContents(QTableView* pView , int scaleColumn) void resizeColumnsToContents(QTableView* pView , int scaleColumn)
{ {

View File

@ -1,4 +1,4 @@
#ifndef COMMONFUNCTION_H #ifndef COMMONFUNCTION_H
#define COMMONFUNCTION_H #define COMMONFUNCTION_H
#include <QTableView> #include <QTableView>

View File

@ -1,4 +1,4 @@
#ifndef SALARMINFO_H #ifndef SALARMINFO_H
#define SALARMINFO_H #define SALARMINFO_H
#include <QString> #include <QString>

View File

@ -1,4 +1,4 @@
#ifndef SALARMLEVEL_H #ifndef SALARMLEVEL_H
#define SALARMLEVEL_H #define SALARMLEVEL_H
#include <QString> #include <QString>

View File

@ -1,4 +1,4 @@
#ifndef SALARMLIST_H #ifndef SALARMLIST_H
#define SALARMLIST_H #define SALARMLIST_H
#include <QList> #include <QList>

View File

@ -1,4 +1,4 @@
#ifndef SDEVICEGROUP_H #ifndef SDEVICEGROUP_H
#define SDEVICEGROUP_H #define SDEVICEGROUP_H
#include <QString> #include <QString>

View File

@ -1,4 +1,4 @@
#ifndef SLOCATION_H #ifndef SLOCATION_H
#define SLOCATION_H #define SLOCATION_H
#include <QList> #include <QList>

View File

@ -1,4 +1,4 @@
#include "CAlarmStatistics.h" #include "CAlarmStatistics.h"
#include <QApplication> #include <QApplication>
#include <QFile> #include <QFile>
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"