GZHM/HM-SPMS
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ref]同步711

Browse Source
This commit is contained in:
shi_jq 2025-03-17 15:06:54 +08:00
parent 46de2e029d
commit 499b61b93e
382 changed files with 647 additions and 631 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
product/src/gui/plugin/HtmlBrowserWidget/CBrowserPluginWidget.cpp
View File

@ -1,4 +1,4 @@
#include <QWidget> #include <QWidget>
#include "CBrowserPluginWidget.h" #include "CBrowserPluginWidget.h"
#include "CBrowserWidget.h" #include "CBrowserWidget.h"

4
product/src/gui/plugin/HtmlBrowserWidget/CBrowserPluginWidget.h
View File

@ -1,4 +1,4 @@
#ifndef CBROWSERPLUGINWIDGET_H #ifndef CBROWSERPLUGINWIDGET_H
#define CBROWSERPLUGINWIDGET_H #define CBROWSERPLUGINWIDGET_H
#include <QObject> #include <QObject>
@ -7,7 +7,7 @@
class CBrowserPluginWidget : public QObject, public CPluginWidgetInterface class CBrowserPluginWidget : 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:

2
product/src/gui/plugin/HtmlBrowserWidget/CBrowserWidget.cpp
View File

@ -1,4 +1,4 @@
#include "CBrowserWidget.h" #include "CBrowserWidget.h"
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"
#include <QNetworkProxyFactory> #include <QNetworkProxyFactory>

2
product/src/gui/plugin/HtmlBrowserWidget/CBrowserWidget.h
View File

@ -1,4 +1,4 @@
#ifndef CBROWSERWIDGET_H #ifndef CBROWSERWIDGET_H
#define CBROWSERWIDGET_H #define CBROWSERWIDGET_H
#include <QCoreApplication> #include <QCoreApplication>

2
product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDataCollect.cpp
View File

@ -1,4 +1,4 @@
#include "CAiAlarmDataCollect.h" #include "CAiAlarmDataCollect.h"
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"
#include "CAlarmMsgManage.h" #include "CAlarmMsgManage.h"
#include <QDebug> #include <QDebug>

2
product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDataCollect.h
View File

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

2
product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDelegate.cpp
View File

@ -1,4 +1,4 @@
#include "CAiAlarmDelegate.h" #include "CAiAlarmDelegate.h"
#include <QFile> #include <QFile>
#include "pub_utility_api/FileUtil.h" #include "pub_utility_api/FileUtil.h"
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"

2
product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmDelegate.h
View File

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

2
product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.cpp
View File

@ -1,4 +1,4 @@
#include "CAiAlarmMsgInfo.h" #include "CAiAlarmMsgInfo.h"
#include <QDateTime> #include <QDateTime>
#include "CAlarmDataCollect.h" #include "CAlarmDataCollect.h"
#include <QDebug> #include <QDebug>

2
product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmMsgInfo.h
View File

@ -1,4 +1,4 @@
#ifndef CAIALARMMSGINFO_H #ifndef CAIALARMMSGINFO_H
#define CAIALARMMSGINFO_H #define CAIALARMMSGINFO_H

2
product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeItem.cpp
View File

@ -1,4 +1,4 @@
#include "CAiAlarmTreeItem.h" #include "CAiAlarmTreeItem.h"
#include "CAiAlarmMsgInfo.h" #include "CAiAlarmMsgInfo.h"
#include "CAlarmMsgInfo.h" #include "CAlarmMsgInfo.h"
#include "CAlarmCommon.h" #include "CAlarmCommon.h"

2
product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeItem.h
View File

@ -1,4 +1,4 @@
#ifndef CAIALARMTREEITEM_H #ifndef CAIALARMTREEITEM_H
#define CAIALARMTREEITEM_H #define CAIALARMTREEITEM_H
#include <QVector> #include <QVector>

2
product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeModel.cpp
View File

@ -1,4 +1,4 @@
#include "CAiAlarmTreeModel.h" #include "CAiAlarmTreeModel.h"
#include "CAlarmMsgManage.h" #include "CAlarmMsgManage.h"
#include "CAiAlarmDataCollect.h" #include "CAiAlarmDataCollect.h"
#include "CAlarmDataCollect.h" #include "CAlarmDataCollect.h"

2
product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeModel.h
View File

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

2
product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeView.cpp
View File

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

2
product/src/gui/plugin/ISCSAlarmWidget/CAiAlarmTreeView.h
View File

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

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmCommon.h
View File

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

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmDataCollect.cpp
View File

@ -1,4 +1,4 @@
#include "CAlarmDataCollect.h" #include "CAlarmDataCollect.h"
#include <QDateTime> #include <QDateTime>
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"
#include "CAlarmMsgManage.h" #include "CAlarmMsgManage.h"

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmDataCollect.h
View File

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

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmDelegate.cpp
View File

@ -1,4 +1,4 @@
#include <QFile> #include <QFile>
#include <QPainter> #include <QPainter>
#include <QDomDocument> #include <QDomDocument>
#include "CAlarmDelegate.h" #include "CAlarmDelegate.h"

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmDelegate.h
View File

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

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeItem.cpp
View File

