diff --git a/product/src/gui/plugin/BusbarTemperatureWidget/BusbarTemperatureWidget.cpp b/product/src/gui/plugin/BusbarTemperatureWidget/BusbarTemperatureWidget.cpp index 26661ae1..70d69c6c 100644 --- a/product/src/gui/plugin/BusbarTemperatureWidget/BusbarTemperatureWidget.cpp +++ b/product/src/gui/plugin/BusbarTemperatureWidget/BusbarTemperatureWidget.cpp @@ -1,4 +1,4 @@ -#include "BusbarTemperatureWidget.h" +#include "BusbarTemperatureWidget.h" #include "ui_BusbarTemperatureWidget.h" diff --git a/product/src/gui/plugin/ChanStatusWidget/ChanTableModel.h b/product/src/gui/plugin/ChanStatusWidget/ChanTableModel.h index bf4845a2..59abfec6 100644 --- a/product/src/gui/plugin/ChanStatusWidget/ChanTableModel.h +++ b/product/src/gui/plugin/ChanStatusWidget/ChanTableModel.h @@ -14,16 +14,17 @@ public: void updateRealValue(QList &dataList); -private: - void update(); - - QVariant headerData(int section, Qt::Orientation orientation, - int role = Qt::DisplayRole) const; int rowCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const; + + QVariant headerData(int section, Qt::Orientation orientation, + int role = Qt::DisplayRole) const; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; +private: + void update(); private: QString getChanStatusDesc(const int &status) const; diff --git a/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.cpp b/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.cpp index 4e4a7acf..54a4608f 100644 --- a/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.cpp +++ b/product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.cpp @@ -444,8 +444,7 @@ void CRobotCtrlWidget::ctrlRobot(QString &pointTag) reqQueue.bCheckInterLock = false; stCtrlCmd.vecOptCtrlQueue.push_back(reqQueue); - COptCtrlRequest objReq; - std::string strMsg = objReq.generate(stCtrlCmd); + std::string strMsg = COptCtrlRequest::generate(stCtrlCmd); if (strMsg.empty()) { LOGERROR("生成控制命令失败"); @@ -539,10 +538,9 @@ void CRobotCtrlWidget::dealOptMsg(const CMbMessage &objMsg) void CRobotCtrlWidget::parseMsg(const CMbMessage &objMsg) { int nRetCode = -1; - COptCtrlReply objOptCtrlReply; SOptCtrlReply stOptCtrlReply; std::string strMsg((char *)objMsg.getDataPtr(),objMsg.getDataSize()); - nRetCode = objOptCtrlReply.parse(strMsg,stOptCtrlReply); + nRetCode = COptCtrlReply::parse(strMsg,stOptCtrlReply); if(stOptCtrlReply.stHead.strKeyIdTag.compare(m_tag.toStdString()) != 0 && stOptCtrlReply.stHead.strInstName.compare(CN_RobotCtrlWidget) != 0) { LOGERROR("标签不匹配,或实例名有问题"); diff --git a/product/src/gui/plugin/StrategyControlWidget/StrategyControlWidget.pro b/product/src/gui/plugin/StrategyControlWidget/StrategyControlWidget.pro index 70cbd8a5..b788c745 100644 --- a/product/src/gui/plugin/StrategyControlWidget/StrategyControlWidget.pro +++ b/product/src/gui/plugin/StrategyControlWidget/StrategyControlWidget.pro @@ -23,7 +23,7 @@ HEADERS += \ SOURCES += \ CStrategyControlWidget.cpp \ - main.cpp \ +# main.cpp \ CStrategyControlPluginWidget.cpp \ template/CPeakValleyTemplateWidget.cpp \ CMbApi.cpp \ diff --git a/product/src/src.pro b/product/src/src.pro index f6b81e09..a7c7f5cd 100644 --- a/product/src/src.pro +++ b/product/src/src.pro @@ -8,6 +8,7 @@ CONFIG += ordered SUBDIRS += public \ idl_files \ + fes/fes_idl_files \ application/OnvifLibs \ sys \ net \