Commit f50344bf authored by ledig's avatar ledig
Browse files

[MODIFY] datahandler now is shared so its a dll in win

parent 63ce568e
......@@ -17,7 +17,7 @@ FILE( GLOB DATAHANDLER_IO_SRC "io/*.cpp" "io/*.h" ) # former WLoader
# ADD_LIBRARY( dataHandler ${DATAHANDLER_SRC} ${DATAHANDLER_EXCEPTIONS_SRC} ${DATAHANDLER_IO_SRC} ${DATAHANDLER_DATASTRUCTURES_SRC} )
# TARGET_LINK_LIBRARIES( dataHandler common ${Boost_LIBRARIES} niftiio libeep ${OPENSCENEGRAPH_LIBRARIES})
#ELSE()
ADD_LIBRARY( OWdataHandler ${DATAHANDLER_SRC} ${DATAHANDLER_EXCEPTIONS_SRC} ${DATAHANDLER_IO_SRC} ${DATAHANDLER_DATASTRUCTURES_SRC} )
ADD_LIBRARY( OWdataHandler SHARED ${DATAHANDLER_SRC} ${DATAHANDLER_EXCEPTIONS_SRC} ${DATAHANDLER_IO_SRC} ${DATAHANDLER_DATASTRUCTURES_SRC} )
TARGET_LINK_LIBRARIES( OWdataHandler OWcommon ${Boost_LIBRARIES} OWext_niftiio OWext_biosig OWext_eep ${OPENSCENEGRAPH_LIBRARIES})
#ENDIF()
# Unit tests
......
......@@ -28,11 +28,12 @@
#include <vector>
#include "../common/WThreadedRunner.h"
#include "WExportDataHandler.h"
/**
* implements a thread that updates the fiber selection bit field
*/
class WCreateColorArraysThread: public WThreadedRunner
class OWDATAHANDLER_EXPORT WCreateColorArraysThread: public WThreadedRunner // NOLINT
{
public:
/**
......
......@@ -36,6 +36,7 @@
#include "../common/WSharedSequenceContainer.h"
#include "WDataSet.h"
#include "WExportDataHandler.h"
class WSubject;
......@@ -46,7 +47,7 @@ class WSubject;
*
* \ingroup dataHandler
*/
class WDataHandler
class OWDATAHANDLER_EXPORT WDataHandler // NOLINT
{
/**
* Only UnitTests may be friends.
......
......@@ -30,6 +30,7 @@
#include <boost/enable_shared_from_this.hpp>
#include "../common/WProperties.h"
#include "../common/WTransferable.h"
#include "WExportDataHandler.h"
class WDataTexture3D;
class WCondition;
......@@ -42,7 +43,7 @@ class WDataSetVector;
* steps) respectively.
* \ingroup dataHandler
*/
class WDataSet: public WTransferable, public boost::enable_shared_from_this< WDataSet >
class OWDATAHANDLER_EXPORT WDataSet: public WTransferable, public boost::enable_shared_from_this< WDataSet > // NOLINT
{
public:
/**
......
......@@ -33,11 +33,12 @@
#include "../common/datastructures/WFiber.h"
#include "WDataSet.h"
#include "WDataSetFibers.h"
#include "WExportDataHandler.h"
/**
* Represents a simple set of WFibers.
*/
class WDataSetFiberVector : public WMixinVector< wmath::WFiber >, public WDataSet
class OWDATAHANDLER_EXPORT WDataSetFiberVector : public WMixinVector< wmath::WFiber >, public WDataSet // NOLINT
{
public:
/**
......
......@@ -36,6 +36,7 @@
#include "../common/WProperties.h"
#include "WDataSet.h"
#include "WExportDataHandler.h"
/**
* converts an integer into a byte array and back
......@@ -58,7 +59,7 @@ union converterByteFloat
/**
* Represents a simple set of WFibers.
*/
class WDataSetFibers : public WDataSet
class OWDATAHANDLER_EXPORT WDataSetFibers : public WDataSet // NOLINT
{
public:
......
......@@ -30,12 +30,13 @@
#include "WDataSetSingle.h"
#include "../common/math/WVector3D.h"
#include "WExportDataHandler.h"
/**
* This data set type contains raw HARDI and its gradients.
* \ingroup dataHandler
*/
class WDataSetRawHARDI : public WDataSetSingle
class OWDATAHANDLER_EXPORT WDataSetRawHARDI : public WDataSetSingle // NOLINT
{
public:
......
......@@ -32,12 +32,13 @@
#include "datastructures/WValueSetHistogram.h"
#include "WDataSetSingle.h"
#include "WExportDataHandler.h"
/**
* This data set type contains scalars as values.
* \ingroup dataHandler
*/
class WDataSetScalar : public WDataSetSingle
class OWDATAHANDLER_EXPORT WDataSetScalar : public WDataSetSingle // NOLINT
{
public:
......
......@@ -34,6 +34,7 @@
#include "WValueSet.h"
#include "WDataSet.h"
#include "WExportDataHandler.h"
class WDataTexture3D;
......@@ -41,7 +42,7 @@ class WDataTexture3D;
* A data set consisting of a set of values based on a grid.
* \ingroup dataHandler
*/
class WDataSetSingle : public WDataSet
class OWDATAHANDLER_EXPORT WDataSetSingle : public WDataSet // NOLINT
{
public:
/**
......
......@@ -33,12 +33,13 @@
#include "WValueSet.h"
#include "WDataSetSingle.h"
#include "WExportDataHandler.h"
/**
* This data set type contains spherical harmonic coefficients as values. The index scheme is like in the Descoteaux paper "Regularized, Fast, and Robust Analytical Q-Ball Imaging".
* \ingroup dataHandler
*/
class WDataSetSphericalHarmonics : public WDataSetSingle
class OWDATAHANDLER_EXPORT WDataSetSphericalHarmonics : public WDataSetSingle // NOLINT
{
public:
......
......@@ -26,12 +26,13 @@
#define WDATASETVECTOR_H
#include "WDataSetSingle.h"
#include "WExportDataHandler.h"
/**
* This data set type contains vectors as values.
* \ingroup dataHandler
*/
class WDataSetVector : public WDataSetSingle
class OWDATAHANDLER_EXPORT WDataSetVector : public WDataSetSingle // NOLINT
{
public:
......
......@@ -36,6 +36,7 @@
#include "WDataHandlerEnums.h"
#include "WValueSetBase.h"
#include "WGridRegular3D.h"
#include "WExportDataHandler.h"
class WCondition;
......@@ -45,7 +46,7 @@ class WCondition;
* scaled from [min,max] to [0,1]. The values min and max can be retrieved by getMinValue and getMaxValue. Your shader should get them as
* uniforms to unscale the texture to have the real value.
*/
class WDataTexture3D
class OWDATAHANDLER_EXPORT WDataTexture3D // NOLINT
{
public:
/**
......
......@@ -31,6 +31,7 @@
#include "WRecording.h"
#include "../common/WPrototyped.h"
#include "../common/math/WPosition.h"
#include "WExportDataHandler.h"
///======================================
......@@ -40,7 +41,7 @@ typedef double WDummyType;
/**
* An incomplete implementation to store information about electrodes of EEG data
*/
class WEEGElectrodeObject
class OWDATAHANDLER_EXPORT WEEGElectrodeObject // NOLINT
{
public:
/**
......@@ -85,7 +86,7 @@ typedef std::vector< std::pair< std::string, std::string > > WEEGChannelLabels;
* Contains EEG recording data.
* \ingroup dataHandler
*/
class WEEG : public WRecording
class OWDATAHANDLER_EXPORT WEEG : public WRecording // NOLINT
{
public:
......
......@@ -37,13 +37,14 @@
#include "WEEGPositionsLibrary.h"
#include "WEEG2Segment.h"
#include "WRecording.h"
#include "WExportDataHandler.h"
/**
* Class which contains EEG recording data, read from a WPagerEEG.
* \ingroup dataHandler
*/
class WEEG2 : public WRecording
class OWDATAHANDLER_EXPORT WEEG2 : public WRecording // NOLINT
{
public:
/**
......
......@@ -31,13 +31,14 @@
#include "io/WPagerEEG.h"
#include "WEEGValueMatrix.h"
#include "WExportDataHandler.h"
/**
* Class which contains one segment of an EEG recording, read from a WPagerEEG.
* \ingroup dataHandler
*/
class WEEG2Segment
class OWDATAHANDLER_EXPORT WEEG2Segment // NOLINT
{
public:
/**
......
......@@ -35,6 +35,7 @@
#include "WEEGPositionsLibrary.h"
#include "exceptions/WDHException.h"
#include "io/WPagerEEG.h"
#include "WExportDataHandler.h"
/**
......@@ -42,7 +43,7 @@
* from a WPagerEEG.
* \ingroup dataHandler
*/
class WEEGChannelInfo
class OWDATAHANDLER_EXPORT WEEGChannelInfo // NOLINT
{
public:
/**
......
......@@ -30,13 +30,14 @@
#include "../common/exceptions/WOutOfBounds.h"
#include "../common/math/WPosition.h"
#include "WExportDataHandler.h"
/**
* Class which contains the positions of EEG electrodes by label.
* \ingroup dataHandler
*/
class WEEGPositionsLibrary
class OWDATAHANDLER_EXPORT WEEGPositionsLibrary // NOLINT
{
public:
/**
......
//---------------------------------------------------------------------------
//
// Project: OpenWalnut ( http://www.openwalnut.org )
//
// Copyright 2009 OpenWalnut Community, BSV@Uni-Leipzig and CNCF@MPI-CBS
// For more information see http://www.openwalnut.org/copying
//
// This file is part of OpenWalnut.
//
// OpenWalnut is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// OpenWalnut is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with OpenWalnut. If not, see <http://www.gnu.org/licenses/>.
//
//---------------------------------------------------------------------------
#ifndef WEXPORTDATAHANDLER_H
#define WEXPORTDATAHANDLER_H
#ifdef _MSC_VER
#pragma warning( disable: 4251 )
#ifdef OWdataHandler_EXPORTS
#define OWDATAHANDLER_EXPORT __declspec( dllexport )
#else
#define OWDATAHANDLER_EXPORT __declspec( dllimport )
#endif
#else
#define OWDATAHANDLER_EXPORT
#endif // _MSC_VER
#endif // WEXPORTDATAHANDLER_H
......@@ -29,12 +29,13 @@
#include <utility>
#include "../common/math/WPosition.h"
#include "WExportDataHandler.h"
/**
* Base class to all grid types, e.g. a regular grid.
* \ingroup dataHandler
*/
class WGrid
class OWDATAHANDLER_EXPORT WGrid // NOLINT
{
public:
/**
......
......@@ -36,6 +36,7 @@
#include "../common/math/WPosition.h"
#include "../common/math/WVector3D.h"
#include "WGrid.h"
#include "WExportDataHandler.h"
/**
* A grid that has parallelepiped cells which all have the same proportion. I.e.
......@@ -45,7 +46,7 @@
* \warning Positions on the upper bounddaries in x, y and z are considered outside the grid.
* \ingroup dataHandler
*/
class WGridRegular3D : public WGrid
class OWDATAHANDLER_EXPORT WGridRegular3D : public WGrid // NOLINT
{
/**
* Only test are allowed as friends.
......
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