@ -1,4 +1,4 @@
#include <QStringList> #include <QStringList>
#include "CAlarmDeviceTreeItem.h" #include "CAlarmDeviceTreeItem.h"
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeItem.h
View File

@ -1,4 +1,4 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeModel.cpp
View File

@ -1,4 +1,4 @@
#include "CAlarmDeviceTreeItem.h" #include "CAlarmDeviceTreeItem.h"
#include "CAlarmDeviceTreeModel.h" #include "CAlarmDeviceTreeModel.h"
#include "CAlarmMsgManage.h" #include "CAlarmMsgManage.h"
#include <QStringList> #include <QStringList>

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeModel.h
View File

@ -1,4 +1,4 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmDeviceTreeView.cpp
View File

@ -1,4 +1,4 @@
#include "CAlarmDeviceTreeView.h" #include "CAlarmDeviceTreeView.h"
#include "CAlarmDeviceTreeModel.h" #include "CAlarmDeviceTreeModel.h"
#include "CAlarmDeviceTreeItem.h" #include "CAlarmDeviceTreeItem.h"
#include <QMenu> #include <QMenu>

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmFilterDialog.cpp
View File

@ -1,4 +1,4 @@
#include "CAlarmFilterDialog.h" #include "CAlarmFilterDialog.h"
#include "ui_CAlarmFilterDialog.h" #include "ui_CAlarmFilterDialog.h"
#include "public/pub_sysinfo_api/SysInfoApi.h" #include "public/pub_sysinfo_api/SysInfoApi.h"
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmFilterDialog.h
View File

@ -1,4 +1,4 @@
#ifndef CALARMFILTERDIALOG_H #ifndef CALARMFILTERDIALOG_H
#define CALARMFILTERDIALOG_H #define CALARMFILTERDIALOG_H
#include <QMap> #include <QMap>

14
product/src/gui/plugin/ISCSAlarmWidget/CAlarmForm.cpp
View File

@ -1,4 +1,4 @@
#include "CAlarmForm.h" #include "CAlarmForm.h"
#include <QMenu> #include <QMenu>
#include <QPrinter> #include <QPrinter>
#include <QMessageBox> #include <QMessageBox>
@ -159,7 +159,7 @@ void CAlarmForm::initialize()
//< lingdaoyaoqiu //< lingdaoyaoqiu
{ {
QSettings columFlags("KBD_HMI", "alarm config"); QSettings columFlags("IOT_HMI", "alarm config");
if(!columFlags.contains(QString("alarm/colum_0"))) if(!columFlags.contains(QString("alarm/colum_0")))
{ {
columFlags.setValue(QString("alarm/colum_0"), false); //< 时间 columFlags.setValue(QString("alarm/colum_0"), false); //< 时间
@ -505,7 +505,7 @@ void CAlarmForm::setAlarmModel(CAlarmItemModel *model)
ui->alarmView->setColumnWidth(6, 120); ui->alarmView->setColumnWidth(6, 120);
ui->alarmView->horizontalHeader()->setSortIndicator(1, Qt::AscendingOrder); ui->alarmView->horizontalHeader()->setSortIndicator(1, Qt::AscendingOrder);
QSettings columFlags("KBD_HMI", "alarm config"); QSettings columFlags("IOT_HMI", "alarm config");
for(int nColumnIndex(0); nColumnIndex < m_pModel->columnCount(); nColumnIndex++) for(int nColumnIndex(0); nColumnIndex < m_pModel->columnCount(); nColumnIndex++)
{ {
bool visible = columFlags.value(QString("alarm/colum_%1").arg(nColumnIndex)).toBool(); bool visible = columFlags.value(QString("alarm/colum_%1").arg(nColumnIndex)).toBool();
@ -1029,7 +1029,7 @@ void CAlarmForm::contextMenuStack0Event(QContextMenuEvent *event)
connect(action, &QAction::triggered, [=](){ connect(action, &QAction::triggered, [=](){
ui->alarmView->setColumnHidden(nColumnIndex, !action->isChecked()); ui->alarmView->setColumnHidden(nColumnIndex, !action->isChecked());
ui->aiAlarmTreeView->setColumnHidden(nColumnIndex, !action->isChecked()); ui->aiAlarmTreeView->setColumnHidden(nColumnIndex, !action->isChecked());
QSettings columFlags("KBD_HMI", "alarm config"); QSettings columFlags("IOT_HMI", "alarm config");
columFlags.setValue(QString("alarm/colum_%1").arg(nColumnIndex), !action->isChecked()); columFlags.setValue(QString("alarm/colum_%1").arg(nColumnIndex), !action->isChecked());
}); });
} }
@ -1099,7 +1099,7 @@ void CAlarmForm::contextMenuStack1Event(QContextMenuEvent *event)
connect(action, &QAction::triggered, [=](){ connect(action, &QAction::triggered, [=](){
ui->alarmView->setColumnHidden(nColumnIndex, !action->isChecked()); ui->alarmView->setColumnHidden(nColumnIndex, !action->isChecked());
ui->aiAlarmTreeView->setColumnHidden(nColumnIndex, !action->isChecked()); ui->aiAlarmTreeView->setColumnHidden(nColumnIndex, !action->isChecked());
QSettings columFlags("KBD_HMI", "alarm config"); QSettings columFlags("IOT_HMI", "alarm config");
columFlags.setValue(QString("alarm/colum_%1").arg(nColumnIndex), !action->isChecked()); columFlags.setValue(QString("alarm/colum_%1").arg(nColumnIndex), !action->isChecked());
}); });
} }
@ -1372,7 +1372,7 @@ void CAlarmForm::loadDeviceGroupFilterWidget()
QString sqlSequenceQuery = QString("select tag_name, description from dev_group where location_id = %1;").arg(iter.key()); QString sqlSequenceQuery = QString("select tag_name, description from dev_group where location_id = %1;").arg(iter.key());
if(false == m_pReadDb->execute(sqlSequenceQuery, query)) if(false == m_pReadDb->execute(sqlSequenceQuery, query))
{ {
LOGINFO("load device info error, dbInterface execute failed!") LOGINFO("load device info error, dbInterface execute failed!");
} }
while(query.next()) while(query.next())
@ -1385,7 +1385,7 @@ void CAlarmForm::loadDeviceGroupFilterWidget()
} }
else else
{ {
LOGINFO("load deviceGroup info error, database open failed!") LOGINFO("load deviceGroup info error, database open failed!");
} }
m_pReadDb->close(); m_pReadDb->close();
delete m_pReadDb; delete m_pReadDb;

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmForm.h
View File

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

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmInhibitDialog.cpp
View File

