Commit ff8b5cf0 authored by Jussi Lindgren's avatar Jussi Lindgren

Everything: Various fixes

- Filename could not be chosen when saving channel names in Acquisition Server, fixed
- Linux gtec driver was not saving/restoring the header, fixed
- Fixed boost chrono find script for Windows, minor cleanup
- Removed unnecessary dependencies from the signal processing plugin
- Fixed VS2013 compiler error in the AS drift correction
parent 3d3f8aed
......@@ -541,7 +541,7 @@ void CConfigurationBuilder::buttonChangeChannelNamesCB(void)
::GtkWidget* l_pWidgetDialogOpen=gtk_file_chooser_dialog_new(
"Select file to save to...",
NULL,
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_FILE_CHOOSER_ACTION_SAVE,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
......
......@@ -9,6 +9,7 @@
#include <cmath> // std::abs
#include <sstream>
#include <iomanip>
#include <algorithm> // std::min, std::max
#define boolean OpenViBE::boolean
......
......@@ -3,34 +3,47 @@
# Adds a def that its present
# ---------------------------------
FIND_PATH(PATH_BOOST_CHRONO "include/boost/chrono.hpp" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/boost ${OV_CUSTOM_DEPENDENCIES_PATH} NO_DEFAULT_PATH)
FIND_PATH(PATH_BOOST_CHRONO "include/boost/chrono.hpp" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/boost)
IF(PATH_BOOST_CHRONO)
MESSAGE(STATUS " Found boost chrono includes...")
ADD_DEFINITIONS(-DTARGET_HAS_Boost_Chrono)
FIND_LIBRARY(LIB_Boost_Chrono NAMES "boost_chrono" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib NO_DEFAULT_PATH)
FIND_LIBRARY(LIB_Boost_Chrono NAMES "boost_chrono" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib)
IF(LIB_Boost_Chrono)
MESSAGE(STATUS " [ OK ] lib ${LIB_Boost_Chrono}")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_Boost_Chrono})
ELSE(LIB_Boost_Chrono)
MESSAGE(STATUS " [FAILED] lib boost_chrono")
ENDIF(LIB_Boost_Chrono)
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_Boost_Chrono})
# Fedora / Ubuntu
FIND_LIBRARY(LIB_STANDARD_MODULE_RT rt)
IF(LIB_STANDARD_MODULE_RT)
MESSAGE(STATUS " Found rt...")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_STANDARD_MODULE_RT})
ELSE(LIB_STANDARD_MODULE_RT)
MESSAGE(STATUS " FAILED to find rt...")
ENDIF(LIB_STANDARD_MODULE_RT)
ELSE(PATH_BOOST_CHRONO)
MESSAGE(STATUS " FAILED to find boost chrono includes...")
ENDIF(PATH_BOOST_CHRONO)
IF(WIN32)
FIND_PATH(PATH_BOOST_CHRONO "include/boost/chrono.hpp" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/boost ${OV_CUSTOM_DEPENDENCIES_PATH} NO_DEFAULT_PATH)
IF(PATH_BOOST_CHRONO)
MESSAGE(STATUS " Found boost chrono includes...")
OV_LINK_BOOST_LIB("chrono" ${OV_WIN32_BOOST_VERSION} )
IF(LIB_BOOST_PATH AND LIB_BOOST_DEBUG_PATH)
ADD_DEFINITIONS(-DTARGET_HAS_Boost_Chrono)
ENDIF(LIB_BOOST_PATH AND LIB_BOOST_DEBUG_PATH)
ENDIF(PATH_BOOST_CHRONO)
ENDIF(WIN32)
IF(UNIX)
FIND_PATH(PATH_BOOST_CHRONO "include/boost/chrono.hpp" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/boost ${OV_CUSTOM_DEPENDENCIES_PATH} NO_DEFAULT_PATH)
FIND_PATH(PATH_BOOST_CHRONO "include/boost/chrono.hpp" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/boost)
IF(PATH_BOOST_CHRONO)
MESSAGE(STATUS " Found boost chrono includes...")
FIND_LIBRARY(LIB_Boost_Chrono NAMES "boost_chrono" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib NO_DEFAULT_PATH)
FIND_LIBRARY(LIB_Boost_Chrono NAMES "boost_chrono" PATHS ${OV_CUSTOM_DEPENDENCIES_PATH}/lib)
IF(LIB_Boost_Chrono)
MESSAGE(STATUS " [ OK ] lib ${LIB_Boost_Chrono}")
ADD_DEFINITIONS(-DTARGET_HAS_Boost_Chrono)
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_Boost_Chrono})
ELSE(LIB_Boost_Chrono)
MESSAGE(STATUS " [FAILED] lib boost_chrono")
ENDIF(LIB_Boost_Chrono)
# Fedora / Ubuntu
FIND_LIBRARY(LIB_STANDARD_MODULE_RT rt)
IF(LIB_STANDARD_MODULE_RT)
MESSAGE(STATUS " Found rt...")
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIB_STANDARD_MODULE_RT})
ELSE(LIB_STANDARD_MODULE_RT)
MESSAGE(STATUS " FAILED to find rt...")
ENDIF(LIB_STANDARD_MODULE_RT)
ELSE(PATH_BOOST_CHRONO)
MESSAGE(STATUS " FAILED to find boost chrono includes...")
ENDIF(PATH_BOOST_CHRONO)
ENDIF(UNIX)
......@@ -89,6 +89,7 @@ CDriverGTecGUSBampLinux::CDriverGTecGUSBampLinux(IDriverContext& rDriverContext)
GT_FreeDeviceList(l_pDeviceList,l_ui32ListSize);
// Now retrieve all those configs from the settings file if they are there to be found (don't need to worry about sample rate or channel number though since they're already in the header)
m_oSettings.add("Header", &m_oHeader);
m_oSettings.add("DeviceName", (string*)&m_oDeviceName);
m_oSettings.add("Mode", (int*)&m_oConfig.mode);
m_oSettings.add("EnableTrigger", (bool*)&m_oConfig.enable_trigger_line);
......
......@@ -24,8 +24,8 @@ INCLUDE("FindThirdPartyEigen")
INCLUDE("FindThirdPartyFFTW3") # used by the wavelet library
INCLUDE("FindThirdPartyITPP") # note that itpp gives the fftw3 on Win
#for additionnal coadapt plugins, the following
INCLUDE("FindThirdPartyBoost_Math")
INCLUDE("FindOpenViBEModuleXML")
# INCLUDE("FindThirdPartyBoost_Math")
# INCLUDE("FindOpenViBEModuleXML")
# ---------------------------------
# Target macros
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment