[ref]同步711
This commit is contained in:
parent
46de2e029d
commit
499b61b93e
@ -1,4 +1,4 @@
|
||||
#include <QWidget>
|
||||
#include <QWidget>
|
||||
#include "CBrowserPluginWidget.h"
|
||||
#include "CBrowserWidget.h"
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CBROWSERPLUGINWIDGET_H
|
||||
#ifndef CBROWSERPLUGINWIDGET_H
|
||||
#define CBROWSERPLUGINWIDGET_H
|
||||
|
||||
#include <QObject>
|
||||
@ -7,7 +7,7 @@
|
||||
class CBrowserPluginWidget : public QObject, public CPluginWidgetInterface
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
|
||||
Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
|
||||
Q_INTERFACES(CPluginWidgetInterface)
|
||||
|
||||
public:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CBrowserWidget.h"
|
||||
#include "CBrowserWidget.h"
|
||||
#include "pub_logger_api/logger.h"
|
||||
#include <QNetworkProxyFactory>
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CBROWSERWIDGET_H
|
||||
#ifndef CBROWSERWIDGET_H
|
||||
#define CBROWSERWIDGET_H
|
||||
|
||||
#include <QCoreApplication>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CAiAlarmDataCollect.h"
|
||||
#include "CAiAlarmDataCollect.h"
|
||||
#include "pub_logger_api/logger.h"
|
||||
#include "CAlarmMsgManage.h"
|
||||
#include <QDebug>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CAIALARMDATACOLLECT_H
|
||||
#ifndef CAIALARMDATACOLLECT_H
|
||||
#define CAIALARMDATACOLLECT_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CAiAlarmDelegate.h"
|
||||
#include "CAiAlarmDelegate.h"
|
||||
#include <QFile>
|
||||
#include "pub_utility_api/FileUtil.h"
|
||||
#include "pub_logger_api/logger.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CAIALARMDELEGATE_H
|
||||
#ifndef CAIALARMDELEGATE_H
|
||||
#define CAIALARMDELEGATE_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CAiAlarmMsgInfo.h"
|
||||
#include "CAiAlarmMsgInfo.h"
|
||||
#include <QDateTime>
|
||||
#include "CAlarmDataCollect.h"
|
||||
#include <QDebug>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CAIALARMMSGINFO_H
|
||||
#ifndef CAIALARMMSGINFO_H
|
||||
#define CAIALARMMSGINFO_H
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CAiAlarmTreeItem.h"
|
||||
#include "CAiAlarmTreeItem.h"
|
||||
#include "CAiAlarmMsgInfo.h"
|
||||
#include "CAlarmMsgInfo.h"
|
||||
#include "CAlarmCommon.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CAIALARMTREEITEM_H
|
||||
#ifndef CAIALARMTREEITEM_H
|
||||
#define CAIALARMTREEITEM_H
|
||||
|
||||
#include <QVector>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CAiAlarmTreeModel.h"
|
||||
#include "CAiAlarmTreeModel.h"
|
||||
#include "CAlarmMsgManage.h"
|
||||
#include "CAiAlarmDataCollect.h"
|
||||
#include "CAlarmDataCollect.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CAIALARMTREEMODEL_H
|
||||
#ifndef CAIALARMTREEMODEL_H
|
||||
#define CAIALARMTREEMODEL_H
|
||||
|
||||
#include <QAbstractItemModel>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CAiAlarmTreeView.h"
|
||||
#include "CAiAlarmTreeView.h"
|
||||
#include <QHeaderView>
|
||||
#include <QScrollBar>
|
||||
CAiAlarmTreeView::CAiAlarmTreeView(QWidget *parent)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CAIALARMTREEVIEW_H
|
||||
#ifndef CAIALARMTREEVIEW_H
|
||||
#define CAIALARMTREEVIEW_H
|
||||
|
||||
#include <QTreeView>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CALARMCOMMON_H
|
||||
#ifndef CALARMCOMMON_H
|
||||
#define CALARMCOMMON_H
|
||||
|
||||
#include <QSharedPointer>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CAlarmDataCollect.h"
|
||||
#include "CAlarmDataCollect.h"
|
||||
#include <QDateTime>
|
||||
#include "pub_logger_api/logger.h"
|
||||
#include "CAlarmMsgManage.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CALARMDATACOLLECT_H
|
||||
#ifndef CALARMDATACOLLECT_H
|
||||
#define CALARMDATACOLLECT_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include <QFile>
|
||||
#include <QFile>
|
||||
#include <QPainter>
|
||||
#include <QDomDocument>
|
||||
#include "CAlarmDelegate.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CALARMDELEGATE_H
|
||||
#ifndef CALARMDELEGATE_H
|
||||
#define CALARMDELEGATE_H
|
||||
|
||||
#include <QStyledItemDelegate>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include <QStringList>
|
||||
#include <QStringList>
|
||||
#include "CAlarmDeviceTreeItem.h"
|
||||
#include "pub_logger_api/logger.h"
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/****************************************************************************
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CAlarmDeviceTreeItem.h"
|
||||
#include "CAlarmDeviceTreeItem.h"
|
||||
#include "CAlarmDeviceTreeModel.h"
|
||||
#include "CAlarmMsgManage.h"
|
||||
#include <QStringList>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/****************************************************************************
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CAlarmDeviceTreeView.h"
|
||||
#include "CAlarmDeviceTreeView.h"
|
||||
#include "CAlarmDeviceTreeModel.h"
|
||||
#include "CAlarmDeviceTreeItem.h"
|
||||
#include <QMenu>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CAlarmFilterDialog.h"
|
||||
#include "CAlarmFilterDialog.h"
|
||||
#include "ui_CAlarmFilterDialog.h"
|
||||
#include "public/pub_sysinfo_api/SysInfoApi.h"
|
||||
#include "pub_logger_api/logger.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CALARMFILTERDIALOG_H
|
||||
#ifndef CALARMFILTERDIALOG_H
|
||||
#define CALARMFILTERDIALOG_H
|
||||
|
||||
#include <QMap>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CAlarmForm.h"
|
||||
#include "CAlarmForm.h"
|
||||
#include <QMenu>
|
||||
#include <QPrinter>
|
||||
#include <QMessageBox>
|
||||
@ -159,7 +159,7 @@ void CAlarmForm::initialize()
|
||||
|
||||
//< lingdaoyaoqiu
|
||||
{
|
||||
QSettings columFlags("KBD_HMI", "alarm config");
|
||||
QSettings columFlags("IOT_HMI", "alarm config");
|
||||
if(!columFlags.contains(QString("alarm/colum_0")))
|
||||
{
|
||||
columFlags.setValue(QString("alarm/colum_0"), false); //< 时间
|
||||
@ -505,7 +505,7 @@ void CAlarmForm::setAlarmModel(CAlarmItemModel *model)
|
||||
ui->alarmView->setColumnWidth(6, 120);
|
||||
|
||||
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++)
|
||||
{
|
||||
bool visible = columFlags.value(QString("alarm/colum_%1").arg(nColumnIndex)).toBool();
|
||||
@ -1029,7 +1029,7 @@ void CAlarmForm::contextMenuStack0Event(QContextMenuEvent *event)
|
||||
connect(action, &QAction::triggered, [=](){
|
||||
ui->alarmView->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());
|
||||
});
|
||||
}
|
||||
@ -1099,7 +1099,7 @@ void CAlarmForm::contextMenuStack1Event(QContextMenuEvent *event)
|
||||
connect(action, &QAction::triggered, [=](){
|
||||
ui->alarmView->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());
|
||||
});
|
||||
}
|
||||
@ -1372,7 +1372,7 @@ void CAlarmForm::loadDeviceGroupFilterWidget()
|
||||
QString sqlSequenceQuery = QString("select tag_name, description from dev_group where location_id = %1;").arg(iter.key());
|
||||
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())
|
||||
@ -1385,7 +1385,7 @@ void CAlarmForm::loadDeviceGroupFilterWidget()
|
||||
}
|
||||
else
|
||||
{
|
||||
LOGINFO("load deviceGroup info error, database open failed!")
|
||||
LOGINFO("load deviceGroup info error, database open failed!");
|
||||
}
|
||||
m_pReadDb->close();
|
||||
delete m_pReadDb;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CALARMFORM_H
|
||||
#ifndef CALARMFORM_H
|
||||
#define CALARMFORM_H
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CAlarmInhibitDialog.h"
|
||||
#include "CAlarmInhibitDialog.h"
|
||||
#include "ui_CAlarmInhibitDialog.h"
|
||||
#include <QDateTime>
|
||||
#include <QFile>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CALARMINHIBITDIALOG_H
|
||||
#ifndef CALARMINHIBITDIALOG_H
|
||||
#define CALARMINHIBITDIALOG_H
|
||||
|
||||
#include <QMap>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CAlarmItemModel.h"
|
||||
#include "CAlarmItemModel.h"
|
||||
#include "CAlarmMsgInfo.h"
|
||||
#include <QModelIndex>
|
||||
#include <QHeaderView>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CALARMITEMMODEL_H
|
||||
#ifndef CALARMITEMMODEL_H
|
||||
#define CALARMITEMMODEL_H
|
||||
|
||||
#include <QSet>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
|
||||
|
||||
#ifdef OS_WINDOWS
|
||||
//< 为了检测可用声卡
|
||||
#include <mmdeviceapi.h>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CALARMMEDIAPLAYER_H
|
||||
#ifndef CALARMMEDIAPLAYER_H
|
||||
#define CALARMMEDIAPLAYER_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CAlarmMsgInfo.h"
|
||||
#include "CAlarmMsgInfo.h"
|
||||
#include <QDateTime>
|
||||
#include "CAlarmDataCollect.h"
|
||||
#include <QDebug>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef ALARMMSGINFO_H
|
||||
#ifndef ALARMMSGINFO_H
|
||||
#define ALARMMSGINFO_H
|
||||
|
||||
#include <QMetaType>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CAlarmMsgManage.h"
|
||||
#include "CAlarmMsgManage.h"
|
||||
#include <QMutex>
|
||||
#include <QMutexLocker>
|
||||
#include <QDateTime>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CALARMMSGMANAGE_H
|
||||
#ifndef CALARMMSGMANAGE_H
|
||||
#define CALARMMSGMANAGE_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CAlarmPlugin.h"
|
||||
#include "CAlarmPlugin.h"
|
||||
#include <QMediaPlaylist>
|
||||
#include <QHBoxLayout>
|
||||
#include <QFile>
|
||||
@ -885,7 +885,7 @@ void CAlarmPlugin::updateAlarmOperatePerm()
|
||||
iot_public::CSysInfoInterfacePtr spSysInfo;
|
||||
if (!iot_public::createSysInfoInstance(spSysInfo))
|
||||
{
|
||||
LOGERROR("创建系统信息访问库实例失败！")
|
||||
LOGERROR("创建系统信息访问库实例失败！");
|
||||
return;
|
||||
}
|
||||
spSysInfo->getLocalNodeInfo(stNodeInfo);
|
||||
@ -901,12 +901,12 @@ void CAlarmPlugin::updateAlarmOperatePerm()
|
||||
std::string strInstanceName;
|
||||
if(0 != permMngPtr->CurUser(m_currentUsrId, nUserGrpId, nLevel, nLoginSec, strInstanceName))
|
||||
{
|
||||
LOGERROR("用户ID获取失败！")
|
||||
LOGERROR("用户ID获取失败！");
|
||||
return;
|
||||
}
|
||||
if(PERM_NORMAL != permMngPtr->GetSpeFunc(FUNC_SPE_ALARM_OPERATE, m_vecRegionId, m_vecLocationId))
|
||||
{
|
||||
LOGERROR("用户不具备告警操作权限！")
|
||||
LOGERROR("用户不具备告警操作权限！");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CALARMPLUGIN_H
|
||||
#ifndef CALARMPLUGIN_H
|
||||
#define CALARMPLUGIN_H
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include <QWidget>
|
||||
#include <QWidget>
|
||||
#include "CAlarmPluginWidget.h"
|
||||
#include "CAlarmPlugin.h"
|
||||
#include "pub_logger_api/logger.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CALARMPLUGINWIDGET_H
|
||||
#ifndef CALARMPLUGINWIDGET_H
|
||||
#define CALARMPLUGINWIDGET_H
|
||||
|
||||
#include <QObject>
|
||||
@ -7,7 +7,7 @@
|
||||
class CAlarmPluginWidget : public QObject, public CPluginWidgetInterface
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
|
||||
Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
|
||||
Q_INTERFACES(CPluginWidgetInterface)
|
||||
|
||||
public:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include <QHeaderView>
|
||||
#include <QHeaderView>
|
||||
#include <QMouseEvent>
|
||||
#include "CAlarmView.h"
|
||||
#include <QScrollBar>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CALARMVIEW_H
|
||||
#ifndef CALARMVIEW_H
|
||||
#define CALARMVIEW_H
|
||||
|
||||
#include <QTableView>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CAlarmWidget.h"
|
||||
#include "CAlarmWidget.h"
|
||||
#include <QVBoxLayout>
|
||||
#include <QTableView>
|
||||
#include <QHeaderView>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CALARMWINDOW_H
|
||||
#ifndef CALARMWINDOW_H
|
||||
#define CALARMWINDOW_H
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CDisposalPlanDialog.h"
|
||||
#include "CDisposalPlanDialog.h"
|
||||
#include "ui_CDisposalPlanDialog.h"
|
||||
#include "CAiAlarmMsgInfo.h"
|
||||
#include <QDate>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CDISPOSALPLANDIALOG_H
|
||||
#ifndef CDISPOSALPLANDIALOG_H
|
||||
#define CDISPOSALPLANDIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CMyCalendar.h"
|
||||
#include "CMyCalendar.h"
|
||||
#include "ui_CMyCalendar.h"
|
||||
#include <pub_logger_api/logger.h>
|
||||
#include <QMessageBox>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CMYCALENDAR_H
|
||||
#ifndef CMYCALENDAR_H
|
||||
#define CMYCALENDAR_H
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CMyCheckBox.h"
|
||||
#include "CMyCheckBox.h"
|
||||
#include <QMouseEvent>
|
||||
|
||||
CMyCheckBox::CMyCheckBox(QString text, QWidget *parent)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef MYCHECKBOX_H
|
||||
#ifndef MYCHECKBOX_H
|
||||
#define MYCHECKBOX_H
|
||||
|
||||
#include <QCheckBox>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CMyListWidget.h"
|
||||
#include "CMyListWidget.h"
|
||||
|
||||
CMyListWidget::CMyListWidget(QWidget *parent):QListWidget(parent)
|
||||
{
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CMYLISTWIDGET_H
|
||||
#ifndef CMYLISTWIDGET_H
|
||||
#define CMYLISTWIDGET_H
|
||||
|
||||
#include <QListWidget>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CPdfPrinter.h"
|
||||
#include "CPdfPrinter.h"
|
||||
#include <QDebug>
|
||||
#include <QPrinter>
|
||||
#include <QHeaderView>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/**
|
||||
/**
|
||||
* @file AlarmWidget 之前是做pdf打印，因需求修改，现在改为excel ，但是类名不变，维护请注意
|
||||
* @brief
|
||||
* @author jxd
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CTableViewPrinter.h"
|
||||
#include "CTableViewPrinter.h"
|
||||
#include "CAlarmCommon.h"
|
||||
#include "CAlarmMsgManage.h"
|
||||
CTableViewPrinter::CTableViewPrinter(CAlarmItemModel *model):
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CTABLEVIEWPRINTER_H
|
||||
#ifndef CTABLEVIEWPRINTER_H
|
||||
#define CTABLEVIEWPRINTER_H
|
||||
#include "CAlarmItemModel.h"
|
||||
class QVariant;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CTreeViewPrinter.h"
|
||||
#include "CTreeViewPrinter.h"
|
||||
#include "CAiAlarmTreeItem.h"
|
||||
CTreeViewPrinter::CTreeViewPrinter(CAiAlarmTreeModel *model):
|
||||
m_pModel(model)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CTREEVIEWPRINTER_H
|
||||
#ifndef CTREEVIEWPRINTER_H
|
||||
#define CTREEVIEWPRINTER_H
|
||||
#include "CAiAlarmTreeModel.h"
|
||||
class QVariant;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include <QApplication>
|
||||
#include <QApplication>
|
||||
#include "CAlarmPlugin.h"
|
||||
#include "pub_logger_api/logger.h"
|
||||
#include "net_msg_bus_api/MsgBusApi.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CEventDataCollect.h"
|
||||
#include "CEventDataCollect.h"
|
||||
#include <QDateTime>
|
||||
#include <QMutex>
|
||||
#include <QThread>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CEventDataCollect_H
|
||||
#ifndef CEventDataCollect_H
|
||||
#define CEventDataCollect_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CEventFilterDialog.h"
|
||||
#include "CEventFilterDialog.h"
|
||||
#include "ui_CEventFilterDialog.h"
|
||||
#include "CEventDataCollect.h"
|
||||
#include "public/pub_sysinfo_api/SysInfoApi.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CEVENTFILTERDIALOG_H
|
||||
#ifndef CEVENTFILTERDIALOG_H
|
||||
#define CEVENTFILTERDIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CEventForm.h"
|
||||
#include "CEventForm.h"
|
||||
#include "ui_CEventForm.h"
|
||||
#include "CEventMsgInfo.h"
|
||||
#include <QContextMenuEvent>
|
||||
@ -140,7 +140,7 @@ void CEventForm::initilize()
|
||||
{
|
||||
//< lingdaoyaoqiu
|
||||
{
|
||||
QSettings columFlags1("KBD_HMI", "eventReal config");
|
||||
QSettings columFlags1("IOT_HMI", "eventReal config");
|
||||
if(!columFlags1.contains(QString("eventReal/colum_0")))
|
||||
{
|
||||
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")))
|
||||
{
|
||||
columFlags2.setValue(QString("eventHis/colum_0"), false); //< 时间
|
||||
@ -487,7 +487,7 @@ void CEventForm::slotUpdateModel()
|
||||
connect(m_pHistoryModel, &CEventHistoryModel::sigHISRecordOutOfRangeTips, this, &CEventForm::slotHISRecordOutOfRangeTips);
|
||||
}
|
||||
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++)
|
||||
{
|
||||
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->setModel(m_pRealTimeModel);
|
||||
QSettings columFlags1("KBD_HMI", "eventReal config");
|
||||
QSettings columFlags1("IOT_HMI", "eventReal config");
|
||||
for(int nColumnIndex(0); nColumnIndex < m_pRealTimeModel->columnCount(); nColumnIndex++)
|
||||
{
|
||||
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());
|
||||
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());
|
||||
|
||||
connect(action, &QAction::triggered, [=](){
|
||||
|
||||
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());
|
||||
});
|
||||
}
|
||||
@ -954,7 +954,7 @@ void CEventForm::contextMenuEvent(QContextMenuEvent *event)
|
||||
action->setChecked(!ui->eventView->isColumnHidden(nColumnIndex));
|
||||
connect(action, &QAction::triggered, [=](){
|
||||
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());
|
||||
});
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CEventForm_H
|
||||
#ifndef CEventForm_H
|
||||
#define CEventForm_H
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CEventHistoryModel.h"
|
||||
#include "CEventHistoryModel.h"
|
||||
#include "CEventMsgInfo.h"
|
||||
#include <QModelIndex>
|
||||
#include <QMutexLocker>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CEVENTHISTORYMODEL_H
|
||||
#ifndef CEVENTHISTORYMODEL_H
|
||||
#define CEVENTHISTORYMODEL_H
|
||||
|
||||
#include <QAbstractTableModel>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CEventItemModel.h"
|
||||
#include "CEventItemModel.h"
|
||||
#include "CEventMsgInfo.h"
|
||||
#include <QModelIndex>
|
||||
#include <QMutexLocker>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CEVENTITEMMODEL_H
|
||||
#ifndef CEVENTITEMMODEL_H
|
||||
#define CEVENTITEMMODEL_H
|
||||
|
||||
#include <QAbstractTableModel>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CEventMsgInfo.h"
|
||||
#include "CEventMsgInfo.h"
|
||||
#include <QDateTime>
|
||||
#include "CEventDataCollect.h"
|
||||
#include <QDebug>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef ALARMMSGINFO_H
|
||||
#ifndef ALARMMSGINFO_H
|
||||
#define ALARMMSGINFO_H
|
||||
|
||||
#include <QMetaType>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CEventMsgManage.h"
|
||||
#include "CEventMsgManage.h"
|
||||
#include <QMutex>
|
||||
#include <QMutexLocker>
|
||||
CEventMsgManage * CEventMsgManage::m_pInstance = Q_NULLPTR;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CEventMsgManage_H
|
||||
#ifndef CEventMsgManage_H
|
||||
#define CEventMsgManage_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include <QWidget>
|
||||
#include <QWidget>
|
||||
#include "CEventPluginWidget.h"
|
||||
#include "CEventForm.h"
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CEVENTPLUGINWIDGET_H
|
||||
#ifndef CEVENTPLUGINWIDGET_H
|
||||
#define CEVENTPLUGINWIDGET_H
|
||||
|
||||
#include <QObject>
|
||||
@ -7,7 +7,7 @@
|
||||
class CEventPluginWidget : public QObject, public CPluginWidgetInterface
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PLUGIN_METADATA(IID "kbd.PluginWidgetInterface/1.0")
|
||||
Q_PLUGIN_METADATA(IID HMI_WidgetPlugin_IID)
|
||||
Q_INTERFACES(CPluginWidgetInterface)
|
||||
|
||||
public:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include <QHeaderView>
|
||||
#include <QHeaderView>
|
||||
#include "CEventView.h"
|
||||
|
||||
CEventView::CEventView(QWidget *parent)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CEventView_H
|
||||
#ifndef CEventView_H
|
||||
#define CEventView_H
|
||||
|
||||
#include <QTableView>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CExcelPrinter.h"
|
||||
#include "CExcelPrinter.h"
|
||||
CExcelPrinter::CExcelPrinter(QObject *parent) : QObject(parent)
|
||||
{
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CEXCELPRINTER_H
|
||||
#ifndef CEXCELPRINTER_H
|
||||
#define CEXCELPRINTER_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CMyCalendar.h"
|
||||
#include "CMyCalendar.h"
|
||||
#include "ui_CMyCalendar.h"
|
||||
#include <pub_logger_api/logger.h>
|
||||
#include <QMessageBox>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CMYCALENDAR_H
|
||||
#ifndef CMYCALENDAR_H
|
||||
#define CMYCALENDAR_H
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CMyCheckBox.h"
|
||||
#include "CMyCheckBox.h"
|
||||
#include <QMouseEvent>
|
||||
|
||||
CMyCheckBox::CMyCheckBox(QString text, QWidget *parent)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef MYCHECKBOX_H
|
||||
#ifndef MYCHECKBOX_H
|
||||
#define MYCHECKBOX_H
|
||||
|
||||
#include <QCheckBox>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CMyListWidget.h"
|
||||
#include "CMyListWidget.h"
|
||||
|
||||
CMyListWidget::CMyListWidget(QWidget *parent):QListWidget(parent)
|
||||
{
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CMYLISTWIDGET_H
|
||||
#ifndef CMYLISTWIDGET_H
|
||||
#define CMYLISTWIDGET_H
|
||||
|
||||
#include <QListWidget>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CTableViewPrinter.h"
|
||||
#include "CTableViewPrinter.h"
|
||||
#include <QPainter>
|
||||
#include <QPrinter>
|
||||
#include <QTableView>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CTABLEVIEWPRINTER_H
|
||||
#ifndef CTABLEVIEWPRINTER_H
|
||||
#define CTABLEVIEWPRINTER_H
|
||||
|
||||
class QPointF;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include <QApplication>
|
||||
#include <QApplication>
|
||||
//#include "CEventPlugin.h"
|
||||
#include "CEventForm.h"
|
||||
#include "pub_logger_api/logger.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CCurveLegendModel.h"
|
||||
#include "CCurveLegendModel.h"
|
||||
#include "CTrendGraph.h"
|
||||
#include <QDoubleSpinBox>
|
||||
#include <QColorDialog>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CCURVELEGENDMODEL_H
|
||||
#ifndef CCURVELEGENDMODEL_H
|
||||
#define CCURVELEGENDMODEL_H
|
||||
|
||||
#include <QLabel>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CCurveLegendView.h"
|
||||
#include "CCurveLegendView.h"
|
||||
#include "CCurveLegendModel.h"
|
||||
#include <QContextMenuEvent>
|
||||
#include <QMenu>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CCURVELEGENDVIEW_H
|
||||
#ifndef CCURVELEGENDVIEW_H
|
||||
#define CCURVELEGENDVIEW_H
|
||||
|
||||
#include <QTableView>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CHisDataManage.h"
|
||||
#include "CHisDataManage.h"
|
||||
#include "db_his_query_api/DbHisQueryApi.h"
|
||||
#include "sample_server_api/SampleDefine.h"
|
||||
#include "CTrendInfoManage.h"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CHISDATAMANAGE_H
|
||||
#ifndef CHISDATAMANAGE_H
|
||||
#define CHISDATAMANAGE_H
|
||||
|
||||
#include <QMutex>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "CHisEventManage.h"
|
||||
#include "CHisEventManage.h"
|
||||
#include "service/alarm_server_api/AlarmCommonDef.h"
|
||||
|
||||
CHisEventManage::CHisEventManage(QObject *parent)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#ifndef CHISEVENTMANAGE_H
|
||||
#ifndef CHISEVENTMANAGE_H
|
||||
#define CHISEVENTMANAGE_H
|
||||
|
||||
#include "db_api_ex/CDbApi.h"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user