projects
/
wdq2wav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Output formatting improvement
[wdq2wav.git]
/
wdq2wav.h
diff --git
a/wdq2wav.h
b/wdq2wav.h
index aa7c43ae1be9bf5c4b904c2b6e2372036fdd0d56..fceee293df2b9819095020e7dad1be57d33971c5 100644
(file)
--- a/
wdq2wav.h
+++ b/
wdq2wav.h
@@
-35,14
+35,14
@@
#include <math.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <math.h>
#include <sys/types.h>
#include <sys/stat.h>
-#ifdef WIN32
+#ifdef
_
WIN32
#include <io.h>
#include <getopt.h>
#else
#include <unistd.h>
#endif
#include <io.h>
#include <getopt.h>
#else
#include <unistd.h>
#endif
-#ifdef
LINUX
+#ifdef
__linux__
#include <endian.h>
#if __BYTE_ORDER == __BIG_ENDIAN
#define WORDS_BIG_ENDIAN 1
#include <endian.h>
#if __BYTE_ORDER == __BIG_ENDIAN
#define WORDS_BIG_ENDIAN 1
@@
-90,7
+90,7
@@
public:
bool is_channel_packed(int iChannel);
};
bool is_channel_packed(int iChannel);
};
-class WindaqChannel
+class WindaqChannel
{
public:
WindaqFile& r_wdq;
{
public:
WindaqFile& r_wdq;
@@
-104,16
+104,18
@@
public:
signed short int m_max_raw_data;
double m_max_scaled_data;
double m_min_scaled_data;
signed short int m_max_raw_data;
double m_max_scaled_data;
double m_min_scaled_data;
+ double m_raw_mean;
WindaqChannel (WindaqFile& wdq, const int channel);
~WindaqChannel ();
WindaqChannel (WindaqFile& wdq, const int channel);
~WindaqChannel ();
+ double raw2measured(signed short int raw) const { return (raw * m_slope) + m_intercept; }
private:
bool read_channel_data();
};
private:
bool read_channel_data();
};
-class WavFile
+class WavFile
{
public:
bool m_valid;
{
public:
bool m_valid;
@@
-135,7
+137,7
@@
class WavFile
bool WriteFile ();
bool Play();
bool WriteFile ();
bool Play();
-
+
private:
bool fill_header();
};
private:
bool fill_header();
};
@@
-144,5
+146,5
@@
template<class T>
inline T nearest (double x)
{
return (x > 0 ?
inline T nearest (double x)
{
return (x > 0 ?
- static_cast<T>(x+0.5) : static_cast<T>(x-0.5));
+
static_cast<T>(x+0.5) : static_cast<T>(x-0.5));
}
}