History

TimeSeriesPlatformLibrary: (1) Improved operation of SubscriberInstance, (2) Updated function signatures for DataSubscriber to always include subscriber reference since callbacks require a static function, this allows "instance" implementations to have access to source subscriber.

J. Ritchie Carroll committed 8 years ago

Commit ddde4ba1 parent 24ecf3a7 files · +336 −230Browse files

Showing the changes to Source/Libraries/TimeSeriesPlatformLibrary/Samples/AverageFrequencyCalculator.cpp (1 of 7 files). Show all

Unified · Split

Source/Libraries/TimeSeriesPlatformLibrary/Samples/AverageFrequencyCalculator.cpp+6−6
@@ -42,9 +42,9 @@ tst::SubscriptionInfo CreateSubscriptionInfo(); · 41 unmodified lines
4242
4343 // Handlers for subscriber callbacks.
4444 void Resubscribe(tst::DataSubscriber* source);
45−void ProcessMeasurements(std::vector<gsfts::Measurement> newMeasurements);
46−void DisplayStatusMessage(std::string message);
47−void DisplayErrorMessage(std::string message);
45+void ProcessMeasurements(tst::DataSubscriber* source, std::vector<gsfts::Measurement> newMeasurements);
46+void DisplayStatusMessage(tst::DataSubscriber* source, std::string message);
47+void DisplayErrorMessage(tst::DataSubscriber* source, std::string message);
4848
4949 // Runs the subscriber.
5050 void RunSubscriber(std::string hostname, gsfts::uint16_t port);
@@ -151,7 +151,7 @@ tst::SubscriberConnector CreateSubscriberConnector(std::string hostname, gsfts:: · 100 unmodified lines
151151
152152 // Callback which is called when the subscriber has
153153 // received a new packet of measurements from the publisher.
154−void ProcessMeasurements(std::vector<gsfts::Measurement> newMeasurements)
154+void ProcessMeasurements(tst::DataSubscriber* source, std::vector<gsfts::Measurement> newMeasurements)
155155 {
156156 const double LoFrequency = 57.0;
157157 const double HiFrequency = 62.0;
@@ -250,13 +250,13 @@ void Resubscribe(tst::DataSubscriber* source) · 92 unmodified lines
250250 }
251251
252252 // Callback which is called to display status messages from the subscriber.
253−void DisplayStatusMessage(std::string message)
253+void DisplayStatusMessage(tst::DataSubscriber* source, std::string message)
254254 {
255255 std::cout << message << std::endl << std::endl;
256256 }
257257
258258 // Callback which is called to display error messages from the connector and subscriber.
259−void DisplayErrorMessage(std::string message)
259+void DisplayErrorMessage(tst::DataSubscriber* source, std::string message)
260260 {
261261 std::cerr << message << std::endl << std::endl;
262262 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t