diff --git a/dataPanel/dpBarsChart.cpp b/dataPanel/dpBarsChart.cpp index 7829a4c..ec66ad0 100644 --- a/dataPanel/dpBarsChart.cpp +++ b/dataPanel/dpBarsChart.cpp @@ -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)