diff --git a/product/src/gui/plugin/AlarmStatisWidget/CAlarmStatisPluginWidget.cpp b/product/src/gui/plugin/AlarmStatisWidget/CAlarmStatisPluginWidget.cpp index fe71f8a2..51aab7b6 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CAlarmStatisPluginWidget.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/CAlarmStatisPluginWidget.cpp @@ -1,4 +1,4 @@ -#include "CAlarmStatisPluginWidget.h" +#include "CAlarmStatisPluginWidget.h" #include "CMainWidget.h" #include diff --git a/product/src/gui/plugin/AlarmStatisWidget/CAlarmStatisPluginWidget.h b/product/src/gui/plugin/AlarmStatisWidget/CAlarmStatisPluginWidget.h index 9766f721..07934679 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CAlarmStatisPluginWidget.h +++ b/product/src/gui/plugin/AlarmStatisWidget/CAlarmStatisPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef CALARMSTATISPLUGINWIDGET_H +#ifndef CALARMSTATISPLUGINWIDGET_H #define CALARMSTATISPLUGINWIDGET_H #include @@ -7,7 +7,7 @@ class CAlarmStatisPluginWidget : 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: CAlarmStatisPluginWidget(QObject *parent = 0); diff --git a/product/src/gui/plugin/AlarmStatisWidget/CCurveChartView.cpp b/product/src/gui/plugin/AlarmStatisWidget/CCurveChartView.cpp index 504f849a..294a91dc 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CCurveChartView.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/CCurveChartView.cpp @@ -1,4 +1,4 @@ -#include "CCurveChartView.h" +#include "CCurveChartView.h" #include CCurveChartView::CCurveChartView(QWidget *parent) diff --git a/product/src/gui/plugin/AlarmStatisWidget/CCurveChartView.h b/product/src/gui/plugin/AlarmStatisWidget/CCurveChartView.h index fde54cb4..0584b661 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CCurveChartView.h +++ b/product/src/gui/plugin/AlarmStatisWidget/CCurveChartView.h @@ -1,4 +1,4 @@ -#ifndef CURVECHARTVIEW_H +#ifndef CURVECHARTVIEW_H #define CURVECHARTVIEW_H #include diff --git a/product/src/gui/plugin/AlarmStatisWidget/CDataInfoManage.cpp b/product/src/gui/plugin/AlarmStatisWidget/CDataInfoManage.cpp index 20300e36..3df1e2f1 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CDataInfoManage.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/CDataInfoManage.cpp @@ -1,4 +1,4 @@ -#include "CDataInfoManage.h" +#include "CDataInfoManage.h" #include "dbms/db_api_ex/CDbApi.h" #include "CStatisCommon.h" diff --git a/product/src/gui/plugin/AlarmStatisWidget/CDataInfoManage.h b/product/src/gui/plugin/AlarmStatisWidget/CDataInfoManage.h index c1ffcd3d..afa79f2a 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CDataInfoManage.h +++ b/product/src/gui/plugin/AlarmStatisWidget/CDataInfoManage.h @@ -1,4 +1,4 @@ -#ifndef CDATAINFOMANAGE_H +#ifndef CDATAINFOMANAGE_H #define CDATAINFOMANAGE_H #include "Common.h" diff --git a/product/src/gui/plugin/AlarmStatisWidget/CDrillDownChart.cpp b/product/src/gui/plugin/AlarmStatisWidget/CDrillDownChart.cpp index ae0805dd..369e4503 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CDrillDownChart.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/CDrillDownChart.cpp @@ -1,4 +1,4 @@ -#include "CDrillDownChart.h" +#include "CDrillDownChart.h" #include "widget/CToolTip.h" #include diff --git a/product/src/gui/plugin/AlarmStatisWidget/CDrillDownChart.h b/product/src/gui/plugin/AlarmStatisWidget/CDrillDownChart.h index 7b5eb16e..8ec4e370 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CDrillDownChart.h +++ b/product/src/gui/plugin/AlarmStatisWidget/CDrillDownChart.h @@ -1,4 +1,4 @@ -#ifndef CDRILLDOWNCHART_H +#ifndef CDRILLDOWNCHART_H #define CDRILLDOWNCHART_H #include diff --git a/product/src/gui/plugin/AlarmStatisWidget/CDrillDownSeries.cpp b/product/src/gui/plugin/AlarmStatisWidget/CDrillDownSeries.cpp index 4c321449..3e6e3bf1 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CDrillDownSeries.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/CDrillDownSeries.cpp @@ -1,4 +1,4 @@ -#include "CDrillDownSeries.h" +#include "CDrillDownSeries.h" CDrillDownSeries::CDrillDownSeries(QStringList categories, QObject *parent) : QStackedBarSeries(parent) diff --git a/product/src/gui/plugin/AlarmStatisWidget/CDrillDownSeries.h b/product/src/gui/plugin/AlarmStatisWidget/CDrillDownSeries.h index 04973bf3..ae6ca6eb 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CDrillDownSeries.h +++ b/product/src/gui/plugin/AlarmStatisWidget/CDrillDownSeries.h @@ -1,4 +1,4 @@ -#ifndef CDRILLDOWNSERIES_H +#ifndef CDRILLDOWNSERIES_H #define CDRILLDOWNSERIES_H #include diff --git a/product/src/gui/plugin/AlarmStatisWidget/CHisEventManage.cpp b/product/src/gui/plugin/AlarmStatisWidget/CHisEventManage.cpp index 0d87b0c2..4471f9fd 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CHisEventManage.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/CHisEventManage.cpp @@ -1,4 +1,4 @@ -#include "CHisEventManage.h" +#include "CHisEventManage.h" #include "CDataInfoManage.h" #include "public/pub_logger_api/logger.h" #include diff --git a/product/src/gui/plugin/AlarmStatisWidget/CHisEventManage.h b/product/src/gui/plugin/AlarmStatisWidget/CHisEventManage.h index c05e3592..7b5895cc 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CHisEventManage.h +++ b/product/src/gui/plugin/AlarmStatisWidget/CHisEventManage.h @@ -1,4 +1,4 @@ -#ifndef CHISEVENTMANAGE_H +#ifndef CHISEVENTMANAGE_H #define CHISEVENTMANAGE_H #include diff --git a/product/src/gui/plugin/AlarmStatisWidget/CMainWidget.cpp b/product/src/gui/plugin/AlarmStatisWidget/CMainWidget.cpp index c5e396b5..5947996f 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CMainWidget.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/CMainWidget.cpp @@ -1,4 +1,4 @@ -#include "CMainWidget.h" +#include "CMainWidget.h" #include "CStatisWidget.h" #include "ContrastWidget.h" #include "CHisEventManage.h" diff --git a/product/src/gui/plugin/AlarmStatisWidget/CMainWidget.h b/product/src/gui/plugin/AlarmStatisWidget/CMainWidget.h index 3618aa21..5360cd99 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CMainWidget.h +++ b/product/src/gui/plugin/AlarmStatisWidget/CMainWidget.h @@ -1,4 +1,4 @@ -#ifndef CMAINWIDGET_H +#ifndef CMAINWIDGET_H #define CMAINWIDGET_H #include diff --git a/product/src/gui/plugin/AlarmStatisWidget/CStatisCommon.h b/product/src/gui/plugin/AlarmStatisWidget/CStatisCommon.h index 512de15a..4f00861a 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CStatisCommon.h +++ b/product/src/gui/plugin/AlarmStatisWidget/CStatisCommon.h @@ -1,4 +1,4 @@ -#ifndef CSTATISCOMMON_H +#ifndef CSTATISCOMMON_H #define CSTATISCOMMON_H #include diff --git a/product/src/gui/plugin/AlarmStatisWidget/CStatisWidget.cpp b/product/src/gui/plugin/AlarmStatisWidget/CStatisWidget.cpp index 7ba1e438..f97c0d26 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CStatisWidget.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/CStatisWidget.cpp @@ -1,4 +1,4 @@ -#include "CStatisWidget.h" +#include "CStatisWidget.h" #include "ui_CStatisWidget.h" #include "CTableViewExport.h" #include "CCurveChartView.h" diff --git a/product/src/gui/plugin/AlarmStatisWidget/CStatisWidget.h b/product/src/gui/plugin/AlarmStatisWidget/CStatisWidget.h index b391d2af..6c14f86b 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CStatisWidget.h +++ b/product/src/gui/plugin/AlarmStatisWidget/CStatisWidget.h @@ -1,4 +1,4 @@ -#ifndef CSTATISWIDGET_H +#ifndef CSTATISWIDGET_H #define CSTATISWIDGET_H #include diff --git a/product/src/gui/plugin/AlarmStatisWidget/CTableModel.cpp b/product/src/gui/plugin/AlarmStatisWidget/CTableModel.cpp index 364e6566..62391313 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CTableModel.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/CTableModel.cpp @@ -1,4 +1,4 @@ -#include "CTableModel.h" +#include "CTableModel.h" #include CTableModel::CTableModel(QObject *parent, const QStringList &alarmLevel) diff --git a/product/src/gui/plugin/AlarmStatisWidget/CTableModel.h b/product/src/gui/plugin/AlarmStatisWidget/CTableModel.h index fb7510c9..f25ef02d 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CTableModel.h +++ b/product/src/gui/plugin/AlarmStatisWidget/CTableModel.h @@ -1,4 +1,4 @@ -#ifndef CTABLEMODEL_H +#ifndef CTABLEMODEL_H #define CTABLEMODEL_H #include diff --git a/product/src/gui/plugin/AlarmStatisWidget/CTableViewExport.cpp b/product/src/gui/plugin/AlarmStatisWidget/CTableViewExport.cpp index 8598241a..12d62793 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CTableViewExport.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/CTableViewExport.cpp @@ -1,4 +1,4 @@ -#include "CTableViewExport.h" +#include "CTableViewExport.h" #include "model_excel/xlsx/xlsxdocument.h" #include "CTableViewPrinter.h" #include diff --git a/product/src/gui/plugin/AlarmStatisWidget/CTableViewExport.h b/product/src/gui/plugin/AlarmStatisWidget/CTableViewExport.h index 2284c1ec..dcca7677 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CTableViewExport.h +++ b/product/src/gui/plugin/AlarmStatisWidget/CTableViewExport.h @@ -1,4 +1,4 @@ -#ifndef CTABLEVIEWEXPORT_H +#ifndef CTABLEVIEWEXPORT_H #define CTABLEVIEWEXPORT_H #include diff --git a/product/src/gui/plugin/AlarmStatisWidget/CTableViewPrinter.cpp b/product/src/gui/plugin/AlarmStatisWidget/CTableViewPrinter.cpp index 6da493f1..bf51f0f9 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CTableViewPrinter.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/CTableViewPrinter.cpp @@ -1,4 +1,4 @@ -#include "CTableViewPrinter.h" +#include "CTableViewPrinter.h" #include #include #include diff --git a/product/src/gui/plugin/AlarmStatisWidget/CTableViewPrinter.h b/product/src/gui/plugin/AlarmStatisWidget/CTableViewPrinter.h index 0a80e9fb..02dadbec 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CTableViewPrinter.h +++ b/product/src/gui/plugin/AlarmStatisWidget/CTableViewPrinter.h @@ -1,4 +1,4 @@ -#ifndef CTABLEVIEWPRINTER_H +#ifndef CTABLEVIEWPRINTER_H #define CTABLEVIEWPRINTER_H class QPointF; diff --git a/product/src/gui/plugin/AlarmStatisWidget/CTsdbQuery.cpp b/product/src/gui/plugin/AlarmStatisWidget/CTsdbQuery.cpp index d1a8c017..6a424ac8 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CTsdbQuery.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/CTsdbQuery.cpp @@ -1,4 +1,4 @@ -#include "CTsdbQuery.h" +#include "CTsdbQuery.h" #include "db_his_query_api/DbHisQueryApi.h" #include "public/pub_logger_api/logger.h" #include "CDataInfoManage.h" diff --git a/product/src/gui/plugin/AlarmStatisWidget/CTsdbQuery.h b/product/src/gui/plugin/AlarmStatisWidget/CTsdbQuery.h index 2816e64c..98078a47 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/CTsdbQuery.h +++ b/product/src/gui/plugin/AlarmStatisWidget/CTsdbQuery.h @@ -1,4 +1,4 @@ -#ifndef CTSDBQUERY_H +#ifndef CTSDBQUERY_H #define CTSDBQUERY_H #include "CStatisCommon.h" diff --git a/product/src/gui/plugin/AlarmStatisWidget/ContrastWidget.cpp b/product/src/gui/plugin/AlarmStatisWidget/ContrastWidget.cpp index 72fe9c8d..419e0601 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/ContrastWidget.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/ContrastWidget.cpp @@ -1,4 +1,4 @@ -#include "ContrastWidget.h" +#include "ContrastWidget.h" #include "ui_ContrastWidget.h" #include "widget/CToolTip.h" #include "CDataInfoManage.h" diff --git a/product/src/gui/plugin/AlarmStatisWidget/ContrastWidget.h b/product/src/gui/plugin/AlarmStatisWidget/ContrastWidget.h index 2c4bf8ec..6fc469d1 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/ContrastWidget.h +++ b/product/src/gui/plugin/AlarmStatisWidget/ContrastWidget.h @@ -1,4 +1,4 @@ -#ifndef CONTRASTWIDGET_H +#ifndef CONTRASTWIDGET_H #define CONTRASTWIDGET_H #include diff --git a/product/src/gui/plugin/AlarmStatisWidget/main.cpp b/product/src/gui/plugin/AlarmStatisWidget/main.cpp index ba852749..9149701c 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/main.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include "CMainWidget.h" #include "pub_logger_api/logger.h" //#include "dp_chg_data_api/CDpcdaForApp.h" @@ -18,7 +18,7 @@ int main(int argc, char *argv[]) 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; } diff --git a/product/src/gui/plugin/AlarmStatisWidget/widget/CSWitchButton.cpp b/product/src/gui/plugin/AlarmStatisWidget/widget/CSWitchButton.cpp index 4752c08a..ae0cfb1a 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/widget/CSWitchButton.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/widget/CSWitchButton.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include "CSWitchButton.h" diff --git a/product/src/gui/plugin/AlarmStatisWidget/widget/CSWitchButton.h b/product/src/gui/plugin/AlarmStatisWidget/widget/CSWitchButton.h index f477243e..80f188f2 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/widget/CSWitchButton.h +++ b/product/src/gui/plugin/AlarmStatisWidget/widget/CSWitchButton.h @@ -1,4 +1,4 @@ -#ifndef SWITCHBUTTON_H +#ifndef SWITCHBUTTON_H #define SWITCHBUTTON_H #include diff --git a/product/src/gui/plugin/AlarmStatisWidget/widget/CToolTip.cpp b/product/src/gui/plugin/AlarmStatisWidget/widget/CToolTip.cpp index 4de7c190..af1486bb 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/widget/CToolTip.cpp +++ b/product/src/gui/plugin/AlarmStatisWidget/widget/CToolTip.cpp @@ -1,4 +1,4 @@ -#include "CToolTip.h" +#include "CToolTip.h" #include #include #include diff --git a/product/src/gui/plugin/AlarmStatisWidget/widget/CToolTip.h b/product/src/gui/plugin/AlarmStatisWidget/widget/CToolTip.h index 27affd5a..67d4d86a 100644 --- a/product/src/gui/plugin/AlarmStatisWidget/widget/CToolTip.h +++ b/product/src/gui/plugin/AlarmStatisWidget/widget/CToolTip.h @@ -1,4 +1,4 @@ -#ifndef CTOOLTIP_H +#ifndef CTOOLTIP_H #define CTOOLTIP_H #include