Commit 2566a468 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Adapting changes from logging API

parent b3186175
......@@ -474,7 +474,8 @@ void CVAVariableDelayLine::Process(const ITASampleBuffer* psbInput, ITASampleBuf
}
#if (VA_VDL_DATA_LOG == 1)
std::ostream& CVAVariableDelayLine::VDLLogData::outputDesc(std::ostream& os) const {
std::ostream& CVAVariableDelayLine::VDLLogData::outputDesc(std::ostream& os)
{
os << "Current delay" << "\t"
<< "New delay" << "\t"
<< "Resampling factor" << "\t"
......
......@@ -264,7 +264,7 @@ private:
//! Implementierungsklasse für Logger-Datum
class VDLLogData : ITALogDataBase {
public:
std::ostream& outputDesc(std::ostream& os) const;
static std::ostream& outputDesc(std::ostream& os);
std::ostream& outputData(std::ostream& os) const;
float fCurrentDelay;
......
......@@ -272,7 +272,7 @@ void CVABasicMotionModel::SetName(const std::string& sNewName)
m_oEstimationDataLog.setOutputFile(sNewName+"_Estimated.log");
}
std::ostream& CVABasicMotionModel::MotionLogDataOutput::outputDesc(std::ostream& os) const
std::ostream& CVABasicMotionModel::MotionLogDataOutput::outputDesc(std::ostream& os)
{
os << "Estimation time" << "\t"
<< "Estimated Position [x]" << "\t"
......@@ -307,7 +307,7 @@ std::ostream& CVABasicMotionModel::MotionLogDataOutput::outputData(std::ostream&
return os;
}
std::ostream& CVABasicMotionModel::MotionLogDataInput::outputDesc(std::ostream& os) const
std::ostream& CVABasicMotionModel::MotionLogDataInput::outputDesc(std::ostream& os)
{
os << "Input time" << "\t"
<< "Input Position [x]" << "\t"
......
......@@ -149,7 +149,7 @@ protected:
class MotionLogDataOutput : public ITALogDataBase
{
public:
std::ostream& outputDesc(std::ostream& os) const;
static std::ostream& outputDesc(std::ostream& os);
std::ostream& outputData(std::ostream& os) const;
std::string sName; //!< Name um die Daten einem Objekt zuordnen zu knnen
double dTime;
......@@ -164,7 +164,7 @@ protected:
class MotionLogDataInput : public ITALogDataBase
{
public:
std::ostream& outputDesc(std::ostream& os) const;
static std::ostream& outputDesc(std::ostream& os);
std::ostream& outputData(std::ostream& os) const;
std::string sName; //!< Name um die Daten einem Objekt zuordnen zu knnen
double dTime;
......
......@@ -105,7 +105,7 @@ private:
//! Implementierungsklasse fr Logger-Datum
class MotionLogDataOutput : ITALogDataBase {
public:
std::ostream& outputDesc(std::ostream& os) const;
static std::ostream& outputDesc(std::ostream& os);
std::ostream& outputData(std::ostream& os) const;
double dTime;
......@@ -117,7 +117,7 @@ private:
//! Implementierungsklasse fr Logger-Datum
class MotionLogDataInput : ITALogDataBase {
public:
std::ostream& outputDesc(std::ostream& os) const;
static std::ostream& outputDesc(std::ostream& os);
std::ostream& outputData(std::ostream& os) const;
double dTime;
......
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