diff --git a/product/src/gui/plugin/DataOptWidget/CDataOptCommon.h b/product/src/gui/plugin/DataOptWidget/CDataOptCommon.h index 4932f87a..38b1d07f 100644 --- a/product/src/gui/plugin/DataOptWidget/CDataOptCommon.h +++ b/product/src/gui/plugin/DataOptWidget/CDataOptCommon.h @@ -1,4 +1,4 @@ -#ifndef CDATAOPTCOMMON_H +#ifndef CDATAOPTCOMMON_H #define CDATAOPTCOMMON_H #include diff --git a/product/src/gui/plugin/DataOptWidget/CDataOptPluginWidget.h b/product/src/gui/plugin/DataOptWidget/CDataOptPluginWidget.h index ff07c06a..b9f7c899 100644 --- a/product/src/gui/plugin/DataOptWidget/CDataOptPluginWidget.h +++ b/product/src/gui/plugin/DataOptWidget/CDataOptPluginWidget.h @@ -7,7 +7,7 @@ class CDataOptPluginWidget : 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: CDataOptPluginWidget(QObject *parent = 0); diff --git a/product/src/gui/plugin/DataOptWidget/CDataOptWidget.cpp b/product/src/gui/plugin/DataOptWidget/CDataOptWidget.cpp index 06d5911e..a41ecd4e 100644 --- a/product/src/gui/plugin/DataOptWidget/CDataOptWidget.cpp +++ b/product/src/gui/plugin/DataOptWidget/CDataOptWidget.cpp @@ -1,4 +1,4 @@ -#include "CDataOptWidget.h" +#include "CDataOptWidget.h" #include "ui_CDataOptWidget.h" #include "pub_utility_api/FileStyle.h" #include @@ -454,7 +454,7 @@ int CDataOptWidget::createReqHead(SOptReqHead &head) if(createSysInfoInstance(sysInfo) == false) { LOGERROR("创建系统信息访问库实例失败!"); - return kbdFailed; + return iotFailed; } else { @@ -467,13 +467,13 @@ int CDataOptWidget::createReqHead(SOptReqHead &head) if(permMng->PermDllInit() != PERM_NORMAL) { LOGERROR("权限接口初始化失败!"); - return kbdFailed; + return iotFailed; }else { if(PERM_NORMAL != permMng->CurUser(userID, usergID, level, loginSec, instanceName)) { userID = -1; - return kbdFailed; + return iotFailed; } } } @@ -488,7 +488,7 @@ int CDataOptWidget::createReqHead(SOptReqHead &head) head.nUserGroupID = usergID; head.nOptTime = QDateTime::currentDateTime().toMSecsSinceEpoch(); - return kbdSuccess; + return iotSuccess; } void CDataOptWidget::filter(const QString &text) @@ -575,7 +575,7 @@ void CDataOptWidget::setDefaultWidth() void CDataOptWidget::cancelSetValue() { - QString mess = QString(tr("当前未选中任何项!")); + QString mess = QString(tr("请至少选择一项人工置数信息!")); QList list = ui->treeWidget->selectedItems(); if (list.size() <= 0) { @@ -671,13 +671,13 @@ void CDataOptWidget::cancelSetValue() bool CDataOptWidget::cancelItemSetValue(const QString &desc,const QString &tagName, int tagType) { STOptTagInfo info; - if(m_pWork->getOptTagInfoByTagAndType(tagName,tagType,info) !=kbdSuccess ) + if(m_pWork->getOptTagInfoByTagAndType(tagName,tagType,info) !=iotSuccess ) { slotShowMess(tr("获取标签操作信息有误，%1").arg(desc)); return false; } STTagInfo tagInfo; - if(m_pWork->getTagInfoByTag(tagName,tagInfo) !=kbdSuccess ) + if(m_pWork->getTagInfoByTag(tagName,tagInfo) !=iotSuccess ) { slotShowMess(tr("获取标签信息有误，%1").arg(desc)); return false; @@ -698,9 +698,8 @@ void CDataOptWidget::removeOptTagInfo(const STOptTagInfo &info) msg.setSubject(info.subSystem, CH_HMI_TO_OPT_OPTCMD_DOWN); SOptTagSet sOptTagSet; SOptTagQueue optTagQueue; - COptTagSet cOptTagSet; - if(createReqHead(sOptTagSet.stHead)!= kbdSuccess) + if(createReqHead(sOptTagSet.stHead)!= iotSuccess) { return ; } @@ -713,7 +712,7 @@ void CDataOptWidget::removeOptTagInfo(const STOptTagInfo &info) optTagQueue.nSubSystem = info.subSystem; sOptTagSet.vecTagQueue.push_back(optTagQueue); - std::string content = cOptTagSet.generate(sOptTagSet); + std::string content = COptTagSet::generate(sOptTagSet); int type = info.tagType; if(type == 1) { diff --git a/product/src/gui/plugin/DataOptWidget/CDataOptWidget.h b/product/src/gui/plugin/DataOptWidget/CDataOptWidget.h index d8c2baf8..2a0abc08 100644 --- a/product/src/gui/plugin/DataOptWidget/CDataOptWidget.h +++ b/product/src/gui/plugin/DataOptWidget/CDataOptWidget.h @@ -1,4 +1,4 @@ -#ifndef CDATAOPTWIDGET_H +#ifndef CDATAOPTWIDGET_H #define CDATAOPTWIDGET_H #include diff --git a/product/src/gui/plugin/DataOptWidget/CDataOptWork.cpp b/product/src/gui/plugin/DataOptWidget/CDataOptWork.cpp index d3939066..c839bda7 100644 --- a/product/src/gui/plugin/DataOptWidget/CDataOptWork.cpp +++ b/product/src/gui/plugin/DataOptWidget/CDataOptWork.cpp @@ -1,4 +1,4 @@ -#include "CDataOptWork.h" +#include "CDataOptWork.h" #include "Common.h" #include "pub_logger_api/logger.h" @@ -22,21 +22,21 @@ int CDataOptWork::getOptTagInfoByTagAndType(const QString &tag, int type,STOptTa if(m_optTagInfoList[index].tagName == tag && type == m_optTagInfoList[index].tagType) { info = m_optTagInfoList[index]; - return kbdSuccess; + return iotSuccess; } } - return kbdFailed; + return iotFailed; } int CDataOptWork::getTagInfoByTag(const QString &tag, STTagInfo &info) { if(m_TagInfoMap.find(tag) == m_TagInfoMap.end()) { - return kbdFailed; + return iotFailed; }else { info = m_TagInfoMap.value(tag); - return kbdSuccess; + return iotSuccess; } } diff --git a/product/src/gui/plugin/DataOptWidget/main.cpp b/product/src/gui/plugin/DataOptWidget/main.cpp index e7125b39..84dff7d5 100644 --- a/product/src/gui/plugin/DataOptWidget/main.cpp +++ b/product/src/gui/plugin/DataOptWidget/main.cpp @@ -1,4 +1,4 @@ - + #include #include "pub_logger_api/logger.h" @@ -19,7 +19,7 @@ int main(int argc, char *argv[]) return -1; } - if(perm->SysLogin("Test", "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/DevHisDataWidget/CDbInterface.cpp b/product/src/gui/plugin/DevHisDataWidget/CDbInterface.cpp index c0e20869..4cbcf20d 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CDbInterface.cpp +++ b/product/src/gui/plugin/DevHisDataWidget/CDbInterface.cpp @@ -1,4 +1,4 @@ -#include "CDbInterface.h" +#include "CDbInterface.h" #include "public/pub_sysinfo_api/SysInfoApi.h" #include "public/pub_logger_api/logger.h" diff --git a/product/src/gui/plugin/DevHisDataWidget/CDbInterface.h b/product/src/gui/plugin/DevHisDataWidget/CDbInterface.h index f6bd3e22..7428c6e5 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CDbInterface.h +++ b/product/src/gui/plugin/DevHisDataWidget/CDbInterface.h @@ -1,4 +1,4 @@ -#ifndef CDBINTERFACE_H +#ifndef CDBINTERFACE_H #define CDBINTERFACE_H #include "dbms/rdb_api/CRdbAccess.h" diff --git a/product/src/gui/plugin/DevHisDataWidget/CDevHisDataPluginWidget.cpp b/product/src/gui/plugin/DevHisDataWidget/CDevHisDataPluginWidget.cpp index 313fd8c3..377edb42 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CDevHisDataPluginWidget.cpp +++ b/product/src/gui/plugin/DevHisDataWidget/CDevHisDataPluginWidget.cpp @@ -1,4 +1,4 @@ -#include "CDevHisDataPluginWidget.h" +#include "CDevHisDataPluginWidget.h" #include "CDevHisDataWidget.h" #include diff --git a/product/src/gui/plugin/DevHisDataWidget/CDevHisDataPluginWidget.h b/product/src/gui/plugin/DevHisDataWidget/CDevHisDataPluginWidget.h index 2e970cb5..367703af 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CDevHisDataPluginWidget.h +++ b/product/src/gui/plugin/DevHisDataWidget/CDevHisDataPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef CDEVHISDATAPLUGINWIDGET_H +#ifndef CDEVHISDATAPLUGINWIDGET_H #define CDEVHISDATAPLUGINWIDGET_H #include @@ -7,7 +7,7 @@ class CDevHisDataPluginWidget : 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: diff --git a/product/src/gui/plugin/DevHisDataWidget/CDevHisDataWidget.cpp b/product/src/gui/plugin/DevHisDataWidget/CDevHisDataWidget.cpp index 02a125a7..ef16bcf5 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CDevHisDataWidget.cpp +++ b/product/src/gui/plugin/DevHisDataWidget/CDevHisDataWidget.cpp @@ -1,4 +1,4 @@ -#include "CDevHisDataWidget.h" +#include "CDevHisDataWidget.h" #include "ui_CDevHisDataWidget.h" #include "CTableViewPrinter.h" #include "model_excel/xlsx/xlsxdocument.h" diff --git a/product/src/gui/plugin/DevHisDataWidget/CDevHisDataWidget.h b/product/src/gui/plugin/DevHisDataWidget/CDevHisDataWidget.h index 2b686c5b..9997cb3f 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CDevHisDataWidget.h +++ b/product/src/gui/plugin/DevHisDataWidget/CDevHisDataWidget.h @@ -1,4 +1,4 @@ -#ifndef CDEVHISDATAWIDGET_H +#ifndef CDEVHISDATAWIDGET_H #define CDEVHISDATAWIDGET_H #include diff --git a/product/src/gui/plugin/DevHisDataWidget/CDevHisTableModel.cpp b/product/src/gui/plugin/DevHisDataWidget/CDevHisTableModel.cpp index 5fa2f027..d4ce7aba 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CDevHisTableModel.cpp +++ b/product/src/gui/plugin/DevHisDataWidget/CDevHisTableModel.cpp @@ -1,4 +1,4 @@ -#include "CDevHisTableModel.h" +#include "CDevHisTableModel.h" #include CDevHisTableModel::CDevHisTableModel(QObject *parent) diff --git a/product/src/gui/plugin/DevHisDataWidget/CDevHisTableModel.h b/product/src/gui/plugin/DevHisDataWidget/CDevHisTableModel.h index 6a6d9ed5..c6982a3e 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CDevHisTableModel.h +++ b/product/src/gui/plugin/DevHisDataWidget/CDevHisTableModel.h @@ -1,4 +1,4 @@ -#ifndef CDEVHISTABLEMODEL_H +#ifndef CDEVHISTABLEMODEL_H #define CDEVHISTABLEMODEL_H #include diff --git a/product/src/gui/plugin/DevHisDataWidget/CDevHisTableView.cpp b/product/src/gui/plugin/DevHisDataWidget/CDevHisTableView.cpp index 5e0944b6..c30328be 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CDevHisTableView.cpp +++ b/product/src/gui/plugin/DevHisDataWidget/CDevHisTableView.cpp @@ -1,4 +1,4 @@ -#include "CDevHisTableView.h" +#include "CDevHisTableView.h" CDevHisTableView::CDevHisTableView(QWidget *parent) :QTableView(parent) diff --git a/product/src/gui/plugin/DevHisDataWidget/CDevHisTableView.h b/product/src/gui/plugin/DevHisDataWidget/CDevHisTableView.h index c029885c..b0ec0aa8 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CDevHisTableView.h +++ b/product/src/gui/plugin/DevHisDataWidget/CDevHisTableView.h @@ -1,4 +1,4 @@ -#ifndef CDEVHISTABLEVIEW_H +#ifndef CDEVHISTABLEVIEW_H #define CDEVHISTABLEVIEW_H #include diff --git a/product/src/gui/plugin/DevHisDataWidget/CHisDataManage.cpp b/product/src/gui/plugin/DevHisDataWidget/CHisDataManage.cpp index bc9fc301..00a406ad 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CHisDataManage.cpp +++ b/product/src/gui/plugin/DevHisDataWidget/CHisDataManage.cpp @@ -1,4 +1,4 @@ -#include "CHisDataManage.h" +#include "CHisDataManage.h" #include "public/pub_logger_api/logger.h" #define SAMPLE_CYC_MIN 5 //MIN diff --git a/product/src/gui/plugin/DevHisDataWidget/CHisDataManage.h b/product/src/gui/plugin/DevHisDataWidget/CHisDataManage.h index 89b4b131..a4443aa3 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CHisDataManage.h +++ b/product/src/gui/plugin/DevHisDataWidget/CHisDataManage.h @@ -1,4 +1,4 @@ -#ifndef CHISDATAMANAGE_H +#ifndef CHISDATAMANAGE_H #define CHISDATAMANAGE_H #include diff --git a/product/src/gui/plugin/DevHisDataWidget/CTableViewPrinter.cpp b/product/src/gui/plugin/DevHisDataWidget/CTableViewPrinter.cpp index 6da493f1..bf51f0f9 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CTableViewPrinter.cpp +++ b/product/src/gui/plugin/DevHisDataWidget/CTableViewPrinter.cpp @@ -1,4 +1,4 @@ -#include "CTableViewPrinter.h" +#include "CTableViewPrinter.h" #include #include #include diff --git a/product/src/gui/plugin/DevHisDataWidget/CTableViewPrinter.h b/product/src/gui/plugin/DevHisDataWidget/CTableViewPrinter.h index 0a80e9fb..02dadbec 100644 --- a/product/src/gui/plugin/DevHisDataWidget/CTableViewPrinter.h +++ b/product/src/gui/plugin/DevHisDataWidget/CTableViewPrinter.h @@ -1,4 +1,4 @@ -#ifndef CTABLEVIEWPRINTER_H +#ifndef CTABLEVIEWPRINTER_H #define CTABLEVIEWPRINTER_H class QPointF; diff --git a/product/src/gui/plugin/DevHisDataWidget/main.cpp b/product/src/gui/plugin/DevHisDataWidget/main.cpp index 2ddedafc..af09229b 100644 --- a/product/src/gui/plugin/DevHisDataWidget/main.cpp +++ b/product/src/gui/plugin/DevHisDataWidget/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include "CDevHisDataWidget.h" #include "pub_logger_api/logger.h" #include "dp_chg_data_api/CDpcdaForApp.h" diff --git a/product/src/gui/plugin/DocumentManageWidget/CDocComManage.h b/product/src/gui/plugin/DocumentManageWidget/CDocComManage.h index 2d69429e..8e6cd5aa 100644 --- a/product/src/gui/plugin/DocumentManageWidget/CDocComManage.h +++ b/product/src/gui/plugin/DocumentManageWidget/CDocComManage.h @@ -1,4 +1,4 @@ -#ifndef CDOCPATHMANAGE_H +#ifndef CDOCPATHMANAGE_H #define CDOCPATHMANAGE_H #include diff --git a/product/src/gui/plugin/DocumentManageWidget/CDocumentManagePlugin.cpp b/product/src/gui/plugin/DocumentManageWidget/CDocumentManagePlugin.cpp index dd6226a3..4a1580a4 100644 --- a/product/src/gui/plugin/DocumentManageWidget/CDocumentManagePlugin.cpp +++ b/product/src/gui/plugin/DocumentManageWidget/CDocumentManagePlugin.cpp @@ -1,9 +1,9 @@ -#include "CDocumentManagePlugin.h" +#include "CDocumentManagePlugin.h" #include "CDocumentManageWidget.h" CDocumentManagePlugin::CDocumentManagePlugin(QObject *parent) { - + Q_UNUSED(parent); } CDocumentManagePlugin::~CDocumentManagePlugin() diff --git a/product/src/gui/plugin/DocumentManageWidget/CDocumentManagePlugin.h b/product/src/gui/plugin/DocumentManageWidget/CDocumentManagePlugin.h index 7989fb48..26173f04 100644 --- a/product/src/gui/plugin/DocumentManageWidget/CDocumentManagePlugin.h +++ b/product/src/gui/plugin/DocumentManageWidget/CDocumentManagePlugin.h @@ -1,13 +1,13 @@ -#ifndef CDOCUMENTMANAGEPLUGIN_H +#ifndef CDOCUMENTMANAGEPLUGIN_H #define CDOCUMENTMANAGEPLUGIN_H #include -#include "GraphShape/CPluginWidget.h" //< ISCS6000_HOME/platform/src/include/gui/GraphShape +#include "GraphShape/CPluginWidget.h" //< RQEH6000_HOME/platform/src/include/gui/GraphShape class CDocumentManagePlugin : 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: diff --git a/product/src/gui/plugin/DocumentManageWidget/CDocumentManageWidget.cpp b/product/src/gui/plugin/DocumentManageWidget/CDocumentManageWidget.cpp index 9e58b520..ff8018f1 100644 --- a/product/src/gui/plugin/DocumentManageWidget/CDocumentManageWidget.cpp +++ b/product/src/gui/plugin/DocumentManageWidget/CDocumentManageWidget.cpp @@ -1,4 +1,4 @@ -#include "CDocumentManageWidget.h" +#include "CDocumentManageWidget.h" #include "ui_CDocumentManageWidget.h" #include "pub_utility_api/FileStyle.h" #include @@ -33,6 +33,11 @@ CDocumentManageWidget::~CDocumentManageWidget() delete ui; } +void CDocumentManageWidget::setFileTableColumnWidth(int colum, int value) +{ + ui->m_tableWidget->setColumnWidth(colum,value); +} + void CDocumentManageWidget::initStyle() { QString qss = QString(); diff --git a/product/src/gui/plugin/DocumentManageWidget/CDocumentManageWidget.h b/product/src/gui/plugin/DocumentManageWidget/CDocumentManageWidget.h index f864ad1e..c04186e2 100644 --- a/product/src/gui/plugin/DocumentManageWidget/CDocumentManageWidget.h +++ b/product/src/gui/plugin/DocumentManageWidget/CDocumentManageWidget.h @@ -1,4 +1,4 @@ -#ifndef CDOCUMENTMANAGEWIDGET_H +#ifndef CDOCUMENTMANAGEWIDGET_H #define CDOCUMENTMANAGEWIDGET_H #include @@ -15,12 +15,16 @@ public: explicit CDocumentManageWidget(QWidget *parent = 0, bool isEditMode = true); ~CDocumentManageWidget(); +public slots: + void setFileTableColumnWidth(int colum, int value); + private: void initStyle(); private slots: void slotSearch(); + private: Ui::CDocumentManageWidget *ui; }; diff --git a/product/src/gui/plugin/DocumentManageWidget/CFileFolderTree.cpp b/product/src/gui/plugin/DocumentManageWidget/CFileFolderTree.cpp index 1f86c43f..6ce248c4 100644 --- a/product/src/gui/plugin/DocumentManageWidget/CFileFolderTree.cpp +++ b/product/src/gui/plugin/DocumentManageWidget/CFileFolderTree.cpp @@ -1,4 +1,4 @@ -#include "CFileFolderTree.h" +#include "CFileFolderTree.h" #include "CDocComManage.h" #include "CInputDialog.h" #include @@ -210,6 +210,7 @@ void CFileFolderTree::slotModify() { currentItem()->setText(0, newName); currentItem()->setData(0, Qt::UserRole, newModuleDir); + emit fileItemClicked(newModuleDir); } } @@ -264,7 +265,7 @@ void CFileFolderTree::contextMenuEvent(QContextMenuEvent *event) QTreeWidgetItem * pItem = static_cast(indexAt(event->pos()).internalPointer()); if(Q_NULLPTR != pItem) { - QMenu menu; + QMenu menu(this); menu.addAction(tr("添加"), [=](){ slotAdd(); }); menu.addAction(tr("修改"), [=](){ slotModify(); }); menu.addAction(tr("删除"), [=](){ slotDelete(); }); @@ -272,7 +273,7 @@ void CFileFolderTree::contextMenuEvent(QContextMenuEvent *event) } else { - QMenu menu; + QMenu menu(this); menu.addAction(tr("添加"), [=](){ slotAdd(); }); menu.exec(event->globalPos()); } diff --git a/product/src/gui/plugin/DocumentManageWidget/CFileFolderTree.h b/product/src/gui/plugin/DocumentManageWidget/CFileFolderTree.h index 89ab6ccc..d69c97e8 100644 --- a/product/src/gui/plugin/DocumentManageWidget/CFileFolderTree.h +++ b/product/src/gui/plugin/DocumentManageWidget/CFileFolderTree.h @@ -1,4 +1,4 @@ -#ifndef CFILEFOLDERTREE_H +#ifndef CFILEFOLDERTREE_H #define CFILEFOLDERTREE_H #include diff --git a/product/src/gui/plugin/DocumentManageWidget/CFileTableWidget.cpp b/product/src/gui/plugin/DocumentManageWidget/CFileTableWidget.cpp index 54d47399..696c428a 100644 --- a/product/src/gui/plugin/DocumentManageWidget/CFileTableWidget.cpp +++ b/product/src/gui/plugin/DocumentManageWidget/CFileTableWidget.cpp @@ -1,4 +1,4 @@ -#include "CFileTableWidget.h" +#include "CFileTableWidget.h" #include "CDocComManage.h" #include #include @@ -7,6 +7,9 @@ #include #include #include +#include +#include "pub_utility_api/I18N.h" + CFileTableWidget::CFileTableWidget(QWidget *parent) : QTableWidget(parent) @@ -250,16 +253,22 @@ void CFileTableWidget::setTableRowHeight(const int &nHeight) void CFileTableWidget::initialize() { setColumnCount(4); - setColumnWidth(COLUMN_SEQ, 50); - setColumnWidth(COLUMN_NAME, 350); - setColumnWidth(COLUMN_DATE, 190); +// setColumnWidth(COLUMN_SEQ, 50); +// setColumnWidth(COLUMN_NAME, 350); +// setColumnWidth(COLUMN_DATE, 190); setHorizontalHeaderLabels(QStringList() << tr("序号") << tr("文档名称") << tr("文档修改时间") << tr("文档路径")); + horizontalHeader()->setDefaultSectionSize(200); setSelectionBehavior(QAbstractItemView::SelectRows); setSelectionMode(QAbstractItemView::ExtendedSelection); setEditTriggers(QAbstractItemView::NoEditTriggers); horizontalHeader()->setStretchLastSection(true); setAlternatingRowColors(true); verticalHeader()->setHidden(true); + + resizeRowsToContents(); + horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); + verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents); + setWordWrap(true); } void CFileTableWidget::makeTable(const QString &path) diff --git a/product/src/gui/plugin/DocumentManageWidget/CFileTableWidget.h b/product/src/gui/plugin/DocumentManageWidget/CFileTableWidget.h index 112a50c1..5553dc5a 100644 --- a/product/src/gui/plugin/DocumentManageWidget/CFileTableWidget.h +++ b/product/src/gui/plugin/DocumentManageWidget/CFileTableWidget.h @@ -1,4 +1,4 @@ -#ifndef CFILETABLEWIDGET_H +#ifndef CFILETABLEWIDGET_H #define CFILETABLEWIDGET_H #include diff --git a/product/src/gui/plugin/DocumentManageWidget/CInputDialog.cpp b/product/src/gui/plugin/DocumentManageWidget/CInputDialog.cpp index 21caaf03..be963fdc 100644 --- a/product/src/gui/plugin/DocumentManageWidget/CInputDialog.cpp +++ b/product/src/gui/plugin/DocumentManageWidget/CInputDialog.cpp @@ -1,20 +1,22 @@ -#include "CInputDialog.h" +#include "CInputDialog.h" #include #include #include #include +const QString CN_BtnObjName = "CInputDialog#QDialogButtonBox"; + CInputDialog::CInputDialog(QWidget *parent) - : QDialog(parent), + : CustomDialog(parent), m_nInputId(0) { - QVBoxLayout * layout = new QVBoxLayout(this); + m_pMainLayout = new QVBoxLayout(this); QDialogButtonBox * buttonBox = new QDialogButtonBox( QDialogButtonBox::Ok | QDialogButtonBox::Cancel); - layout->addWidget(buttonBox); - layout->setMargin(3); - layout->setSpacing(3); - setLayout(layout); + m_pMainLayout->addWidget(buttonBox); + m_pMainLayout->setMargin(3); + m_pMainLayout->setSpacing(3); + setLayout(m_pMainLayout); connect(buttonBox, &QDialogButtonBox::accepted, [=]{accept();}); connect(buttonBox, &QDialogButtonBox::rejected, [=]{reject();}); } @@ -31,7 +33,7 @@ void CInputDialog::setTitle(const QString &title) int CInputDialog::addOneInput(const QString &text, const QString &value) { - QVBoxLayout *gLayout = dynamic_cast(this->layout()); + QVBoxLayout *gLayout = dynamic_cast(m_pMainLayout); if(gLayout) { QVBoxLayout * layout = new QVBoxLayout; diff --git a/product/src/gui/plugin/DocumentManageWidget/CInputDialog.h b/product/src/gui/plugin/DocumentManageWidget/CInputDialog.h index 1a9f1544..f5103825 100644 --- a/product/src/gui/plugin/DocumentManageWidget/CInputDialog.h +++ b/product/src/gui/plugin/DocumentManageWidget/CInputDialog.h @@ -1,12 +1,12 @@ -#ifndef CINPUTDIALOG_H +#ifndef CINPUTDIALOG_H #define CINPUTDIALOG_H #include -#include #include +#include "pub_widget/CustomDialog.h" class QLineEdit; -class CInputDialog : public QDialog +class CInputDialog : public CustomDialog { Q_OBJECT public: @@ -22,7 +22,7 @@ public: private: int m_nInputId; QMap m_inputMap; - + QVBoxLayout *m_pMainLayout; }; #endif // CINPUTDIALOG_H diff --git a/product/src/gui/plugin/DocumentManageWidget/DocumentManageWidget.pro b/product/src/gui/plugin/DocumentManageWidget/DocumentManageWidget.pro index 36344f9f..3b0c2a21 100644 --- a/product/src/gui/plugin/DocumentManageWidget/DocumentManageWidget.pro +++ b/product/src/gui/plugin/DocumentManageWidget/DocumentManageWidget.pro @@ -43,7 +43,8 @@ FORMS += \ LIBS += \ -lpub_utility_api \ - -lperm_mng_api + -lperm_mng_api \ + -lpub_widget COMMON_PRI=$$PWD/../../../common.pri exists($$COMMON_PRI) { diff --git a/product/src/gui/plugin/DocumentManageWidget/main.cpp b/product/src/gui/plugin/DocumentManageWidget/main.cpp index a6c31bbc..cf98f110 100644 --- a/product/src/gui/plugin/DocumentManageWidget/main.cpp +++ b/product/src/gui/plugin/DocumentManageWidget/main.cpp @@ -1,4 +1,4 @@ -#include "CDocumentManageWidget.h" +#include "CDocumentManageWidget.h" #include int main(int argc, char *argv[]) diff --git a/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordCommon.h b/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordCommon.h index 35f5e9f7..e2c6506d 100644 --- a/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordCommon.h +++ b/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordCommon.h @@ -1,4 +1,4 @@ -#ifndef CFAULTRECALLRECORDCOMMON_H +#ifndef CFAULTRECALLRECORDCOMMON_H #define CFAULTRECALLRECORDCOMMON_H #include diff --git a/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordPluginWidget.cpp b/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordPluginWidget.cpp index 6d2ada56..c5105ad8 100644 --- a/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordPluginWidget.cpp +++ b/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordPluginWidget.cpp @@ -1,4 +1,4 @@ -#include "CFaultRecallRecordPluginWidget.h" +#include "CFaultRecallRecordPluginWidget.h" #include "CFaultRecallRecordWidget.h" CFaultRecallRecordPluginWidget::CFaultRecallRecordPluginWidget(QObject *parent): QObject(parent) { diff --git a/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordPluginWidget.h b/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordPluginWidget.h index e0458f40..760ab2e4 100644 --- a/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordPluginWidget.h +++ b/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef CFAULTRECALLRECORDPLUGINWIDGET_H +#ifndef CFAULTRECALLRECORDPLUGINWIDGET_H #define CFAULTRECALLRECORDPLUGINWIDGET_H #include @@ -7,7 +7,7 @@ class CFaultRecallRecordPluginWidget : 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: CFaultRecallRecordPluginWidget(QObject *parent = 0); diff --git a/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordWidget.cpp b/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordWidget.cpp index f8860496..a4fa9c16 100644 --- a/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordWidget.cpp +++ b/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordWidget.cpp @@ -1,4 +1,4 @@ -#include "CFaultRecallRecordWidget.h" +#include "CFaultRecallRecordWidget.h" #include "ui_CFaultRecallRecordWidget.h" #include "pub_utility_api/FileStyle.h" #include @@ -469,6 +469,9 @@ void CFaultRecallRecordWidget::setRecordStatus(int status) void CFaultRecallRecordWidget::slotItemDoubleClicked(QTreeWidgetItem *item, int cl) { + Q_UNUSED(item); + Q_UNUSED(cl); + slotPlayBtn(); } diff --git a/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordWidget.h b/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordWidget.h index 14eeff48..dc675d25 100644 --- a/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordWidget.h +++ b/product/src/gui/plugin/FaultRecallRecordWidget/CFaultRecallRecordWidget.h @@ -1,4 +1,4 @@ -#ifndef CFAULTRECALLRECORDWIDGET_H +#ifndef CFAULTRECALLRECORDWIDGET_H #define CFAULTRECALLRECORDWIDGET_H #include @@ -65,7 +65,7 @@ public slots: void setColumnHidden(int column,bool hide); void setColumnWidth(int column,int width); -signals: +Q_SIGNALS: void sigPlay(const QString& file,qint64 startTime, qint64 endTime); private: diff --git a/product/src/gui/plugin/FaultRecallRecordWidget/main.cpp b/product/src/gui/plugin/FaultRecallRecordWidget/main.cpp index 4c3abb84..5cd2676f 100644 --- a/product/src/gui/plugin/FaultRecallRecordWidget/main.cpp +++ b/product/src/gui/plugin/FaultRecallRecordWidget/main.cpp @@ -1,4 +1,4 @@ - + #include #include "pub_logger_api/logger.h" @@ -19,7 +19,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/FaultRecordWidget/FaultRecordModel.cpp b/product/src/gui/plugin/FaultRecordWidget/FaultRecordModel.cpp index b2dfded0..9bbb0e4f 100644 --- a/product/src/gui/plugin/FaultRecordWidget/FaultRecordModel.cpp +++ b/product/src/gui/plugin/FaultRecordWidget/FaultRecordModel.cpp @@ -1,4 +1,4 @@ -#include "FaultRecordModel.h" +#include "FaultRecordModel.h" #include FaultRecordModel::FaultRecordModel(QObject *parent) : QAbstractTableModel(parent) diff --git a/product/src/gui/plugin/FaultRecordWidget/FaultRecordModel.h b/product/src/gui/plugin/FaultRecordWidget/FaultRecordModel.h index 84b12cf6..dc8373b7 100644 --- a/product/src/gui/plugin/FaultRecordWidget/FaultRecordModel.h +++ b/product/src/gui/plugin/FaultRecordWidget/FaultRecordModel.h @@ -1,4 +1,4 @@ -#ifndef FAULTRECORDMODEL_H +#ifndef FAULTRECORDMODEL_H #define FAULTRECORDMODEL_H #include diff --git a/product/src/gui/plugin/FaultRecordWidget/FaultRecordPluginWidget.cpp b/product/src/gui/plugin/FaultRecordWidget/FaultRecordPluginWidget.cpp index de85bf83..4bda5dc1 100644 --- a/product/src/gui/plugin/FaultRecordWidget/FaultRecordPluginWidget.cpp +++ b/product/src/gui/plugin/FaultRecordWidget/FaultRecordPluginWidget.cpp @@ -1,4 +1,4 @@ -#include "FaultRecordPluginWidget.h" +#include "FaultRecordPluginWidget.h" #include "FaultRecordWidget.h" #include #include "StructDefine.h" diff --git a/product/src/gui/plugin/FaultRecordWidget/FaultRecordPluginWidget.h b/product/src/gui/plugin/FaultRecordWidget/FaultRecordPluginWidget.h index 72a6ef98..fa977f75 100644 --- a/product/src/gui/plugin/FaultRecordWidget/FaultRecordPluginWidget.h +++ b/product/src/gui/plugin/FaultRecordWidget/FaultRecordPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef FAULTRECORDPLUGINWIDGET_H +#ifndef FAULTRECORDPLUGINWIDGET_H #define FAULTRECORDPLUGINWIDGET_H #include @@ -7,7 +7,7 @@ class FaultRecordPluginWidget : 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: FaultRecordPluginWidget(QObject *parent = nullptr); diff --git a/product/src/gui/plugin/FaultRecordWidget/FaultRecordWidget.cpp b/product/src/gui/plugin/FaultRecordWidget/FaultRecordWidget.cpp index fb9cd64f..0536a68b 100644 --- a/product/src/gui/plugin/FaultRecordWidget/FaultRecordWidget.cpp +++ b/product/src/gui/plugin/FaultRecordWidget/FaultRecordWidget.cpp @@ -1,4 +1,4 @@ -#include "FaultRecordWidget.h" +#include "FaultRecordWidget.h" #include "ui_FaultRecordWidget.h" #include #include diff --git a/product/src/gui/plugin/FaultRecordWidget/FaultRecordWidget.h b/product/src/gui/plugin/FaultRecordWidget/FaultRecordWidget.h index e344e3a0..7bfa6b9d 100644 --- a/product/src/gui/plugin/FaultRecordWidget/FaultRecordWidget.h +++ b/product/src/gui/plugin/FaultRecordWidget/FaultRecordWidget.h @@ -1,4 +1,4 @@ -#ifndef FAULTRECORDWIDGET_H +#ifndef FAULTRECORDWIDGET_H #define FAULTRECORDWIDGET_H #include diff --git a/product/src/gui/plugin/FaultRecordWidget/StructDefine.h b/product/src/gui/plugin/FaultRecordWidget/StructDefine.h index 813346d4..6f485f93 100644 --- a/product/src/gui/plugin/FaultRecordWidget/StructDefine.h +++ b/product/src/gui/plugin/FaultRecordWidget/StructDefine.h @@ -1,4 +1,4 @@ -#ifndef STRUCTDEFINE_H +#ifndef STRUCTDEFINE_H #define STRUCTDEFINE_H #include #include diff --git a/product/src/gui/plugin/FaultRecordWidget/main.cpp b/product/src/gui/plugin/FaultRecordWidget/main.cpp index 9aee6e5f..01e4e231 100644 --- a/product/src/gui/plugin/FaultRecordWidget/main.cpp +++ b/product/src/gui/plugin/FaultRecordWidget/main.cpp @@ -1,4 +1,4 @@ -#include "FaultRecordWidget.h" +#include "FaultRecordWidget.h" #include #include "pub_logger_api/logger.h" int main(int argc, char *argv[]) diff --git a/product/src/gui/plugin/FbdEditorWidget/FbdEditorPluginWidget.cpp b/product/src/gui/plugin/FbdEditorWidget/FbdEditorPluginWidget.cpp index cda97848..8440b821 100644 --- a/product/src/gui/plugin/FbdEditorWidget/FbdEditorPluginWidget.cpp +++ b/product/src/gui/plugin/FbdEditorWidget/FbdEditorPluginWidget.cpp @@ -1,4 +1,4 @@ -#include +#include #include "FbdEditorPluginWidget.h" #include "FbdEditorWidget.h" diff --git a/product/src/gui/plugin/FbdEditorWidget/FbdEditorPluginWidget.h b/product/src/gui/plugin/FbdEditorWidget/FbdEditorPluginWidget.h index 9c9ab34f..c8242254 100644 --- a/product/src/gui/plugin/FbdEditorWidget/FbdEditorPluginWidget.h +++ b/product/src/gui/plugin/FbdEditorWidget/FbdEditorPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef FBDEDITORPLUGINWIDGET_H +#ifndef FBDEDITORPLUGINWIDGET_H #define FBDEDITORPLUGINWIDGET_H #include @@ -7,7 +7,7 @@ class CFbdEditorPluginWidget: 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: diff --git a/product/src/gui/plugin/FbdEditorWidget/FbdEditorWidget.cpp b/product/src/gui/plugin/FbdEditorWidget/FbdEditorWidget.cpp index ce6a5519..194d21b4 100644 --- a/product/src/gui/plugin/FbdEditorWidget/FbdEditorWidget.cpp +++ b/product/src/gui/plugin/FbdEditorWidget/FbdEditorWidget.cpp @@ -1,6 +1,8 @@ -#include "FbdEditorWidget.h" +#include "FbdEditorWidget.h" #include "fbd_designer/fbd_editor/CFBDMainWindow.h" #include "fbd_designer/fbd_editor/CFBDMainWindow_global.h" +#include "public/pub_utility_api/FileUtil.h" +#include "pub_utility_api/FileStyle.h" #include FbdEditorWidget::FbdEditorWidget(bool editMode, QWidget *parent) : @@ -20,10 +22,14 @@ FbdEditorWidget::FbdEditorWidget(bool editMode, QWidget *parent) : else { m_ptrWindow = new CFBDMainWindow(parent); + m_ptrWindow->setObjectName("fbdEditorWindow"); + m_ptrWindow->slotInit(); QGridLayout *layout = new QGridLayout(this); layout->addWidget(m_ptrWindow); layout->setMargin(0); setLayout(layout); + + initStyle(); } } @@ -36,6 +42,34 @@ FbdEditorWidget::~FbdEditorWidget() m_ptrWindow = NULL; } +void FbdEditorWidget::initStyle() +{ + QString qss = QString(); + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("public.qss") ; + QFile qssfile1(QString::fromStdString(strFullPath)); + qssfile1.open(QFile::ReadOnly); + if (qssfile1.isOpen()) + { + qss += QLatin1String(qssfile1.readAll()); + //setStyleSheet(qss); + qssfile1.close(); + } + + strFullPath = iot_public::CFileStyle::getPathOfStyleFile("fbd_designer.qss") ; + QFile qssfile2(QString::fromStdString(strFullPath)); + qssfile2.open(QFile::ReadOnly); + if (qssfile2.isOpen()) + { + qss += QLatin1String(qssfile2.readAll()); + //setStyleSheet(qss); + qssfile2.close(); + } + if(!qss.isEmpty()) + { + setStyleSheet(qss); + } +} + void FbdEditorWidget::slotHideMenu(bool bHide) { if(m_ptrWindow) diff --git a/product/src/gui/plugin/FbdEditorWidget/FbdEditorWidget.h b/product/src/gui/plugin/FbdEditorWidget/FbdEditorWidget.h index d8f9215f..7c80338d 100644 --- a/product/src/gui/plugin/FbdEditorWidget/FbdEditorWidget.h +++ b/product/src/gui/plugin/FbdEditorWidget/FbdEditorWidget.h @@ -1,4 +1,4 @@ -#ifndef FBDEDITORWIDGET_H +#ifndef FBDEDITORWIDGET_H #define FBDEDITORWIDGET_H #include @@ -11,6 +11,8 @@ class FbdEditorWidget : public QWidget public: explicit FbdEditorWidget(bool editMode, QWidget *parent = 0); ~FbdEditorWidget(); +private: + void initStyle(); public slots: void slotHideMenu(bool bHide); diff --git a/product/src/gui/plugin/FbdEditorWidget/FbdEditorWidget.pro b/product/src/gui/plugin/FbdEditorWidget/FbdEditorWidget.pro index 44dbb0bd..19e53956 100644 --- a/product/src/gui/plugin/FbdEditorWidget/FbdEditorWidget.pro +++ b/product/src/gui/plugin/FbdEditorWidget/FbdEditorWidget.pro @@ -33,7 +33,9 @@ HEADERS += \ FbdEditorPluginWidget.h \ FbdEditorWidget.h -LIBS += -lfbd_editor +LIBS += -lfbd_editor -lpub_widget +LIBS += -lpub_utility_api + exists($$PWD/../../../common.pri) { include($$PWD/../../../common.pri) diff --git a/product/src/gui/plugin/HangPanelWidget/CHangPanelPluginWidget.h b/product/src/gui/plugin/HangPanelWidget/CHangPanelPluginWidget.h index 3889afcd..96b75ad4 100644 --- a/product/src/gui/plugin/HangPanelWidget/CHangPanelPluginWidget.h +++ b/product/src/gui/plugin/HangPanelWidget/CHangPanelPluginWidget.h @@ -7,7 +7,7 @@ class CHangPanelPluginWidget : 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: CHangPanelPluginWidget(QObject *parent = 0); diff --git a/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.cpp b/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.cpp index 4e1dc4f8..72efb030 100644 --- a/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.cpp +++ b/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.cpp @@ -1,4 +1,4 @@ -#include "CHangPanelWidget.h" +#include "CHangPanelWidget.h" #include "ui_CHangPanelWidget.h" #include "pub_utility_api/FileStyle.h" #include @@ -272,7 +272,7 @@ void CHangPanelWidget::loadHangType() { int nTokenId = query.value(0).toInt(); QString sDesc = query.value(1).toString(); - int nTokenProp = query.value(2).toInt(); + //int nTokenProp = query.value(2).toInt(); m_typeMap.insert(nTokenId, sDesc); } return; @@ -441,7 +441,7 @@ int CHangPanelWidget::createReqHead(SOptReqHead &head) if(createSysInfoInstance(sysInfo) == false) { LOGERROR("创建系统信息访问库实例失败!"); - return kbdFailed; + return iotFailed; } else { @@ -454,13 +454,13 @@ int CHangPanelWidget::createReqHead(SOptReqHead &head) if(permMng->PermDllInit() != PERM_NORMAL) { LOGERROR("权限接口初始化失败!"); - return kbdFailed; + return iotFailed; }else { if(PERM_NORMAL != permMng->CurUser(userID, usergID, level, loginSec, instanceName)) { userID = -1; - return kbdFailed; + return iotFailed; } } } @@ -475,12 +475,14 @@ int CHangPanelWidget::createReqHead(SOptReqHead &head) head.nUserGroupID = usergID; head.nOptTime = QDateTime::currentDateTime().toMSecsSinceEpoch(); - return kbdSuccess; + return iotSuccess; } void CHangPanelWidget::filter(const QString &content) { Q_UNUSED(content); + + /* 没看出实际作用，注释掉 int locId = ui->cLocation->currentData().toInt(); int row = ui->tableWidget->rowCount(); for(int index(0);indextableWidget->item(index,0)->data(Qt::UserRole).toInt(); int type = ui->tableWidget->item(index,4)->data(Qt::UserRole).toInt(); } + */ } void CHangPanelWidget::slotShowMess(const QString &mess) @@ -540,10 +543,10 @@ void CHangPanelWidget::cancelHangePanel() slotShowMess(mess); return; } - int row = ui->tableWidget->currentRow(); - QString tagName= ui->tableWidget->item(row,10)->data(Qt::UserRole).toString(); //标签 - QString descName= ui->tableWidget->item(row,10)->text(); //标签 - int tagType = ui->tableWidget->item(row,3)->data(Qt::UserRole).toInt(); //挂牌类型 + //int row = ui->tableWidget->currentRow(); + //QString tagName= ui->tableWidget->item(row,10)->data(Qt::UserRole).toString(); //标签 + //QString descName= ui->tableWidget->item(row,10)->text(); //标签 + //int tagType = ui->tableWidget->item(row,3)->data(Qt::UserRole).toInt(); //挂牌类型 struct itemData { @@ -581,13 +584,13 @@ void CHangPanelWidget::cancelHangePanel() bool CHangPanelWidget::cancelItemHangePanel(const QString &desc, const QString &tagName, int tagType) { SHangPanelInfo info; - if(m_pWork->getHangInfoByTagAndType(tagName,tagType,info) !=kbdSuccess ) //得到挂牌信息 + if(m_pWork->getHangInfoByTagAndType(tagName,tagType,info) !=iotSuccess ) //得到挂牌信息 { slotShowMess(tr("获取标签挂牌信息有误，%1").arg(desc)); return false; } SDeviceInfo tagInfo; - if(m_pWork->getHangeInfoByTag(tagName,tagInfo) !=kbdSuccess ) //挂牌设备信息 + if(m_pWork->getHangeInfoByTag(tagName,tagInfo) !=iotSuccess ) //挂牌设备信息 { slotShowMess(tr("获取标签挂牌信息有误，%1").arg(desc)); return false; @@ -607,9 +610,8 @@ void CHangPanelWidget::removeHangInfo(const SHangPanelInfo &info) msg.setSubject(info.subSystem, CH_HMI_TO_OPT_OPTCMD_DOWN); STokenSet sOptHangSet; STokenQueue optHangQueue; - CTokenSet cTokenSet; - if(createReqHead(sOptHangSet.stHead)!= kbdSuccess){ return ; } + if(createReqHead(sOptHangSet.stHead)!= iotSuccess){ return ; } optHangQueue.strKeyIdTag = info.keyIdTag.toStdString(); optHangQueue.nTokenId = info.tokenId ;// 0：取消；1：设置； @@ -617,7 +619,7 @@ void CHangPanelWidget::removeHangInfo(const SHangPanelInfo &info) optHangQueue.nSubSystem = info.subSystem; sOptHangSet.vecTokenQueue.push_back(optHangQueue); - std::string content = cTokenSet.generate(sOptHangSet); + std::string content = CTokenSet::generate(sOptHangSet); msg.setMsgType(MT_OPT_TOKEN_DELETE); msg.setData(content); diff --git a/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.h b/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.h index 1a98e0c4..52f5dd95 100644 --- a/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.h +++ b/product/src/gui/plugin/HangPanelWidget/CHangPanelWidget.h @@ -1,4 +1,4 @@ -#ifndef CHangPanelWidget_H +#ifndef CHangPanelWidget_H #define CHangPanelWidget_H #include diff --git a/product/src/gui/plugin/HangPanelWidget/CHangPanelWork.cpp b/product/src/gui/plugin/HangPanelWidget/CHangPanelWork.cpp index a877b710..cc49799a 100644 --- a/product/src/gui/plugin/HangPanelWidget/CHangPanelWork.cpp +++ b/product/src/gui/plugin/HangPanelWidget/CHangPanelWork.cpp @@ -1,4 +1,4 @@ -#include "CHangPanelWork.h" +#include "CHangPanelWork.h" #include "Common.h" #include "pub_logger_api/logger.h" @@ -22,21 +22,21 @@ int CHangPanelWork::getHangInfoByTagAndType(const QString &tag, int type,SHangPa if(m_listHangPanel[index].tagName == tag && type == m_listHangPanel[index].tokenId) { info = m_listHangPanel[index]; - return kbdSuccess; + return iotSuccess; } } - return kbdFailed; + return iotFailed; } int CHangPanelWork::getHangeInfoByTag(const QString &tag, SDeviceInfo &info) { if(m_mapDeviceInfo.find(tag) == m_mapDeviceInfo.end()) { - return kbdFailed; + return iotFailed; }else { info = m_mapDeviceInfo.value(tag); - return kbdSuccess; + return iotSuccess; } } diff --git a/product/src/gui/plugin/HangPanelWidget/main.cpp b/product/src/gui/plugin/HangPanelWidget/main.cpp index c64c7447..032ab4c3 100644 --- a/product/src/gui/plugin/HangPanelWidget/main.cpp +++ b/product/src/gui/plugin/HangPanelWidget/main.cpp @@ -1,4 +1,4 @@ - + #include #include "pub_logger_api/logger.h" @@ -19,7 +19,7 @@ int main(int argc, char *argv[]) return -1; } - if(perm->SysLogin("Test", "kbdct", 1, 12*60*60, "hmi") != 0) + if(perm->SysLogin("Test", "admin", 1, 12*60*60, "hmi") != 0) { //return -1; } diff --git a/product/src/gui/plugin/HmiRollWidget/CGroupManageDialog.cpp b/product/src/gui/plugin/HmiRollWidget/CGroupManageDialog.cpp index 12816a98..e3877558 100644 --- a/product/src/gui/plugin/HmiRollWidget/CGroupManageDialog.cpp +++ b/product/src/gui/plugin/HmiRollWidget/CGroupManageDialog.cpp @@ -1,4 +1,4 @@ -#include "CGroupManageDialog.h" +#include "CGroupManageDialog.h" #include #include #include diff --git a/product/src/gui/plugin/HmiRollWidget/CGroupManageDialog.h b/product/src/gui/plugin/HmiRollWidget/CGroupManageDialog.h index df234eee..020c6d4b 100644 --- a/product/src/gui/plugin/HmiRollWidget/CGroupManageDialog.h +++ b/product/src/gui/plugin/HmiRollWidget/CGroupManageDialog.h @@ -1,4 +1,4 @@ -#ifndef CGROUPMANAGEDIALOG_H +#ifndef CGROUPMANAGEDIALOG_H #define CGROUPMANAGEDIALOG_H #include diff --git a/product/src/gui/plugin/HmiRollWidget/CHmiRollPlugin.cpp b/product/src/gui/plugin/HmiRollWidget/CHmiRollPlugin.cpp index d7a2bb25..d3f3f48c 100644 --- a/product/src/gui/plugin/HmiRollWidget/CHmiRollPlugin.cpp +++ b/product/src/gui/plugin/HmiRollWidget/CHmiRollPlugin.cpp @@ -1,4 +1,4 @@ -#include "CHmiRollPlugin.h" +#include "CHmiRollPlugin.h" #include "CHmiRollWidget.h" #include diff --git a/product/src/gui/plugin/HmiRollWidget/CHmiRollPlugin.h b/product/src/gui/plugin/HmiRollWidget/CHmiRollPlugin.h index 10538500..e2fffbf0 100644 --- a/product/src/gui/plugin/HmiRollWidget/CHmiRollPlugin.h +++ b/product/src/gui/plugin/HmiRollWidget/CHmiRollPlugin.h @@ -1,4 +1,4 @@ -#ifndef CHMIROLLPLUGIN_H +#ifndef CHMIROLLPLUGIN_H #define CHMIROLLPLUGIN_H #include @@ -7,7 +7,7 @@ class CHmiRollPlugin : 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: diff --git a/product/src/gui/plugin/HmiRollWidget/CHmiRollWidget.cpp b/product/src/gui/plugin/HmiRollWidget/CHmiRollWidget.cpp index 6c4800ff..bac7c931 100644 --- a/product/src/gui/plugin/HmiRollWidget/CHmiRollWidget.cpp +++ b/product/src/gui/plugin/HmiRollWidget/CHmiRollWidget.cpp @@ -1,4 +1,4 @@ -#include "CHmiRollWidget.h" +#include "CHmiRollWidget.h" #include "ConfigWidget.h" #include "CRollSwitchWidget.h" #include diff --git a/product/src/gui/plugin/HmiRollWidget/CHmiRollWidget.h b/product/src/gui/plugin/HmiRollWidget/CHmiRollWidget.h index 333343eb..c0fc48c2 100644 --- a/product/src/gui/plugin/HmiRollWidget/CHmiRollWidget.h +++ b/product/src/gui/plugin/HmiRollWidget/CHmiRollWidget.h @@ -1,4 +1,4 @@ -#ifndef CHMIROLLWIDGET_H +#ifndef CHMIROLLWIDGET_H #define CHMIROLLWIDGET_H #include diff --git a/product/src/gui/plugin/HmiRollWidget/CLineEditWithBtn.cpp b/product/src/gui/plugin/HmiRollWidget/CLineEditWithBtn.cpp index cc17f7f1..39c2c000 100644 --- a/product/src/gui/plugin/HmiRollWidget/CLineEditWithBtn.cpp +++ b/product/src/gui/plugin/HmiRollWidget/CLineEditWithBtn.cpp @@ -1,4 +1,4 @@ -#include "CLineEditWithBtn.h" +#include "CLineEditWithBtn.h" #include #include #include diff --git a/product/src/gui/plugin/HmiRollWidget/CLineEditWithBtn.h b/product/src/gui/plugin/HmiRollWidget/CLineEditWithBtn.h index e7608ca3..a67829b5 100644 --- a/product/src/gui/plugin/HmiRollWidget/CLineEditWithBtn.h +++ b/product/src/gui/plugin/HmiRollWidget/CLineEditWithBtn.h @@ -1,4 +1,4 @@ -#ifndef CLINEEDITWITHBTN_H +#ifndef CLINEEDITWITHBTN_H #define CLINEEDITWITHBTN_H #include diff --git a/product/src/gui/plugin/HmiRollWidget/CRollSwitchWidget.cpp b/product/src/gui/plugin/HmiRollWidget/CRollSwitchWidget.cpp index 8d8e858c..17b14d82 100644 --- a/product/src/gui/plugin/HmiRollWidget/CRollSwitchWidget.cpp +++ b/product/src/gui/plugin/HmiRollWidget/CRollSwitchWidget.cpp @@ -1,4 +1,4 @@ -#include "CRollSwitchWidget.h" +#include "CRollSwitchWidget.h" #include #include #include @@ -95,7 +95,7 @@ void CRollSwitchWidget::initWidget() cLayout->addWidget(m_timeSpin); QGridLayout *gLayout = new QGridLayout(this); - gLayout->addLayout(hLayout, 0, 0, 1, 1); + gLayout->addLayout(hLayout, 0, 0, 1,3); gLayout->addWidget(m_TableWidget, 1, 0, 1, 3); gLayout->addLayout(cLayout, 2, 0, 1, 3); diff --git a/product/src/gui/plugin/HmiRollWidget/CRollSwitchWidget.h b/product/src/gui/plugin/HmiRollWidget/CRollSwitchWidget.h index 665f97bb..02e8ea45 100644 --- a/product/src/gui/plugin/HmiRollWidget/CRollSwitchWidget.h +++ b/product/src/gui/plugin/HmiRollWidget/CRollSwitchWidget.h @@ -1,4 +1,4 @@ -#ifndef CROLLSWITCHWIDGET_H +#ifndef CROLLSWITCHWIDGET_H #define CROLLSWITCHWIDGET_H #include diff --git a/product/src/gui/plugin/HmiRollWidget/CTableDelegata.cpp b/product/src/gui/plugin/HmiRollWidget/CTableDelegata.cpp index 2f9fd12e..aea3900e 100644 --- a/product/src/gui/plugin/HmiRollWidget/CTableDelegata.cpp +++ b/product/src/gui/plugin/HmiRollWidget/CTableDelegata.cpp @@ -1,4 +1,4 @@ -#include "CTableDelegata.h" +#include "CTableDelegata.h" #include #include #include "CLineEditWithBtn.h" diff --git a/product/src/gui/plugin/HmiRollWidget/CTableDelegata.h b/product/src/gui/plugin/HmiRollWidget/CTableDelegata.h index d7432e67..b386eced 100644 --- a/product/src/gui/plugin/HmiRollWidget/CTableDelegata.h +++ b/product/src/gui/plugin/HmiRollWidget/CTableDelegata.h @@ -1,4 +1,4 @@ -#ifndef CTABLEDELEGATA_H +#ifndef CTABLEDELEGATA_H #define CTABLEDELEGATA_H #include diff --git a/product/src/gui/plugin/HmiRollWidget/CXmlOpt.cpp b/product/src/gui/plugin/HmiRollWidget/CXmlOpt.cpp index df8e9da1..77e1e02f 100644 --- a/product/src/gui/plugin/HmiRollWidget/CXmlOpt.cpp +++ b/product/src/gui/plugin/HmiRollWidget/CXmlOpt.cpp @@ -1,4 +1,4 @@ -#include "CXmlOpt.h" +#include "CXmlOpt.h" #include #include diff --git a/product/src/gui/plugin/HmiRollWidget/CXmlOpt.h b/product/src/gui/plugin/HmiRollWidget/CXmlOpt.h index 5cd49b54..fef44e3a 100644 --- a/product/src/gui/plugin/HmiRollWidget/CXmlOpt.h +++ b/product/src/gui/plugin/HmiRollWidget/CXmlOpt.h @@ -1,4 +1,4 @@ -#ifndef CXMLOPT_H +#ifndef CXMLOPT_H #define CXMLOPT_H #include diff --git a/product/src/gui/plugin/HmiRollWidget/ConfigWidget.cpp b/product/src/gui/plugin/HmiRollWidget/ConfigWidget.cpp index 18e16fbe..65b8911b 100644 --- a/product/src/gui/plugin/HmiRollWidget/ConfigWidget.cpp +++ b/product/src/gui/plugin/HmiRollWidget/ConfigWidget.cpp @@ -1,4 +1,4 @@ -#include "ConfigWidget.h" +#include "ConfigWidget.h" #include #include #include @@ -8,6 +8,7 @@ #include #include #include +#include "pub_widget/MessageBox.h" ConfigWidget::ConfigWidget(QWidget *parent) : QWidget(parent) @@ -233,6 +234,16 @@ void ConfigWidget::slotDelClick() if(m_GroupComb->currentText().isEmpty()) return; QList selectList = m_TableWidget->selectedRanges(); + + if( selectList.isEmpty() ) + { + N_MessageBox::warning(this, tr("警告"), tr("请选择任意一条记录")); + return; + } + int button = N_MessageBox::information( this, tr("提示"), tr("确认删除？"), N_MessageBox::Yes, N_MessageBox::No ); + if ( button != N_MessageBox::Yes ) + return; + for(int nIndex=selectList.count()-1; nIndex>=0; nIndex--) { int bottomRow = selectList.at(nIndex).bottomRow(); @@ -251,7 +262,8 @@ void ConfigWidget::slotMoveUpClick() QList selectList = m_TableWidget->selectedRanges(); if(selectList.isEmpty() || selectList.first().topRow() == 0) { - return; + N_MessageBox::warning(this, tr("警告"), tr("请选择任意一条记录")); + return; } int insertRow = selectList.first().topRow() - 1; @@ -271,7 +283,8 @@ void ConfigWidget::slotMoveDownClick() QList selectList = m_TableWidget->selectedRanges(); if(selectList.isEmpty() || selectList.last().bottomRow() == m_TableWidget->rowCount()-1) { - return; + N_MessageBox::warning(this, tr("警告"), tr("请选择任意一条记录")); + return; } int insertRow = selectList.last().bottomRow() + 2; diff --git a/product/src/gui/plugin/HmiRollWidget/ConfigWidget.h b/product/src/gui/plugin/HmiRollWidget/ConfigWidget.h index 3af8dfe1..b1bb4745 100644 --- a/product/src/gui/plugin/HmiRollWidget/ConfigWidget.h +++ b/product/src/gui/plugin/HmiRollWidget/ConfigWidget.h @@ -1,4 +1,4 @@ -#ifndef CONFIGWIDGET_H +#ifndef CONFIGWIDGET_H #define CONFIGWIDGET_H #include diff --git a/product/src/gui/plugin/HmiRollWidget/HmiRollWidget.pro b/product/src/gui/plugin/HmiRollWidget/HmiRollWidget.pro index 4686237b..3dac311c 100644 --- a/product/src/gui/plugin/HmiRollWidget/HmiRollWidget.pro +++ b/product/src/gui/plugin/HmiRollWidget/HmiRollWidget.pro @@ -46,7 +46,8 @@ HEADERS += \ CHmiRollPlugin.h LIBS += \ - -lpub_utility_api + -lpub_utility_api\ + -lpub_widget COMMON_PRI=$$PWD/../../../common.pri diff --git a/product/src/gui/plugin/HmiRollWidget/main.cpp b/product/src/gui/plugin/HmiRollWidget/main.cpp index 19829895..1d2a1f6a 100644 --- a/product/src/gui/plugin/HmiRollWidget/main.cpp +++ b/product/src/gui/plugin/HmiRollWidget/main.cpp @@ -1,4 +1,4 @@ -#include "CHmiRollWidget.h" +#include "CHmiRollWidget.h" #include #include diff --git a/product/src/gui/plugin/InverseTimeLimit/CExcelOpt.cpp b/product/src/gui/plugin/InverseTimeLimit/CExcelOpt.cpp index a2d3683f..0868f47f 100644 --- a/product/src/gui/plugin/InverseTimeLimit/CExcelOpt.cpp +++ b/product/src/gui/plugin/InverseTimeLimit/CExcelOpt.cpp @@ -1,4 +1,4 @@ -#include "CExcelOpt.h" +#include "CExcelOpt.h" #include #include #include diff --git a/product/src/gui/plugin/InverseTimeLimit/CExcelOpt.h b/product/src/gui/plugin/InverseTimeLimit/CExcelOpt.h index 1ccb0770..ef85d759 100644 --- a/product/src/gui/plugin/InverseTimeLimit/CExcelOpt.h +++ b/product/src/gui/plugin/InverseTimeLimit/CExcelOpt.h @@ -1,4 +1,4 @@ -#ifndef CEXCELOPT_H +#ifndef CEXCELOPT_H #define CEXCELOPT_H #ifdef WIN32 diff --git a/product/src/gui/plugin/InverseTimeLimit/CInversetimelimitPluginWidget.cpp b/product/src/gui/plugin/InverseTimeLimit/CInversetimelimitPluginWidget.cpp index e0cafade..f31bcb3f 100644 --- a/product/src/gui/plugin/InverseTimeLimit/CInversetimelimitPluginWidget.cpp +++ b/product/src/gui/plugin/InverseTimeLimit/CInversetimelimitPluginWidget.cpp @@ -1,4 +1,4 @@ -#include "CInversetimelimitPluginWidget.h" +#include "CInversetimelimitPluginWidget.h" #include "inversetimelimit.h" #include diff --git a/product/src/gui/plugin/InverseTimeLimit/CInversetimelimitPluginWidget.h b/product/src/gui/plugin/InverseTimeLimit/CInversetimelimitPluginWidget.h index 9a38dc97..e3b4f482 100644 --- a/product/src/gui/plugin/InverseTimeLimit/CInversetimelimitPluginWidget.h +++ b/product/src/gui/plugin/InverseTimeLimit/CInversetimelimitPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef CINVERSETIMELIMITPLUGINWIDGET_H +#ifndef CINVERSETIMELIMITPLUGINWIDGET_H #define CINVERSETIMELIMITPLUGINWIDGET_H @@ -8,7 +8,7 @@ class CInversetimelimitPluginWidge : 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: CInversetimelimitPluginWidge(QObject *parent = 0); diff --git a/product/src/gui/plugin/InverseTimeLimit/CProcessDialog.cpp b/product/src/gui/plugin/InverseTimeLimit/CProcessDialog.cpp index 0ab825fa..c5c85f06 100644 --- a/product/src/gui/plugin/InverseTimeLimit/CProcessDialog.cpp +++ b/product/src/gui/plugin/InverseTimeLimit/CProcessDialog.cpp @@ -1,4 +1,4 @@ -#include "CProcessDialog.h" +#include "CProcessDialog.h" #include "ui_CProcessDialog.h" #include diff --git a/product/src/gui/plugin/InverseTimeLimit/CProcessDialog.h b/product/src/gui/plugin/InverseTimeLimit/CProcessDialog.h index bb06cd74..d9cd15be 100644 --- a/product/src/gui/plugin/InverseTimeLimit/CProcessDialog.h +++ b/product/src/gui/plugin/InverseTimeLimit/CProcessDialog.h @@ -1,4 +1,4 @@ -#ifndef CPROCESSDIALOG_H +#ifndef CPROCESSDIALOG_H #define CPROCESSDIALOG_H #include diff --git a/product/src/gui/plugin/InverseTimeLimit/inversetimelimit.cpp b/product/src/gui/plugin/InverseTimeLimit/inversetimelimit.cpp index 26676d30..4ebded0f 100644 --- a/product/src/gui/plugin/InverseTimeLimit/inversetimelimit.cpp +++ b/product/src/gui/plugin/InverseTimeLimit/inversetimelimit.cpp @@ -1,4 +1,4 @@ -#include "inversetimelimit.h" +#include "inversetimelimit.h" #include "ui_inversetimelimit.h" #include "CProcessDialog.h" #include "pub_utility_api/FileStyle.h" diff --git a/product/src/gui/plugin/InverseTimeLimit/inversetimelimit.h b/product/src/gui/plugin/InverseTimeLimit/inversetimelimit.h index f457c3c4..ab679940 100644 --- a/product/src/gui/plugin/InverseTimeLimit/inversetimelimit.h +++ b/product/src/gui/plugin/InverseTimeLimit/inversetimelimit.h @@ -1,4 +1,4 @@ -#ifndef INVERSETIMELIMIT_H +#ifndef INVERSETIMELIMIT_H #define INVERSETIMELIMIT_H #include diff --git a/product/src/gui/plugin/InverseTimeLimit/main.cpp b/product/src/gui/plugin/InverseTimeLimit/main.cpp index 97fd9ce6..135884d6 100644 --- a/product/src/gui/plugin/InverseTimeLimit/main.cpp +++ b/product/src/gui/plugin/InverseTimeLimit/main.cpp @@ -1,4 +1,4 @@ -#include "inversetimelimit.h" +#include "inversetimelimit.h" #include int main(int argc, char *argv[]) diff --git a/product/src/gui/plugin/InverseTimeLimit/mainwindow.cpp b/product/src/gui/plugin/InverseTimeLimit/mainwindow.cpp index 9e752635..9d1ec8f3 100644 --- a/product/src/gui/plugin/InverseTimeLimit/mainwindow.cpp +++ b/product/src/gui/plugin/InverseTimeLimit/mainwindow.cpp @@ -1,4 +1,4 @@ -#include "mainwindow.h" +#include "mainwindow.h" #include "ui_mainwindow.h" #include #include diff --git a/product/src/gui/plugin/InverseTimeLimit/para.h b/product/src/gui/plugin/InverseTimeLimit/para.h index ac6ffc82..d3d349f2 100644 --- a/product/src/gui/plugin/InverseTimeLimit/para.h +++ b/product/src/gui/plugin/InverseTimeLimit/para.h @@ -1,4 +1,4 @@ -#ifndef PARA_H +#ifndef PARA_H #define PARA_H #include #include diff --git a/product/src/gui/plugin/IpcPlusWidget/CCamInfo.cpp b/product/src/gui/plugin/IpcPlusWidget/CCamInfo.cpp index 7c3f5b60..3f05563a 100644 --- a/product/src/gui/plugin/IpcPlusWidget/CCamInfo.cpp +++ b/product/src/gui/plugin/IpcPlusWidget/CCamInfo.cpp @@ -1,4 +1,4 @@ -#include "CCamInfo.h" +#include "CCamInfo.h" #include "OnvifLibs/onvif.h" #include #include "CPresetInfo.h" diff --git a/product/src/gui/plugin/IpcPlusWidget/CCamInfo.h b/product/src/gui/plugin/IpcPlusWidget/CCamInfo.h index 4b557197..673c38ef 100644 --- a/product/src/gui/plugin/IpcPlusWidget/CCamInfo.h +++ b/product/src/gui/plugin/IpcPlusWidget/CCamInfo.h @@ -1,4 +1,4 @@ -#ifndef CCAMINFO_H +#ifndef CCAMINFO_H #define CCAMINFO_H #include diff --git a/product/src/gui/plugin/IpcPlusWidget/COnvifOpt.cpp b/product/src/gui/plugin/IpcPlusWidget/COnvifOpt.cpp index dd3cf570..ee95b4a1 100644 --- a/product/src/gui/plugin/IpcPlusWidget/COnvifOpt.cpp +++ b/product/src/gui/plugin/IpcPlusWidget/COnvifOpt.cpp @@ -1,4 +1,4 @@ -#include "COnvifOpt.h" +#include "COnvifOpt.h" #include "common/Common.h" #include "pub_logger_api/logger.h" COnvifOpt::COnvifOpt(QObject *parent) : QObject(parent) @@ -15,12 +15,12 @@ COnvifOpt::~COnvifOpt() void COnvifOpt::slotCamInfo(CCamInfo caminfo) { LOGINFO("in slotCamInfo(),start getOnvifArgs()"); - if(kbdSuccess ==caminfo.getOnvifArgs()) + if(iotSuccess ==caminfo.getOnvifArgs()) { - emit sigInitStream(caminfo,kbdSuccess); + emit sigInitStream(caminfo,iotSuccess); }else { - emit sigInitStream(caminfo,kbdFailed); + emit sigInitStream(caminfo,iotFailed); } LOGINFO("sig sigInitStream emit"); diff --git a/product/src/gui/plugin/IpcPlusWidget/COnvifOpt.h b/product/src/gui/plugin/IpcPlusWidget/COnvifOpt.h index 1af95489..6fa3236b 100644 --- a/product/src/gui/plugin/IpcPlusWidget/COnvifOpt.h +++ b/product/src/gui/plugin/IpcPlusWidget/COnvifOpt.h @@ -1,4 +1,4 @@ -#ifndef CONVIFOPT_H +#ifndef CONVIFOPT_H #define CONVIFOPT_H #include diff --git a/product/src/gui/plugin/IpcPlusWidget/CPresetInfo.h b/product/src/gui/plugin/IpcPlusWidget/CPresetInfo.h index 224411ae..46b72a27 100644 --- a/product/src/gui/plugin/IpcPlusWidget/CPresetInfo.h +++ b/product/src/gui/plugin/IpcPlusWidget/CPresetInfo.h @@ -1,4 +1,4 @@ -#ifndef CPRESETINFO_H +#ifndef CPRESETINFO_H #define CPRESETINFO_H #include diff --git a/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.cpp b/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.cpp index 6ea23a56..d3d773b1 100644 --- a/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.cpp +++ b/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.cpp @@ -1,4 +1,4 @@ -#include "CRdbAccessUtilty.h" +#include "CRdbAccessUtilty.h" #include "pub_logger_api/logger.h" #include #include "Common.h" @@ -23,7 +23,7 @@ CRdbAccessUtilty::~CRdbAccessUtilty() bool CRdbAccessUtilty::getCamInfo(std::string pointtag, CCamInfo & outCamInfo) { std::string pointtype,pointTagWithoutType; - if(splitTagName(pointtag,pointtype,pointTagWithoutType) == kbdFailed) + if(splitTagName(pointtag,pointtype,pointTagWithoutType) == iotFailed) { LOGERROR("分割标签名错误,标签名为[%s]",pointtag.c_str()); return false; @@ -58,7 +58,7 @@ int CRdbAccessUtilty::splitTagName(const std::string &inTag, std::string &outTyp std::size_t firstDotindex = inTag.find_first_of('.'); if(firstDotindex == std::string::npos) { - return kbdFailed; + return iotFailed; } // 赋值表名; @@ -75,11 +75,11 @@ int CRdbAccessUtilty::splitTagName(const std::string &inTag, std::string &outTyp else if(inTag.substr(0,firstDotindex) == std::string("mix")){ outType = "mix"; }else{ - return kbdFailed; + return iotFailed; } outTagName = inTag.substr(firstDotindex+1,inTag.size()); - return kbdSuccess; + return iotSuccess; } bool CRdbAccessUtilty::queryPointTable(const std::string &pointtag, const std::string &pointType, CCamInfo &outCamInfo) diff --git a/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.h b/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.h index 1ece149d..6089d695 100644 --- a/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.h +++ b/product/src/gui/plugin/IpcPlusWidget/CRdbAccessUtilty.h @@ -1,4 +1,4 @@ -#ifndef CRDBACCESSUTILTY_H +#ifndef CRDBACCESSUTILTY_H #define CRDBACCESSUTILTY_H diff --git a/product/src/gui/plugin/IpcPlusWidget/IpcPlusPluginWidget.cpp b/product/src/gui/plugin/IpcPlusWidget/IpcPlusPluginWidget.cpp index d529d3b2..18e640e8 100644 --- a/product/src/gui/plugin/IpcPlusWidget/IpcPlusPluginWidget.cpp +++ b/product/src/gui/plugin/IpcPlusWidget/IpcPlusPluginWidget.cpp @@ -1,4 +1,4 @@ -#include "IpcPlusPluginWidget.h" +#include "IpcPlusPluginWidget.h" #include "IpcPlusWidget.h" #include "pub_logger_api/logger.h" IpcPlusPluginWidget::IpcPlusPluginWidget(QObject *parent) : QObject(parent) diff --git a/product/src/gui/plugin/IpcPlusWidget/IpcPlusPluginWidget.h b/product/src/gui/plugin/IpcPlusWidget/IpcPlusPluginWidget.h index f91ac87f..c15eb6d4 100644 --- a/product/src/gui/plugin/IpcPlusWidget/IpcPlusPluginWidget.h +++ b/product/src/gui/plugin/IpcPlusWidget/IpcPlusPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef IPCPLUSPLUGINWIDGET_H +#ifndef IPCPLUSPLUGINWIDGET_H #define IPCPLUSPLUGINWIDGET_H #include @@ -7,7 +7,7 @@ class IpcPlusPluginWidget : 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: IpcPlusPluginWidget(QObject *parent=0); diff --git a/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.cpp b/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.cpp index c1ce55d1..7af5e48a 100644 --- a/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.cpp +++ b/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.cpp @@ -1,4 +1,4 @@ -#include "IpcPlusWidget.h" +#include "IpcPlusWidget.h" #include "ui_IpcPlusWidget.h" #include #include @@ -191,7 +191,7 @@ void IpcPlusWidget::slotInitStream(CCamInfo caminfo,int result) { LOGINFO("slotInitStream()"); - if(result == kbdFailed) + if(result == iotFailed) { // QMessageBox::information(this,tr("提醒"),tr("设置直播流失败")); LOGINFO("information QMessagexBox 设置直播流失败"); @@ -507,8 +507,7 @@ bool IpcPlusWidget::sendOptContinuousMove(int cmd, double cmd_speed) stOptKeyValue.strKeyValue = QString::number(cmd_speed).toStdString() ; stCustomCmd.vecOptCustCtrlQueue.push_back(stOptKeyValue); - COptCustCtrlRequest objReq; - std::string strMsg = objReq.generate(stCustomCmd); + std::string strMsg = COptCustCtrlRequest::generate(stCustomCmd); if (strMsg.empty()) { LOGERROR("生成控制命令失败"); @@ -556,8 +555,7 @@ bool IpcPlusWidget::sendOptStopMove() stOptKeyValue.strKeyValue = m_caminfo.camTag() ; stCustomCmd.vecOptCustCtrlQueue.push_back(stOptKeyValue); - COptCustCtrlRequest objReq; - std::string strMsg = objReq.generate(stCustomCmd); + std::string strMsg = COptCustCtrlRequest::generate(stCustomCmd); if (strMsg.empty()) { LOGERROR("生成控制命令失败"); @@ -610,8 +608,7 @@ bool IpcPlusWidget::sendOptGotopreset(const std::string &preset_tag) stOptKeyValue.strKeyValue = preset_tag; stCustomCmd.vecOptCustCtrlQueue.push_back(stOptKeyValue); - COptCustCtrlRequest objReq; - std::string strMsg = objReq.generate(stCustomCmd); + std::string strMsg = COptCustCtrlRequest::generate(stCustomCmd); if (strMsg.empty()) { LOGERROR("生成控制命令失败"); diff --git a/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.h b/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.h index 3b626d45..fa3bdf07 100644 --- a/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.h +++ b/product/src/gui/plugin/IpcPlusWidget/IpcPlusWidget.h @@ -1,4 +1,4 @@ -#ifndef IPCPLUSWIDGET_H +#ifndef IPCPLUSWIDGET_H #define IPCPLUSWIDGET_H #include diff --git a/product/src/gui/plugin/IpcPlusWidget/VoiceSlider.cpp b/product/src/gui/plugin/IpcPlusWidget/VoiceSlider.cpp index 5b07b54b..26f48bc8 100644 --- a/product/src/gui/plugin/IpcPlusWidget/VoiceSlider.cpp +++ b/product/src/gui/plugin/IpcPlusWidget/VoiceSlider.cpp @@ -1,4 +1,4 @@ -#include "VoiceSlider.h" +#include "VoiceSlider.h" #include "ui_VoiceSlider.h" VoiceSlider::VoiceSlider(int voice,bool bo, QWidget *parent, Qt::WindowFlags f) : diff --git a/product/src/gui/plugin/IpcPlusWidget/VoiceSlider.h b/product/src/gui/plugin/IpcPlusWidget/VoiceSlider.h index a3c5c39d..42fd1967 100644 --- a/product/src/gui/plugin/IpcPlusWidget/VoiceSlider.h +++ b/product/src/gui/plugin/IpcPlusWidget/VoiceSlider.h @@ -1,4 +1,4 @@ -#ifndef VOICESLIDER_H +#ifndef VOICESLIDER_H #define VOICESLIDER_H #include diff --git a/product/src/gui/plugin/IpcPlusWidget/main.cpp b/product/src/gui/plugin/IpcPlusWidget/main.cpp index 82e1b36f..fff3ee84 100644 --- a/product/src/gui/plugin/IpcPlusWidget/main.cpp +++ b/product/src/gui/plugin/IpcPlusWidget/main.cpp @@ -1,4 +1,4 @@ -#include "IpcPlusWidget.h" +#include "IpcPlusWidget.h" #include #include "net_msg_bus_api/MsgBusApi.h" #include "pub_logger_api/logger.h" @@ -13,7 +13,7 @@ int main(int argc, char *argv[]) { IpcPlusWidget w(false,NULL); w.setNodeInfo(1,4); - w.setNodeName("kbdctrd-jxd"); + w.setNodeName("node_test"); w.setAppName("hmi"); w.setStreamInfo("analog.syx.ZLQR2_jgxh.WD"); w.show(); diff --git a/product/src/gui/plugin/IpcViewerWidget/ccaminfo.cpp b/product/src/gui/plugin/IpcViewerWidget/ccaminfo.cpp index 29734689..57bad8f4 100644 --- a/product/src/gui/plugin/IpcViewerWidget/ccaminfo.cpp +++ b/product/src/gui/plugin/IpcViewerWidget/ccaminfo.cpp @@ -1,4 +1,4 @@ -#include "ccaminfo.h" +#include "ccaminfo.h" #include "OnvifLibs/onvif.h" #include #include diff --git a/product/src/gui/plugin/IpcViewerWidget/ccaminfo.h b/product/src/gui/plugin/IpcViewerWidget/ccaminfo.h index 11b65060..2390b8d6 100644 --- a/product/src/gui/plugin/IpcViewerWidget/ccaminfo.h +++ b/product/src/gui/plugin/IpcViewerWidget/ccaminfo.h @@ -1,4 +1,4 @@ -#ifndef CCAMINFO_H +#ifndef CCAMINFO_H #define CCAMINFO_H #include diff --git a/product/src/gui/plugin/IpcViewerWidget/cipcviewermsgbusmng.cpp b/product/src/gui/plugin/IpcViewerWidget/cipcviewermsgbusmng.cpp index cc05765f..7d36e031 100644 --- a/product/src/gui/plugin/IpcViewerWidget/cipcviewermsgbusmng.cpp +++ b/product/src/gui/plugin/IpcViewerWidget/cipcviewermsgbusmng.cpp @@ -1,4 +1,4 @@ -#include "cipcviewermsgbusmng.h" +#include "cipcviewermsgbusmng.h" #include "pub_logger_api/logger.h" #include "common/MessageChannel.h" diff --git a/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.cpp b/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.cpp index 9edbb49f..20288aec 100644 --- a/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.cpp +++ b/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.cpp @@ -1,4 +1,4 @@ -#include "crdbaccessutilty.h" +#include "crdbaccessutilty.h" #include "pub_logger_api/logger.h" #include #include "Common.h" @@ -23,7 +23,7 @@ CRdbAccessUtilty::~CRdbAccessUtilty() bool CRdbAccessUtilty::getCamInfo(std::string pointtag, CCamInfo & outCamInfo) { std::string pointtype,pointTagWithoutType; - if(splitTagName(pointtag,pointtype,pointTagWithoutType) == kbdFailed) + if(splitTagName(pointtag,pointtype,pointTagWithoutType) == iotFailed) { LOGERROR("分割标签名错误,标签名为[%s]",pointtag.c_str()); return false; @@ -58,7 +58,7 @@ int CRdbAccessUtilty::splitTagName(const std::string &inTag, std::string &outTyp std::size_t firstDotindex = inTag.find_first_of('.'); if(firstDotindex == std::string::npos) { - return kbdFailed; + return iotFailed; } // 赋值表名; @@ -75,11 +75,11 @@ int CRdbAccessUtilty::splitTagName(const std::string &inTag, std::string &outTyp else if(inTag.substr(0,firstDotindex) == std::string("mix")){ outType = "mix"; }else{ - return kbdFailed; + return iotFailed; } outTagName = inTag.substr(firstDotindex+1,inTag.size()); - return kbdSuccess; + return iotSuccess; } bool CRdbAccessUtilty::queryPointTable(const std::string &pointtag, const std::string &pointType, CCamInfo &outCamInfo) diff --git a/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.h b/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.h index 18c67b57..5d49c6da 100644 --- a/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.h +++ b/product/src/gui/plugin/IpcViewerWidget/crdbaccessutilty.h @@ -1,4 +1,4 @@ -/** +/** @author ganyuhang @date 2020-02-25 @brief 访问内存库工具类 diff --git a/product/src/gui/plugin/IpcViewerWidget/en.ts b/product/src/gui/plugin/IpcViewerWidget/en.ts index 5a48b95b..f4e5d374 100644 --- a/product/src/gui/plugin/IpcViewerWidget/en.ts +++ b/product/src/gui/plugin/IpcViewerWidget/en.ts @@ -2,16 +2,137 @@ - IpcViwerWidget + IpcViewerWidget - - IpcViwerWidget - + + Form + - + + + 实时视频 - Streaming + Streaming + + + + ptz + + + + + 移动速度 + + + + + + + - + + + + + 调焦 + + + + + + + + + + + + + 聚焦 + + + + + 光圈 + + + + + 预置位： + + + + + 调用 + + + + + + 录像回放 + + + + + 选择日期 + + + + + 开始时间 + + + + + + H:mm:ss + + + + + 结束时间 + + + + + 查询 + + + + + 播放器配置错误 + + + + + + QtAV error：Can not create video renderer + + + + + 请检查摄像头设备建模是否正确 + + + + + 无法查询到该段时间录像或者请关闭其他回放窗口 + + + + + 请开始时间小于结束时间 + + + + + 间隔时间请大于等于20s + + + + + IpcViwerWidget + + 实时视频 + Streaming diff --git a/product/src/gui/plugin/IpcViewerWidget/img/camera-hovered.svg b/product/src/gui/plugin/IpcViewerWidget/img/camera-hovered.svg index 4f6ffcb8..ff027f96 100644 --- a/product/src/gui/plugin/IpcViewerWidget/img/camera-hovered.svg +++ b/product/src/gui/plugin/IpcViewerWidget/img/camera-hovered.svg @@ -1,4 +1,4 @@ - + diff --git a/product/src/gui/plugin/IpcViewerWidget/img/camera.svg b/product/src/gui/plugin/IpcViewerWidget/img/camera.svg index ec5e62a7..9ef7bb93 100644 --- a/product/src/gui/plugin/IpcViewerWidget/img/camera.svg +++ b/product/src/gui/plugin/IpcViewerWidget/img/camera.svg @@ -1,4 +1,4 @@ - + diff --git a/product/src/gui/plugin/IpcViewerWidget/img/play-hovered.svg b/product/src/gui/plugin/IpcViewerWidget/img/play-hovered.svg index 5f11f65a..9e7d678f 100644 --- a/product/src/gui/plugin/IpcViewerWidget/img/play-hovered.svg +++ b/product/src/gui/plugin/IpcViewerWidget/img/play-hovered.svg @@ -1,4 +1,4 @@ - + diff --git a/product/src/gui/plugin/IpcViewerWidget/img/vol-hovered.svg b/product/src/gui/plugin/IpcViewerWidget/img/vol-hovered.svg index 896640bb..2a42f67e 100644 --- a/product/src/gui/plugin/IpcViewerWidget/img/vol-hovered.svg +++ b/product/src/gui/plugin/IpcViewerWidget/img/vol-hovered.svg @@ -1,4 +1,4 @@ - + diff --git a/product/src/gui/plugin/IpcViewerWidget/img/vol.svg b/product/src/gui/plugin/IpcViewerWidget/img/vol.svg index 92939f39..c7330305 100644 --- a/product/src/gui/plugin/IpcViewerWidget/img/vol.svg +++ b/product/src/gui/plugin/IpcViewerWidget/img/vol.svg @@ -1,4 +1,4 @@ - + diff --git a/product/src/gui/plugin/IpcViewerWidget/ipcViewerWidget_global.h b/product/src/gui/plugin/IpcViewerWidget/ipcViewerWidget_global.h index 278e8a7b..8293943f 100644 --- a/product/src/gui/plugin/IpcViewerWidget/ipcViewerWidget_global.h +++ b/product/src/gui/plugin/IpcViewerWidget/ipcViewerWidget_global.h @@ -1,4 +1,4 @@ -#ifndef IPCVIEWERWIDGET_GLOBAL_H +#ifndef IPCVIEWERWIDGET_GLOBAL_H #define IPCVIEWERWIDGET_GLOBAL_H diff --git a/product/src/gui/plugin/IpcViewerWidget/ipcviewerpluginwidget.h b/product/src/gui/plugin/IpcViewerWidget/ipcviewerpluginwidget.h index 3b783a45..f08e03bd 100644 --- a/product/src/gui/plugin/IpcViewerWidget/ipcviewerpluginwidget.h +++ b/product/src/gui/plugin/IpcViewerWidget/ipcviewerpluginwidget.h @@ -8,7 +8,7 @@ class IpcViewerPluginWidget: 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: IpcViewerPluginWidget(QObject *parent=0); diff --git a/product/src/gui/plugin/IpcViewerWidget/ipcviewerwidget.cpp b/product/src/gui/plugin/IpcViewerWidget/ipcviewerwidget.cpp index 4d93240d..473b1387 100644 --- a/product/src/gui/plugin/IpcViewerWidget/ipcviewerwidget.cpp +++ b/product/src/gui/plugin/IpcViewerWidget/ipcviewerwidget.cpp @@ -1,4 +1,4 @@ -#include "ipcviewerwidget.h" +#include "ipcviewerwidget.h" #include "ui_ipcviewerwidget.h" #include #include @@ -731,8 +731,7 @@ bool IpcViewerWidget::sendOptContinuousMove(int cmd, double cmd_speed) stOptKeyValue.strKeyValue = QString::number(cmd_speed).toStdString() ; stCustomCmd.vecOptCustCtrlQueue.push_back(stOptKeyValue); - COptCustCtrlRequest objReq; - std::string strMsg = objReq.generate(stCustomCmd); + std::string strMsg = COptCustCtrlRequest::generate(stCustomCmd); if (strMsg.empty()) { LOGERROR("生成控制命令失败"); @@ -773,8 +772,7 @@ bool IpcViewerWidget::sendOptStopMove() stOptKeyValue.strKeyValue = m_caminfo->camTag() ; stCustomCmd.vecOptCustCtrlQueue.push_back(stOptKeyValue); - COptCustCtrlRequest objReq; - std::string strMsg = objReq.generate(stCustomCmd); + std::string strMsg = COptCustCtrlRequest::generate(stCustomCmd); if (strMsg.empty()) { LOGERROR("生成控制命令失败"); @@ -820,8 +818,7 @@ bool IpcViewerWidget::sendOptGotopreset(const std::string &preset_tag) stOptKeyValue.strKeyValue = preset_tag; stCustomCmd.vecOptCustCtrlQueue.push_back(stOptKeyValue); - COptCustCtrlRequest objReq; - std::string strMsg = objReq.generate(stCustomCmd); + std::string strMsg = COptCustCtrlRequest::generate(stCustomCmd); if (strMsg.empty()) { LOGERROR("生成控制命令失败"); diff --git a/product/src/gui/plugin/IpcViewerWidget/ipcviewerwidget.h b/product/src/gui/plugin/IpcViewerWidget/ipcviewerwidget.h index f0254d8c..b4bde127 100644 --- a/product/src/gui/plugin/IpcViewerWidget/ipcviewerwidget.h +++ b/product/src/gui/plugin/IpcViewerWidget/ipcviewerwidget.h @@ -1,4 +1,4 @@ -#ifndef IPCVIEWERWIDGET_H +#ifndef IPCVIEWERWIDGET_H #define IPCVIEWERWIDGET_H #include diff --git a/product/src/gui/plugin/IpcViewerWidget/main.cpp b/product/src/gui/plugin/IpcViewerWidget/main.cpp index 80ad5671..42d12706 100644 --- a/product/src/gui/plugin/IpcViewerWidget/main.cpp +++ b/product/src/gui/plugin/IpcViewerWidget/main.cpp @@ -1,4 +1,4 @@ -#include "ipcviewerwidget.h" +#include "ipcviewerwidget.h" #include #include diff --git a/product/src/gui/plugin/IpcWallWidget/CCamInfoLoadMng.cpp b/product/src/gui/plugin/IpcWallWidget/CCamInfoLoadMng.cpp index dcb93d9c..9c5f066d 100644 --- a/product/src/gui/plugin/IpcWallWidget/CCamInfoLoadMng.cpp +++ b/product/src/gui/plugin/IpcWallWidget/CCamInfoLoadMng.cpp @@ -1,4 +1,4 @@ -#include "CCamInfoLoadMng.h" +#include "CCamInfoLoadMng.h" #include #include #include diff --git a/product/src/gui/plugin/IpcWallWidget/CCamInfoLoadWorker.cpp b/product/src/gui/plugin/IpcWallWidget/CCamInfoLoadWorker.cpp index ece1af91..5cfab9b4 100644 --- a/product/src/gui/plugin/IpcWallWidget/CCamInfoLoadWorker.cpp +++ b/product/src/gui/plugin/IpcWallWidget/CCamInfoLoadWorker.cpp @@ -1,4 +1,4 @@ -#include "CCamInfoLoadWorker.h" +#include "CCamInfoLoadWorker.h" #include #include #include <../IpcViewerWidget/crdbaccessutilty.h> diff --git a/product/src/gui/plugin/IpcWallWidget/VideoWall.cpp b/product/src/gui/plugin/IpcWallWidget/VideoWall.cpp index 19366f99..16a3db0b 100644 --- a/product/src/gui/plugin/IpcWallWidget/VideoWall.cpp +++ b/product/src/gui/plugin/IpcWallWidget/VideoWall.cpp @@ -1,4 +1,4 @@ -/****************************************************************************** +/****************************************************************************** VideoWall: this file is part of QtAV examples Copyright (C) 2012-2016 Wang Bin @@ -926,8 +926,7 @@ bool VideoWall::sendOptContinuousMove(int cmd, double cmd_speed) stOptKeyValue.strKeyValue = QString::number(cmd_speed).toStdString() ; stCustomCmd.vecOptCustCtrlQueue.push_back(stOptKeyValue); - COptCustCtrlRequest objReq; - std::string strMsg = objReq.generate(stCustomCmd); + std::string strMsg = COptCustCtrlRequest::generate(stCustomCmd); if (strMsg.empty()) { LOGERROR("生成控制命令失败"); @@ -975,8 +974,7 @@ bool VideoWall::sendOptStopMove() stOptKeyValue.strKeyValue = m_camInfoVec[curNo].camTag() ; stCustomCmd.vecOptCustCtrlQueue.push_back(stOptKeyValue); - COptCustCtrlRequest objReq; - std::string strMsg = objReq.generate(stCustomCmd); + std::string strMsg = COptCustCtrlRequest::generate(stCustomCmd); if (strMsg.empty()) { LOGERROR("生成控制命令失败"); @@ -1029,8 +1027,7 @@ bool VideoWall::sendOptGotopreset(const std::string &preset_tag) stOptKeyValue.strKeyValue = preset_tag; stCustomCmd.vecOptCustCtrlQueue.push_back(stOptKeyValue); - COptCustCtrlRequest objReq; - std::string strMsg = objReq.generate(stCustomCmd); + std::string strMsg = COptCustCtrlRequest::generate(stCustomCmd); if (strMsg.empty()) { LOGERROR("生成控制命令失败"); diff --git a/product/src/gui/plugin/IpcWallWidget/VideoWall.h b/product/src/gui/plugin/IpcWallWidget/VideoWall.h index e8717a2a..095ad357 100644 --- a/product/src/gui/plugin/IpcWallWidget/VideoWall.h +++ b/product/src/gui/plugin/IpcWallWidget/VideoWall.h @@ -1,4 +1,4 @@ -/****************************************************************************** +/****************************************************************************** VideoWall: this file is part of QtAV examples Copyright (C) 2013-2016 Wang Bin diff --git a/product/src/gui/plugin/IpcWallWidget/ipcWallPluginWidge.h b/product/src/gui/plugin/IpcWallWidget/ipcWallPluginWidge.h index 3b783a45..f08e03bd 100644 --- a/product/src/gui/plugin/IpcWallWidget/ipcWallPluginWidge.h +++ b/product/src/gui/plugin/IpcWallWidget/ipcWallPluginWidge.h @@ -8,7 +8,7 @@ class IpcViewerPluginWidget: 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: IpcViewerPluginWidget(QObject *parent=0); diff --git a/product/src/gui/plugin/IpcWallWidget/main.cpp b/product/src/gui/plugin/IpcWallWidget/main.cpp index 11292b4d..9baf2ea2 100644 --- a/product/src/gui/plugin/IpcWallWidget/main.cpp +++ b/product/src/gui/plugin/IpcWallWidget/main.cpp @@ -1,4 +1,4 @@ -/****************************************************************************** +/****************************************************************************** VideoWall: this file is part of QtAV examples Copyright (C) 2012-2016 Wang Bin @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) wall.showUi(); wall.loadCamInfo(); wall.showErrMsg(); - // QString file = "rtsp://admin:kbdct123@192.168.79.231:554/Streaming/Channels/101?transportmode=unicast&profile=Profile_1"; + // QString file = "rtsp://admin:admin123@192.168.79.231:554/Streaming/Channels/101?transportmode=unicast&profile=Profile_1"; // wall.play(file); int result ; diff --git a/product/src/gui/plugin/LimitOptWidget/CLimitCommon.h b/product/src/gui/plugin/LimitOptWidget/CLimitCommon.h index 664d8849..8049181b 100644 --- a/product/src/gui/plugin/LimitOptWidget/CLimitCommon.h +++ b/product/src/gui/plugin/LimitOptWidget/CLimitCommon.h @@ -1,4 +1,4 @@ -#ifndef CLIMITCOMMON_H +#ifndef CLIMITCOMMON_H #define CLIMITCOMMON_H #include diff --git a/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.cpp b/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.cpp index 73fe34d6..9f5ec32e 100644 --- a/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.cpp +++ b/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.cpp @@ -1,4 +1,4 @@ -#include "CLimitOptWidget.h" +#include "CLimitOptWidget.h" #include "ui_CLimitOptWidget.h" #include "CTableDelegate.h" #include "CLimitOptWork.h" @@ -569,7 +569,7 @@ int CLimitOptWidget::getAppIdBySubName(const QString &subName) return CN_InvalidAppId; } SAppInfo stAppInfo; - if(kbdFailed == m_ptrSysInfo->getAppInfoBySubsystemName(subName.toStdString(), stAppInfo)) + if(iotFailed == m_ptrSysInfo->getAppInfoBySubsystemName(subName.toStdString(), stAppInfo)) { return CN_InvalidAppId; } diff --git a/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.h b/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.h index 8d901064..80de6b5b 100644 --- a/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.h +++ b/product/src/gui/plugin/LimitOptWidget/CLimitOptWidget.h @@ -1,4 +1,4 @@ -#ifndef CLIMITOPTWIDGET_H +#ifndef CLIMITOPTWIDGET_H #define CLIMITOPTWIDGET_H #include diff --git a/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.cpp b/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.cpp index 8fb7d5a6..3431dce2 100644 --- a/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.cpp +++ b/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.cpp @@ -1,4 +1,4 @@ -#include "CLimitOptWork.h" +#include "CLimitOptWork.h" #include "public/pub_logger_api/logger.h" #include "db_api_ex/CDbApi.h" #include "alarm_server_api/AlarmCommonDef.h" @@ -78,7 +78,7 @@ bool CLimitOptWork::initSysApi() } SNodeInfo stNodeInfo; SAppInfo stAppInfo; - if(kbdFailed == m_ptrSysInfo->getLocalNodeInfo(stNodeInfo)) + if(iotFailed == m_ptrSysInfo->getLocalNodeInfo(stNodeInfo)) { LOGERROR("获取本机节点信息失败!"); return false; @@ -86,7 +86,7 @@ bool CLimitOptWork::initSysApi() m_nDomainId = stNodeInfo.nDomainId; m_strName = stNodeInfo.strName; m_nLocationId = stNodeInfo.nLocationId; - if(kbdFailed == m_ptrSysInfo->getAppInfoByName("public", stAppInfo)) + if(iotFailed == m_ptrSysInfo->getAppInfoByName("public", stAppInfo)) { LOGERROR("获取public应用信息失败!"); return false; @@ -142,7 +142,6 @@ bool CLimitOptWork::updateLimitPara(const QMap, QList, QListsendMsgToDomain(msg, iter.key().first)) diff --git a/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.h b/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.h index ac31e881..2cffcc30 100644 --- a/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.h +++ b/product/src/gui/plugin/LimitOptWidget/CLimitOptWork.h @@ -1,4 +1,4 @@ -#ifndef CLIMITOPTWORK_H +#ifndef CLIMITOPTWORK_H #define CLIMITOPTWORK_H #include diff --git a/product/src/gui/plugin/LimitOptWidget/CLimitPluginWidget.cpp b/product/src/gui/plugin/LimitOptWidget/CLimitPluginWidget.cpp index d3771802..b3836f98 100644 --- a/product/src/gui/plugin/LimitOptWidget/CLimitPluginWidget.cpp +++ b/product/src/gui/plugin/LimitOptWidget/CLimitPluginWidget.cpp @@ -1,4 +1,4 @@ -#include +#include #include "CLimitPluginWidget.h" #include "CLimitOptWidget.h" diff --git a/product/src/gui/plugin/LimitOptWidget/CLimitPluginWidget.h b/product/src/gui/plugin/LimitOptWidget/CLimitPluginWidget.h index fa8a320e..8bd267fb 100644 --- a/product/src/gui/plugin/LimitOptWidget/CLimitPluginWidget.h +++ b/product/src/gui/plugin/LimitOptWidget/CLimitPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef CLIMITPLUGINWIDGET_H +#ifndef CLIMITPLUGINWIDGET_H #define CLIMITPLUGINWIDGET_H #include @@ -7,7 +7,7 @@ class CLimitPluginWidget : 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: diff --git a/product/src/gui/plugin/LimitOptWidget/CTableDelegate.cpp b/product/src/gui/plugin/LimitOptWidget/CTableDelegate.cpp index 1747409d..9ddeb175 100644 --- a/product/src/gui/plugin/LimitOptWidget/CTableDelegate.cpp +++ b/product/src/gui/plugin/LimitOptWidget/CTableDelegate.cpp @@ -1,4 +1,4 @@ -#include "CTableDelegate.h" +#include "CTableDelegate.h" #include #include diff --git a/product/src/gui/plugin/LimitOptWidget/CTableDelegate.h b/product/src/gui/plugin/LimitOptWidget/CTableDelegate.h index ed699691..b01faaf2 100644 --- a/product/src/gui/plugin/LimitOptWidget/CTableDelegate.h +++ b/product/src/gui/plugin/LimitOptWidget/CTableDelegate.h @@ -1,4 +1,4 @@ -#ifndef CTABLEDELEGATE_H +#ifndef CTABLEDELEGATE_H #define CTABLEDELEGATE_H #include diff --git a/product/src/gui/plugin/MediaWidget/CMediaAVWidget.cpp b/product/src/gui/plugin/MediaWidget/CMediaAVWidget.cpp index c2c9d92f..94794c8c 100644 --- a/product/src/gui/plugin/MediaWidget/CMediaAVWidget.cpp +++ b/product/src/gui/plugin/MediaWidget/CMediaAVWidget.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/product/src/gui/plugin/MediaWidget/CMediaAVWidget.h b/product/src/gui/plugin/MediaWidget/CMediaAVWidget.h index 03e14072..e1b64e48 100644 --- a/product/src/gui/plugin/MediaWidget/CMediaAVWidget.h +++ b/product/src/gui/plugin/MediaWidget/CMediaAVWidget.h @@ -1,4 +1,4 @@ -#ifndef CMediaAVWIDGET_H +#ifndef CMediaAVWIDGET_H #define CMediaAVWIDGET_H #include diff --git a/product/src/gui/plugin/MediaWidget/CMediaCommon.h b/product/src/gui/plugin/MediaWidget/CMediaCommon.h index 0632b570..e6343685 100644 --- a/product/src/gui/plugin/MediaWidget/CMediaCommon.h +++ b/product/src/gui/plugin/MediaWidget/CMediaCommon.h @@ -1,4 +1,4 @@ -#ifndef CMediaLINKCOMMON_H +#ifndef CMediaLINKCOMMON_H #define CMediaLINKCOMMON_H #include diff --git a/product/src/gui/plugin/MediaWidget/CMediaPluginWidget.cpp b/product/src/gui/plugin/MediaWidget/CMediaPluginWidget.cpp index 18fdfbde..eefab561 100644 --- a/product/src/gui/plugin/MediaWidget/CMediaPluginWidget.cpp +++ b/product/src/gui/plugin/MediaWidget/CMediaPluginWidget.cpp @@ -1,4 +1,4 @@ -#include "CMediaPluginWidget.h" +#include "CMediaPluginWidget.h" #include "CMediaWidget.h" #include CMediaPluginWidget::CMediaPluginWidget(QObject *parent) : QObject(parent) diff --git a/product/src/gui/plugin/MediaWidget/CMediaPluginWidget.h b/product/src/gui/plugin/MediaWidget/CMediaPluginWidget.h index fe0a7204..c62bbfe4 100644 --- a/product/src/gui/plugin/MediaWidget/CMediaPluginWidget.h +++ b/product/src/gui/plugin/MediaWidget/CMediaPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef CMediaPLUGINWIDGET_H +#ifndef CMediaPLUGINWIDGET_H #define CMediaPLUGINWIDGET_H #include @@ -7,7 +7,7 @@ class CMediaPluginWidget : 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: CMediaPluginWidget(QObject *parent = nullptr); diff --git a/product/src/gui/plugin/MediaWidget/CMediaWidget.cpp b/product/src/gui/plugin/MediaWidget/CMediaWidget.cpp index f5276f31..fdd7828c 100644 --- a/product/src/gui/plugin/MediaWidget/CMediaWidget.cpp +++ b/product/src/gui/plugin/MediaWidget/CMediaWidget.cpp @@ -1,4 +1,4 @@ -#include "CMediaWidget.h" +#include "CMediaWidget.h" #include "ui_CMediaWidget.h" #include "CMediaAVWidget.h" #include diff --git a/product/src/gui/plugin/MediaWidget/CMediaWidget.h b/product/src/gui/plugin/MediaWidget/CMediaWidget.h index 3006c8f5..41fda204 100644 --- a/product/src/gui/plugin/MediaWidget/CMediaWidget.h +++ b/product/src/gui/plugin/MediaWidget/CMediaWidget.h @@ -1,4 +1,4 @@ -#ifndef CMediaLINKCTRLWIDGET_H +#ifndef CMediaLINKCTRLWIDGET_H #define CMediaLINKCTRLWIDGET_H #include diff --git a/product/src/gui/plugin/MediaWidget/Label.cpp b/product/src/gui/plugin/MediaWidget/Label.cpp index 1a60ab67..22881a63 100644 --- a/product/src/gui/plugin/MediaWidget/Label.cpp +++ b/product/src/gui/plugin/MediaWidget/Label.cpp @@ -1,4 +1,4 @@ -#include "Label.h" +#include "Label.h" #include #include Label::Label(QWidget *parent): diff --git a/product/src/gui/plugin/MediaWidget/Label.h b/product/src/gui/plugin/MediaWidget/Label.h index 5e1b5dc4..73672aa5 100644 --- a/product/src/gui/plugin/MediaWidget/Label.h +++ b/product/src/gui/plugin/MediaWidget/Label.h @@ -1,4 +1,4 @@ -#ifndef LABEL_H +#ifndef LABEL_H #define LABEL_H #include diff --git a/product/src/gui/plugin/MediaWidget/Renderer.cpp b/product/src/gui/plugin/MediaWidget/Renderer.cpp index 351f40c1..2bee8880 100644 --- a/product/src/gui/plugin/MediaWidget/Renderer.cpp +++ b/product/src/gui/plugin/MediaWidget/Renderer.cpp @@ -1,4 +1,4 @@ -#include "Renderer.h" +#include "Renderer.h" #include #include Renderer::Renderer(QWidget *parent): diff --git a/product/src/gui/plugin/MediaWidget/Renderer.h b/product/src/gui/plugin/MediaWidget/Renderer.h index 86d2a2ef..56481f8e 100644 --- a/product/src/gui/plugin/MediaWidget/Renderer.h +++ b/product/src/gui/plugin/MediaWidget/Renderer.h @@ -1,4 +1,4 @@ -#ifndef RENDERER_H +#ifndef RENDERER_H #define RENDERER_H #include #include diff --git a/product/src/gui/plugin/MediaWidget/Slider.cpp b/product/src/gui/plugin/MediaWidget/Slider.cpp index 13981231..072a6ba5 100644 --- a/product/src/gui/plugin/MediaWidget/Slider.cpp +++ b/product/src/gui/plugin/MediaWidget/Slider.cpp @@ -1,4 +1,4 @@ -#include "Slider.h" +#include "Slider.h" #include #include #include diff --git a/product/src/gui/plugin/MediaWidget/Slider.h b/product/src/gui/plugin/MediaWidget/Slider.h index 0ce56d6a..a6d56bf8 100644 --- a/product/src/gui/plugin/MediaWidget/Slider.h +++ b/product/src/gui/plugin/MediaWidget/Slider.h @@ -1,4 +1,4 @@ -#ifndef SLIDER_H +#ifndef SLIDER_H #define SLIDER_H #include diff --git a/product/src/gui/plugin/MediaWidget/VoiceSlider.cpp b/product/src/gui/plugin/MediaWidget/VoiceSlider.cpp index 5edc7320..abd1f848 100644 --- a/product/src/gui/plugin/MediaWidget/VoiceSlider.cpp +++ b/product/src/gui/plugin/MediaWidget/VoiceSlider.cpp @@ -1,4 +1,4 @@ -#include "VoiceSlider.h" +#include "VoiceSlider.h" #include "ui_VoiceSlider.h" VoiceSlider::VoiceSlider(int voice,bool bo, QWidget *parent, Qt::WindowFlags f) : diff --git a/product/src/gui/plugin/MediaWidget/VoiceSlider.h b/product/src/gui/plugin/MediaWidget/VoiceSlider.h index ad09d51e..8290aa83 100644 --- a/product/src/gui/plugin/MediaWidget/VoiceSlider.h +++ b/product/src/gui/plugin/MediaWidget/VoiceSlider.h @@ -1,4 +1,4 @@ -#ifndef VOICESLIDER_H +#ifndef VOICESLIDER_H #define VOICESLIDER_H #include diff --git a/product/src/gui/plugin/MediaWidget/main.cpp b/product/src/gui/plugin/MediaWidget/main.cpp index e85a55d6..2dbe94dd 100644 --- a/product/src/gui/plugin/MediaWidget/main.cpp +++ b/product/src/gui/plugin/MediaWidget/main.cpp @@ -1,4 +1,4 @@ -#include "CMediaWidget.h" +#include "CMediaWidget.h" #include #include "pub_logger_api/logger.h" diff --git a/product/src/gui/plugin/OrderManageWidget/COperationOrderForm.cpp b/product/src/gui/plugin/OrderManageWidget/COperationOrderForm.cpp index 551115ea..3789e28b 100644 --- a/product/src/gui/plugin/OrderManageWidget/COperationOrderForm.cpp +++ b/product/src/gui/plugin/OrderManageWidget/COperationOrderForm.cpp @@ -1,4 +1,4 @@ -#include "COperationOrderForm.h" +#include "COperationOrderForm.h" #include "ui_COperationOrderForm.h" #include "perm_mng_api/PermMngApi.h" #include "public/pub_logger_api/logger.h" @@ -414,8 +414,7 @@ bool COperationOrderForm::updateDbModelData() for (int row = 0; row < ui->m_table->rowCount(); ++row) { - int seq = ui->m_table->item(row, 0)->text().toInt(); - + //int seq = ui->m_table->item(row, 0)->text().toInt(); SOrderPreStoreInfo info = getOrderInfo(row, order_id); ret = dbCtrl.insertOneOrderInfoData(info); if (ret == false) diff --git a/product/src/gui/plugin/OrderManageWidget/COperationOrderForm.h b/product/src/gui/plugin/OrderManageWidget/COperationOrderForm.h index badbcf1c..0c84f6be 100644 --- a/product/src/gui/plugin/OrderManageWidget/COperationOrderForm.h +++ b/product/src/gui/plugin/OrderManageWidget/COperationOrderForm.h @@ -1,4 +1,4 @@ -#ifndef COPERATIONORDERFORM_H +#ifndef COPERATIONORDERFORM_H #define COPERATIONORDERFORM_H #include diff --git a/product/src/gui/plugin/OrderManageWidget/COperationOrderHisForm.cpp b/product/src/gui/plugin/OrderManageWidget/COperationOrderHisForm.cpp index 447d8ce2..443f2200 100644 --- a/product/src/gui/plugin/OrderManageWidget/COperationOrderHisForm.cpp +++ b/product/src/gui/plugin/OrderManageWidget/COperationOrderHisForm.cpp @@ -1,4 +1,4 @@ -#include "COperationOrderHisForm.h" +#include "COperationOrderHisForm.h" #include COperationOrderHisForm::COperationOrderHisForm(QWidget *parent): diff --git a/product/src/gui/plugin/OrderManageWidget/COperationOrderHisForm.h b/product/src/gui/plugin/OrderManageWidget/COperationOrderHisForm.h index b1f82856..b02632a8 100644 --- a/product/src/gui/plugin/OrderManageWidget/COperationOrderHisForm.h +++ b/product/src/gui/plugin/OrderManageWidget/COperationOrderHisForm.h @@ -1,4 +1,4 @@ -#ifndef COPERATIONORDERHISFORM_H +#ifndef COPERATIONORDERHISFORM_H #define COPERATIONORDERHISFORM_H #include "COperationOrderForm.h" #include "CSqlDbCtrl.h" diff --git a/product/src/gui/plugin/OrderManageWidget/COperationOrderModelForm.cpp b/product/src/gui/plugin/OrderManageWidget/COperationOrderModelForm.cpp index ce09cde7..354af57f 100644 --- a/product/src/gui/plugin/OrderManageWidget/COperationOrderModelForm.cpp +++ b/product/src/gui/plugin/OrderManageWidget/COperationOrderModelForm.cpp @@ -1,4 +1,4 @@ -#include "COperationOrderModelForm.h" +#include "COperationOrderModelForm.h" #include #include diff --git a/product/src/gui/plugin/OrderManageWidget/COperationOrderModelForm.h b/product/src/gui/plugin/OrderManageWidget/COperationOrderModelForm.h index 7033b50f..1a1d0b1a 100644 --- a/product/src/gui/plugin/OrderManageWidget/COperationOrderModelForm.h +++ b/product/src/gui/plugin/OrderManageWidget/COperationOrderModelForm.h @@ -1,4 +1,4 @@ -#ifndef COPERATIONORDERMODELFORM_H +#ifndef COPERATIONORDERMODELFORM_H #define COPERATIONORDERMODELFORM_H #include "COperationOrderForm.h" #include "CSqlDbCtrl.h" diff --git a/product/src/gui/plugin/OrderManageWidget/COperationOrderPluginWidget.cpp b/product/src/gui/plugin/OrderManageWidget/COperationOrderPluginWidget.cpp index 61163e83..665f2203 100644 --- a/product/src/gui/plugin/OrderManageWidget/COperationOrderPluginWidget.cpp +++ b/product/src/gui/plugin/OrderManageWidget/COperationOrderPluginWidget.cpp @@ -1,4 +1,4 @@ -#include +#include #include "COperationOrderPluginWidget.h" #include "COrderManageWidget.h" #include "Mainwindow.h" diff --git a/product/src/gui/plugin/OrderManageWidget/COperationOrderPluginWidget.h b/product/src/gui/plugin/OrderManageWidget/COperationOrderPluginWidget.h index a9dbba56..91a68204 100644 --- a/product/src/gui/plugin/OrderManageWidget/COperationOrderPluginWidget.h +++ b/product/src/gui/plugin/OrderManageWidget/COperationOrderPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef COPERATIONORDERPLUGINWIDGET_H +#ifndef COPERATIONORDERPLUGINWIDGET_H #define COPERATIONORDERPLUGINWIDGET_H #include @@ -7,7 +7,7 @@ class COperationOrderPluginWidget: 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: diff --git a/product/src/gui/plugin/OrderManageWidget/COrderManageWidget.cpp b/product/src/gui/plugin/OrderManageWidget/COrderManageWidget.cpp index 84db5923..862960f1 100644 --- a/product/src/gui/plugin/OrderManageWidget/COrderManageWidget.cpp +++ b/product/src/gui/plugin/OrderManageWidget/COrderManageWidget.cpp @@ -1,4 +1,4 @@ -#include "COrderManageWidget.h" +#include "COrderManageWidget.h" #include "ui_COrderManageWidget.h" #include #include "pub_utility_api/FileStyle.h" diff --git a/product/src/gui/plugin/OrderManageWidget/COrderManageWidget.h b/product/src/gui/plugin/OrderManageWidget/COrderManageWidget.h index 7476d93f..df8555e1 100644 --- a/product/src/gui/plugin/OrderManageWidget/COrderManageWidget.h +++ b/product/src/gui/plugin/OrderManageWidget/COrderManageWidget.h @@ -1,4 +1,4 @@ -#ifndef CORDERMANAGEWIDGET_H +#ifndef CORDERMANAGEWIDGET_H #define CORDERMANAGEWIDGET_H #include diff --git a/product/src/gui/plugin/OrderManageWidget/COrderPrinter.cpp b/product/src/gui/plugin/OrderManageWidget/COrderPrinter.cpp index 346348d3..29291930 100644 --- a/product/src/gui/plugin/OrderManageWidget/COrderPrinter.cpp +++ b/product/src/gui/plugin/OrderManageWidget/COrderPrinter.cpp @@ -1,4 +1,4 @@ -#include "COrderPrinter.h" +#include "COrderPrinter.h" #include COrderPrinter::COrderPrinter() diff --git a/product/src/gui/plugin/OrderManageWidget/COrderPrinter.h b/product/src/gui/plugin/OrderManageWidget/COrderPrinter.h index 949f41f7..b3d3caf4 100644 --- a/product/src/gui/plugin/OrderManageWidget/COrderPrinter.h +++ b/product/src/gui/plugin/OrderManageWidget/COrderPrinter.h @@ -1,4 +1,4 @@ -#ifndef CORDERPRINTER_H +#ifndef CORDERPRINTER_H #define CORDERPRINTER_H #include diff --git a/product/src/gui/plugin/OrderManageWidget/CRecordForm.cpp b/product/src/gui/plugin/OrderManageWidget/CRecordForm.cpp index b1f17606..8bee18d1 100644 --- a/product/src/gui/plugin/OrderManageWidget/CRecordForm.cpp +++ b/product/src/gui/plugin/OrderManageWidget/CRecordForm.cpp @@ -1,4 +1,4 @@ -#include "CRecordForm.h" +#include "CRecordForm.h" #include "ui_CRecordForm.h" #include #include "dbms/db_api_ex/CDbApi.h" diff --git a/product/src/gui/plugin/OrderManageWidget/CRecordForm.h b/product/src/gui/plugin/OrderManageWidget/CRecordForm.h index ca5e744c..fbed85e4 100644 --- a/product/src/gui/plugin/OrderManageWidget/CRecordForm.h +++ b/product/src/gui/plugin/OrderManageWidget/CRecordForm.h @@ -1,4 +1,4 @@ -#ifndef CRECORDFORM_H +#ifndef CRECORDFORM_H #define CRECORDFORM_H #include diff --git a/product/src/gui/plugin/OrderManageWidget/CSqlDbCtrl.cpp b/product/src/gui/plugin/OrderManageWidget/CSqlDbCtrl.cpp index 2086e178..3fb394ce 100644 --- a/product/src/gui/plugin/OrderManageWidget/CSqlDbCtrl.cpp +++ b/product/src/gui/plugin/OrderManageWidget/CSqlDbCtrl.cpp @@ -1,4 +1,4 @@ -#include "CSqlDbCtrl.h" +#include "CSqlDbCtrl.h" #include #include #include "pub_sysinfo_api/SysInfoApi.h" diff --git a/product/src/gui/plugin/OrderManageWidget/CSqlDbCtrl.h b/product/src/gui/plugin/OrderManageWidget/CSqlDbCtrl.h index 30485c1f..aa2ed2bf 100644 --- a/product/src/gui/plugin/OrderManageWidget/CSqlDbCtrl.h +++ b/product/src/gui/plugin/OrderManageWidget/CSqlDbCtrl.h @@ -1,4 +1,4 @@ -#ifndef CSQLDBCTRL_H +#ifndef CSQLDBCTRL_H #define CSQLDBCTRL_H #include "db_api_ex/CDbApi.h" diff --git a/product/src/gui/plugin/OrderManageWidget/CTextPrinter.cpp b/product/src/gui/plugin/OrderManageWidget/CTextPrinter.cpp index c5e5250a..c114e7fe 100644 --- a/product/src/gui/plugin/OrderManageWidget/CTextPrinter.cpp +++ b/product/src/gui/plugin/OrderManageWidget/CTextPrinter.cpp @@ -1,4 +1,4 @@ -#include "CTextPrinter.h" +#include "CTextPrinter.h" #include #include diff --git a/product/src/gui/plugin/OrderManageWidget/CTextPrinter.h b/product/src/gui/plugin/OrderManageWidget/CTextPrinter.h index e0d2b2a7..65050165 100644 --- a/product/src/gui/plugin/OrderManageWidget/CTextPrinter.h +++ b/product/src/gui/plugin/OrderManageWidget/CTextPrinter.h @@ -1,4 +1,4 @@ -#ifndef CTEXTPRINTER_H +#ifndef CTEXTPRINTER_H #define CTEXTPRINTER_H #include diff --git a/product/src/gui/plugin/OrderManageWidget/Mainwindow.cpp b/product/src/gui/plugin/OrderManageWidget/Mainwindow.cpp index a43ef832..55dcde00 100644 --- a/product/src/gui/plugin/OrderManageWidget/Mainwindow.cpp +++ b/product/src/gui/plugin/OrderManageWidget/Mainwindow.cpp @@ -1,4 +1,4 @@ -#include "Mainwindow.h" +#include "Mainwindow.h" #include "ui_Mainwindow.h" #include "COrderManageWidget.h" #include "CRecordForm.h" diff --git a/product/src/gui/plugin/OrderManageWidget/Mainwindow.h b/product/src/gui/plugin/OrderManageWidget/Mainwindow.h index 7a929168..0bdf6fb4 100644 --- a/product/src/gui/plugin/OrderManageWidget/Mainwindow.h +++ b/product/src/gui/plugin/OrderManageWidget/Mainwindow.h @@ -1,4 +1,4 @@ -#ifndef MAINWINDOW_H +#ifndef MAINWINDOW_H #define MAINWINDOW_H #include diff --git a/product/src/gui/plugin/OrderManageWidget/SDbTableDefine.h b/product/src/gui/plugin/OrderManageWidget/SDbTableDefine.h index 20059049..682df91c 100644 --- a/product/src/gui/plugin/OrderManageWidget/SDbTableDefine.h +++ b/product/src/gui/plugin/OrderManageWidget/SDbTableDefine.h @@ -1,4 +1,4 @@ -#ifndef SDBTABLEDEFINE_H +#ifndef SDBTABLEDEFINE_H #define SDBTABLEDEFINE_H #include diff --git a/product/src/gui/plugin/OrderManageWidget/main.cpp b/product/src/gui/plugin/OrderManageWidget/main.cpp index 219120ad..cea10571 100644 --- a/product/src/gui/plugin/OrderManageWidget/main.cpp +++ b/product/src/gui/plugin/OrderManageWidget/main.cpp @@ -1,4 +1,4 @@ - + #include #include "pub_logger_api/logger.h" @@ -21,7 +21,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/UserManageWidget/UserDbOpt.cpp b/product/src/gui/plugin/UserManageWidget/UserDbOpt.cpp index 1889fea7..e861e6e5 100644 --- a/product/src/gui/plugin/UserManageWidget/UserDbOpt.cpp +++ b/product/src/gui/plugin/UserManageWidget/UserDbOpt.cpp @@ -1,4 +1,4 @@ -#include "UserDbOpt.h" +#include "UserDbOpt.h" #include "kbdtabledatamgr.h" UserDbOpt::UserDbOpt() diff --git a/product/src/gui/plugin/UserManageWidget/UserDbOpt.h b/product/src/gui/plugin/UserManageWidget/UserDbOpt.h index 0315071c..369ac8de 100644 --- a/product/src/gui/plugin/UserManageWidget/UserDbOpt.h +++ b/product/src/gui/plugin/UserManageWidget/UserDbOpt.h @@ -1,4 +1,4 @@ -#ifndef USERDBOPT_H +#ifndef USERDBOPT_H #define USERDBOPT_H #include diff --git a/product/src/gui/plugin/UserManageWidget/UserManagePluginWidget.cpp b/product/src/gui/plugin/UserManageWidget/UserManagePluginWidget.cpp index 4dbd8d29..e6e77224 100644 --- a/product/src/gui/plugin/UserManageWidget/UserManagePluginWidget.cpp +++ b/product/src/gui/plugin/UserManageWidget/UserManagePluginWidget.cpp @@ -1,4 +1,4 @@ -#include +#include #include "UserManagePluginWidget.h" #include "UserManageWidget.h" #include "pub_logger_api/logger.h" diff --git a/product/src/gui/plugin/UserManageWidget/UserManagePluginWidget.h b/product/src/gui/plugin/UserManageWidget/UserManagePluginWidget.h index 0652b4e6..7a718bfa 100644 --- a/product/src/gui/plugin/UserManageWidget/UserManagePluginWidget.h +++ b/product/src/gui/plugin/UserManageWidget/UserManagePluginWidget.h @@ -1,4 +1,4 @@ -#ifndef USERMANAGEPLUGINWIDGET_H +#ifndef USERMANAGEPLUGINWIDGET_H #define USERMANAGEPLUGINWIDGET_H #include @@ -7,7 +7,7 @@ class UserManagePluginWidget : 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: diff --git a/product/src/gui/plugin/UserManageWidget/UserManageWidget.cpp b/product/src/gui/plugin/UserManageWidget/UserManageWidget.cpp index c0e7998c..bcf5a694 100644 --- a/product/src/gui/plugin/UserManageWidget/UserManageWidget.cpp +++ b/product/src/gui/plugin/UserManageWidget/UserManageWidget.cpp @@ -1,4 +1,4 @@ -#include "UserManageWidget.h" +#include "UserManageWidget.h" #include "ui_UserManageWidget.h" #include #include @@ -13,6 +13,10 @@ #include #include "pub_logger_api/logger.h" #include "pub_utility_api/FileStyle.h" +#include +#include "public/pub_utility_api/FileUtil.h" +#include +#include #define CLK_FUNC "CLK_FUNC" #define CLK_USER "CLK_USER" @@ -98,6 +102,7 @@ void UserManageWidget::initialize(int model) else if(E_Window_User == model) { m_stack->setCurrentIndex(1); + resetUserWidgetBar(); } else if(E_Window_Role == model) { @@ -174,3 +179,60 @@ void UserManageWidget::checkPerm() LOGINFO("当前登录用户ID[%d],用户组ID[%d],具有浏览权限!",nUserId,nUserGrpId); } } + +void UserManageWidget::resetUserWidgetBar() +{ + //设置QToolBar按钮风格 + QWidget* w = m_stack->currentWidget(); + if(w== nullptr) + return; + QList listToolBar = w->findChildren(); + + for(auto toolbar : listToolBar) + toolbar->setToolButtonStyle(Qt::ToolButtonTextOnly); + + //设置下方QTabWidget的设置窗口 + //读取配置文件 + std::string tabBarCfgPathstr = iot_public::CFileUtil::getPathOfCfgFile("userManagerWidgetTabBar.xml"); + QString tabBarCfgPath = QString::fromStdString(tabBarCfgPathstr); + if(tabBarCfgPath.isEmpty()) + return; + + QDomDocument doc; + QFile file(tabBarCfgPath); + if (!file.open(QIODevice::ReadOnly)) + return; + if (!doc.setContent(&file)) + { + file.close(); + return; + } + file.close(); + + QStringList tabBarNameList; + QDomNodeList domNodeList = doc.elementsByTagName("TabBar"); + for(int i=0 ; i < domNodeList.size(); i++) + { + QDomElement e = domNodeList.at(i).toElement(); + if(!e.isNull() && e.attribute("visiable") == "true") + { + tabBarNameList.append(e.attribute("desc")); + } + } + QList listTabBar = w->findChildren(); + for(auto tabBar :listTabBar) + { + for(int i=0 ; i< tabBar->count() ; i++) + { + if(tabBarNameList.indexOf(tabBar->tabText(i)) <0) + { + tabBar->setTabEnabled(i,false); + tabBar->removeTab(i); + i--; + } + } + } + + //设置 + +} diff --git a/product/src/gui/plugin/UserManageWidget/UserManageWidget.h b/product/src/gui/plugin/UserManageWidget/UserManageWidget.h index dceb4201..fee293b0 100644 --- a/product/src/gui/plugin/UserManageWidget/UserManageWidget.h +++ b/product/src/gui/plugin/UserManageWidget/UserManageWidget.h @@ -1,4 +1,4 @@ -#ifndef USERMANAGEWIDGET_H +#ifndef USERMANAGEWIDGET_H #define USERMANAGEWIDGET_H #include @@ -49,6 +49,9 @@ private: void checkPerm(); + //将工具栏设置和系统一致的风格 + void resetUserWidgetBar(); + private: Ui::UserManageWidget *ui; diff --git a/product/src/gui/plugin/UserManageWidget/UserManageWidget.pro b/product/src/gui/plugin/UserManageWidget/UserManageWidget.pro index 594bc0f5..3720051e 100644 --- a/product/src/gui/plugin/UserManageWidget/UserManageWidget.pro +++ b/product/src/gui/plugin/UserManageWidget/UserManageWidget.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += core gui widgets charts sql +QT += core gui widgets charts sql xml greaterThan(QT_MAJOR_VERSION, 4): QT += widgets @@ -21,7 +21,7 @@ exists($$PWD/../../../common.pri) { } INCLUDEPATH += $$PWD/../../../../../platform/src/include/tools/model_common \ - $$PWD/../../../../../platform/src/include/tools/model_excel/xlsx \ + $$PWD/../../../../../platform/src/include/public/pub_excel/xlsx \ $$PWD/../../../../../platform/src/include/tools/model_table \ $$PWD/../../../../../platform/src/include/tools/model_user \ $$PWD/../../../../../platform/src/include/tools/model_table/CustomWidget \ @@ -61,7 +61,8 @@ LIBS += -lpub_logger_api LIBS += -llog4cplus LIBS += -lmodel_table LIBS += -lmodel_common -LIBS += -lmodel_excel +LIBS += -lpub_excel LIBS += -lmodel_user + diff --git a/product/src/gui/plugin/UserManageWidget/main.cpp b/product/src/gui/plugin/UserManageWidget/main.cpp index 4888b866..daa30b97 100644 --- a/product/src/gui/plugin/UserManageWidget/main.cpp +++ b/product/src/gui/plugin/UserManageWidget/main.cpp @@ -1,4 +1,4 @@ -#include "UserManageWidget.h" +#include "UserManageWidget.h" #include #include "net_msg_bus_api/MsgBusApi.h" #include "service/perm_mng_api/PermMngApi.h" @@ -9,7 +9,7 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); std::string name="admin"; - std::string password ="kbdct"; + std::string password ="admin"; iot_public::StartLogSystem("HMI", "hmi"); iot_net::initMsgBus("HMI", "HMI"); int group =1; diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/CFileTableWidget.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/CFileTableWidget.cpp index 9a0ef7ba..2f4bff1c 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/CFileTableWidget.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/CFileTableWidget.cpp @@ -1,4 +1,4 @@ -#include "CFileTableWidget.h" +#include "CFileTableWidget.h" #include "public/pub_utility_api/FileUtil.h" #include "perm_mng_api/PermMngApi.h" #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/CFileTableWidget.h b/product/src/gui/plugin/WaveAnalyzeWidget/CFileTableWidget.h index e2f24093..bf04f123 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/CFileTableWidget.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/CFileTableWidget.h @@ -1,4 +1,4 @@ -#ifndef CFILETABLEWIDGET_H +#ifndef CFILETABLEWIDGET_H #define CFILETABLEWIDGET_H #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzePlugin.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzePlugin.cpp index 5a07c7f1..f78fe076 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzePlugin.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzePlugin.cpp @@ -1,4 +1,4 @@ -#include "CWaveAnalyzePlugin.h" +#include "CWaveAnalyzePlugin.h" #include "CWaveAnalyzeWidget.h" CWaveAnalyzePlugin::CWaveAnalyzePlugin(QObject *parent) diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzePlugin.h b/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzePlugin.h index cfa0f380..610e4ce3 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzePlugin.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzePlugin.h @@ -1,4 +1,4 @@ -#ifndef CWAVEANALYZEPLUGIN_H +#ifndef CWAVEANALYZEPLUGIN_H #define CWAVEANALYZEPLUGIN_H #include @@ -7,7 +7,7 @@ class CWaveAnalyzePlugin : 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: diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzeWidget.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzeWidget.cpp index db83f683..c6fa7bce 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzeWidget.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzeWidget.cpp @@ -1,4 +1,4 @@ -#include "CWaveAnalyzeWidget.h" +#include "CWaveAnalyzeWidget.h" #include "ui_CWaveAnalyzeWidget.h" #include "pub_utility_api/FileStyle.h" #include "./WaveAnalyze/CComDataClass.h" diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzeWidget.h b/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzeWidget.h index 673ffd97..9b7571ab 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzeWidget.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/CWaveAnalyzeWidget.h @@ -1,4 +1,4 @@ -#ifndef CWAVEANALYZEWIDGET_H +#ifndef CWAVEANALYZEWIDGET_H #define CWAVEANALYZEWIDGET_H #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnaAxisShow.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnaAxisShow.cpp index 0ec006cb..2ba219b3 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnaAxisShow.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnaAxisShow.cpp @@ -1,4 +1,4 @@ -#include "CAnaAxisShow.h" +#include "CAnaAxisShow.h" #include "CTimeAxisShow.h" #include #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnaAxisShow.h b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnaAxisShow.h index 706fa67d..b9386b70 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnaAxisShow.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnaAxisShow.h @@ -1,4 +1,4 @@ -#ifndef CANASHOWSHOW_H_HEADER_INCLUDED_BFC41131 +#ifndef CANASHOWSHOW_H_HEADER_INCLUDED_BFC41131 #define CANASHOWSHOW_H_HEADER_INCLUDED_BFC41131 #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnalogDataSet.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnalogDataSet.cpp index 8e492e82..cc997896 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnalogDataSet.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnalogDataSet.cpp @@ -1,4 +1,4 @@ -#include "CComDataClass.h" +#include "CComDataClass.h" #include "math.h" //////////////////////////////////// CAnalogData::CAnalogData(): m_nAverageTicks(0) diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnalogueShow.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnalogueShow.cpp index 669046a9..860c7ea2 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnalogueShow.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnalogueShow.cpp @@ -1,4 +1,4 @@ -#include "CAnalogueShow.h" +#include "CAnalogueShow.h" #include #include #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnalogueShow.h b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnalogueShow.h index 0f20a1d5..8e9eb177 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnalogueShow.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CAnalogueShow.h @@ -1,4 +1,4 @@ -#ifndef CANALOGUESHOW_H_HEADER_INCLUDED_BFC41131 +#ifndef CANALOGUESHOW_H_HEADER_INCLUDED_BFC41131 #define CANALOGUESHOW_H_HEADER_INCLUDED_BFC41131 #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CComDataClass.h b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CComDataClass.h index edd3fe9f..e7994632 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CComDataClass.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CComDataClass.h @@ -1,4 +1,4 @@ -#ifndef _COMMONDATA_H +#ifndef _COMMONDATA_H #define _COMMONDATA_H diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CComtradeFile.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CComtradeFile.cpp index 71b77ced..f5e3a406 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CComtradeFile.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CComtradeFile.cpp @@ -1,4 +1,4 @@ -#include "CComDataClass.h" +#include "CComDataClass.h" #include #include #include @@ -3797,7 +3797,7 @@ void CComtradeFile::LoadDisplayOption() int i,nIndex; QString szCnt,szSub; //显示属性 - nIndex = CSectionOperate::GetSection(sectlist,tr("Display Attribute"),tr("SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD"));//显示属性 + nIndex = CSectionOperate::GetSection(sectlist,tr("Display Attribute"),tr("SHENZHEN BYD CO.LTD"));//显示属性 if(nIndex<0) return; CInfSection& sect1 = sectlist[nIndex]; @@ -3807,7 +3807,7 @@ void CComtradeFile::LoadDisplayOption() m_DispAttr.m_dTagsHeight = sect1.GetAttribute(tr("State Channel Height"), "20").toDouble();//状态通道高度 //模拟通道显示属性 - nIndex = CSectionOperate::GetSection(sectlist, tr("Analogous Channel Display"),tr("SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD"));//模拟通道显示 + nIndex = CSectionOperate::GetSection(sectlist, tr("Analogous Channel Display"),tr("SHENZHEN BYD CO.LTD"));//模拟通道显示 if(nIndex<0) return; CInfSection sect2 = sectlist[nIndex];; int nAnalogueNum = sect2.GetAttribute(tr("Analogous Channel Count"), "0").toInt();//模拟通道个数 @@ -3835,7 +3835,7 @@ void CComtradeFile::LoadDisplayOption() } //状态通道显示属性 - nIndex = CSectionOperate::GetSection(sectlist, tr("State Channel Display"), tr("SHENZHEN KANGBIDA CONTROL TECHNOLOGY CO.LTD"));//状态通道显示 + nIndex = CSectionOperate::GetSection(sectlist, tr("State Channel Display"), tr("SHENZHEN BYD CO.LTD"));//状态通道显示 if(nIndex<0) return; CInfSection sect3 = sectlist[nIndex]; int nDigitalNum = sect3.GetAttribute(tr("State Channel Count"), "0").toInt();//状态通道个数 diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDgtNameShow.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDgtNameShow.cpp index dd092ea4..2921dc1a 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDgtNameShow.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDgtNameShow.cpp @@ -1,4 +1,4 @@ -#include "CDgtNameShow.h" +#include "CDgtNameShow.h" #include #include #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDgtNameShow.h b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDgtNameShow.h index 26d4b387..65253c3c 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDgtNameShow.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDgtNameShow.h @@ -1,4 +1,4 @@ -#ifndef CDGTNAMESHOW_H_HEADER_INCLUDED_BFC41131 +#ifndef CDGTNAMESHOW_H_HEADER_INCLUDED_BFC41131 #define CDGTNAMESHOW_H_HEADER_INCLUDED_BFC41131 #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDigitDataSet.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDigitDataSet.cpp index 62dfa616..927d02bb 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDigitDataSet.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDigitDataSet.cpp @@ -1,4 +1,4 @@ -#include "CComDataClass.h" +#include "CComDataClass.h" /////////////////////////////////// CDigitData::CDigitData() diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDigitalShow.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDigitalShow.cpp index 8c3cbe79..a0531bd4 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDigitalShow.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDigitalShow.cpp @@ -1,4 +1,4 @@ -#include "CDigitalShow.h" +#include "CDigitalShow.h" #include #include #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDigitalShow.h b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDigitalShow.h index c92c1b9e..9ffcdf5e 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDigitalShow.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CDigitalShow.h @@ -1,4 +1,4 @@ -#ifndef CDIGITALSHOW_H_HEADER_INCLUDED_BFC41131 +#ifndef CDIGITALSHOW_H_HEADER_INCLUDED_BFC41131 #define CDIGITALSHOW_H_HEADER_INCLUDED_BFC41131 #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CInfSection.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CInfSection.cpp index b457c3d4..c8b4f93d 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CInfSection.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CInfSection.cpp @@ -1,4 +1,4 @@ -#include "CComDataClass.h" +#include "CComDataClass.h" #include #include "CPublic.h" #include "CommonFunction.h" diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CLabel.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CLabel.cpp index 53efb3e9..f33bde6e 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CLabel.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CLabel.cpp @@ -1,4 +1,4 @@ -#include "CComDataClass.h" +#include "CComDataClass.h" #include #include #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CLineStatusShow.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CLineStatusShow.cpp index 03b51d83..f346292e 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CLineStatusShow.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CLineStatusShow.cpp @@ -1,4 +1,4 @@ -#include "CLineStatusShow.h" +#include "CLineStatusShow.h" CLineStatusShow::CLineStatusShow( QWidget *parent ) :QWidget(parent) diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CLineStatusShow.h b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CLineStatusShow.h index fbe64032..24752b6a 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CLineStatusShow.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CLineStatusShow.h @@ -1,4 +1,4 @@ -#ifndef CLINESTATUSSHOW_H +#ifndef CLINESTATUSSHOW_H #define CLINESTATUSSHOW_H #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CPrintPreview.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CPrintPreview.cpp index 53dc9f9e..b59d3183 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CPrintPreview.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CPrintPreview.cpp @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** ** Form implementation generated from reading ui file 'CPrintPreview.ui' ** ** Created: 鏄熸湡鍥?涓夋湀 25 19:21:48 2004 diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CPrintPreview.h b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CPrintPreview.h index 1b0681b5..27a36419 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CPrintPreview.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CPrintPreview.h @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** ** Created:hujf 03-22 11:50:06 2004 ** by: hujf ****************************************************************************/ diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CPublic.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CPublic.cpp index 768f7fee..711f32b8 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CPublic.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CPublic.cpp @@ -1,4 +1,4 @@ -// CPublic.cpp: implementation of the CPublic class. +// CPublic.cpp: implementation of the CPublic class. // ////////////////////////////////////////////////////////////////////// diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CPublic.h b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CPublic.h index 051a83a2..28f3cfe2 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CPublic.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CPublic.h @@ -1,4 +1,4 @@ -#ifndef _PUBLICFUN_H +#ifndef _PUBLICFUN_H #define _PUBLICFUN_H diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CTimeAxisShow.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CTimeAxisShow.cpp index a8a6c1c5..bc848c33 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CTimeAxisShow.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CTimeAxisShow.cpp @@ -1,4 +1,4 @@ -#include "CTimeAxisShow.h" +#include "CTimeAxisShow.h" #include #include #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CTimeAxisShow.h b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CTimeAxisShow.h index ec14044d..86a3ae4b 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CTimeAxisShow.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CTimeAxisShow.h @@ -1,4 +1,4 @@ -#ifndef CTIMEAXISSHOW_H_HEADER_INCLUDED_BFC41131 +#ifndef CTIMEAXISSHOW_H_HEADER_INCLUDED_BFC41131 #define CTIMEAXISSHOW_H_HEADER_INCLUDED_BFC41131 #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CWaveGraph.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CWaveGraph.cpp index 41631728..e6af115e 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CWaveGraph.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CWaveGraph.cpp @@ -1,4 +1,4 @@ -#include +#include #include "CWaveGraph.h" #include "CWaveShow.h" diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CWaveGraph.h b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CWaveGraph.h index 7c0b4679..d0426a6e 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CWaveGraph.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CWaveGraph.h @@ -1,4 +1,4 @@ -#ifndef CWAVEGRAPH_H_HEADER_INCLUDED_BFC4519F +#ifndef CWAVEGRAPH_H_HEADER_INCLUDED_BFC4519F #define CWAVEGRAPH_H_HEADER_INCLUDED_BFC4519F #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CWaveShow.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CWaveShow.cpp index 8a43f2c7..6ce15be1 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CWaveShow.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CWaveShow.cpp @@ -1,4 +1,4 @@ -#include "CWaveShow.h" +#include "CWaveShow.h" #include #include #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CWaveShow.h b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CWaveShow.h index dcec48de..8349322a 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CWaveShow.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CWaveShow.h @@ -1,4 +1,4 @@ -#ifndef CWAVESHOW_H_HEADER_INCLUDED_BFC41131 +#ifndef CWAVESHOW_H_HEADER_INCLUDED_BFC41131 #define CWAVESHOW_H_HEADER_INCLUDED_BFC41131 #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CommonFunction.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CommonFunction.cpp index f127b077..598e8a24 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CommonFunction.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CommonFunction.cpp @@ -1,4 +1,4 @@ -#include "CommonFunction.h" +#include "CommonFunction.h" bool autoSetTextStreamCodec( QTextStream& objTextStream ) { diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CommonFunction.h b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CommonFunction.h index 06bb150d..7c2452ef 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CommonFunction.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/CommonFunction.h @@ -1,4 +1,4 @@ -#ifndef COMMONFUNCTION_H +#ifndef COMMONFUNCTION_H #define COMMONFUNCTION_H #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/calgorithms.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/calgorithms.cpp index 8ff5f142..a654946d 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/calgorithms.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/calgorithms.cpp @@ -1,4 +1,4 @@ -#include "calgorithms.h" +#include "calgorithms.h" #include "math.h" #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/calgorithms.h b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/calgorithms.h index 3f7fe3f7..1cc0958b 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/calgorithms.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/calgorithms.h @@ -1,4 +1,4 @@ -#ifndef CALGORITHMS_H_HEADER_INCLUDED +#ifndef CALGORITHMS_H_HEADER_INCLUDED #define CALGORITHMS_H_HEADER_INCLUDED diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/cpageshow.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/cpageshow.cpp index 8adb8111..141726ca 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/cpageshow.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/cpageshow.cpp @@ -1,4 +1,4 @@ -#include "cpageshow.h" +#include "cpageshow.h" #include #include #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/cpageshow.h b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/cpageshow.h index eebaf912..a9c1a871 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/cpageshow.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/cpageshow.h @@ -1,4 +1,4 @@ -#ifndef CPAGESHOW_H_HEADER_INCLUDED +#ifndef CPAGESHOW_H_HEADER_INCLUDED #define CPAGESHOW_H_HEADER_INCLUDED #include diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/cwavedisplay.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/cwavedisplay.cpp index 87b85b20..3d327483 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/cwavedisplay.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/cwavedisplay.cpp @@ -1,4 +1,4 @@ -#include "CComDataClass.h" +#include "CComDataClass.h" #include ////////////////////////////////////////////////////////// //CWaveDisplay diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/datastruct.h b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/datastruct.h index d3866e21..fcd7c132 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/datastruct.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/datastruct.h @@ -1,4 +1,4 @@ -#ifndef _DATASTRUCT_H +#ifndef _DATASTRUCT_H #define _DATASTRUCT_H diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/wavedata.h b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/wavedata.h index 649deb10..04f25848 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/wavedata.h +++ b/product/src/gui/plugin/WaveAnalyzeWidget/WaveAnalyze/wavedata.h @@ -1,4 +1,4 @@ -#ifndef WAVEDATA_H_HEADER_INCLUDED +#ifndef WAVEDATA_H_HEADER_INCLUDED #define WAVEDATA_H_HEADER_INCLUDED //1.分析算法交换数据 // 分析算法规模 diff --git a/product/src/gui/plugin/WaveAnalyzeWidget/main.cpp b/product/src/gui/plugin/WaveAnalyzeWidget/main.cpp index c186d427..74ea751b 100644 --- a/product/src/gui/plugin/WaveAnalyzeWidget/main.cpp +++ b/product/src/gui/plugin/WaveAnalyzeWidget/main.cpp @@ -1,4 +1,4 @@ -#include "CWaveAnalyzeWidget.h" +#include "CWaveAnalyzeWidget.h" #include int main(int argc, char *argv[]) diff --git a/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.cpp b/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.cpp index 03212af0..d9937979 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.cpp +++ b/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.cpp @@ -1,4 +1,4 @@ -#include +#include #include "pub_sysinfo_api/SysInfoApi.h" #include "pub_logger_api/logger.h" #include "CBiCookieManage.h" @@ -24,7 +24,7 @@ CBiCookieManage::CBiCookieManage() return; } SNodeInfo stNodeInfo; - if(kbdFailed == sysInfoPtr->getLocalNodeInfo(stNodeInfo)) + if(iotFailed == sysInfoPtr->getLocalNodeInfo(stNodeInfo)) { LOGERROR("获取本机节点信息失败!"); return; @@ -43,7 +43,7 @@ bool CBiCookieManage::createCookie(QString &strCookie, int &nUserId) int nUserGrpId, nLevel, nLoginSec; std::string strInstanceName; - if(kbdSuccess != m_ptrPermMngApi->CurUser(nUserId, nUserGrpId, nLevel, nLoginSec, strInstanceName)) + if(iotSuccess != m_ptrPermMngApi->CurUser(nUserId, nUserGrpId, nLevel, nLoginSec, strInstanceName)) { LOGERROR("获取当前登录用户信息失败!"); return false; diff --git a/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.h b/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.h index 1f17dbd1..79d010c7 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.h +++ b/product/src/gui/plugin/WebBrowserWidget/CBiCookieManage.h @@ -1,4 +1,4 @@ -#ifndef CBICOOKIEMANAGE_H +#ifndef CBICOOKIEMANAGE_H #define CBICOOKIEMANAGE_H #include diff --git a/product/src/gui/plugin/WebBrowserWidget/CBiTabWidget.cpp b/product/src/gui/plugin/WebBrowserWidget/CBiTabWidget.cpp index 2016a302..ccdeb62d 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CBiTabWidget.cpp +++ b/product/src/gui/plugin/WebBrowserWidget/CBiTabWidget.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include "pub_utility_api/FileStyle.h" diff --git a/product/src/gui/plugin/WebBrowserWidget/CBiTabWidget.h b/product/src/gui/plugin/WebBrowserWidget/CBiTabWidget.h index 01cda06e..11a055ff 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CBiTabWidget.h +++ b/product/src/gui/plugin/WebBrowserWidget/CBiTabWidget.h @@ -1,4 +1,4 @@ -#ifndef CBITABWIDGET_H +#ifndef CBITABWIDGET_H #define CBITABWIDGET_H #include diff --git a/product/src/gui/plugin/WebBrowserWidget/CBrowserPluginWidget.cpp b/product/src/gui/plugin/WebBrowserWidget/CBrowserPluginWidget.cpp index c4a4703a..7b31e10b 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CBrowserPluginWidget.cpp +++ b/product/src/gui/plugin/WebBrowserWidget/CBrowserPluginWidget.cpp @@ -1,4 +1,4 @@ -#include +#include #include "CBrowserPluginWidget.h" #include "CBrowserWidget.h" diff --git a/product/src/gui/plugin/WebBrowserWidget/CBrowserPluginWidget.h b/product/src/gui/plugin/WebBrowserWidget/CBrowserPluginWidget.h index 4fd2cc2d..a1485778 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CBrowserPluginWidget.h +++ b/product/src/gui/plugin/WebBrowserWidget/CBrowserPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef CBROWSERPLUGINWIDGET_H +#ifndef CBROWSERPLUGINWIDGET_H #define CBROWSERPLUGINWIDGET_H #include @@ -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: diff --git a/product/src/gui/plugin/WebBrowserWidget/CBrowserWidget.cpp b/product/src/gui/plugin/WebBrowserWidget/CBrowserWidget.cpp index 6f697808..029df467 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CBrowserWidget.cpp +++ b/product/src/gui/plugin/WebBrowserWidget/CBrowserWidget.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/product/src/gui/plugin/WebBrowserWidget/CBrowserWidget.h b/product/src/gui/plugin/WebBrowserWidget/CBrowserWidget.h index b0f0286c..91fc681e 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CBrowserWidget.h +++ b/product/src/gui/plugin/WebBrowserWidget/CBrowserWidget.h @@ -1,4 +1,4 @@ -#ifndef CBROWSERWIDGET_H +#ifndef CBROWSERWIDGET_H #define CBROWSERWIDGET_H #include diff --git a/product/src/gui/plugin/WebBrowserWidget/CEnergyTabWidget.cpp b/product/src/gui/plugin/WebBrowserWidget/CEnergyTabWidget.cpp index 2bd5d562..be42a272 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CEnergyTabWidget.cpp +++ b/product/src/gui/plugin/WebBrowserWidget/CEnergyTabWidget.cpp @@ -1,4 +1,4 @@ -#include +#include #include "CWebEngineView.h" #include "CEnergyTabWidget.h" #include "pub_utility_api/FileStyle.h" diff --git a/product/src/gui/plugin/WebBrowserWidget/CEnergyTabWidget.h b/product/src/gui/plugin/WebBrowserWidget/CEnergyTabWidget.h index ebb41594..252c14b6 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CEnergyTabWidget.h +++ b/product/src/gui/plugin/WebBrowserWidget/CEnergyTabWidget.h @@ -1,4 +1,4 @@ -#ifndef CENERGYTABWIDGET_H +#ifndef CENERGYTABWIDGET_H #define CENERGYTABWIDGET_H #include "CWebTabWidget.h" diff --git a/product/src/gui/plugin/WebBrowserWidget/CWebEngineView.cpp b/product/src/gui/plugin/WebBrowserWidget/CWebEngineView.cpp index 87b341ce..248160e5 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CWebEngineView.cpp +++ b/product/src/gui/plugin/WebBrowserWidget/CWebEngineView.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/product/src/gui/plugin/WebBrowserWidget/CWebEngineView.h b/product/src/gui/plugin/WebBrowserWidget/CWebEngineView.h index 9699e48d..cc23eacc 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CWebEngineView.h +++ b/product/src/gui/plugin/WebBrowserWidget/CWebEngineView.h @@ -1,4 +1,4 @@ -#ifndef CWEBENGINEVIEW_H +#ifndef CWEBENGINEVIEW_H #define CWEBENGINEVIEW_H #include diff --git a/product/src/gui/plugin/WebBrowserWidget/CWebTabWidget.cpp b/product/src/gui/plugin/WebBrowserWidget/CWebTabWidget.cpp index 64d0b02d..76e0daf9 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CWebTabWidget.cpp +++ b/product/src/gui/plugin/WebBrowserWidget/CWebTabWidget.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include "pub_logger_api/logger.h" diff --git a/product/src/gui/plugin/WebBrowserWidget/CWebTabWidget.h b/product/src/gui/plugin/WebBrowserWidget/CWebTabWidget.h index 6208d68b..b3293a65 100644 --- a/product/src/gui/plugin/WebBrowserWidget/CWebTabWidget.h +++ b/product/src/gui/plugin/WebBrowserWidget/CWebTabWidget.h @@ -1,4 +1,4 @@ -#ifndef CWEBTABWIDGET_H +#ifndef CWEBTABWIDGET_H #define CWEBTABWIDGET_H #include diff --git a/product/src/gui/plugin/WebBrowserWidget/main.cpp b/product/src/gui/plugin/WebBrowserWidget/main.cpp index 0955b106..db45bf9e 100644 --- a/product/src/gui/plugin/WebBrowserWidget/main.cpp +++ b/product/src/gui/plugin/WebBrowserWidget/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include "pub_logger_api/logger.h" #include "service/perm_mng_api/PermMngApi.h" #include "net/net_msg_bus_api/MsgBusApi.h" @@ -17,7 +17,7 @@ int main(int argc, char *argv[]) { return -1; } - if(perm->SysLogin("Test", "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/WorkTicket/CWorkTicketManage.cpp b/product/src/gui/plugin/WorkTicket/CWorkTicketManage.cpp index 2bd51317..ba316035 100644 --- a/product/src/gui/plugin/WorkTicket/CWorkTicketManage.cpp +++ b/product/src/gui/plugin/WorkTicket/CWorkTicketManage.cpp @@ -1,4 +1,4 @@ -#include "CWorkTicketManage.h" +#include "CWorkTicketManage.h" #include "ui_CWorkTicketManage.h" #include "WorkTicketWidget.h" #include diff --git a/product/src/gui/plugin/WorkTicket/CWorkTicketManage.h b/product/src/gui/plugin/WorkTicket/CWorkTicketManage.h index 10e04dd7..1e278112 100644 --- a/product/src/gui/plugin/WorkTicket/CWorkTicketManage.h +++ b/product/src/gui/plugin/WorkTicket/CWorkTicketManage.h @@ -1,4 +1,4 @@ -#ifndef CWORKTICKETMANAGE_H +#ifndef CWORKTICKETMANAGE_H #define CWORKTICKETMANAGE_H #include diff --git a/product/src/gui/plugin/WorkTicket/CWorkTicketPluginWidget.cpp b/product/src/gui/plugin/WorkTicket/CWorkTicketPluginWidget.cpp index 24b547d1..98132491 100644 --- a/product/src/gui/plugin/WorkTicket/CWorkTicketPluginWidget.cpp +++ b/product/src/gui/plugin/WorkTicket/CWorkTicketPluginWidget.cpp @@ -1,4 +1,4 @@ -#include +#include #include "CWorkTicketPluginWidget.h" #include "CWorkTicketManage.h" diff --git a/product/src/gui/plugin/WorkTicket/CWorkTicketPluginWidget.h b/product/src/gui/plugin/WorkTicket/CWorkTicketPluginWidget.h index 1a71c47c..843e3e95 100644 --- a/product/src/gui/plugin/WorkTicket/CWorkTicketPluginWidget.h +++ b/product/src/gui/plugin/WorkTicket/CWorkTicketPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef CWORKTICKETPLUGINWIDGET_H +#ifndef CWORKTICKETPLUGINWIDGET_H #define CWORKTICKETPLUGINWIDGET_H #include @@ -7,7 +7,7 @@ class CWorkTicketPluginWidget : 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: diff --git a/product/src/gui/plugin/WorkTicket/HistoryWidget.cpp b/product/src/gui/plugin/WorkTicket/HistoryWidget.cpp index 098bd144..7b048d39 100644 --- a/product/src/gui/plugin/WorkTicket/HistoryWidget.cpp +++ b/product/src/gui/plugin/WorkTicket/HistoryWidget.cpp @@ -1,4 +1,4 @@ -#include "HistoryWidget.h" +#include "HistoryWidget.h" #include "kbdtable.h" #include #include diff --git a/product/src/gui/plugin/WorkTicket/HistoryWidget.h b/product/src/gui/plugin/WorkTicket/HistoryWidget.h index 585aa934..87b78479 100644 --- a/product/src/gui/plugin/WorkTicket/HistoryWidget.h +++ b/product/src/gui/plugin/WorkTicket/HistoryWidget.h @@ -1,4 +1,4 @@ -#ifndef HISTORYWIDGET_H +#ifndef HISTORYWIDGET_H #define HISTORYWIDGET_H #include diff --git a/product/src/gui/plugin/WorkTicket/WorkTicketWidget.cpp b/product/src/gui/plugin/WorkTicket/WorkTicketWidget.cpp index 7dad3da2..19051217 100644 --- a/product/src/gui/plugin/WorkTicket/WorkTicketWidget.cpp +++ b/product/src/gui/plugin/WorkTicket/WorkTicketWidget.cpp @@ -1,4 +1,4 @@ -#include "WorkTicketWidget.h" +#include "WorkTicketWidget.h" #include #include #include @@ -76,10 +76,10 @@ void WorkTicketWidget::initLayout() void WorkTicketWidget::initTableModel() { -// QSettings settings("KbdSoft.ZHJK","ISCS6000.tools"); +// QSettings settings("IOT","ISCS6000.tools"); // KbdTableDataMgr::getInstance()->initDBLink(DataBaseInterface::DirectLink, // settings.value("login/user","root").toString(), -// settings.value("login/psw","kbdct@0755").toString(), +// settings.value("login/psw","ems@byd23").toString(), // settings.value("login/ip","192.168.190.128").toString(), // settings.value("login/port","3306").toInt(), // settings.value("login/dbname","ISCS6000").toString(), diff --git a/product/src/gui/plugin/WorkTicket/WorkTicketWidget.h b/product/src/gui/plugin/WorkTicket/WorkTicketWidget.h index d53186e5..3b00ad4e 100644 --- a/product/src/gui/plugin/WorkTicket/WorkTicketWidget.h +++ b/product/src/gui/plugin/WorkTicket/WorkTicketWidget.h @@ -1,4 +1,4 @@ -#ifndef WORKTICKETWIDGET_H +#ifndef WORKTICKETWIDGET_H #define WORKTICKETWIDGET_H #include #include diff --git a/product/src/gui/plugin/WorkTicket/xlsxsheetmodel.cpp b/product/src/gui/plugin/WorkTicket/xlsxsheetmodel.cpp index 1a710770..4c738b2e 100644 --- a/product/src/gui/plugin/WorkTicket/xlsxsheetmodel.cpp +++ b/product/src/gui/plugin/WorkTicket/xlsxsheetmodel.cpp @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** ** Copyright (c) 2013-2014 Debao Zhang ** All right reserved. ** diff --git a/product/src/gui/plugin/WorkTicket/xlsxsheetmodel.h b/product/src/gui/plugin/WorkTicket/xlsxsheetmodel.h index b500ff3f..40003e7d 100644 --- a/product/src/gui/plugin/WorkTicket/xlsxsheetmodel.h +++ b/product/src/gui/plugin/WorkTicket/xlsxsheetmodel.h @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** ** Copyright (c) 2013-2014 Debao Zhang ** All right reserved. ** diff --git a/product/src/gui/plugin/iDongOpsWidget/CCfgParser.cpp b/product/src/gui/plugin/iDongOpsWidget/CCfgParser.cpp index f95ead38..96b951c1 100644 --- a/product/src/gui/plugin/iDongOpsWidget/CCfgParser.cpp +++ b/product/src/gui/plugin/iDongOpsWidget/CCfgParser.cpp @@ -27,19 +27,19 @@ bool CCfgParser::g_isValid=false; bool CCfgParser::loadGlobal(iot_public::CCommonConfigParse &cfg) { - if( cfg.getBoolValue(CN_GLOBAL, CN_IS_PERM_CHECKED , g_global_cfg.is_perm_checked ) == kbdFailed){ LOGERROR( " is_perm_checked option parser err"); return false;} - if( cfg.getStringValue(CN_GLOBAL, CN_DEFAULT_USER , g_global_cfg.default_user ) == kbdFailed){ LOGERROR( " default_user option parser err"); return false;} - if( cfg.getStringValue(CN_GLOBAL, CN_DEFAULT_PASSWD , g_global_cfg.default_passwd ) == kbdFailed){ LOGERROR( " default_passwd option parser err"); return false;} - if( cfg.getStringValue(CN_GLOBAL, CN_SERVER_ADDRESS , g_global_cfg.server_address ) == kbdFailed){ LOGERROR( " server_address option parser err"); return false;} - if( cfg.getIntValue(CN_GLOBAL, CN_SERVER_PORT , g_global_cfg.server_port ) == kbdFailed){ LOGERROR( " server_port option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL, CN_IS_HTTPS , g_global_cfg.is_https ) == kbdFailed){ LOGERROR( " is_https option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL, CN_IS_HEADER , g_global_cfg.is_header ) == kbdFailed){ LOGERROR( " is_header option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL, CN_IS_TITLE , g_global_cfg.is_title ) == kbdFailed){ LOGERROR( " is_title option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL, CN_IS_LEFTBAR , g_global_cfg.is_leftbar ) == kbdFailed){ LOGERROR( " is_leftbar option parser err"); return false;} - if( cfg.getBoolValue(CN_GLOBAL, CN_IS_BUTTON , g_global_cfg.is_button ) == kbdFailed){ LOGERROR( " is_button option parser err"); return false;} - if( cfg.getStringValue(CN_GLOBAL, CN_LOCAL_STATICPAGE_PATH , g_global_cfg.local_static_page_path ) == kbdFailed){ LOGERROR( " local_staticpage_path option parser err"); return false;} - if( cfg.getStringValue(CN_GLOBAL, CN_ERR_PAGE , g_global_cfg.err_page ) == kbdFailed){ LOGERROR( " err_page option parser err"); return false;} - if( cfg.getStringValue(CN_GLOBAL, CN_PERM_ERR_PAGE , g_global_cfg.perm_err_page ) == kbdFailed){ LOGERROR( " perm_err_page option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL, CN_IS_PERM_CHECKED , g_global_cfg.is_perm_checked ) == iotFailed){ LOGERROR( " is_perm_checked option parser err"); return false;} + if( cfg.getStringValue(CN_GLOBAL, CN_DEFAULT_USER , g_global_cfg.default_user ) == iotFailed){ LOGERROR( " default_user option parser err"); return false;} + if( cfg.getStringValue(CN_GLOBAL, CN_DEFAULT_PASSWD , g_global_cfg.default_passwd ) == iotFailed){ LOGERROR( " default_passwd option parser err"); return false;} + if( cfg.getStringValue(CN_GLOBAL, CN_SERVER_ADDRESS , g_global_cfg.server_address ) == iotFailed){ LOGERROR( " server_address option parser err"); return false;} + if( cfg.getIntValue(CN_GLOBAL, CN_SERVER_PORT , g_global_cfg.server_port ) == iotFailed){ LOGERROR( " server_port option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL, CN_IS_HTTPS , g_global_cfg.is_https ) == iotFailed){ LOGERROR( " is_https option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL, CN_IS_HEADER , g_global_cfg.is_header ) == iotFailed){ LOGERROR( " is_header option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL, CN_IS_TITLE , g_global_cfg.is_title ) == iotFailed){ LOGERROR( " is_title option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL, CN_IS_LEFTBAR , g_global_cfg.is_leftbar ) == iotFailed){ LOGERROR( " is_leftbar option parser err"); return false;} + if( cfg.getBoolValue(CN_GLOBAL, CN_IS_BUTTON , g_global_cfg.is_button ) == iotFailed){ LOGERROR( " is_button option parser err"); return false;} + if( cfg.getStringValue(CN_GLOBAL, CN_LOCAL_STATICPAGE_PATH , g_global_cfg.local_static_page_path ) == iotFailed){ LOGERROR( " local_staticpage_path option parser err"); return false;} + if( cfg.getStringValue(CN_GLOBAL, CN_ERR_PAGE , g_global_cfg.err_page ) == iotFailed){ LOGERROR( " err_page option parser err"); return false;} + if( cfg.getStringValue(CN_GLOBAL, CN_PERM_ERR_PAGE , g_global_cfg.perm_err_page ) == iotFailed){ LOGERROR( " perm_err_page option parser err"); return false;} return true; } @@ -52,7 +52,7 @@ bool CCfgParser::isValid() bool CCfgParser::loadCfg(const std::string &cfgPath) { iot_public::CCommonConfigParse cfgP; - if( cfgP.load(cfgPath) == kbdFailed) + if( cfgP.load(cfgPath) == iotFailed) { LOGERROR("config failed to load, please check config syntax!"); g_isValid = false; diff --git a/product/src/gui/plugin/iDongOpsWidget/CCfgParser.h b/product/src/gui/plugin/iDongOpsWidget/CCfgParser.h index 21dfdcc8..1bb838ed 100644 --- a/product/src/gui/plugin/iDongOpsWidget/CCfgParser.h +++ b/product/src/gui/plugin/iDongOpsWidget/CCfgParser.h @@ -1,4 +1,4 @@ -#ifndef CCFGPARSER_H +#ifndef CCFGPARSER_H #define CCFGPARSER_H #include #include "pub_utility_api/FileUtil.h" diff --git a/product/src/gui/plugin/iDongOpsWidget/CIDongOpsPluginWidget.cpp b/product/src/gui/plugin/iDongOpsWidget/CIDongOpsPluginWidget.cpp index d59a0b78..f01d8287 100644 --- a/product/src/gui/plugin/iDongOpsWidget/CIDongOpsPluginWidget.cpp +++ b/product/src/gui/plugin/iDongOpsWidget/CIDongOpsPluginWidget.cpp @@ -1,4 +1,4 @@ -#include +#include #include "CIDongOpsPluginWidget.h" #include "CReportWidget.h" diff --git a/product/src/gui/plugin/iDongOpsWidget/CIDongOpsPluginWidget.h b/product/src/gui/plugin/iDongOpsWidget/CIDongOpsPluginWidget.h index aeda95c6..9442baeb 100644 --- a/product/src/gui/plugin/iDongOpsWidget/CIDongOpsPluginWidget.h +++ b/product/src/gui/plugin/iDongOpsWidget/CIDongOpsPluginWidget.h @@ -1,4 +1,4 @@ -#ifndef CREPORTPLUGINWIDGET_H +#ifndef CREPORTPLUGINWIDGET_H #define CREPORTPLUGINWIDGET_H #include @@ -7,7 +7,7 @@ class CIDongOpsPluginWidget : 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: diff --git a/product/src/gui/plugin/iDongOpsWidget/CReportStackedWidget.cpp b/product/src/gui/plugin/iDongOpsWidget/CReportStackedWidget.cpp index b6862b75..04ce261a 100644 --- a/product/src/gui/plugin/iDongOpsWidget/CReportStackedWidget.cpp +++ b/product/src/gui/plugin/iDongOpsWidget/CReportStackedWidget.cpp @@ -1,4 +1,4 @@ -#include "CReportStackedWidget.h" +#include "CReportStackedWidget.h" CReportStackedWidget::CReportStackedWidget(QWidget *parent) :QStackedWidget(parent) diff --git a/product/src/gui/plugin/iDongOpsWidget/CReportStackedWidget.h b/product/src/gui/plugin/iDongOpsWidget/CReportStackedWidget.h index 5591a847..d05f139e 100644 --- a/product/src/gui/plugin/iDongOpsWidget/CReportStackedWidget.h +++ b/product/src/gui/plugin/iDongOpsWidget/CReportStackedWidget.h @@ -1,4 +1,4 @@ -#ifndef CREPORTSTACKEDWIDGET_H +#ifndef CREPORTSTACKEDWIDGET_H #define CREPORTSTACKEDWIDGET_H #include "CReportWebView.h" #include "CReportWidget.h" diff --git a/product/src/gui/plugin/iDongOpsWidget/CReportWebView.cpp b/product/src/gui/plugin/iDongOpsWidget/CReportWebView.cpp index 7ad8ae5d..c0e1343a 100644 --- a/product/src/gui/plugin/iDongOpsWidget/CReportWebView.cpp +++ b/product/src/gui/plugin/iDongOpsWidget/CReportWebView.cpp @@ -1,4 +1,4 @@ -#include "CReportWebView.h" +#include "CReportWebView.h" #include #include #include diff --git a/product/src/gui/plugin/iDongOpsWidget/CReportWebView.h b/product/src/gui/plugin/iDongOpsWidget/CReportWebView.h index 74655a47..7572242f 100644 --- a/product/src/gui/plugin/iDongOpsWidget/CReportWebView.h +++ b/product/src/gui/plugin/iDongOpsWidget/CReportWebView.h @@ -1,4 +1,4 @@ -#ifndef CREPORTWEBVIEW_H +#ifndef CREPORTWEBVIEW_H #define CREPORTWEBVIEW_H #include diff --git a/product/src/gui/plugin/iDongOpsWidget/CReportWidget.cpp b/product/src/gui/plugin/iDongOpsWidget/CReportWidget.cpp index 643e4313..be92262f 100644 --- a/product/src/gui/plugin/iDongOpsWidget/CReportWidget.cpp +++ b/product/src/gui/plugin/iDongOpsWidget/CReportWidget.cpp @@ -1,4 +1,4 @@ -#include "CReportWidget.h" +#include "CReportWidget.h" #include "pub_logger_api/logger.h" #include #include diff --git a/product/src/gui/plugin/iDongOpsWidget/CReportWidget.h b/product/src/gui/plugin/iDongOpsWidget/CReportWidget.h index 9b87d180..e5fc10f7 100644 --- a/product/src/gui/plugin/iDongOpsWidget/CReportWidget.h +++ b/product/src/gui/plugin/iDongOpsWidget/CReportWidget.h @@ -1,4 +1,4 @@ -#ifndef CREPORTWIDGET_H +#ifndef CREPORTWIDGET_H #define CREPORTWIDGET_H #include diff --git a/product/src/gui/plugin/iDongOpsWidget/idong_common.h b/product/src/gui/plugin/iDongOpsWidget/idong_common.h index 0f05ab75..bf5b679b 100644 --- a/product/src/gui/plugin/iDongOpsWidget/idong_common.h +++ b/product/src/gui/plugin/iDongOpsWidget/idong_common.h @@ -1,4 +1,4 @@ -#ifndef IDONG_COMMON_H +#ifndef IDONG_COMMON_H #define IDONG_COMMON_H #include @@ -47,7 +47,7 @@ const std::string CN_PROCESSNAME = "iDongOpsWidget"; #define COL_STATUS_VALUE_VALID 1 #define COL_STATUS_VALUE_INVALID 0 // 返回值 -#define kbdFailedRdb 2 // 内存库错误 +#define iotFailedRdb 2 // 内存库错误 #define valid_value 0 #define invalid_value 1