[ref]同步711

This commit is contained in:
shi_jq 2025-03-17 11:05:15 +08:00
parent 65ca8f4a92
commit 409d23d2f6
30 changed files with 32 additions and 32 deletions

View File

@ -1,4 +1,4 @@
#include "AddObjAlarmDialog.h" #include "AddObjAlarmDialog.h"
#include "ui_AddObjAlarmDialog.h" #include "ui_AddObjAlarmDialog.h"
#include "AlarmMng.h" #include "AlarmMng.h"
#include "AlarmCalcParaTableDelegate.h" #include "AlarmCalcParaTableDelegate.h"

View File

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

View File

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

View File

@ -1,4 +1,4 @@
#ifndef ALARMCALCINFO_H #ifndef ALARMCALCINFO_H
#define ALARMCALCINFO_H #define ALARMCALCINFO_H
#include <QSharedPointer> #include <QSharedPointer>

View File

@ -1,4 +1,4 @@
#include "AlarmCalcParaTableDelegate.h" #include "AlarmCalcParaTableDelegate.h"
#include <QApplication> #include <QApplication>
#include <QPainter> #include <QPainter>
#include <QMouseEvent> #include <QMouseEvent>

View File

@ -1,4 +1,4 @@
#ifndef ALARMCALCPARATABLEDELEGATE_H #ifndef ALARMCALCPARATABLEDELEGATE_H
#define ALARMCALCPARATABLEDELEGATE_H #define ALARMCALCPARATABLEDELEGATE_H
#include <QStyledItemDelegate> #include <QStyledItemDelegate>

View File

@ -1,4 +1,4 @@
#include "AlarmCalcParaTableModel.h" #include "AlarmCalcParaTableModel.h"
AlarmCalcParaTableModel::AlarmCalcParaTableModel(QObject *parent,QTableView *view) AlarmCalcParaTableModel::AlarmCalcParaTableModel(QObject *parent,QTableView *view)
: m_view(view), : m_view(view),

View File

@ -1,4 +1,4 @@
#ifndef ALARMCALCPARATABLEMODEL_H #ifndef ALARMCALCPARATABLEMODEL_H
#define ALARMCALCPARATABLEMODEL_H #define ALARMCALCPARATABLEMODEL_H
#include <QAbstractTableModel> #include <QAbstractTableModel>

View File

@ -1,4 +1,4 @@
#include "AlarmDevTreeModel.h" #include "AlarmDevTreeModel.h"
#include "AlarmDevTreeView.h" #include "AlarmDevTreeView.h"
#include "QTreeWidgetItem" #include "QTreeWidgetItem"
#include <QTreeView> #include <QTreeView>

View File

@ -1,4 +1,4 @@
#ifndef ALARMDEVTREEMODEL_H #ifndef ALARMDEVTREEMODEL_H
#define ALARMDEVTREEMODEL_H #define ALARMDEVTREEMODEL_H
#include <QAbstractItemModel> #include <QAbstractItemModel>

View File

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

View File

@ -1,4 +1,4 @@
#ifndef ALARMDEVTREEVIEW_H #ifndef ALARMDEVTREEVIEW_H
#define ALARMDEVTREEVIEW_H #define ALARMDEVTREEVIEW_H
#include <QTreeView> #include <QTreeView>

View File

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

View File

@ -1,4 +1,4 @@
#include "AlarmManageForm.h" #include "AlarmManageForm.h"
#include "ui_AlarmManageForm.h" #include "ui_AlarmManageForm.h"
#include "AlarmManageWidget.h" #include "AlarmManageWidget.h"

View File

@ -1,4 +1,4 @@
#ifndef ALARMMANAGEFORM_H #ifndef ALARMMANAGEFORM_H
#define ALARMMANAGEFORM_H #define ALARMMANAGEFORM_H
#include <QWidget> #include <QWidget>

View File

