detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-21 03:10:02 +02:00
Code Issues Actions Packages Releases Activity

Merge branch '4.0.1-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.1-rc

Browse Source
This commit is contained in:
maliakal_d 2019-02-08 16:02:15 +01:00
commit 046fb11e5e
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -13,16 +13,22 @@ option (SLS_USE_TEXTCLIENT "Text Client" OFF)
option (SLS_USE_RECEIVER "Receiver" OFF) option (SLS_USE_RECEIVER "Receiver" OFF)
option (SLS_USE_GUI "GUI" OFF) option (SLS_USE_GUI "GUI" OFF)
#Flags to always be used
# -Wno-unused-parameter should eventually be removes
# -Wno-overloaded-virtual TODO! remove warnings in refactor
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-overloaded-virtual -Wno-unused-parameter -std=c++98")
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
# clang does not support -Wno-misleading-indentation # clang does not support -Wno-misleading-indentation
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++98") # add any special clang flags
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0) if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++98 -Wno-misleading-indentation") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-misleading-indentation")
else ()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++98")
endif () endif ()
endif() endif()
find_package(Qt4) find_package(Qt4)
find_package(Qwt 6) find_package(Qwt 6)
find_package(CBF) find_package(CBF)

4
slsReceiverSoftware/include/GeneralData.h
View File

@ -155,7 +155,7 @@ public:
* @param i pointer to a vector of ROI pointers * @param i pointer to a vector of ROI pointers
* @returns adc configured * @returns adc configured
*/ */
virtual const int GetAdcConfigured(int index, std::vector<slsReceiverDefs::ROI>* i) const{ virtual int GetAdcConfigured(int index, std::vector<slsReceiverDefs::ROI>* i) const{
cprintf(RED,"This is a generic function that should be overloaded by a derived class\n"); cprintf(RED,"This is a generic function that should be overloaded by a derived class\n");
return 0; return 0;
}; };
@ -345,7 +345,7 @@ private:
* @param i pointer to a vector of ROI * @param i pointer to a vector of ROI
* @returns adc configured * @returns adc configured
*/ */
const int GetAdcConfigured(int index, std::vector<slsReceiverDefs::ROI>* i) const{ int GetAdcConfigured(int index, std::vector<slsReceiverDefs::ROI>* i) const{
int adc = -1; int adc = -1;
// single adc // single adc
if(i->size()) { if(i->size()) {

2
slsReceiverSoftware/include/logger.h
View File

@ -115,7 +115,7 @@ inline std::string NowTime()
const int buffer_len = sizeof(buffer); const int buffer_len = sizeof(buffer);
time_t t; time_t t;
time(&t); time(&t);
tm r = {0}; tm r = {};
strftime(buffer, buffer_len, "%X", localtime_r(&t, &r)); strftime(buffer, buffer_len, "%X", localtime_r(&t, &r));
buffer[buffer_len - 1] = 0; buffer[buffer_len - 1] = 0;
struct timeval tv; struct timeval tv;