@ -1,4 +1,4 @@
#include "CAlarmInhibitDialog.h" #include "CAlarmInhibitDialog.h"
#include "ui_CAlarmInhibitDialog.h" #include "ui_CAlarmInhibitDialog.h"
#include <QDateTime> #include <QDateTime>
#include <QFile> #include <QFile>

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmInhibitDialog.h
View File

@ -1,4 +1,4 @@
#ifndef CALARMINHIBITDIALOG_H #ifndef CALARMINHIBITDIALOG_H
#define CALARMINHIBITDIALOG_H #define CALARMINHIBITDIALOG_H
#include <QMap> #include <QMap>

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmItemModel.cpp
View File

@ -1,4 +1,4 @@
#include "CAlarmItemModel.h" #include "CAlarmItemModel.h"
#include "CAlarmMsgInfo.h" #include "CAlarmMsgInfo.h"
#include <QModelIndex> #include <QModelIndex>
#include <QHeaderView> #include <QHeaderView>

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmItemModel.h
View File

@ -1,4 +1,4 @@
#ifndef CALARMITEMMODEL_H #ifndef CALARMITEMMODEL_H
#define CALARMITEMMODEL_H #define CALARMITEMMODEL_H
#include <QSet> #include <QSet>

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmMediaPlayer.cpp
View File

@ -1,4 +1,4 @@

#ifdef OS_WINDOWS #ifdef OS_WINDOWS
//< 为了检测可用声卡 //< 为了检测可用声卡
#include <mmdeviceapi.h> #include <mmdeviceapi.h>

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmMediaPlayer.h
View File

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

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgInfo.cpp
View File

@ -1,4 +1,4 @@
#include "CAlarmMsgInfo.h" #include "CAlarmMsgInfo.h"
#include <QDateTime> #include <QDateTime>
#include "CAlarmDataCollect.h" #include "CAlarmDataCollect.h"
#include <QDebug> #include <QDebug>

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgInfo.h
View File

@ -1,4 +1,4 @@
#ifndef ALARMMSGINFO_H #ifndef ALARMMSGINFO_H
#define ALARMMSGINFO_H #define ALARMMSGINFO_H
#include <QMetaType> #include <QMetaType>

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgManage.cpp
View File

@ -1,4 +1,4 @@
#include "CAlarmMsgManage.h" #include "CAlarmMsgManage.h"
#include <QMutex> #include <QMutex>
#include <QMutexLocker> #include <QMutexLocker>
#include <QDateTime> #include <QDateTime>

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmMsgManage.h
View File

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

8
product/src/gui/plugin/ISCSAlarmWidget/CAlarmPlugin.cpp
View File

