detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-17 23:37:14 +02:00
Code Issues Actions Packages Releases Activity

rxr sls namespace (#457)

Browse Source 
* rxr src files and classes (detectordata, ZmqSocket) added to sls namespace

* moving defines inside namespace

* moving defines inside namespace, added helpdacs to namespace

* added namespace to gui

* gui also updated

* removed unnecessary sls:: when already in sls namespace for slsDetectoSoftware, receverSoftware, slsDetectorGui and slsSupportlib
This commit is contained in:
Dhanya Thattil
2022-05-18 11:48:38 +02:00
committed by GitHub
parent fcc7f7aef8
commit 4259363169
88 changed files with 1200 additions and 923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
slsReceiverSoftware/src/Implementation.h
View File

@ -6,12 +6,7 @@
#include "sls/container_utils.h"
#include "sls/logger.h"
#include "sls/network_utils.h"
class GeneralData;
class Listener;
class DataProcessor;
class DataStreamer;
class Fifo;
class slsDetectorDefs;
#include "sls/sls_detector_defs.h"
#include <atomic>
#include <chrono>
@ -20,8 +15,16 @@ class slsDetectorDefs;
#include <memory>
#include <mutex>
#include <vector>
namespace sls {
using ns = std::chrono::nanoseconds;
class GeneralData;
class Listener;
class DataProcessor;
class DataStreamer;
class Fifo;
class Implementation : private virtual slsDetectorDefs {
public:
explicit Implementation(const detectorType d);
@ -137,8 +140,8 @@ class Implementation : private virtual slsDetectorDefs {
void setStreamingStartingFrameNumber(const uint32_t fnum);
uint32_t getStreamingPort() const;
void setStreamingPort(const uint32_t i);
sls::IpAddr getStreamingSourceIP() const;
void setStreamingSourceIP(const sls::IpAddr ip);
IpAddr getStreamingSourceIP() const;
void setStreamingSourceIP(const IpAddr ip);
int getStreamingHwm() const;
void setStreamingHwm(const int i);
std::map<std::string, std::string> getAdditionalJsonHeader() const;
@ -338,7 +341,7 @@ class Implementation : private virtual slsDetectorDefs {
uint32_t streamingTimerInMs{DEFAULT_STREAMING_TIMER_IN_MS};
uint32_t streamingStartFnum{0};
uint32_t streamingPort{0};
sls::IpAddr streamingSrcIP = sls::IpAddr{};
IpAddr streamingSrcIP = IpAddr{};
int streamingHwm{-1};
std::map<std::string, std::string> additionalJsonHeader;
@ -406,3 +409,5 @@ class Implementation : private virtual slsDetectorDefs {
// mutex shared across all hdf5 virtual, master and data files
std::mutex hdf5LibMutex;
};
} // namespace sls