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

PRS1 Loader multithreading Rewrite, plus some minor graph tinkering

Browse Source
This commit is contained in:
Mark Watkins 2014-06-01 07:25:07 +10:00
parent 166c9ad839
commit b1fa273539
20 changed files with 1060 additions and 866 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sleepyhead/Graphs/gLineChart.cpp
View File

@ -566,6 +566,12 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
}
}
painter.setPen(QPen(m_colors[gi],p_profile->appearance->lineThickness()));
painter.drawLines(lines);
w.graphView()->lines_drawn_this_frame+=lines.count();
lines.clear();
} else {
//////////////////////////////////////////////////////////////////
// Standard events/zoomed in Plot
@ -695,10 +701,10 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
}
}
painter.setPen(QPen(m_colors[gi],p_profile->appearance->lineThickness()));
painter.drawLines(lines);
w.graphView()->lines_drawn_this_frame+=lines.count();
lines.clear();
// painter.setPen(QPen(m_colors[gi],p_profile->appearance->lineThickness()));
// painter.drawLines(lines);
// w.graphView()->lines_drawn_this_frame+=lines.count();
// lines.clear();
////////////////////////////////////////////////////////////////////
// Draw Legends on the top line

79
sleepyhead/Graphs/gSummaryChart.cpp
View File

