[ref]同步711

This commit is contained in:
shi_jq 2025-03-17 11:07:28 +08:00
parent 29f4a38f83
commit e031f71989
32 changed files with 34 additions and 34 deletions

View File

@ -1,4 +1,4 @@
#include "CAlarmStatisPluginWidget.h" #include "CAlarmStatisPluginWidget.h"
#include "CMainWidget.h" #include "CMainWidget.h"
#include <QWidget> #include <QWidget>

View File

@ -1,4 +1,4 @@
#ifndef CALARMSTATISPLUGINWIDGET_H #ifndef CALARMSTATISPLUGINWIDGET_H
#define CALARMSTATISPLUGINWIDGET_H #define CALARMSTATISPLUGINWIDGET_H
#include <QObject> #include <QObject>
@ -7,7 +7,7 @@
class CAlarmStatisPluginWidget : public QObject, public CPluginWidgetInterface class CAlarmStatisPluginWidget : 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:
CAlarmStatisPluginWidget(QObject *parent = 0); CAlarmStatisPluginWidget(QObject *parent = 0);

View File

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

View File

@ -1,4 +1,4 @@
#ifndef CURVECHARTVIEW_H #ifndef CURVECHARTVIEW_H
#define CURVECHARTVIEW_H #define CURVECHARTVIEW_H
#include <QtCharts/QChartView> #include <QtCharts/QChartView>

View File

@ -1,4 +1,4 @@
#include "CDataInfoManage.h" #include "CDataInfoManage.h"
#include "dbms/db_api_ex/CDbApi.h" #include "dbms/db_api_ex/CDbApi.h"
#include "CStatisCommon.h" #include "CStatisCommon.h"

View File

@ -1,4 +1,4 @@
#ifndef CDATAINFOMANAGE_H #ifndef CDATAINFOMANAGE_H
#define CDATAINFOMANAGE_H #define CDATAINFOMANAGE_H
#include "Common.h" #include "Common.h"

View File

@ -1,4 +1,4 @@
#include "CDrillDownChart.h" #include "CDrillDownChart.h"
#include "widget/CToolTip.h" #include "widget/CToolTip.h"
#include <QBarSet> #include <QBarSet>

View File

@ -1,4 +1,4 @@
#ifndef CDRILLDOWNCHART_H #ifndef CDRILLDOWNCHART_H
#define CDRILLDOWNCHART_H #define CDRILLDOWNCHART_H
#include <QtCharts/QChartView> #include <QtCharts/QChartView>

View File

@ -1,4 +1,4 @@
#include "CDrillDownSeries.h" #include "CDrillDownSeries.h"
CDrillDownSeries::CDrillDownSeries(QStringList categories, QObject *parent) CDrillDownSeries::CDrillDownSeries(QStringList categories, QObject *parent)
: QStackedBarSeries(parent) : QStackedBarSeries(parent)

View File

@ -1,4 +1,4 @@
#ifndef CDRILLDOWNSERIES_H #ifndef CDRILLDOWNSERIES_H
#define CDRILLDOWNSERIES_H #define CDRILLDOWNSERIES_H
#include <QtCharts/QStackedBarSeries> #include <QtCharts/QStackedBarSeries>

View File

@ -1,4 +1,4 @@
#include "CHisEventManage.h" #include "CHisEventManage.h"
#include "CDataInfoManage.h" #include "CDataInfoManage.h"
#include "public/pub_logger_api/logger.h" #include "public/pub_logger_api/logger.h"
#include <QTime> #include <QTime>

View File

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

View File

@ -1,4 +1,4 @@
#include "CMainWidget.h" #include "CMainWidget.h"
#include "CStatisWidget.h" #include "CStatisWidget.h"
#include "ContrastWidget.h" #include "ContrastWidget.h"
#include "CHisEventManage.h" #include "CHisEventManage.h"

View File

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

View File

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

View File

@ -1,4 +1,4 @@
#include "CStatisWidget.h" #include "CStatisWidget.h"
#include "ui_CStatisWidget.h" #include "ui_CStatisWidget.h"
#include "CTableViewExport.h" #include "CTableViewExport.h"
#include "CCurveChartView.h" #include "CCurveChartView.h"

View File

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

View File

@ -1,4 +1,4 @@
#include "CTableModel.h" #include "CTableModel.h"
#include <QDateTime> #include <QDateTime>
CTableModel::CTableModel(QObject *parent, const QStringList &alarmLevel) CTableModel::CTableModel(QObject *parent, const QStringList &alarmLevel)

View File

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

View File

@ -1,4 +1,4 @@
#include "CTableViewExport.h" #include "CTableViewExport.h"
#include "model_excel/xlsx/xlsxdocument.h" #include "model_excel/xlsx/xlsxdocument.h"
#include "CTableViewPrinter.h" #include "CTableViewPrinter.h"
#include <QMessageBox> #include <QMessageBox>

View File

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

View File

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

View File

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

View File

@ -1,4 +1,4 @@
#include "CTsdbQuery.h" #include "CTsdbQuery.h"
#include "db_his_query_api/DbHisQueryApi.h" #include "db_his_query_api/DbHisQueryApi.h"
#include "public/pub_logger_api/logger.h" #include "public/pub_logger_api/logger.h"
#include "CDataInfoManage.h" #include "CDataInfoManage.h"

View File

@ -1,4 +1,4 @@
#ifndef CTSDBQUERY_H #ifndef CTSDBQUERY_H
#define CTSDBQUERY_H #define CTSDBQUERY_H
#include "CStatisCommon.h" #include "CStatisCommon.h"

View File

@ -1,4 +1,4 @@
#include "ContrastWidget.h" #include "ContrastWidget.h"
#include "ui_ContrastWidget.h" #include "ui_ContrastWidget.h"
#include "widget/CToolTip.h" #include "widget/CToolTip.h"
#include "CDataInfoManage.h" #include "CDataInfoManage.h"

View File

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

View File

@ -1,4 +1,4 @@
#include <QApplication> #include <QApplication>
#include "CMainWidget.h" #include "CMainWidget.h"
#include "pub_logger_api/logger.h" #include "pub_logger_api/logger.h"
//#include "dp_chg_data_api/CDpcdaForApp.h" //#include "dp_chg_data_api/CDpcdaForApp.h"
@ -18,7 +18,7 @@ int main(int argc, char *argv[])
return -1; return -1;
} }
if(perm->SysLogin("admin", "kbdct", 1, 12*60*60, "hmi") != 0) if(perm->SysLogin("admin", "admin", 1, 12*60*60, "hmi") != 0)
{ {
return -1; return -1;
} }

View File

@ -1,4 +1,4 @@
#include <QPainter> #include <QPainter>
#include <QMouseEvent> #include <QMouseEvent>
#include <QPainterPath> #include <QPainterPath>
#include "CSWitchButton.h" #include "CSWitchButton.h"

View File

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

View File

@ -1,4 +1,4 @@
#include "CToolTip.h" #include "CToolTip.h"
#include <QLabel> #include <QLabel>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QEvent> #include <QEvent>

View File

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