Showing the changes to Source/Libraries/TimeSeriesPlatformLibrary/Samples/SubscriberHandler.cpp (1 of 22 files). Show all
Unified · Split
| @@ -141,35 +141,33 @@ void SubscriberHandler::ReceivedNewMeasurements(const vector<MeasurementPtr>& me · 140 unmodified lines | ||
| 141 | 141 | const string TimestampFormat = "%Y-%m-%d %H:%M:%S.%f"; |
| 142 | 142 | const size_t MaxTimestampSize = 80; |
| 143 | 143 | |
| 144 | − static int processCount = 0; | |
| 145 | − size_t i; | |
| 144 | + static long processCount = 0; | |
| 145 | + static char timestamp[MaxTimestampSize]; | |
| 146 | + static const long interval = 5 * 60; | |
| 147 | + const long measurementCount = measurements.size(); | |
| 148 | + const bool showMessage = (processCount + measurementCount >= (processCount / interval + 1) * interval); | |
| 146 | 149 | |
| 147 | − char timestamp[MaxTimestampSize]; | |
| 150 | + processCount += measurementCount; | |
| 148 | 151 | |
| 149 | 152 | // Only display messages every few seconds |
| 150 | − if (processCount % 150 == 0) | |
| 153 | + if (showMessage) | |
| 151 | 154 | { |
| 152 | 155 | stringstream message; |
| 153 | 156 | |
| 154 | 157 | message << GetTotalMeasurementsReceived() << " measurements received so far..." << endl; |
| 155 | 158 | |
| 156 | − if (!measurements.empty()) | |
| 157 | − { | |
| 158 | − if (TicksToString(timestamp, MaxTimestampSize, TimestampFormat, measurements[0]->Timestamp)) | |
| 159 | − message << "Timestamp: " << string(timestamp) << endl; | |
| 159 | + if (TicksToString(timestamp, MaxTimestampSize, TimestampFormat, measurements[0]->Timestamp)) | |
| 160 | + message << "Timestamp: " << string(timestamp) << endl; | |
| 160 | 161 | |
| 161 | − message << "Point\tValue" << endl; | |
| 162 | + message << "Point\tValue" << endl; | |
| 162 | 163 | |
| 163 | − for (i = 0; i < measurements.size(); ++i) | |
| 164 | − message << measurements[i]->ID << '\t' << measurements[i]->Value << endl; | |
| 164 | + for (const auto& measurement : measurements) | |
| 165 | + message << measurement->ID << '\t' << measurement->Value << endl; | |
| 165 | 166 | |
| 166 | − message << endl; | |
| 167 | − } | |
| 167 | + message << endl; | |
| 168 | 168 | |
| 169 | 169 | StatusMessage(message.str()); |
| 170 | 170 | } |
| 171 | − | |
| 172 | − ++processCount; | |
| 173 | 171 | } |
| 174 | 172 | |
| 175 | 173 | void SubscriberHandler::ConfigurationChanged() |