From 5680aa99001cb50c707c4187cd8ada0c41a573dd Mon Sep 17 00:00:00 2001 From: Tobias Frust <tobiasfrust@gmail.com> Date: Thu, 30 Jun 2016 10:13:01 +0200 Subject: implemented virtual DetectorModule with simple send via udp --- src/main_client.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/main_client.cpp (limited to 'src/main_client.cpp') diff --git a/src/main_client.cpp b/src/main_client.cpp new file mode 100644 index 0000000..363f610 --- /dev/null +++ b/src/main_client.cpp @@ -0,0 +1,20 @@ +#include "UDPClient/UDPClient.h" +#include "DetectorModule/DetectorModule.h" + +#include <iostream> +#include <string> + +int main (int argc, char *argv[]){ + + std::cout << "Sending UDP packages: " << std::endl; + + auto configPath = std::string { "config.cfg" }; + std::string address = "10.0.0.10"; + + DetectorModule<unsigned short> detModule0 = DetectorModule<unsigned short>(0, address, configPath); + + detModule0.sendPeriodically(5000); + + return 0; + +} -- cgit v1.2.3 From dbf28e725f062744222559257abe64d8a39a9d50 Mon Sep 17 00:00:00 2001 From: Tobias Frust <tobiasfrust@gmail.com> Date: Thu, 30 Jun 2016 10:27:20 +0200 Subject: bug fixes --- src/main_client.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main_client.cpp') diff --git a/src/main_client.cpp b/src/main_client.cpp index 363f610..451bd02 100644 --- a/src/main_client.cpp +++ b/src/main_client.cpp @@ -11,9 +11,9 @@ int main (int argc, char *argv[]){ auto configPath = std::string { "config.cfg" }; std::string address = "10.0.0.10"; - DetectorModule<unsigned short> detModule0 = DetectorModule<unsigned short>(0, address, configPath); + DetectorModule detModule0 = DetectorModule(0, address, configPath); - detModule0.sendPeriodically(5000); + detModule0.sendPeriodically(5000u); return 0; -- cgit v1.2.3 From 0c33319451deec9b5461b57856423bc619817245 Mon Sep 17 00:00:00 2001 From: Tobias Frust <tobiasfrust@gmail.com> Date: Thu, 30 Jun 2016 15:22:07 +0200 Subject: added classes for detector; Sending out in n different streams with n different ports --- src/main_client.cpp | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'src/main_client.cpp') diff --git a/src/main_client.cpp b/src/main_client.cpp index 451bd02..ed7d285 100644 --- a/src/main_client.cpp +++ b/src/main_client.cpp @@ -1,19 +1,38 @@ #include "UDPClient/UDPClient.h" #include "DetectorModule/DetectorModule.h" +#include "Detector/Detector.h" + +#include <boost/log/core.hpp> +#include <boost/log/trivial.hpp> +#include <boost/log/expressions.hpp> #include <iostream> #include <string> +void initLog() { +#ifndef NDEBUG + boost::log::core::get()->set_filter(boost::log::trivial::severity >= boost::log::trivial::debug); +#else + boost::log::core::get()->set_filter(boost::log::trivial::severity >= boost::log::trivial::info); +#endif +} + int main (int argc, char *argv[]){ + initLog(); + std::cout << "Sending UDP packages: " << std::endl; auto configPath = std::string { "config.cfg" }; - std::string address = "10.0.0.10"; + std::string address = "localhost"; + + Detector detector{address, configPath, 1000u}; + + //DetectorModule detModule0 = DetectorModule(1, address, configPath); - DetectorModule detModule0 = DetectorModule(0, address, configPath); + detector.run(); - detModule0.sendPeriodically(5000u); + std::cin.ignore(); return 0; -- cgit v1.2.3 From d71e5fe7330fa51cdce466ec0df876eb9b8e721e Mon Sep 17 00:00:00 2001 From: Tobias Frust <tobiasfrust@gmail.com> Date: Mon, 11 Jul 2016 14:58:00 +0200 Subject: UDP packets are sent out correctly --- src/main_client.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main_client.cpp') diff --git a/src/main_client.cpp b/src/main_client.cpp index ed7d285..b88341a 100644 --- a/src/main_client.cpp +++ b/src/main_client.cpp @@ -24,9 +24,9 @@ int main (int argc, char *argv[]){ std::cout << "Sending UDP packages: " << std::endl; auto configPath = std::string { "config.cfg" }; - std::string address = "localhost"; + std::string address = "127.0.0.1"; - Detector detector{address, configPath, 1000u}; + Detector detector{address, configPath, 1000000u}; //DetectorModule detModule0 = DetectorModule(1, address, configPath); -- cgit v1.2.3 From 409e2fd20af5620066796e43410a92521376b2c1 Mon Sep 17 00:00:00 2001 From: Tobias Frust <tobiasfrust@gmail.com> Date: Mon, 11 Jul 2016 15:13:55 +0200 Subject: the number of images per second is now configurable via terminal input --- src/main_client.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/main_client.cpp') diff --git a/src/main_client.cpp b/src/main_client.cpp index b88341a..2b9927d 100644 --- a/src/main_client.cpp +++ b/src/main_client.cpp @@ -19,6 +19,16 @@ void initLog() { int main (int argc, char *argv[]){ + if(argc < 2){ + BOOST_LOG_TRIVIAL(error) << "Program usage: ./onlineDetectorSimulatorClient <images_per_second>!"; + return 0; + } + + int imagesPerSec = std::stoi(argv[1]); + + double timegap = 1./(double)imagesPerSec; + unsigned int intervall = timegap*1000*1000; + initLog(); std::cout << "Sending UDP packages: " << std::endl; @@ -26,7 +36,7 @@ int main (int argc, char *argv[]){ auto configPath = std::string { "config.cfg" }; std::string address = "127.0.0.1"; - Detector detector{address, configPath, 1000000u}; + Detector detector{address, configPath, intervall}; //DetectorModule detModule0 = DetectorModule(1, address, configPath); -- cgit v1.2.3