@ -1,4 +1,4 @@
#include "CAlarmPlugin.h" #include "CAlarmPlugin.h"
#include <QMediaPlaylist> #include <QMediaPlaylist>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QFile> #include <QFile>
@ -885,7 +885,7 @@ void CAlarmPlugin::updateAlarmOperatePerm()
iot_public::CSysInfoInterfacePtr spSysInfo; iot_public::CSysInfoInterfacePtr spSysInfo;
if (!iot_public::createSysInfoInstance(spSysInfo)) if (!iot_public::createSysInfoInstance(spSysInfo))
{ {
LOGERROR("创建系统信息访问库实例失败！") LOGERROR("创建系统信息访问库实例失败！");
return; return;
} }
spSysInfo->getLocalNodeInfo(stNodeInfo); spSysInfo->getLocalNodeInfo(stNodeInfo);
@ -901,12 +901,12 @@ void CAlarmPlugin::updateAlarmOperatePerm()
std::string strInstanceName; std::string strInstanceName;
if(0 != permMngPtr->CurUser(m_currentUsrId, nUserGrpId, nLevel, nLoginSec, strInstanceName)) if(0 != permMngPtr->CurUser(m_currentUsrId, nUserGrpId, nLevel, nLoginSec, strInstanceName))
{ {
LOGERROR("用户ID获取失败！") LOGERROR("用户ID获取失败！");
return; return;
} }
if(PERM_NORMAL != permMngPtr->GetSpeFunc(FUNC_SPE_ALARM_OPERATE, m_vecRegionId, m_vecLocationId)) if(PERM_NORMAL != permMngPtr->GetSpeFunc(FUNC_SPE_ALARM_OPERATE, m_vecRegionId, m_vecLocationId))
{ {
LOGERROR("用户不具备告警操作权限！") LOGERROR("用户不具备告警操作权限！");
return; return;
} }
} }

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmPlugin.h
View File

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

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmPluginWidget.cpp
View File

@ -1,4 +1,4 @@
#include <QWidget> #include <QWidget>
#include "CAlarmPluginWidget.h" #include "CAlarmPluginWidget.h"
#include "CAlarmPlugin.h" #include "CAlarmPlugin.h"
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"

4
product/src/gui/plugin/ISCSAlarmWidget/CAlarmPluginWidget.h
View File

@ -1,4 +1,4 @@
#ifndef CALARMPLUGINWIDGET_H #ifndef CALARMPLUGINWIDGET_H
#define CALARMPLUGINWIDGET_H #define CALARMPLUGINWIDGET_H
#include <QObject> #include <QObject>
@ -7,7 +7,7 @@
class CAlarmPluginWidget : public QObject, public CPluginWidgetInterface class CAlarmPluginWidget : 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:

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmView.cpp
View File

@ -1,4 +1,4 @@
#include <QHeaderView> #include <QHeaderView>
#include <QMouseEvent> #include <QMouseEvent>
#include "CAlarmView.h" #include "CAlarmView.h"
#include <QScrollBar> #include <QScrollBar>

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmView.h
View File

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

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmWidget.cpp
View File

@ -1,4 +1,4 @@
#include "CAlarmWidget.h" #include "CAlarmWidget.h"
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QTableView> #include <QTableView>
#include <QHeaderView> #include <QHeaderView>

2
product/src/gui/plugin/ISCSAlarmWidget/CAlarmWidget.h
View File

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

2
product/src/gui/plugin/ISCSAlarmWidget/CDisposalPlanDialog.cpp
View File

@ -1,4 +1,4 @@
#include "CDisposalPlanDialog.h" #include "CDisposalPlanDialog.h"
#include "ui_CDisposalPlanDialog.h" #include "ui_CDisposalPlanDialog.h"
#include "CAiAlarmMsgInfo.h" #include "CAiAlarmMsgInfo.h"
#include <QDate> #include <QDate>

2
product/src/gui/plugin/ISCSAlarmWidget/CDisposalPlanDialog.h
View File

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

2
product/src/gui/plugin/ISCSAlarmWidget/CMyCalendar.cpp
View File

@ -1,4 +1,4 @@
#include "CMyCalendar.h" #include "CMyCalendar.h"
#include "ui_CMyCalendar.h" #include "ui_CMyCalendar.h"
#include <pub_logger_api/logger.h> #include <pub_logger_api/logger.h>
#include <QMessageBox> #include <QMessageBox>

2
product/src/gui/plugin/ISCSAlarmWidget/CMyCalendar.h
View File

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

2
product/src/gui/plugin/ISCSAlarmWidget/CMyCheckBox.cpp
View File

@ -1,4 +1,4 @@
#include "CMyCheckBox.h" #include "CMyCheckBox.h"
#include <QMouseEvent> #include <QMouseEvent>
CMyCheckBox::CMyCheckBox(QString text, QWidget *parent) CMyCheckBox::CMyCheckBox(QString text, QWidget *parent)

2
product/src/gui/plugin/ISCSAlarmWidget/CMyCheckBox.h
View File

@ -1,4 +1,4 @@
#ifndef MYCHECKBOX_H #ifndef MYCHECKBOX_H
#define MYCHECKBOX_H #define MYCHECKBOX_H
#include <QCheckBox> #include <QCheckBox>

2
product/src/gui/plugin/ISCSAlarmWidget/CMyListWidget.cpp
View File

