CL-Softwares
/
PowerMaster
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:在柱形图数据面板中添加数据服务

This commit is contained in:
duanshengchao 2026-01-28 15:52:53 +08:00
parent 9ddacd21b9
commit b9d43a7882
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dataPanel/dpBarsChart.cpp
View File

@ -1,5 +1,6 @@
#include "dpBarsChart.h"
#include "dataManager.h"
//#include "dataManager.h"
#include "measurementDataManager.h"
CustomBars::CustomBars(QCPAxis* keyAxis, QCPAxis* valueAxis)
: QCPBars(keyAxis, valueAxis),
@ -126,7 +127,7 @@ dpBarsChart::dpBarsChart(QWidget* parent)
m_updateData = false;
connect(DataManager::instance(), &DataManager::dataUpdated, this, &dpBarsChart::onSignal_dataUpdated);
//connect(DataManager::instance(), &DataManager::dataUpdated, this, &dpBarsChart::onSignal_dataUpdated);
}
dpBarsChart::~dpBarsChart()
@ -201,7 +202,7 @@ void dpBarsChart::setDateTime(const QDateTime& dateTime)
if(m_updateData)
{
for(auto it = m_bars.begin(); it != m_bars.end(); ++it)
DataManager::instance()->requestData(it.key(), this);
//DataManager::instance()->requestData(it.key(), this);
m_pCustomPlot->replot();
}
@ -246,10 +247,11 @@ void dpBarsChart::synchronizeConfigData(const configurationResults& cfg)
for(int i = 0; i < cfg.m_pModel_dataSource->rowCount(); i++)
{
QString itemText = cfg.m_pModel_dataSource->item(i, 0)->text();
QString stationID = cfg.m_pModel_dataSource->item(i, 0)->data(Qt::UserRole + itemRole_stationID).toString();
QString compoentID = cfg.m_pModel_dataSource->item(i, 0)->data(Qt::UserRole + itemRole_componentID).toString();
QString pointID = cfg.m_pModel_dataSource->item(i, 0)->data(Qt::UserRole + itemRole_pointID).toString();
QString dataID = stationID + "-" + compoentID + "-" + pointID;
// QString stationID = cfg.m_pModel_dataSource->item(i, 0)->data(Qt::UserRole + itemRole_stationID).toString();
// QString compoentID = cfg.m_pModel_dataSource->item(i, 0)->data(Qt::UserRole + itemRole_componentID).toString();
// QString pointID = cfg.m_pModel_dataSource->item(i, 0)->data(Qt::UserRole + itemRole_pointID).toString();
// QString dataID = stationID + "-" + compoentID + "-" + pointID;
QString dataID = cfg.m_pModel_dataSource->item(i, 0)->data(Qt::UserRole + itemRole_pointID).toString();
QVariant colorData = cfg.m_pModel_dataSource->item(i, 0)->data(Qt::DecorationRole);
RealTimeDataType dataType = (RealTimeDataType)cfg.m_pModel_dataSource->item(i, 0)->data(Qt::UserRole + itemRole_dataType).toInt();
@ -286,11 +288,11 @@ void dpBarsChart::synchronizeConfigData(const configurationResults& cfg)
m_bars.insert(dataID, bars);
//实时模拟数据
DataManager::instance()->registerDataSource(dataID, [](){
/*DataManager::instance()->registerDataSource(dataID, [](){
static double min = 0, max = 10.0;
double randomFloat = min + QRandomGenerator::global()->generateDouble() * (max - min);
return QVariant::fromValue(randomFloat);
});
});*/
}
if(groupByType)