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

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.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -42,9 +42,9 @@ tst::SubscriptionInfo CreateSubscriptionInfo(); · 41 unmodified lines
42		42
43	// Handlers for subscriber callbacks.	43	// Handlers for subscriber callbacks.
44	void Resubscribe(tst::DataSubscriber* source);	44	void Resubscribe(tst::DataSubscriber* source);
45	void ProcessMeasurements(std::vector<gsfts::Measurement> newMeasurements);	45	void ProcessMeasurements(tst::DataSubscriber* source, std::vector<gsfts::Measurement> newMeasurements);
46	void DisplayStatusMessage(std::string message);	46	void DisplayStatusMessage(tst::DataSubscriber* source, std::string message);
47	void DisplayErrorMessage(std::string message);	47	void DisplayErrorMessage(tst::DataSubscriber* source, std::string message);
48		48
49	// Runs the subscriber.	49	// Runs the subscriber.
50	void RunSubscriber(std::string hostname, gsfts::uint16_t port);	50	void RunSubscriber(std::string hostname, gsfts::uint16_t port);
@@ -151,7 +151,7 @@ tst::SubscriberConnector CreateSubscriberConnector(std::string hostname, gsfts:: · 100 unmodified lines
151		151
152	// Callback which is called when the subscriber has	152	// Callback which is called when the subscriber has
153	// received a new packet of measurements from the publisher.	153	// 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)
155	{	155	{
156	const double LoFrequency = 57.0;	156	const double LoFrequency = 57.0;
157	const double HiFrequency = 62.0;	157	const double HiFrequency = 62.0;
@@ -250,13 +250,13 @@ void Resubscribe(tst::DataSubscriber* source) · 92 unmodified lines
250	}	250	}
251		251
252	// Callback which is called to display status messages from the subscriber.	252	// 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)
254	{	254	{
255	std::cout << message << std::endl << std::endl;	255	std::cout << message << std::endl << std::endl;
256	}	256	}
257		257
258	// Callback which is called to display error messages from the connector and subscriber.	258	// 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)
260	{	260	{
261	std::cerr << message << std::endl << std::endl;	261	std::cerr << message << std::endl << std::endl;
262	}	262	}