@ -1,4 +1,4 @@
#include "CMyListWidget.h" #include "CMyListWidget.h"
CMyListWidget::CMyListWidget(QWidget *parent):QListWidget(parent) CMyListWidget::CMyListWidget(QWidget *parent):QListWidget(parent)
{ {

2
product/src/gui/plugin/ISCSAlarmWidget/CMyListWidget.h
View File

@ -1,4 +1,4 @@
#ifndef CMYLISTWIDGET_H #ifndef CMYLISTWIDGET_H
#define CMYLISTWIDGET_H #define CMYLISTWIDGET_H
#include <QListWidget> #include <QListWidget>

2
product/src/gui/plugin/ISCSAlarmWidget/CPdfPrinter.cpp
View File

@ -1,4 +1,4 @@
#include "CPdfPrinter.h" #include "CPdfPrinter.h"
#include <QDebug> #include <QDebug>
#include <QPrinter> #include <QPrinter>
#include <QHeaderView> #include <QHeaderView>

2
product/src/gui/plugin/ISCSAlarmWidget/CPdfPrinter.h
View File

@ -1,4 +1,4 @@
/** /**
* @file AlarmWidget 之前是做pdf打印，因需求修改，现在改为excel ，但是类名不变，维护请注意 * @file AlarmWidget 之前是做pdf打印，因需求修改，现在改为excel ，但是类名不变，维护请注意
* @brief * @brief
* @author jxd * @author jxd

2
product/src/gui/plugin/ISCSAlarmWidget/CTableViewPrinter.cpp
View File

@ -1,4 +1,4 @@
#include "CTableViewPrinter.h" #include "CTableViewPrinter.h"
#include "CAlarmCommon.h" #include "CAlarmCommon.h"
#include "CAlarmMsgManage.h" #include "CAlarmMsgManage.h"
CTableViewPrinter::CTableViewPrinter(CAlarmItemModel *model): CTableViewPrinter::CTableViewPrinter(CAlarmItemModel *model):

2
product/src/gui/plugin/ISCSAlarmWidget/CTableViewPrinter.h
View File

@ -1,4 +1,4 @@
#ifndef CTABLEVIEWPRINTER_H #ifndef CTABLEVIEWPRINTER_H
#define CTABLEVIEWPRINTER_H #define CTABLEVIEWPRINTER_H
#include "CAlarmItemModel.h" #include "CAlarmItemModel.h"
class QVariant; class QVariant;

2
product/src/gui/plugin/ISCSAlarmWidget/CTreeViewPrinter.cpp
View File

@ -1,4 +1,4 @@
#include "CTreeViewPrinter.h" #include "CTreeViewPrinter.h"
#include "CAiAlarmTreeItem.h" #include "CAiAlarmTreeItem.h"
CTreeViewPrinter::CTreeViewPrinter(CAiAlarmTreeModel *model): CTreeViewPrinter::CTreeViewPrinter(CAiAlarmTreeModel *model):
m_pModel(model) m_pModel(model)

2
product/src/gui/plugin/ISCSAlarmWidget/CTreeViewPrinter.h
View File

@ -1,4 +1,4 @@
#ifndef CTREEVIEWPRINTER_H #ifndef CTREEVIEWPRINTER_H
#define CTREEVIEWPRINTER_H #define CTREEVIEWPRINTER_H
#include "CAiAlarmTreeModel.h" #include "CAiAlarmTreeModel.h"
class QVariant; class QVariant;

2
product/src/gui/plugin/ISCSAlarmWidget/main.cpp
View File

@ -1,4 +1,4 @@
#include <QApplication> #include <QApplication>
#include "CAlarmPlugin.h" #include "CAlarmPlugin.h"
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"
#include "net_msg_bus_api/MsgBusApi.h" #include "net_msg_bus_api/MsgBusApi.h"

2
product/src/gui/plugin/ISCSEventWidget/CEventDataCollect.cpp
View File

@ -1,4 +1,4 @@
#include "CEventDataCollect.h" #include "CEventDataCollect.h"
#include <QDateTime> #include <QDateTime>
#include <QMutex> #include <QMutex>
#include <QThread> #include <QThread>

2
product/src/gui/plugin/ISCSEventWidget/CEventDataCollect.h
View File

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

2
product/src/gui/plugin/ISCSEventWidget/CEventFilterDialog.cpp
View File

@ -1,4 +1,4 @@
#include "CEventFilterDialog.h" #include "CEventFilterDialog.h"
#include "ui_CEventFilterDialog.h" #include "ui_CEventFilterDialog.h"
#include "CEventDataCollect.h" #include "CEventDataCollect.h"
#include "public/pub_sysinfo_api/SysInfoApi.h" #include "public/pub_sysinfo_api/SysInfoApi.h"

2
product/src/gui/plugin/ISCSEventWidget/CEventFilterDialog.h
View File

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

16
product/src/gui/plugin/ISCSEventWidget/CEventForm.cpp
View File

@ -1,4 +1,4 @@
#include "CEventForm.h" #include "CEventForm.h"
#include "ui_CEventForm.h" #include "ui_CEventForm.h"
#include "CEventMsgInfo.h" #include "CEventMsgInfo.h"
#include <QContextMenuEvent> #include <QContextMenuEvent>
@ -140,7 +140,7 @@ void CEventForm::initilize()
{ {
//< lingdaoyaoqiu //< lingdaoyaoqiu
{ {
QSettings columFlags1("KBD_HMI", "eventReal config"); QSettings columFlags1("IOT_HMI", "eventReal config");
if(!columFlags1.contains(QString("eventReal/colum_0"))) if(!columFlags1.contains(QString("eventReal/colum_0")))
{ {
columFlags1.setValue(QString("eventReal/colum_0"), false); //< 时间 columFlags1.setValue(QString("eventReal/colum_0"), false); //< 时间
@ -153,7 +153,7 @@ void CEventForm::initilize()
} }
} }
{ {
QSettings columFlags2("KBD_HMI", "eventHis config"); QSettings columFlags2("IOT_HMI", "eventHis config");
if(!columFlags2.contains(QString("eventHis/colum_0"))) if(!columFlags2.contains(QString("eventHis/colum_0")))
{ {
columFlags2.setValue(QString("eventHis/colum_0"), false); //< 时间 columFlags2.setValue(QString("eventHis/colum_0"), false); //< 时间
@ -487,7 +487,7 @@ void CEventForm::slotUpdateModel()
connect(m_pHistoryModel, &CEventHistoryModel::sigHISRecordOutOfRangeTips, this, &CEventForm::slotHISRecordOutOfRangeTips); connect(m_pHistoryModel, &CEventHistoryModel::sigHISRecordOutOfRangeTips, this, &CEventForm::slotHISRecordOutOfRangeTips);
} }
ui->eventView->setModel(m_pHistoryModel); ui->eventView->setModel(m_pHistoryModel);
QSettings columFlags2("KBD_HMI", "eventHis config"); QSettings columFlags2("IOT_HMI", "eventHis config");
for(int nColumnIndex(0); nColumnIndex < m_pHistoryModel->columnCount(); nColumnIndex++) for(int nColumnIndex(0); nColumnIndex < m_pHistoryModel->columnCount(); nColumnIndex++)
{ {
bool visible = columFlags2.value(QString("eventHis/colum_%1").arg(nColumnIndex)).toBool(); bool visible = columFlags2.value(QString("eventHis/colum_%1").arg(nColumnIndex)).toBool();
@ -512,7 +512,7 @@ void CEventForm::slotUpdateModel()
ui->eventView->horizontalHeader()->setSortIndicator(0, Qt::AscendingOrder); ui->eventView->horizontalHeader()->setSortIndicator(0, Qt::AscendingOrder);
} }
ui->eventView->setModel(m_pRealTimeModel); ui->eventView->setModel(m_pRealTimeModel);
QSettings columFlags1("KBD_HMI", "eventReal config"); QSettings columFlags1("IOT_HMI", "eventReal config");
for(int nColumnIndex(0); nColumnIndex < m_pRealTimeModel->columnCount(); nColumnIndex++) for(int nColumnIndex(0); nColumnIndex < m_pRealTimeModel->columnCount(); nColumnIndex++)
{ {
bool visible = columFlags1.value(QString("eventReal/colum_%1").arg(nColumnIndex)).toBool(); bool visible = columFlags1.value(QString("eventReal/colum_%1").arg(nColumnIndex)).toBool();
@ -935,13 +935,13 @@ void CEventForm::contextMenuEvent(QContextMenuEvent *event)
{ {
QAction * action = columnMenu.addAction(m_pRealTimeModel->headerData(nColumnIndex, Qt::Horizontal, Qt::DisplayRole).toString()); QAction * action = columnMenu.addAction(m_pRealTimeModel->headerData(nColumnIndex, Qt::Horizontal, Qt::DisplayRole).toString());
action->setCheckable(true); action->setCheckable(true);
QSettings columFlags1_1("KBD_HMI", "eventReal config"); QSettings columFlags1_1("IOT_HMI", "eventReal config");
action->setChecked(!columFlags1_1.value(QString("eventReal/colum_%1").arg(nColumnIndex)).toBool()); action->setChecked(!columFlags1_1.value(QString("eventReal/colum_%1").arg(nColumnIndex)).toBool());
connect(action, &QAction::triggered, [=](){ connect(action, &QAction::triggered, [=](){
ui->eventView->setColumnHidden(nColumnIndex, !action->isChecked()); ui->eventView->setColumnHidden(nColumnIndex, !action->isChecked());
QSettings columFlags1("KBD_HMI", "eventReal config"); QSettings columFlags1("IOT_HMI", "eventReal config");
columFlags1.setValue(QString("eventReal/colum_%1").arg(nColumnIndex), !action->isChecked()); columFlags1.setValue(QString("eventReal/colum_%1").arg(nColumnIndex), !action->isChecked());
}); });
} }
@ -954,7 +954,7 @@ void CEventForm::contextMenuEvent(QContextMenuEvent *event)
action->setChecked(!ui->eventView->isColumnHidden(nColumnIndex)); action->setChecked(!ui->eventView->isColumnHidden(nColumnIndex));
connect(action, &QAction::triggered, [=](){ connect(action, &QAction::triggered, [=](){
ui->eventView->setColumnHidden(nColumnIndex, !action->isChecked()); ui->eventView->setColumnHidden(nColumnIndex, !action->isChecked());
QSettings columFlags2("KBD_HMI", "eventHis config"); QSettings columFlags2("IOT_HMI", "eventHis config");
columFlags2.setValue(QString("eventHis/colum_%1").arg(nColumnIndex), !action->isChecked()); columFlags2.setValue(QString("eventHis/colum_%1").arg(nColumnIndex), !action->isChecked());
}); });
} }

2
product/src/gui/plugin/ISCSEventWidget/CEventForm.h
View File

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

2
product/src/gui/plugin/ISCSEventWidget/CEventHistoryModel.cpp
View File

@ -1,4 +1,4 @@
#include "CEventHistoryModel.h" #include "CEventHistoryModel.h"
#include "CEventMsgInfo.h" #include "CEventMsgInfo.h"
#include <QModelIndex> #include <QModelIndex>
#include <QMutexLocker> #include <QMutexLocker>

2
product/src/gui/plugin/ISCSEventWidget/CEventHistoryModel.h
View File

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

2
product/src/gui/plugin/ISCSEventWidget/CEventItemModel.cpp
View File

@ -1,4 +1,4 @@
#include "CEventItemModel.h" #include "CEventItemModel.h"
#include "CEventMsgInfo.h" #include "CEventMsgInfo.h"
#include <QModelIndex> #include <QModelIndex>
#include <QMutexLocker> #include <QMutexLocker>

2
product/src/gui/plugin/ISCSEventWidget/CEventItemModel.h
View File

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

2
product/src/gui/plugin/ISCSEventWidget/CEventMsgInfo.cpp
View File

@ -1,4 +1,4 @@
#include "CEventMsgInfo.h" #include "CEventMsgInfo.h"
#include <QDateTime> #include <QDateTime>
#include "CEventDataCollect.h" #include "CEventDataCollect.h"
#include <QDebug> #include <QDebug>

2
product/src/gui/plugin/ISCSEventWidget/CEventMsgInfo.h
View File

@ -1,4 +1,4 @@
#ifndef ALARMMSGINFO_H #ifndef ALARMMSGINFO_H
#define ALARMMSGINFO_H #define ALARMMSGINFO_H
#include <QMetaType> #include <QMetaType>

2
product/src/gui/plugin/ISCSEventWidget/CEventMsgManage.cpp
View File

@ -1,4 +1,4 @@
#include "CEventMsgManage.h" #include "CEventMsgManage.h"
#include <QMutex> #include <QMutex>
#include <QMutexLocker> #include <QMutexLocker>
CEventMsgManage * CEventMsgManage::m_pInstance = Q_NULLPTR; CEventMsgManage * CEventMsgManage::m_pInstance = Q_NULLPTR;

2
product/src/gui/plugin/ISCSEventWidget/CEventMsgManage.h
View File

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

2
product/src/gui/plugin/ISCSEventWidget/CEventPluginWidget.cpp
View File

@ -1,4 +1,4 @@
#include <QWidget> #include <QWidget>
#include "CEventPluginWidget.h" #include "CEventPluginWidget.h"
#include "CEventForm.h" #include "CEventForm.h"

4
product/src/gui/plugin/ISCSEventWidget/CEventPluginWidget.h
View File

@ -1,4 +1,4 @@
#ifndef CEVENTPLUGINWIDGET_H #ifndef CEVENTPLUGINWIDGET_H
#define CEVENTPLUGINWIDGET_H #define CEVENTPLUGINWIDGET_H
#include <QObject> #include <QObject>
@ -7,7 +7,7 @@
class CEventPluginWidget : public QObject, public CPluginWidgetInterface class CEventPluginWidget : 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:

2
product/src/gui/plugin/ISCSEventWidget/CEventView.cpp
View File

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

2
product/src/gui/plugin/ISCSEventWidget/CEventView.h
View File

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

2
product/src/gui/plugin/ISCSEventWidget/CExcelPrinter.cpp
View File

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

2
product/src/gui/plugin/ISCSEventWidget/CExcelPrinter.h
View File

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

2
product/src/gui/plugin/ISCSEventWidget/CMyCalendar.cpp
View File

@ -1,4 +1,4 @@
#include "CMyCalendar.h" #include "CMyCalendar.h"
#include "ui_CMyCalendar.h" #include "ui_CMyCalendar.h"
#include <pub_logger_api/logger.h> #include <pub_logger_api/logger.h>
#include <QMessageBox> #include <QMessageBox>

2
product/src/gui/plugin/ISCSEventWidget/CMyCalendar.h
View File

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

2
product/src/gui/plugin/ISCSEventWidget/CMyCheckBox.cpp
View File

@ -1,4 +1,4 @@
#include "CMyCheckBox.h" #include "CMyCheckBox.h"
#include <QMouseEvent> #include <QMouseEvent>
CMyCheckBox::CMyCheckBox(QString text, QWidget *parent) CMyCheckBox::CMyCheckBox(QString text, QWidget *parent)

2
product/src/gui/plugin/ISCSEventWidget/CMyCheckBox.h
View File

@ -1,4 +1,4 @@
#ifndef MYCHECKBOX_H #ifndef MYCHECKBOX_H
#define MYCHECKBOX_H #define MYCHECKBOX_H
#include <QCheckBox> #include <QCheckBox>

2
product/src/gui/plugin/ISCSEventWidget/CMyListWidget.cpp
View File

@ -1,4 +1,4 @@
#include "CMyListWidget.h" #include "CMyListWidget.h"
CMyListWidget::CMyListWidget(QWidget *parent):QListWidget(parent) CMyListWidget::CMyListWidget(QWidget *parent):QListWidget(parent)
{ {

2
product/src/gui/plugin/ISCSEventWidget/CMyListWidget.h
View File

@ -1,4 +1,4 @@
#ifndef CMYLISTWIDGET_H #ifndef CMYLISTWIDGET_H
#define CMYLISTWIDGET_H #define CMYLISTWIDGET_H
#include <QListWidget> #include <QListWidget>

2
product/src/gui/plugin/ISCSEventWidget/CTableViewPrinter.cpp
View File

@ -1,4 +1,4 @@
#include "CTableViewPrinter.h" #include "CTableViewPrinter.h"
#include <QPainter> #include <QPainter>
#include <QPrinter> #include <QPrinter>
#include <QTableView> #include <QTableView>

2
product/src/gui/plugin/ISCSEventWidget/CTableViewPrinter.h
View File

@ -1,4 +1,4 @@
#ifndef CTABLEVIEWPRINTER_H #ifndef CTABLEVIEWPRINTER_H
#define CTABLEVIEWPRINTER_H #define CTABLEVIEWPRINTER_H
class QPointF; class QPointF;

2
product/src/gui/plugin/ISCSEventWidget/main.cpp
View File

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

2
product/src/gui/plugin/ISCSTrendCurves/CCurveLegendModel.cpp
View File

@ -1,4 +1,4 @@
#include "CCurveLegendModel.h" #include "CCurveLegendModel.h"
#include "CTrendGraph.h" #include "CTrendGraph.h"
#include <QDoubleSpinBox> #include <QDoubleSpinBox>
#include <QColorDialog> #include <QColorDialog>

2
product/src/gui/plugin/ISCSTrendCurves/CCurveLegendModel.h
View File

@ -1,4 +1,4 @@
#ifndef CCURVELEGENDMODEL_H #ifndef CCURVELEGENDMODEL_H
#define CCURVELEGENDMODEL_H #define CCURVELEGENDMODEL_H
#include <QLabel> #include <QLabel>

2
product/src/gui/plugin/ISCSTrendCurves/CCurveLegendView.cpp
View File

@ -1,4 +1,4 @@
#include "CCurveLegendView.h" #include "CCurveLegendView.h"
#include "CCurveLegendModel.h" #include "CCurveLegendModel.h"
#include <QContextMenuEvent> #include <QContextMenuEvent>
#include <QMenu> #include <QMenu>

2
product/src/gui/plugin/ISCSTrendCurves/CCurveLegendView.h
View File

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

2
product/src/gui/plugin/ISCSTrendCurves/CHisDataManage.cpp
View File

@ -1,4 +1,4 @@
#include "CHisDataManage.h" #include "CHisDataManage.h"
#include "db_his_query_api/DbHisQueryApi.h" #include "db_his_query_api/DbHisQueryApi.h"
#include "sample_server_api/SampleDefine.h" #include "sample_server_api/SampleDefine.h"
#include "CTrendInfoManage.h" #include "CTrendInfoManage.h"

2
product/src/gui/plugin/ISCSTrendCurves/CHisDataManage.h
View File

@ -1,4 +1,4 @@
#ifndef CHISDATAMANAGE_H #ifndef CHISDATAMANAGE_H
#define CHISDATAMANAGE_H #define CHISDATAMANAGE_H
#include <QMutex> #include <QMutex>

2
product/src/gui/plugin/ISCSTrendCurves/CHisEventManage.cpp
View File

@ -1,4 +1,4 @@
#include "CHisEventManage.h" #include "CHisEventManage.h"
#include "service/alarm_server_api/AlarmCommonDef.h" #include "service/alarm_server_api/AlarmCommonDef.h"
CHisEventManage::CHisEventManage(QObject *parent) CHisEventManage::CHisEventManage(QObject *parent)

2
product/src/gui/plugin/ISCSTrendCurves/CHisEventManage.h
View File

@ -1,4 +1,4 @@
#ifndef CHISEVENTMANAGE_H #ifndef CHISEVENTMANAGE_H
#define CHISEVENTMANAGE_H #define CHISEVENTMANAGE_H
#include "db_api_ex/CDbApi.h" #include "db_api_ex/CDbApi.h"

Some files were not shown because too many files have changed in this diff Show More