@ -1,4 +1,4 @@
#include "AlarmManagePluginWidget.h" #include "AlarmManagePluginWidget.h"
#include "AlarmManageForm.h" #include "AlarmManageForm.h"
AlarmManagePluginWidget::AlarmManagePluginWidget(QObject *parent): QObject(parent) AlarmManagePluginWidget::AlarmManagePluginWidget(QObject *parent): QObject(parent)
{ {

View File

@ -1,4 +1,4 @@
#ifndef ALARMMANAGEPLUGINWIDGET_H #ifndef ALARMMANAGEPLUGINWIDGET_H
#define ALARMMANAGEPLUGINWIDGET_H #define ALARMMANAGEPLUGINWIDGET_H
#include <QObject> #include <QObject>
@ -8,7 +8,7 @@
class AlarmManagePluginWidget : public QObject, public CPluginWidgetInterface class AlarmManagePluginWidget : public QObject, 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 "AlarmManageWidget.h" #include "AlarmManageWidget.h"
#include "ui_AlarmManageWidget.h" #include "ui_AlarmManageWidget.h"
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"
#include "perm_mng_api/PermMngApi.h" #include "perm_mng_api/PermMngApi.h"

View File

@ -1,4 +1,4 @@
#ifndef ALARMMANAGEWIDGET_H #ifndef ALARMMANAGEWIDGET_H
#define ALARMMANAGEWIDGET_H #define ALARMMANAGEWIDGET_H
#include <QWidget> #include <QWidget>

View File

@ -1,4 +1,4 @@
#include "AlarmMng.h" #include "AlarmMng.h"
#include "public/pub_sysinfo_api/SysInfoApi.h" #include "public/pub_sysinfo_api/SysInfoApi.h"
#include "pub_utility_api/CharUtil.h" #include "pub_utility_api/CharUtil.h"
#include "perm_mng_api/PermMngApi.h" #include "perm_mng_api/PermMngApi.h"

View File

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

View File

@ -1,4 +1,4 @@
#include "AlarmPointTableModel.h" #include "AlarmPointTableModel.h"
#include "AlarmMng.h" #include "AlarmMng.h"
#include <QTableView> #include <QTableView>

View File

@ -1,4 +1,4 @@
#ifndef ALARMPOINTTABLEMODEL_H #ifndef ALARMPOINTTABLEMODEL_H
#define ALARMPOINTTABLEMODEL_H #define ALARMPOINTTABLEMODEL_H
#include <QAbstractTableModel> #include <QAbstractTableModel>

View File

@ -1,4 +1,4 @@
#include "AlarmPointTableView.h" #include "AlarmPointTableView.h"
#include <QHeaderView> #include <QHeaderView>
#include <QEvent> #include <QEvent>
#include <QPushButton> #include <QPushButton>

View File

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

View File

@ -1,4 +1,4 @@
#include "AlarmUuidBase64.h" #include "AlarmUuidBase64.h"
#include "boost/typeof/typeof.hpp" #include "boost/typeof/typeof.hpp"
#include "boost/algorithm/string/replace.hpp" #include "boost/algorithm/string/replace.hpp"

View File

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

View File

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

View File

@ -1,4 +1,4 @@
#ifndef POINTINFO_H #ifndef POINTINFO_H
#define POINTINFO_H #define POINTINFO_H
#include <QSharedPointer> #include <QSharedPointer>

View File

@ -1,4 +1,4 @@
#include "AlarmManageForm.h" #include "AlarmManageForm.h"
#include <QApplication> #include <QApplication>
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"
#include "service/perm_mng_api/PermMngApi.h" #include "service/perm_mng_api/PermMngApi.h"
@ -8,7 +8,7 @@ int main(int argc, char *argv[])
QApplication a(argc, argv); QApplication a(argc, argv);
std::string name="admin"; std::string name="admin";
std::string password ="kbdct"; std::string password ="admin";
iot_public::StartLogSystem("HMI", "hmi"); iot_public::StartLogSystem("HMI", "hmi");
iot_net::initMsgBus("HMI", "HMI"); iot_net::initMsgBus("HMI", "HMI");