diff --git a/dataPanel/dpConfigurationDialog.cpp b/dataPanel/dpConfigurationDialog.cpp index a3d70c3..5ab2644 100644 --- a/dataPanel/dpConfigurationDialog.cpp +++ b/dataPanel/dpConfigurationDialog.cpp @@ -187,7 +187,8 @@ void dpConfigurationDialog::createDataSourceList() voltageItem->setData("point", Qt::UserRole + itemRole_tag); voltageItem->setData(i, Qt::UserRole + itemRole_stationID); voltageItem->setData(0, Qt::UserRole + itemRole_componentID); - voltageItem->setData(0, Qt::UserRole + itemRole_pointID); + //voltageItem->setData(0, Qt::UserRole + itemRole_pointID); + voltageItem->setData("grid1.zone1.station1.ns1.tag1.bay.I11_A_rms", Qt::UserRole + itemRole_pointID); voltageItem->setData(RealTimeDataType::voltage, Qt::UserRole + itemRole_dataType); componentItem->appendRow(voltageItem); QStandardItem* currentItem = new QStandardItem("电流"); @@ -195,7 +196,8 @@ void dpConfigurationDialog::createDataSourceList() currentItem->setData("point", Qt::UserRole + itemRole_tag); currentItem->setData(i, Qt::UserRole + itemRole_stationID); currentItem->setData(0, Qt::UserRole + itemRole_componentID); - currentItem->setData(1, Qt::UserRole + itemRole_pointID); + //currentItem->setData(1, Qt::UserRole + itemRole_pointID); + currentItem->setData("grid1.zone1.station1.ns1.tag1.bay.I11_B_rms", Qt::UserRole + itemRole_pointID); currentItem->setData(RealTimeDataType::current, Qt::UserRole + itemRole_dataType); componentItem->appendRow(currentItem); QStandardItem* powerItem = new QStandardItem("功率"); @@ -203,7 +205,8 @@ void dpConfigurationDialog::createDataSourceList() powerItem->setData("point", Qt::UserRole + itemRole_tag); powerItem->setData(i, Qt::UserRole + itemRole_stationID); powerItem->setData(0, Qt::UserRole + itemRole_componentID); - powerItem->setData(2, Qt::UserRole + itemRole_pointID); + //powerItem->setData(2, Qt::UserRole + itemRole_pointID); + powerItem->setData("grid1.zone1.station1.ns1.tag1.bay.I11_C_rms", Qt::UserRole + itemRole_pointID); powerItem->setData(RealTimeDataType::power, Qt::UserRole + itemRole_dataType); componentItem->appendRow(powerItem); QStandardItem* tempItem = new QStandardItem("温度"); @@ -211,7 +214,8 @@ void dpConfigurationDialog::createDataSourceList() tempItem->setData("point", Qt::UserRole + itemRole_tag); tempItem->setData(i, Qt::UserRole + itemRole_stationID); tempItem->setData(0, Qt::UserRole + itemRole_componentID); - tempItem->setData(3, Qt::UserRole + itemRole_pointID); + //tempItem->setData(3, Qt::UserRole + itemRole_pointID); + tempItem->setData("grid1.zone1.station1.ns1.tag1.bay.I11_D_rms", Qt::UserRole + itemRole_pointID); tempItem->setData(RealTimeDataType::temperature, Qt::UserRole + itemRole_dataType); componentItem->appendRow(tempItem); } @@ -222,7 +226,7 @@ void dpConfigurationDialog::createDataSourceList() void dpConfigurationDialog::removeDataSelected(int deleteRow) { QList items = m_pModel_dataSelected->takeRow(deleteRow); - for(QStandardItem* item: items) + for(QStandardItem* item: std::as_const(items)) delete item; //更新颜色-从当前删除项往后的所有项