GZHM/HM-SPMS
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix]修改因为同步711而编译不过去的问题

Browse Source
This commit is contained in:
shi_jq 2025-03-20 14:06:39 +08:00
parent d23436a1f0
commit b5270dcfe1
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
product/src/gui/plugin/BusbarTemperatureWidget/BusbarTemperatureWidget.cpp
View File

@ -1,4 +1,4 @@
#include "BusbarTemperatureWidget.h"
#include "BusbarTemperatureWidget.h"
#include "ui_BusbarTemperatureWidget.h"

11
product/src/gui/plugin/ChanStatusWidget/ChanTableModel.h
View File

@ -14,16 +14,17 @@ public:
void updateRealValue(QList<SChanStatus> &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;

6
product/src/gui/plugin/RobotCtrlWidget/CRobotCtrlWidget.cpp
View File

@ -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("标签不匹配,或实例名有问题");

2
product/src/gui/plugin/StrategyControlWidget/StrategyControlWidget.pro
View File

@ -23,7 +23,7 @@ HEADERS += \
SOURCES += \
CStrategyControlWidget.cpp \
main.cpp \
# main.cpp \
CStrategyControlPluginWidget.cpp \
template/CPeakValleyTemplateWidget.cpp \
CMbApi.cpp \

1
product/src/src.pro
View File

@ -8,6 +8,7 @@ CONFIG += ordered
SUBDIRS += public \
idl_files \
fes/fes_idl_files \
application/OnvifLibs \
sys \
net \