@ -57,6 +57,10 @@ void SummaryChart::SetDay(Day * nullday)
CPAPMode cpapmode = (CPAPMode)(int)PROFILE.calcSettingsMax(CPAP_Mode, MT_CPAP,
PROFILE.FirstDay(MT_CPAP), PROFILE.LastDay(MT_CPAP));
//////////////////////////////////////////////////////////
// Setup for dealing with different CPAP Pressure types
//////////////////////////////////////////////////////////
if (m_label == STR_TR_Pressure) {
m_codes.clear();
m_colors.clear();
@ -68,14 +72,11 @@ void SummaryChart::SetDay(Day * nullday)
SummaryType mid;
if (mididx == 0) { mid = ST_PERC; }
if (mididx == 1) { mid = ST_WAVG; }
if (mididx == 2) { mid = ST_AVG; }
else if (mididx == 1) { mid = ST_WAVG; }
else if (mididx == 2) { mid = ST_AVG; }
if (cpapmode >= MODE_ASV) {
addSlice(CPAP_EPAP, QColor("green"), ST_SETMIN);
addSlice(CPAP_IPAPLo, QColor("light blue"), ST_SETMIN);
addSlice(CPAP_IPAP, QColor("cyan"), mid, 0.5);
addSlice(CPAP_IPAP, QColor("dark cyan"), ST_PERC, perc);
@ -97,8 +98,8 @@ void SummaryChart::SetDay(Day * nullday)
}
}
// Initialize goodcodes (which identified which legends are drawn) to all off
m_goodcodes.resize(m_codes.size());
for (int i = 0; i < m_codes.size(); i++) {
m_goodcodes[i] = false;
}
@ -108,6 +109,7 @@ void SummaryChart::SetDay(Day * nullday)
m_empty = true;
if (m_graphtype == GT_SESSIONS) {
// No point drawing anything if no real data on record
if (PROFILE.countDays(MT_CPAP, PROFILE.FirstDay(MT_CPAP), PROFILE.LastDay(MT_CPAP)) == 0) {
return;
}
@ -117,52 +119,74 @@ void SummaryChart::SetDay(Day * nullday)
SummaryType type;
bool first = true;
for (QMap<QDate, QList<Day *> >::iterator d = PROFILE.daylist.begin(); d != PROFILE.daylist.end();
d++) {
// For each day in the main profile daylist
QMap<QDate, QList<Day *> >::iterator d;
for (d = PROFILE.daylist.begin(); d != PROFILE.daylist.end(); d++) {
// get the timestamp of this day.
tt = QDateTime(d.key(), QTime(0, 0, 0), Qt::UTC).toTime_t();
// calculate day number
dn = tt / 86400;
// to ms since epoch.
tt *= 1000L;
// update min and max for this timestamp
if (!m_minx || tt < m_minx) { m_minx = tt; }
if (!m_maxx || tt > m_maxx) { m_maxx = tt; }
total = 0;
bool fnd = false;
//////////////////////////////////////////////////////////
// Setup for Sessions Time display chart
//////////////////////////////////////////////////////////
if (m_graphtype == GT_SESSIONS) {
// Turn all legends on
for (int i = 0; i < m_codes.size(); i++) {
m_goodcodes[i] = true;
}
for (int i = 0; i < d.value().size(); i++) { // for each day
// for each day object on record for this date
int dlistsize = d.value().size();
for (int i = 0; i < dlistsize; ++i) {
day = d.value().at(i);
if (!day) { continue; }
if (day->machine_type() != m_machinetype) { continue; }
// skip any empty or irrelevant day records
if (!day || (day->machine_type() != m_machinetype)) { continue; }
int ft = qint64(day->first()) / 1000L;
ft += tz_offset; // convert to local time
int dz2 = ft / 86400;
dz2 *= 86400; // ft = first sessions time, rounded back to midnight..
dz2 *= 86400;
// ft = first sessions time, rounded back to midnight..
// For each session in this day record
for (int s = 0; s < day->size(); s++) {
Session *sess = (*day)[s];
if (!sess->enabled()) { continue; }
// Get session duration
tmp = sess->hours();
m_values[dn][s] = tmp;
total += tmp;
// Get session start timestamp
zt = qint64(sess->first()) / 1000L;
zt += tz_offset;
// Calculate the starting hour
tmp2 = zt - dn * 86400;
tmp2 /= 3600.0;
m_times[dn][s] = tmp2;
// Update min & max Y values
if (first) {
m_miny = tmp2;
m_maxy = tmp2 + tmp;
@ -176,8 +200,9 @@ void SummaryChart::SetDay(Day * nullday)
m_maxy = tmp2 + tmp;
}
}
}
} // for each session
// if total hours for all sessions more than 0, register the day as valid
if (total > 0) {
m_days[dn] = day;
m_hours[dn] = total;
@ -185,16 +210,24 @@ void SummaryChart::SetDay(Day * nullday)
}
}
} else {
for (int j = 0; j < m_codes.size(); j++) { // for each code slice
//////////////////////////////////////////////////////////////////////////////
// Data Channel summary charts
//////////////////////////////////////////////////////////////////////////////
// For each Channel
for (int j = 0; j < m_codes.size(); j++) {
code = m_codes[j];
suboffset = 0;
type = m_type[j];
EventDataType typeval = m_typeval[j];
for (int i = 0; i < d.value().size(); i++) { // for each machine object for this day
// for each machine object for this day
for (int i = 0; i < d.value().size(); i++) {
day = d.value()[i];
CPAPMode mode = (CPAPMode)(int)day->settings_max(CPAP_Mode);
// ignore irrelevent day objects
if (day->machine_type() != m_machinetype) { continue; }
bool hascode = //day->channelHasData(code) ||
@ -801,6 +834,11 @@ jumpnext:
bool ishours = false;
int good = 0;
if (w.title().compare("Resp. Rate")==0) {
int i=5;
int b = i;
}
for (int j = 0; j < m_codes.size(); j++) {
if (!goodcodes[j]) { continue; }
@ -908,7 +946,7 @@ jumpnext:
w.renderText(a, legendx, top - 4);
// legendx-=bw/2;
painter.fillRect(legendx - bw, top-w.marginTop()-1, bh, w.marginTop(), QBrush(m_colors[j]));
painter.fillRect(legendx - bw-4, top-w.marginTop()-1, bh, w.marginTop(), QBrush(m_colors[j]));
legendx -= bw * 2;
@ -1027,10 +1065,9 @@ bool SummaryChart::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
//QTime t2=dt2.time();
QDate dt = dt2.date();
day = m_days[zd];
if (d != m_values.end()) {
day = m_days[zd];
if ((d != m_values.end()) && (day != nullptr)) {
QString z = dt.toString(Qt::SystemLocaleShortDate);

2
sleepyhead/Graphs/gSummaryChart.h
View File

@ -33,7 +33,7 @@ class SummaryChart: public Layer
SummaryChart(QString label, GraphType type = GT_BAR);
virtual ~SummaryChart();
//! \brief Drawing code that fills the Vertex buffers
//! \brief Renders the graph to the QPainter object
virtual void paint(QPainter &painter, gGraph &w, const QRegion &region);
//! \brief Precalculation code prior to drawing. Day object is not needed here, it's just here for Layer compatability.

126
sleepyhead/Graphs/gsessiontimeschart.cpp Normal file
View File

@ -0,0 +1,126 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gSessionTimesChart Implementation
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of the Linux
* distribution for more details. */
#include <math.h>
#include <QLabel>
#include <QDateTime>
#include "SleepLib/profiles.h"
#include "gsessiontimeschart.h"
#include "gYAxis.h"
gSessionTimesChart::gSessionTimesChart(QString label, MachineType machtype)
:Layer(NoChannel), m_label(label), m_machtype(machtype)
{
QDateTime d1 = QDateTime::currentDateTime();
QDateTime d2 = d1;
d1.setTimeSpec(Qt::UTC); // CHECK: Does this deal with DST?
tz_offset = d2.secsTo(d1);
tz_hours = tz_offset / 3600.0;
}
gSessionTimesChart::~gSessionTimesChart()
{
}
void gSessionTimesChart::SetDay(Day *unused_day)
{
Q_UNUSED(unused_day)
Layer::SetDay(nullptr);
QDate firstday = PROFILE.FirstDay(m_machtype);
QDate lastday = PROFILE.LastDay(m_machtype);
m_minx = QDateTime(firstday, QTime(0,0,0)).toMSecsSinceEpoch();
m_maxx = QDateTime(lastday, QTime(23,59,59)).toMSecsSinceEpoch();
// Get list of valid day records in supplied date range
QList<Day *> daylist = PROFILE.getDays(m_machtype, firstday, lastday);
if (daylist.size() == 0) {
m_miny = m_maxy = 0;
return;
}
int cnt = 0;
bool first = true;
QList<Day *>::iterator end = daylist.end();
quint32 dn; // day number
// For each day
for (QList<Day *>::iterator it = daylist.begin(); it != end; ++it) {
Day * day = (*it);
if (day->size() == 0) continue;
dn = day->first() / 86400000L;
// For each session
for (int i=0; i < day->size(); i++) {
Session * session = (*day)[i];
if (!session->enabled()) continue;
// calculate start and end hours
float start = ((session->first() / 1000L) % 86400) / 3600.0;
float end = ((session->last() / 1000L) % 86400) / 3600.0;
// apply tzoffset??
// update min & max Y values
if (first) {
first = false;
m_miny = start;
m_maxy = end;
} else {
if (start < m_miny) m_miny = start;
if (end > m_maxy) m_maxy = end;
}
sessiontimes[cnt].push_back(TimeSpan(start,end));
}
}
}
void gSessionTimesChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
{
QMap<quint32, QList<TimeSpan> >::iterator st_end = sessiontimes.end();
QMap<quint32, QList<TimeSpan> >::iterator it;
for (it = sessiontimes.begin(); it != st_end; ++it) {
int dn = it.key();
QList<TimeSpan> & st = it.value();
int stsize = st.size();
// Skip if empty
if (stsize == 0) continue;
}
}
bool gSessionTimesChart::keyPressEvent(QKeyEvent *event, gGraph *graph)
{
}
bool gSessionTimesChart::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
{
}
bool gSessionTimesChart::mousePressEvent(QMouseEvent *event, gGraph *graph)
{
}
bool gSessionTimesChart::mouseReleaseEvent(QMouseEvent *event, gGraph *graph)
{
}

80
sleepyhead/Graphs/gsessiontimeschart.h Normal file
View File

@ -0,0 +1,80 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* gSessionTimesChart Header
*
* Copyright (c) 2011-2014 Mark Watkins <jedimark@users.sourceforge.net>
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file COPYING in the main directory of the Linux
* distribution for more details. */
#ifndef GSESSIONTIMESCHART_H
#define GSESSIONTIMESCHART_H
#include <SleepLib/day.h>
#include "gGraphView.h"
struct TimeSpan
{
public:
TimeSpan(): begin(0), end(0) {}
TimeSpan(float b, float e) : begin(b), end(e) {}
TimeSpan(const TimeSpan & copy) {
begin = copy.begin;
end = copy.end;
}
~TimeSpan() {}
float begin;
float end;
};
/*! \class gSessionTimesChart
\brief Displays a summary of session times
*/
class gSessionTimesChart : public Layer
{
public:
gSessionTimesChart(QString label, MachineType machtype);
~gSessionTimesChart();
//! \brief Renders the graph to the QPainter object
virtual void paint(QPainter &painter, gGraph &w, const QRegion &region);
//! \brief Precalculation code prior to drawing. Day object is not needed here, it's just here for Layer compatability.
virtual void SetDay(Day *day = nullptr);
//! \brief Returns true if no data was found for this day during SetDay
virtual bool isEmpty() { return m_empty; }
//! \brief Deselect highlighting (the gold bar)
virtual void deselect() {
hl_day = -1;
}
//! \brief Returns true if currently selected..
virtual bool isSelected() { return hl_day >= 0; }
protected:
//! \brief Key was pressed that effects this layer
virtual bool keyPressEvent(QKeyEvent *event, gGraph *graph);
//! \brief Mouse moved over this layers area (shows the hover-over tooltips here)
virtual bool mouseMoveEvent(QMouseEvent *event, gGraph *graph);
//! \brief Mouse Button was pressed over this area
virtual bool mousePressEvent(QMouseEvent *event, gGraph *graph);
//! \brief Mouse Button was released over this area. (jumps to daily view here)
virtual bool mouseReleaseEvent(QMouseEvent *event, gGraph *graph);
QString m_label;
MachineType m_machtype;
bool m_empty;
int hl_day;
int tz_offset;
float tz_hours;
QMap<quint32, QList<TimeSpan> > sessiontimes;
};
#endif // GSESSIONTIMESCHART_H

6
sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
View File

@ -536,7 +536,6 @@ bool FPIconLoader::OpenFLW(Machine *mach, QString filename, Profile *profile)
flow->setFirst(ti);
pressure->setFirst(ti);
quint16 endMarker;
qint8 offset; // offset from center for this block
quint16 pres; // mask pressure
@ -569,9 +568,12 @@ bool FPIconLoader::OpenFLW(Machine *mach, QString filename, Profile *profile)
samples[i] = val;
}
flow->AddWaveform(ti, samples, samples_per_block, rate);
ti += samples_per_block * rate;
pres = *((quint16 *)p);
pressure->AddEvent(ti, pres);
ti += samples_per_block * rate;
p+=3; // (offset too)
} while (p < end);

1234
sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
View File

File diff suppressed because it is too large Load Diff

137
sleepyhead/SleepLib/loader_plugins/prs1_loader.h
View File

@ -39,10 +39,136 @@ class PRS1: public CPAP
const int max_load_buffer_size = 1024 * 1024;
const QString prs1_class_name = STR_MACH_PRS1;
/*! \struct PRS1Waveform
\brief Used in PRS1 Waveform Parsing */
struct PRS1Waveform {
PRS1Waveform(quint16 i, quint8 f) {
interleave = i;
sample_format = f;
}
quint16 interleave;
quint8 sample_format;
};
class PRS1DataChunk
{
friend class PRS1DataGroup;
public:
PRS1DataChunk() {
timestamp = 0;
ext = 255;
sessionid = 0;
htype = 0;
family = 0;
familyVersion = 0;
duration = 0;
}
~PRS1DataChunk() {
}
inline int size() const { return m_data.size(); }
QByteArray m_data;
SessionID sessionid;
quint8 fileVersion;
quint8 ext;
quint8 htype;
quint8 family;
quint8 familyVersion;
quint32 timestamp;
quint16 duration;
QList<PRS1Waveform> waveformInfo;
};
class PRS1SessionData
{
public:
PRS1SessionData() {
compliance = summary = event = nullptr;
session = nullptr;
}
PRS1SessionData(const PRS1SessionData & copy) {
session = copy.session;
compliance = copy.compliance;
summary = copy.summary;
event = copy.event;
waveforms = copy.waveforms;
}
~PRS1SessionData() {
delete compliance;
delete summary;
delete event;
Q_FOREACH(PRS1DataChunk * c, waveforms) {
delete c;
}
}
bool ParseCompliance();
bool ParseSummary();
bool ParseEvents();
bool ParseWaveforms();
//! \brief Parse a single data chunk from a .002 file containing event data for a standard system one machine
bool ParseF0Events();
//! \brief Parse a single data chunk from a .002 file containing event data for a family 5 ASV machine (which has a different format)
bool ParseF5Events();
Session * session;
PRS1DataChunk * compliance;
PRS1DataChunk * summary;
PRS1DataChunk * event;
QList<PRS1DataChunk *> waveforms;
};
struct PRS1FileGroup
{
PRS1FileGroup() {}
PRS1FileGroup(const PRS1FileGroup & copy) {
compliance = copy.compliance;
summary = copy.summary;
event = copy.event;
waveform = copy.waveform;
}
~PRS1FileGroup() {
}
QString compliance;
QString summary;
QString event;
QString waveform;
bool ParseFile(QString path);
void ParseChunks();
QMap<SessionID, PRS1SessionData*> sessions;
};
class PRS1Loader;
class PRS1Import:public ImportTask
{
public:
PRS1Import(PRS1Loader * l, SessionID s, PRS1FileGroup *g, Machine * m): loader(l), sessionid(s), group(g), mach(m) {}
virtual ~PRS1Import() {}
virtual void run();
protected:
PRS1Loader * loader;
SessionID sessionid;
PRS1FileGroup *group;
Machine * mach;
};
/*! \class PRS1Loader
\brief Philips Respironics System One Loader Module
*/
@ -92,12 +218,7 @@ class PRS1Loader : public MachineLoader
bool ParseSummary(Machine *mach, qint32 sequence, quint32 timestamp, unsigned char *data,
quint16 size, int family, int familyVersion);
//! \brief Parse a single data chunk from a .002 file containing event data for a standard system one machine
bool Parse002(qint32 sequence, quint32 timestamp, unsigned char *data, quint16 size, int family,
int familyVersion);
//! \brief Parse a single data chunk from a .002 file containing event data for a family 5 ASV machine (which has a different format)
bool Parse002v5(qint32 sequence, quint32 timestamp, unsigned char *data, quint16 size, int familyVersion);
//! \brief Open a PRS1 data file, and break into data chunks, delivering them to the correct parser.
bool OpenFile(Machine *mach, QString filename);
@ -109,6 +230,8 @@ class PRS1Loader : public MachineLoader
//! \brief PRS1 Data files can store multiple sessions, so store them in this list for later processing.
QHash<SessionID, Session *> new_sessions;
QHash<SessionID, PRS1FileGroup*> prs1sessions;
qint32 summary_duration;
};

9
sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -178,11 +178,16 @@ void ResmedLoader::ParseSTR(Machine *mach, QStringList strfiles)
QMap<quint32, STRRecord>::iterator si = strsess.find(laston);
if (si != strsess.end()) {
if (si.value().maskoff == 0) {
si.value().maskoff = offtime;
if (offtime > laston) {
si.value().maskoff = offtime;
}
} else {
if (si.value().maskoff != offtime) {
// not sure why this happens.
qDebug() << "WTF??" << si.value().maskoff << "!=" << offtime;
qDebug() << "WTF?? mask off's don't match"
<< QDateTime::fromTime_t(laston).toString()
<< QDateTime::fromTime_t(si.value().maskoff).toString()
<< "!=" << QDateTime::fromTime_t(offtime).toString();
}
//Q_ASSERT(si.value().maskoff == offtime);
}

2
sleepyhead/SleepLib/loader_plugins/resmed_loader.h
View File

@ -372,8 +372,6 @@ protected:
QMap<quint32, STRRecord> strsess;
QMap<QDate, QList<STRRecord *> > strdate;
QMutex saveMutex;
#ifdef DEBUG_EFFICIENCY
QHash<ChannelID, qint64> channel_efficiency;
QHash<ChannelID, qint64> channel_time;

26
sleepyhead/SleepLib/machine_loader.cpp
View File

@ -116,21 +116,33 @@ void MachineLoader::queTask(ImportTask * task)
m_tasklist.push_back(task);
}
void MachineLoader::runTasks()
void MachineLoader::runTasks(bool threaded)
{
QThreadPool * threadpool = QThreadPool::globalInstance();
m_totaltasks=m_tasklist.size();
m_currenttask=0;
while (!m_tasklist.isEmpty()) {
if (threadpool->tryStart(m_tasklist.at(0))) {
m_tasklist.pop_front();
if (!threaded) {
while (!m_tasklist.isEmpty()) {
ImportTask * task = m_tasklist.takeFirst();
task->run();
float f = float(m_currenttask) / float(m_totaltasks) * 100.0;
qprogress->setValue(f);
m_currenttask++;
QApplication::processEvents();
}
QApplication::processEvents();
} else {
QThreadPool * threadpool = QThreadPool::globalInstance();
while (!m_tasklist.isEmpty()) {
if (threadpool->tryStart(m_tasklist.at(0))) {
m_tasklist.pop_front();
float f = float(m_currenttask) / float(m_totaltasks) * 100.0;
qprogress->setValue(f);
m_currenttask++;
}
QApplication::processEvents();
}
QThreadPool::globalInstance()->waitForDone(-1);
}
QThreadPool::globalInstance()->waitForDone(-1);
}
/*const QString machine_profile_name="MachineList.xml";

6
sleepyhead/SleepLib/machine_loader.h
View File

@ -61,7 +61,7 @@ class MachineLoader: public QObject
void queTask(ImportTask * task);
//! \brief Process Task list using all available threads.
void runTasks();
void runTasks(bool threaded=true);
inline bool isAborted() { return m_abort; }
void abort() { m_abort = true; }
@ -71,6 +71,9 @@ class MachineLoader: public QObject
DeviceStatus status() { return m_status; }
void setStatus(DeviceStatus status) { m_status = status; }
QMutex sessionMutex;
QMutex saveMutex;
signals:
void updateProgress(int cnt, int total);
// void updateDisplay(MachineLoader *);
@ -99,6 +102,7 @@ signals:
DeviceStatus m_status;
private:
QList<ImportTask *> m_tasklist;
};

40
sleepyhead/SleepLib/profiles.cpp
View File

@ -609,18 +609,51 @@ void Scan()
} // namespace Profiles
// Returns a list of all days records matching machine type between start and end date
QList<Day *> Profile::getDays(MachineType mt, QDate start, QDate end)
{
QList<Day *> daylist;
if (!start.isValid()) {
return daylist;
}
if (!end.isValid()) {
return daylist;
}
QDate date = start;
if (date.isNull()) {
return daylist;
}
do {
Day *day = GetGoodDay(date, mt);
if (day) {
if ((mt == MT_UNKNOWN) || (day->machine->GetType() == mt)) {
daylist.push_back(day);
}
}
date = date.addDays(1);
} while (date <= end);
return daylist;
}
int Profile::countDays(MachineType mt, QDate start, QDate end)
{
if (!start.isValid()) {
return 0;
}
//start=LastDay(mt);
if (!end.isValid()) {
return 0;
}
//end=LastDay(mt);
QDate date = start;
if (date.isNull()) {
@ -1263,13 +1296,14 @@ QDate Profile::LastDay(MachineType mt)
QDate Profile::FirstGoodDay(MachineType mt)
{
if (mt == MT_UNKNOWN) { //|| (!m_last.isValid()) || (!m_first.isValid()))
if (mt == MT_UNKNOWN) {
return FirstDay();
}
QDate d = FirstDay(mt);
QDate l = LastDay(mt);
// No data will return invalid date records
if (!d.isValid() || !l.isValid()) {
return QDate();
}

47
sleepyhead/SleepLib/profiles.h
View File

@ -45,11 +45,12 @@ class SessionSettings;
class Profile : public Preferences
{
public:
//! \brief Loads a new Profile from the given path.
//! \brief Constructor.. Does not open profile
Profile(QString path);
virtual ~Profile();
//! \brief Open profile, parse profile.xml file, and initialize helper classes
virtual bool Open(QString filename = "");
//! \brief Save Profile object (This is an extension to Preference::Save(..))
@ -97,54 +98,94 @@ class Profile : public Preferences
//! \brief Returns true if this profile stores this variable identified by key
bool contains(QString key) { return p_preferences.contains(key); }
//! \brief Get all days records of machine type between start and end dates
QList<Day *> getDays(MachineType mt, QDate start, QDate end);
//! \brief Returns a count of all days (with data) of machine type, between start and end dates
int countDays(MachineType mt = MT_UNKNOWN, QDate start = QDate(), QDate end = QDate());
//! \brief Returns a count of all compliant days of machine type between start and end dates
int countCompliantDays(MachineType mt, QDate start, QDate end);
//! \brief Returns a count of all event entries for code, matching machine type between start an end dates
EventDataType calcCount(ChannelID code, MachineType mt = MT_CPAP, QDate start = QDate(),
QDate end = QDate());
//! \brief Returns a sum of all event data for Channel code, matching machine type between start an end dates
double calcSum(ChannelID code, MachineType mt = MT_CPAP, QDate start = QDate(),
QDate end = QDate());
//! \brief Returns a sum of all session durations for machine type, between start and end dates
EventDataType calcHours(MachineType mt = MT_CPAP, QDate start = QDate(), QDate end = QDate());
//! \brief Calculates Channel Average (Sums and counts all events, returning the sum divided by the count.)
EventDataType calcAvg(ChannelID code, MachineType mt = MT_CPAP, QDate start = QDate(),
QDate end = QDate());
//! \brief Calculates Channel Weighted Average between start and end dates
EventDataType calcWavg(ChannelID code, MachineType mt = MT_CPAP, QDate start = QDate(),
QDate end = QDate());
//! \brief Calculates the minimum value for channel code, between start and end dates
EventDataType calcMin(ChannelID code, MachineType mt = MT_CPAP, QDate start = QDate(),
QDate end = QDate());
//! \brief Calculates the maximum value for channel code, between start and end dates
EventDataType calcMax(ChannelID code, MachineType mt = MT_CPAP, QDate start = QDate(),
QDate end = QDate());
//! \brief Calculates a percentile value percent for channel code, between start and end dates
EventDataType calcPercentile(ChannelID code, EventDataType percent, MachineType mt = MT_CPAP,
QDate start = QDate(), QDate end = QDate());
//! \brief Tests if Channel code is available in all day sets
bool hasChannel(ChannelID code);
//! \brief Calculates the minimum session settings value for channel code, between start and end dates
EventDataType calcSettingsMin(ChannelID code, MachineType mt = MT_CPAP, QDate start = QDate(),
QDate end = QDate());
//! \brief Calculates the maximum session settings value for channel code, between start and end dates
EventDataType calcSettingsMax(ChannelID code, MachineType mt = MT_CPAP, QDate start = QDate(),
QDate end = QDate());
//! \brief Calculates the time channel code spends above threshold value for machine type, between start and end dates
EventDataType calcAboveThreshold(ChannelID code, EventDataType threshold, MachineType mt = MT_CPAP,
QDate start = QDate(), QDate end = QDate());
//! \brief Calculates the time channel code spends below threshold value for machine type, between start and end dates
EventDataType calcBelowThreshold(ChannelID code, EventDataType threshold, MachineType mt = MT_CPAP,
QDate start = QDate(), QDate end = QDate());
// XML load components
virtual void ExtraLoad(QDomElement &root);
virtual QDomElement ExtraSave(QDomDocument &doc);
//! \brief Looks for the first date containing a day record matching machinetype
QDate FirstDay(MachineType mt = MT_UNKNOWN);
//! \brief Looks for the last date containing a day record matching machinetype
QDate LastDay(MachineType mt = MT_UNKNOWN);
//! \brief Looks for the first date containing a day record with enabled sessions matching machinetype
QDate FirstGoodDay(MachineType mt = MT_UNKNOWN);
//! \brief Looks for the last date containing a day record with enabled sessions matching machinetype
QDate LastGoodDay(MachineType mt = MT_UNKNOWN);
//! \brief Returns this profiles data folder
QString dataFolder() { return (*this).Get("{DataFolder}"); }
//! \brief Return if this profile has been opened or not
bool isOpen() { return m_opened; }
QMap<QDate, QList<Day *> > daylist; // Red-Black tree of Days (iterates in order).
QHash<MachineID, Machine *> machlist; // List of machines, indexed by MachineID.
//! \brief Red-Black tree of Days (iterates in order).
QMap<QDate, QList<Day *> > daylist;
//! \brief List of machines, indexed by MachineID.
QHash<MachineID, Machine *> machlist;
bool is_first_day;

20
sleepyhead/daily.cpp
View File

@ -645,7 +645,7 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day)
t-=float(ev.raw(o)/2.0)*1000.0;
}
QStringList a;
QDateTime d=QDateTime::fromTime_t(t/1000L);
QDateTime d=QDateTime::fromMSecsSinceEpoch(t);
QString s=QString("#%1: %2 (%3)").arg((int)(++mccnt[code]),(int)3,(int)10,QChar('0')).arg(d.toString("HH:mm:ss")).arg(m.value()[z]->raw(o));
a.append(s);
QTreeWidgetItem *item=new QTreeWidgetItem(a);
@ -660,6 +660,24 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day)
for (QHash<ChannelID,QTreeWidgetItem *>::iterator m=mcroot.begin();m!=mcroot.end();m++) {
tree->insertTopLevelItem(cnt++,m.value());
}
QTreeWidgetItem * start = new QTreeWidgetItem(QStringList(tr("Session Start Times")));
QTreeWidgetItem * end = new QTreeWidgetItem(QStringList(tr("Session End Times")));
tree->insertTopLevelItem(cnt++ , start);
tree->insertTopLevelItem(cnt++ , end);
for (QList<Session *>::iterator s=day->begin(); s!=day->end(); ++s) {
QDateTime st = QDateTime::fromMSecsSinceEpoch((*s)->first());
QDateTime et = QDateTime::fromMSecsSinceEpoch((*s)->last());
QTreeWidgetItem * item = new QTreeWidgetItem(QStringList(st.toString("HH:mm:ss")));
item->setData(0,Qt::UserRole, (*s)->first());
start->addChild(item);
item = new QTreeWidgetItem(QStringList(et.toString("HH:mm:ss")));
item->setData(0,Qt::UserRole, (*s)->last());
end->addChild(item);
}
//tree->insertTopLevelItem(cnt++,new QTreeWidgetItem(QStringList("[Total Events ("+QString::number(total_events)+")]")));
tree->sortByColumn(0,Qt::AscendingOrder);
//tree->expandAll();

22
sleepyhead/mainwindow.cpp
View File

@ -328,10 +328,11 @@ void MainWindow::Notify(QString s, QString title, int ms)
void MainWindow::PopulatePurgeMenu()
{
QList<QAction *> actions = ui->menu_Purge_CPAP_Data->actions();
for (int i=0; i < actions.size(); i++) {
ui->menu_Purge_CPAP_Data->disconnect(ui->menu_Purge_CPAP_Data, SIGNAL(triggered(QAction*)), this, SLOT(on_actionPurgeMachine(QAction *)));
}
ui->menu_Purge_CPAP_Data->disconnect(ui->menu_Purge_CPAP_Data, SIGNAL(triggered(QAction*)), this, SLOT(on_actionPurgeMachine(QAction *)));
ui->menu_Purge_CPAP_Data->clear();
QList<Machine *> machines = PROFILE.GetMachines(MT_CPAP);
for (int i=0; i < machines.size(); ++i) {
Machine *mach = machines.at(i);
@ -342,8 +343,8 @@ void MainWindow::PopulatePurgeMenu()
QAction * action = new QAction(name.replace("&","&&"), ui->menu_Purge_CPAP_Data);
action->setData(mach->GetClass()+":"+mach->properties[STR_PROP_Serial]);
ui->menu_Purge_CPAP_Data->addAction(action);
ui->menu_Purge_CPAP_Data->connect(ui->menu_Purge_CPAP_Data, SIGNAL(triggered(QAction*)), this, SLOT(on_actionPurgeMachine(QAction*)));
}
ui->menu_Purge_CPAP_Data->connect(ui->menu_Purge_CPAP_Data, SIGNAL(triggered(QAction*)), this, SLOT(on_actionPurgeMachine(QAction*)));
}
void MainWindow::Startup()
@ -2285,9 +2286,19 @@ void MainWindow::on_reportModeRange_clicked()
void MainWindow::on_actionPurgeCurrentDaysOximetry_triggered()
{
if (!getDaily())
return;
QDate date = getDaily()->getDate();
Day * day = PROFILE.GetDay(date, MT_OXIMETER);
if (day) {
if (QMessageBox::question(this, STR_MessageBox_Warning,
tr("Are you sure you want to delete oximetry data for %1").
arg(getDaily()->getDate().toString(Qt::DefaultLocaleLongDate))+"<br/><br/>"+
tr("<b>Please be aware you can not undo this operation!</b>"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No) {
return;
}
QList<Session *> sessions;
sessions.append(day->getSessions());
@ -2299,5 +2310,8 @@ void MainWindow::on_actionPurgeCurrentDaysOximetry_triggered()
daily->clearLastDay(); // otherwise Daily will crash
getDaily()->ReloadGraphs();
} else {
QMessageBox::information(this, STR_MessageBox_Information,
tr("Select the day with valid oximetry data in daily view first."),QMessageBox::Ok);
}
}

2
sleepyhead/overview.cpp
View File

@ -124,9 +124,7 @@ Overview::Overview(QWidget *parent, gGraphView *shared) :
SummaryType ST_mid;
if (mididx == 0) { ST_mid = ST_PERC; }
if (mididx == 1) { ST_mid = ST_WAVG; }
if (mididx == 2) { ST_mid = ST_AVG; }
SummaryType ST_max = PROFILE.general->prefCalcMax() ? ST_PERC : ST_MAX;

62
sleepyhead/oximeterimport.cpp
View File

@ -272,7 +272,7 @@ void OximeterImport::on_fileImportButton_clicked()
#endif
QString filename = QFileDialog::getOpenFileName(nullptr , tr("Select a valid oximetry data file"), documentsFolder, "Oximetry Files (*.spo *.spor *.dat)");
QString filename = QFileDialog::getOpenFileName(nullptr , tr("Select a valid oximetry data file"), documentsFolder, tr("Oximetry Files (*.spo *.spor *.dat)"));
if (filename.isEmpty())
return;
@ -324,7 +324,7 @@ void OximeterImport::on_liveImportButton_clicked()
SerialOximeter * oximodule = detectOximeter();
if (!oximodule) {
updateStatus("Couldn't access oximeter");
updateStatus(tr("Couldn't access oximeter"));
ui->retryButton->setVisible(true);
ui->progressBar->setValue(0);
@ -334,7 +334,7 @@ void OximeterImport::on_liveImportButton_clicked()
Machine *mach = oximodule->CreateMachine(p_profile);
connect(oximodule, SIGNAL(updatePlethy(QByteArray)), this, SLOT(on_updatePlethy(QByteArray)));
ui->liveConnectLabel->setText("Live Oximetery Mode");
ui->liveConnectLabel->setText(tr("Live Oximetery Mode"));
liveView->setEmptyText(tr("Starting up..."));
@ -381,7 +381,7 @@ void OximeterImport::finishedRecording()
disconnect(ui->stopButton, SIGNAL(clicked()), this, SLOT(finishedRecording()));
ui->stopButton->setVisible(false);
ui->liveConnectLabel->setText("Live Import Stopped");
ui->liveConnectLabel->setText(tr("Live Import Stopped"));
liveView->setEmptyText(tr("Live Oximetery Stopped"));
updateStatus(tr("Live Oximetery import has been stopped"));
@ -413,30 +413,36 @@ void OximeterImport::on_stopButton_clicked()
void OximeterImport::on_calendarWidget_clicked(const QDate &date)
{
Day * day = PROFILE.GetGoodDay(date, MT_CPAP);
if (ui->radioSyncCPAP->isChecked()) {
Day * day = PROFILE.GetGoodDay(date, MT_CPAP);
sessbar->clear();
if (day) {
QDateTime time=QDateTime::fromMSecsSinceEpoch(day->first());
sessbar->clear();
QList<QColor> colors;
colors.push_back("#ffffe0");
colors.push_back("#ffe0ff");
colors.push_back("#e0ffff");
QList<Session *>::iterator i;
int j=0;
for (i=day->begin(); i != day->end(); ++i) {
sessbar->add((*i),colors.at(j++ % colors.size()));
if (day) {
QDateTime time=QDateTime::fromMSecsSinceEpoch(day->first());
sessbar->clear();
QList<QColor> colors;
colors.push_back("#ffffe0");
colors.push_back("#ffe0ff");
colors.push_back("#e0ffff");
QList<Session *>::iterator i;
int j=0;
for (i=day->begin(); i != day->end(); ++i) {
sessbar->add((*i),colors.at(j++ % colors.size()));
}
sessbar->setVisible(true);
ui->sessbarLabel->setText(tr("%1 session(s) on %2, starting at %3").arg(day->size()).arg(time.date().toString(Qt::SystemLocaleLongDate)).arg(time.time().toString("hh:mm:ssap")));
sessbar->setSelected(0);
ui->dateTimeEdit->setDateTime(time);
} else {
ui->sessbarLabel->setText(tr("No CPAP data available on %1").arg(date.toString(Qt::SystemLocaleLongDate)));
ui->dateTimeEdit->setDateTime(QDateTime(date,oximodule->startTime().time()));
}
sessbar->setVisible(true);
ui->sessbarLabel->setText(QString("%1 session(s), starting at %2").arg(day->size()).arg(time.time().toString("hh:mm:ssap")));
sessbar->setSelected(0);
ui->dateTimeEdit->setDateTime(time);
} else {
ui->sessbarLabel->setText("No CPAP Data available for this date"); // sessbar->setVisible(false);
}
sessbar->update();
sessbar->update();
} else if (ui->radioSyncOximeter) {
ui->sessbarLabel->setText(tr("%1").arg(date.toString(Qt::SystemLocaleLongDate)));
ui->dateTimeEdit->setDateTime(QDateTime(date, ui->dateTimeEdit->dateTime().time()));
}
}
void OximeterImport::on_calendarWidget_selectionChanged()
@ -473,13 +479,7 @@ void OximeterImport::on_sessionForwardButton_clicked()
void OximeterImport::on_radioSyncCPAP_clicked()
{
ui->calendarWidget->setSelectedDate(oximodule->startTime().date());
sessbar->setSelected(0);
sessbar->update();
QDateTime datetime = QDateTime::fromMSecsSinceEpoch(sessbar->session(0)->first());
ui->dateTimeEdit->setDateTime(datetime);
on_calendarWidget_clicked(oximodule->startTime().date());
ui->syncCPAPGroup->setVisible(true);

6
sleepyhead/oximeterimport.ui
View File

@ -1393,7 +1393,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
<property name="minimumSize">
<size>
<width>0</width>
<height>180</height>
<height>200</height>
</size>
</property>
<property name="title">
@ -1436,7 +1436,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
<property name="minimumSize">
<size>
<width>0</width>
<height>180</height>
<height>200</height>
</size>
</property>
<property name="title">
@ -1691,7 +1691,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
<enum>QAbstractSpinBox::UpDownArrows</enum>
</property>
<property name="displayFormat">
<string>hh:mm:ss AP</string>
<string>HH:mm:ssap</string>
</property>
</widget>
</item>

6
sleepyhead/sleepyhead.pro
View File

@ -145,7 +145,8 @@ SOURCES += \
statistics.cpp \
oximeterimport.cpp \
SleepLib/serialoximeter.cpp \
SleepLib/loader_plugins/md300w1_loader.cpp
SleepLib/loader_plugins/md300w1_loader.cpp \
Graphs/gSessionTimesChart.cpp
HEADERS += \
common_gui.h \
@ -199,7 +200,8 @@ HEADERS += \
statistics.h \
oximeterimport.h \
SleepLib/serialoximeter.h \
SleepLib/loader_plugins/md300w1_loader.h
SleepLib/loader_plugins/md300w1_loader.h \
Graphs/gSessionTimesChart.h
FORMS += \
daily.ui \