Commit 09064423 authored by Pascal Palenda's avatar Pascal Palenda
Browse files

Change RAVEN_API to ITA_SIMULATION_SCHEDULER_API

parent 9582a88d
......@@ -44,7 +44,7 @@
* This class holds information on statistical values such as
* average and deviation.
*/
class RAVEN_API CRavenStatistics
class ITA_SIMULATION_SCHEDULER_API CRavenStatistics
{
public:
//! Constructor, sets internal values to zero
......@@ -77,7 +77,7 @@ public:
* Datenpfade sollten mit dem Makro $(RavenDataBasePath) beginnen, um den (entfernten) Simulator
* anzuweisen, den fr sich eingestellten Datenpfad zu verwenden.
*/
class RAVEN_API CRavenSimulationTask
class ITA_SIMULATION_SCHEDULER_API CRavenSimulationTask
{
public:
//!< Simulation types
......@@ -135,7 +135,7 @@ public:
};
//! Container for simulation results
class RAVEN_API CRavenSimulationResult
class ITA_SIMULATION_SCHEDULER_API CRavenSimulationResult
{
public:
......@@ -188,7 +188,7 @@ public:
* has to implement.
*
*/
class RAVEN_API IRavenSimulationInterface
class ITA_SIMULATION_SCHEDULER_API IRavenSimulationInterface
{
public:
......@@ -259,7 +259,7 @@ class IRavenSimulationSchedulerResultHandler;
* returns a simulation result.
*
*/
class RAVEN_API IRavenSimulationSchedulerInterface
class ITA_SIMULATION_SCHEDULER_API IRavenSimulationSchedulerInterface
{
public:
//! Destructor
......@@ -339,7 +339,7 @@ protected:
//! Abstracter Handler, der einem Scheduler hinzugefgt werden kann und welcher dann mit Resultaten bedient wird
class RAVEN_API IRavenSimulationSchedulerResultHandler
class ITA_SIMULATION_SCHEDULER_API IRavenSimulationSchedulerResultHandler
{
public:
enum
......
......@@ -44,7 +44,7 @@
*
* \note $(RavenDataBasePath) wird durch den aktuellen Basispfad der Instanz ersetzt
*/
class RAVEN_API CRavenConfig
class ITA_SIMULATION_SCHEDULER_API CRavenConfig
{
public:
//! Difference flags (bitvector)
......
......@@ -64,16 +64,16 @@
* knnte dann sinnvoll sein, wenn man den Scheduler als "Task-Queue" verwendet, um z.B. Trajektorien abzufahren und
* Impulsantworten zu generieren.
*/
class RAVEN_API CRavenLocalScheduler : public IRavenSimulationSchedulerInterface, public VistaThreadLoop
class ITA_SIMULATION_SCHEDULER_API CRavenLocalScheduler : public IRavenSimulationSchedulerInterface, public VistaThreadLoop
{
public:
//! Scheduler configuration
class RAVEN_API CConfiguration
class ITA_SIMULATION_SCHEDULER_API CConfiguration
{
public:
//! Thread configuration
class RAVEN_API CThreadConfiguration
class ITA_SIMULATION_SCHEDULER_API CThreadConfiguration
{
public:
......@@ -231,7 +231,7 @@ protected:
};
//! Schnittstelle zur Rckmeldung ber den Zustand von Simulationsaufgaben implementieren
class RAVEN_API CRavenSimulationSchedulerTaskHandler : public IRavenSimulationSchedulerResultHandler
class ITA_SIMULATION_SCHEDULER_API CRavenSimulationSchedulerTaskHandler : public IRavenSimulationSchedulerResultHandler
{
public:
virtual ~CRavenSimulationSchedulerTaskHandler() {};
......@@ -241,7 +241,7 @@ public:
};
//! Scheduler Result Handler that stores results to the hard drive
class RAVEN_API CSimulationResultDumper : public CRavenSimulationSchedulerTaskHandler
class ITA_SIMULATION_SCHEDULER_API CSimulationResultDumper : public CRavenSimulationSchedulerTaskHandler
{
public:
CSimulationResultDumper( const std::string& sOutputDataPath );
......
......@@ -37,7 +37,7 @@
#include <vector>
//! Class that contains information on a receiver
class RAVEN_API CRavenReceiverState
class ITA_SIMULATION_SCHEDULER_API CRavenReceiverState
{
public:
CRavenReceiverState() {};
......@@ -62,7 +62,7 @@ public:
};
//! Class that contains information on a sound source
class RAVEN_API CRavenSourceState
class ITA_SIMULATION_SCHEDULER_API CRavenSourceState
{
public:
CRavenSourceState() {};
......@@ -88,7 +88,7 @@ public:
};
//! Class that contains information on an acoustic portal
class RAVEN_API CRavenPortalState
class ITA_SIMULATION_SCHEDULER_API CRavenPortalState
{
public:
CRavenPortalState() {};
......@@ -109,7 +109,7 @@ public:
};
//! Difference between number of objects from another scene
class RAVEN_API CRavenSceneDiff
class ITA_SIMULATION_SCHEDULER_API CRavenSceneDiff
{
public:
std::vector< int > viNewReceivers; //!< New receivers
......@@ -130,7 +130,7 @@ public:
/**
* Funktionalitt, die eine Raven-Szene erfllen muss.
*/
class RAVEN_API IRavenSceneInterface
class ITA_SIMULATION_SCHEDULER_API IRavenSceneInterface
{
public:
......@@ -237,7 +237,7 @@ public:
* erweiterte Funktionalitt fr das Vergleichen
* zweier Szenen zur Verfgung.
*/
class RAVEN_API CRavenScene : public IRavenSceneInterface
class ITA_SIMULATION_SCHEDULER_API CRavenScene : public IRavenSceneInterface
{
public:
......
......@@ -52,7 +52,7 @@ class R_MasterController;
* @note $(RavenDataBasePath) wird durch den aktuellen Basispfad der Instanz ersetzt und wird fr alle
* Datenbankpfade gesetzt (Materials, HRIRs, Models, Directivities, Portals, ... )
*/
class RAVEN_API CRavenSimulator : public IRavenSimulationInterface
class ITA_SIMULATION_SCHEDULER_API CRavenSimulator : public IRavenSimulationInterface
{
public:
//! Raven Statusbeschreibung
......
......@@ -64,7 +64,7 @@ namespace RavenUtilsCompat
* \param sShortSimType simulation type string in short form
* \return CRavenSimulationTask identifier, -1 on error
*/
int RAVEN_API ParseSimulationType( const std::string& sShortSimType );
int ITA_SIMULATION_SCHEDULER_API ParseSimulationType( const std::string& sShortSimType );
//! Return human readable simulation type as short or long description
/**
......@@ -73,23 +73,23 @@ int RAVEN_API ParseSimulationType( const std::string& sShortSimType );
*
* \return humand readable string
*/
std::string RAVEN_API GetSimulationTypeString( const int iSimType, const bool bShort=true );
std::string ITA_SIMULATION_SCHEDULER_API GetSimulationTypeString( const int iSimType, const bool bShort=true );
//! Formatting to string of a task with config, scene and profile
std::string RAVEN_API TaskToString( const CRavenSimulationTask* pTask );
std::string ITA_SIMULATION_SCHEDULER_API TaskToString( const CRavenSimulationTask* pTask );
//! Load a task from file
void RAVEN_API LoadTask( CRavenSimulationTask& oTask, const std::string& sPath );
void ITA_SIMULATION_SCHEDULER_API LoadTask( CRavenSimulationTask& oTask, const std::string& sPath );
//! Store a task to file
void RAVEN_API StoreTask( const CRavenSimulationTask* pTask, const std::string& sPath );
void ITA_SIMULATION_SCHEDULER_API StoreTask( const CRavenSimulationTask* pTask, const std::string& sPath );
//! Stream output operator for statistics
RAVEN_API std::ostream& operator<<( std::ostream& os, const std::vector< CRavenStatistics >& voStatistics );
RAVEN_API std::ostream& operator<<( std::ostream& os, const IRavenSimulationInterface::CProfiler& oProfiler );
ITA_SIMULATION_SCHEDULER_API std::ostream& operator<<( std::ostream& os, const std::vector< CRavenStatistics >& voStatistics );
ITA_SIMULATION_SCHEDULER_API std::ostream& operator<<( std::ostream& os, const IRavenSimulationInterface::CProfiler& oProfiler );
std::string RAVEN_API GetProfilerToString( const IRavenSimulationSchedulerInterface::CProfiler& oSchedProfiler );
std::string RAVEN_API GetProfilerToString( const IRavenSimulationInterface::CProfiler& oSimProfiler );
std::string ITA_SIMULATION_SCHEDULER_API GetProfilerToString( const IRavenSimulationSchedulerInterface::CProfiler& oSchedProfiler );
std::string ITA_SIMULATION_SCHEDULER_API GetProfilerToString( const IRavenSimulationInterface::CProfiler& oSimProfiler );
//! Parse simulation type ...
/**
......@@ -100,10 +100,10 @@ std::string RAVEN_API GetProfilerToString( const IRavenSimulationInterface::CPro
*
* \return CRavenSimulationTask::SIM_XX and combinations, -1 if unrecognized
*/
int RAVEN_API ParseSimulationType( const std::string& sShortSimType );
int ITA_SIMULATION_SCHEDULER_API ParseSimulationType( const std::string& sShortSimType );
class RAVEN_API CRavenDeserializer : public VistaByteBufferDeSerializer
class ITA_SIMULATION_SCHEDULER_API CRavenDeserializer : public VistaByteBufferDeSerializer
{
public:
CRavenDeserializer();
......@@ -147,7 +147,7 @@ public:
};
class RAVEN_API CRavenSerializer : public VistaByteBufferSerializer
class ITA_SIMULATION_SCHEDULER_API CRavenSerializer : public VistaByteBufferSerializer
{
public:
CRavenSerializer();
......
Supports Markdown
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