diff --git a/source/alarmEventDataView.cpp b/source/alarmEventDataView.cpp index 35f91cc..3bc1440 100644 --- a/source/alarmEventDataView.cpp +++ b/source/alarmEventDataView.cpp @@ -20,6 +20,7 @@ AlarmEventDataModel::AlarmEventDataModel(AlarmDataMode mode, QObject* parent) { EventData event; event.id = ""; //空事件 + event.timestamp = 0; //给一个初始值,后续的实际事件会根据时间排名,不给初始值的话这个时间值不确定 m_displayEvents.append(event); } } @@ -189,7 +190,7 @@ void AlarmEventDataModel::iniHeaderData() void AlarmEventDataModel::setMaxRealTimeEvents(int count) { - if(m_dataMode == Historical) //实时列表初始化表格 + if(m_dataMode == RealTime) //实时列表初始化表格 { if(m_maxRealTimeEvents == count) return; @@ -338,10 +339,13 @@ void AlarmEventDataModel::onRealTimeEventReceived(const EventData& event) int insertPosition = 0; for(; insertPosition < m_displayEvents.size(); ++insertPosition) { + qDebug() << "event.timestamp: " << event.timestamp << " m_displayEvents.at(n): " << m_displayEvents.at(insertPosition).timestamp; if(event.timestamp > m_displayEvents.at(insertPosition).timestamp) break; } + qDebug() << insertPosition; + if(insertPosition < m_displayEvents.size()) m_displayEvents.insert(insertPosition, event); else