chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-22 05:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor EventList cleanups

Browse Source
This commit is contained in:
Mark Watkins 2014-05-14 07:44:00 +10:00
parent ec0ed2359c
commit 8ce69b7e27
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sleepyhead/Graphs/gLineChart.cpp
View File

@ -170,6 +170,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
return; return;
} }
top++; top++;
EventDataType miny, maxy; EventDataType miny, maxy;

26
sleepyhead/SleepLib/event.cpp
View File

@ -92,7 +92,7 @@ void EventList::AddEvent(qint64 time, EventStoreType data)
qint32 delta = (m_first - time); qint32 delta = (m_first - time);
for (quint32 i = 0; i < m_count; i++) { for (quint32 i = 0; i < m_count; ++i) {
m_time[i] -= delta; m_time[i] -= delta;
} }
@ -172,10 +172,9 @@ void EventList::AddWaveform(qint64 start, qint16 *data, int recs, qint64 duratio
if (m_update_minmax) { if (m_update_minmax) {
EventDataType min = m_min, max = m_max, val, gain = m_gain; EventDataType min = m_min, max = m_max, val, gain = m_gain;
//if (m_offset; for (sp = data; sp < ep; ++sp) {
for (sp = data; sp < ep; sp++) {
*dp++ = raw = *sp; *dp++ = raw = *sp;
val = EventDataType(*sp) * gain + m_offset; val = EventDataType(raw) * gain + m_offset;
if (min > val) { min = val; } if (min > val) { min = val; }
@ -186,8 +185,8 @@ void EventList::AddWaveform(qint64 start, qint16 *data, int recs, qint64 duratio
m_max = max; m_max = max;
} else { } else {
//register EventDataType val,gain=m_gain; //register EventDataType val,gain=m_gain;
for (sp = data; sp < ep; sp++) { for (sp = data; sp < ep; ++sp) {
*dp++ = raw = *sp; *dp++ = *sp;
//val=EventDataType(raw)*gain; //val=EventDataType(raw)*gain;
} }
} }
@ -241,7 +240,7 @@ void EventList::AddWaveform(qint64 start, unsigned char *data, int recs, qint64
if (m_update_minmax) { if (m_update_minmax) {
// ignoring m_offset // ignoring m_offset
for (sp = data; sp < ep; sp++) { for (sp = data; sp < ep; ++sp) {
raw = *sp; raw = *sp;
val = EventDataType(raw) * m_gain; val = EventDataType(raw) * m_gain;
@ -252,14 +251,14 @@ void EventList::AddWaveform(qint64 start, unsigned char *data, int recs, qint64
*dp++ = raw; *dp++ = raw;
} }
} else { } else {
for (sp = data; sp < ep; sp++) { for (sp = data; sp < ep; ++sp) {
raw = *sp; raw = *sp;
val = EventDataType(raw) * m_gain; //val = EventDataType(raw) * m_gain;
*dp++ = raw; *dp++ = raw;
} }
} }
} }
void EventList::AddWaveform(qint64 start, char *data, int recs, qint64 duration) void EventList::AddWaveform(qint64 start, char *data, int recs, qint64 duration)
{ {
if (m_type != EVL_Waveform) { if (m_type != EVL_Waveform) {
@ -308,20 +307,19 @@ void EventList::AddWaveform(qint64 start, char *data, int recs, qint64 duration)
EventStoreType *dp = &edata[r]; EventStoreType *dp = &edata[r];
if (m_update_minmax) { if (m_update_minmax) {
for (sp = data; sp < ep; sp++) { for (sp = data; sp < ep; ++sp) {
raw = *sp; raw = *sp;
val = EventDataType(raw) * m_gain + m_offset; val = EventDataType(raw) * m_gain + m_offset;
if (m_min > val) { m_min = val; } if (m_min > val) { m_min = val; }
if (m_max < val) { m_max = val; } if (m_max < val) { m_max = val; }
*dp++ = raw; *dp++ = raw;
} }
} else { } else {
for (sp = data; sp < ep; sp++) { for (sp = data; sp < ep; ++sp) {
raw = *sp; raw = *sp;
val = EventDataType(raw) * m_gain + m_offset; // val = EventDataType(raw) * m_gain + m_offset;
*dp++ = raw; *dp++ = raw;
} }
} }

3
sleepyhead/SleepLib/session.cpp
View File

@ -980,7 +980,7 @@ EventDataType Session::Min(ChannelID id)
bool first = true; bool first = true;
EventDataType min = 0, t1; EventDataType min = 0, t1;
int evec_size=evec.size(); int evec_size = evec.size();
for (int i = 0; i < evec_size; ++i) { for (int i = 0; i < evec_size; ++i) {
if (evec[i]->count() != 0) { if (evec[i]->count() != 0) {
@ -1000,6 +1000,7 @@ EventDataType Session::Min(ChannelID id)
m_min[id] = min; m_min[id] = min;
return min; return min;
} }
EventDataType Session::Max(ChannelID id) EventDataType Session::Max(ChannelID id)
{ {
QHash<ChannelID, EventDataType>::iterator i = m_max.find(id); QHash<ChannelID, EventDataType>::iterator i = m_max.find(id);