Showing the changes to Source/Libraries/TimeSeriesPlatformLibrary/Samples/AverageFrequencyCalculator.cpp (1 of 4 files). Show all
Unified · Split
| @@ -41,9 +41,9 @@ SubscriptionInfo CreateSubscriptionInfo(); · 40 unmodified lines | ||
| 41 | 41 | |
| 42 | 42 | // Handlers for subscriber callbacks. |
| 43 | 43 | void Resubscribe(DataSubscriber* source); |
| 44 | −void ProcessMeasurements(DataSubscriber* source, vector<Measurement> newMeasurements); | |
| 45 | −void DisplayStatusMessage(DataSubscriber* source, string message); | |
| 46 | −void DisplayErrorMessage(DataSubscriber* source, string message); | |
| 44 | +void ProcessMeasurements(DataSubscriber* source, const vector<MeasurementPtr>& newMeasurements); | |
| 45 | +void DisplayStatusMessage(DataSubscriber* source, const string& message); | |
| 46 | +void DisplayErrorMessage(DataSubscriber* source, const string& message); | |
| 47 | 47 | |
| 48 | 48 | // Runs the subscriber. |
| 49 | 49 | void RunSubscriber(string hostname, uint16_t port); |
| @@ -159,7 +159,7 @@ SubscriberConnector CreateSubscriberConnector(string hostname, uint16_t port) · 109 unmodified lines | ||
| 159 | 159 | |
| 160 | 160 | // Callback which is called when the subscriber has |
| 161 | 161 | // received a new packet of measurements from the publisher. |
| 162 | −void ProcessMeasurements(DataSubscriber* source, vector<Measurement> newMeasurements) | |
| 162 | +void ProcessMeasurements(DataSubscriber* source, const vector<MeasurementPtr>& newMeasurements) | |
| 163 | 163 | { |
| 164 | 164 | const double LoFrequency = 57.0; |
| 165 | 165 | const double HiFrequency = 62.0; |
| @@ -171,7 +171,7 @@ void ProcessMeasurements(DataSubscriber* source, vector<Measurement> newMeasurem · 5 unmodified lines | ||
| 171 | 171 | static map<Guid, int> m_lastValues; |
| 172 | 172 | |
| 173 | 173 | map<Guid, int>::iterator lastValueIter; |
| 174 | − Measurement currentMeasurement; | |
| 174 | + MeasurementPtr currentMeasurement; | |
| 175 | 175 | Guid signalID; |
| 176 | 176 | |
| 177 | 177 | double frequency; |
| @@ -188,26 +188,26 @@ void ProcessMeasurements(DataSubscriber* source, vector<Measurement> newMeasurem · 10 unmodified lines | ||
| 188 | 188 | frequencyTotal = 0.0; |
| 189 | 189 | total = 0; |
| 190 | 190 | |
| 191 | − cout << Subscriber.GetTotalMeasurementsReceived() << " measurements received so far..." << endl; | |
| 191 | + cout << source->GetTotalMeasurementsReceived() << " measurements received so far..." << endl; | |
| 192 | 192 | |
| 193 | − if (newMeasurements.size() > 0) | |
| 193 | + if (!newMeasurements.empty()) | |
| 194 | 194 | { |
| 195 | − if (TicksToString(timestamp, MaxTimestampSize, TimestampFormat, newMeasurements[0].Timestamp)) | |
| 195 | + if (TicksToString(timestamp, MaxTimestampSize, TimestampFormat, newMeasurements[0]->Timestamp)) | |
| 196 | 196 | cout << "Timestamp: " << string(timestamp) << endl; |
| 197 | 197 | |
| 198 | 198 | cout << "Point\tValue" << endl; |
| 199 | 199 | |
| 200 | 200 | for (i = 0; i < newMeasurements.size(); ++i) |
| 201 | − cout << newMeasurements[i].ID << '\t' << newMeasurements[i].Value << endl; | |
| 201 | + cout << newMeasurements[i]->ID << '\t' << newMeasurements[i]->Value << endl; | |
| 202 | 202 | |
| 203 | 203 | cout << endl; |
| 204 | 204 | |
| 205 | 205 | for (i = 0; i < newMeasurements.size(); ++i) |
| 206 | 206 | { |
| 207 | 207 | currentMeasurement = newMeasurements[i]; |
| 208 | − frequency = currentMeasurement.Value; | |
| 209 | − signalID = currentMeasurement.SignalID; | |
| 210 | − adjustedFrequency = (int)(frequency * HzResolution); | |
| 208 | + frequency = currentMeasurement->Value; | |
| 209 | + signalID = currentMeasurement->SignalID; | |
| 210 | + adjustedFrequency = static_cast<int>(frequency * HzResolution); | |
| 211 | 211 | |
| 212 | 212 | // Do some simple flat line avoidance... |
| 213 | 213 | lastValueIter = m_lastValues.find(signalID); |
| @@ -266,13 +266,13 @@ void Resubscribe(DataSubscriber* source) · 52 unmodified lines | ||
| 266 | 266 | } |
| 267 | 267 | |
| 268 | 268 | // Callback which is called to display status messages from the subscriber. |
| 269 | −void DisplayStatusMessage(DataSubscriber* source, string message) | |
| 269 | +void DisplayStatusMessage(DataSubscriber* source, const string& message) | |
| 270 | 270 | { |
| 271 | 271 | cout << message << endl << endl; |
| 272 | 272 | } |
| 273 | 273 | |
| 274 | 274 | // Callback which is called to display error messages from the connector and subscriber. |
| 275 | −void DisplayErrorMessage(DataSubscriber* source, string message) | |
| 275 | +void DisplayErrorMessage(DataSubscriber* source, const string& message) | |
| 276 | 276 | { |
| 277 | 277 | cerr << message << endl << endl; |
| 278 | 278 | } |