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

Connected LCD components in Live Oximetery, added graph hide ability

Browse Source
This commit is contained in:
Mark Watkins 2014-05-26 17:37:28 +10:00
parent 66e8d249cf
commit ffca449ac2
10 changed files with 376 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sleepyhead/Graphs/gXAxis.cpp
View File

@ -24,7 +24,7 @@ const quint64 divisors[] = {
15552000000ULL, 7776000000ULL, 5184000000ULL, 2419200000ULL, 1814400000ULL, 1209600000L, 604800000L, 259200000L,
172800000L, 86400000, 2880000, 14400000, 7200000, 3600000, 2700000,
1800000, 1200000, 900000, 600000, 300000, 120000, 60000, 45000, 30000,
20000, 15000, 10000, 5000, 2000, 1000, 100, 50, 10, 1
20000, 15000, 10000, 5000, 2000, 1000, 500, 100, 50, 10, 1
};
const int divcnt = sizeof(divisors) / sizeof(quint64);

43
sleepyhead/SleepLib/loader_plugins/cms50_loader.cpp
View File

@ -93,7 +93,7 @@ int CMS50Loader::Open(QString path, Profile *profile)
startImportTimeout();
return 1;
} else if (path.compare("live") == 0) {
oxitime = QDateTime::currentDateTime();
m_startTime = oxitime = QDateTime::currentDateTime();
setStatus(LIVE);
return 1;
}
@ -111,7 +111,7 @@ void CMS50Loader::processBytes(QByteArray bytes)
{
// Sync to start of message type we are interested in
quint8 c;
quint8 msgcode = (m_status == IMPORTING) ? 0xf0 : 0x80;
quint8 msgcode = 0x80;
int idx=0;
int bytesread = bytes.size();
@ -157,17 +157,9 @@ void CMS50Loader::processBytes(QByteArray bytes)
int CMS50Loader::doImportMode()
{
if (finished_import) {
// CMS50E/F continue streaming after import, CMS50D+ stops dead
// there is a timer running at this stage that will kill the 50D
killTimers();
closeDevice();
m_importing = false;
imp_callbacks = 0;
return 0;
}
int hour,minute;
int available = buffer.size();
Q_ASSERT(!finished_import);
int hour,minute;
int idx = 0;
while (idx < available) {
unsigned char c=(unsigned char)buffer.at(idx);
@ -256,16 +248,16 @@ int CMS50Loader::doImportMode()
} else if (!started_reading) { // have not got a valid trio yet, skip...
idx += 1;
} else {
// trio's are over.. finish up.
//Completed
finished_import = true;
killTimers();
closeDevice();
started_import = false;
started_reading = false;
finished_import = true;
m_importing = false;
break;
//Completed
m_status = NEUTRAL;
emit importComplete(this);
return available;
imp_callbacks = cb_reset = 0;
return available;
}
}
}
@ -298,13 +290,6 @@ int CMS50Loader::doLiveMode()
oxirec.append(OxiRecord(pulse, spo2));
plethy.append(pwave);
int elapsed = m_time.elapsed();
// update the graph plots
if (elapsed > 1000) {
m_time.start();
emit updateDisplay(this);
}
idx += 5;
}
emit updatePlethy(plethy);
@ -386,7 +371,7 @@ void CMS50Loader::resetImportTimeout()
if (imp_callbacks != cb_reset) {
// Still receiving data.. reset timer
qDebug() << "Still receiving data in resetImportTimeout()";
qDebug() << "Still receiving data in resetImportTimeout()" << imp_callbacks << cb_reset;
if (resetTimer.isActive())
resetTimer.stop();
@ -403,9 +388,9 @@ void CMS50Loader::resetImportTimeout()
resetDevice(); // Send Reset to CMS50D+
//started_import = false;
finished_import = true;
m_streaming=false;
//m_streaming=false;
closeDevice();
//closeDevice();
//emit transferComplete();
//doImportComplete();
return;

11
sleepyhead/SleepLib/loader_plugins/cms50_loader.h
View File

@ -17,15 +17,6 @@
const QString cms50_class_name = "CMS50";
const int cms50_data_version = 4;
struct OxiRecord
{
quint8 pulse;
quint8 spo2;
OxiRecord():pulse(0), spo2(0) {}
OxiRecord(quint8 p, quint8 s): pulse(p), spo2(s) {}
OxiRecord(const OxiRecord & copy) { pulse = copy.pulse; spo2= copy.spo2; }
};
/*! \class CMS50Loader
\brief Bulk Importer for CMS50 SPO2Review format.. Deprecated, as the Oximetry module does a better job
@ -64,8 +55,6 @@ protected:
int doImportMode();
int doLiveMode();
QVector<OxiRecord> oxirec;
virtual void killTimers();
// Switch CMS50D+ device to live streaming mode

2
sleepyhead/SleepLib/machine_loader.cpp
View File

@ -53,7 +53,7 @@ void DestroyLoaders()
MachineLoader::MachineLoader() :QObject(nullptr)
{
m_importing = m_abort = m_streaming = false;
m_abort = false;
m_type = MT_UNKNOWN;
m_status = NEUTRAL;
}

36
sleepyhead/SleepLib/machine_loader.h
View File

@ -49,22 +49,20 @@ class MachineLoader: public QObject
virtual const QString &ClassName() = 0;
inline MachineType type() { return m_type; }
virtual bool openDevice() { return false; }
virtual void closeDevice() {}
virtual bool scanDevice(QString keyword="", quint16 vendor_id=0, quint16 product_id=0) {
Q_UNUSED(keyword)
Q_UNUSED(vendor_id)
Q_UNUSED(product_id)
return false;
}
// virtual bool openDevice() { return false; }
// virtual void closeDevice() {}
// virtual bool scanDevice(QString keyword="", quint16 vendor_id=0, quint16 product_id=0) {
// Q_UNUSED(keyword)
// Q_UNUSED(vendor_id)
// Q_UNUSED(product_id)
// return false;
// }
void queTask(ImportTask * task);
//! \brief Process Task list using all available threads.
void runTasks();
inline bool isStreaming() { return m_streaming; }
inline bool isImporting() { return m_importing; }
inline bool isAborted() { return m_abort; }
void abort() { m_abort = true; }
@ -75,16 +73,16 @@ class MachineLoader: public QObject
signals:
void updateProgress(int cnt, int total);
void updateDisplay(MachineLoader *);
// void updateDisplay(MachineLoader *);
protected slots:
virtual void dataAvailable() {}
virtual void resetImportTimeout() {}
virtual void startImportTimeout() {}
//protected slots:
// virtual void dataAvailable() {}
// virtual void resetImportTimeout() {}
// virtual void startImportTimeout() {}
protected:
virtual void killTimers(){}
virtual void resetDevice(){}
//protected:
// virtual void killTimers(){}
// virtual void resetDevice(){}
protected:
//! \brief Contains a list of Machine records known by this loader
@ -97,8 +95,6 @@ protected:
int m_currenttask;
int m_totaltasks;
bool m_streaming;
bool m_importing;
bool m_abort;
DeviceStatus m_status;

7
sleepyhead/SleepLib/serialoximeter.cpp
View File

@ -124,4 +124,9 @@ void SerialOximeter::dataAvailable()
processBytes(bytes);
}
void SerialOximeter::stopRecording()
{
closeDevice();
m_status = NEUTRAL;
emit importComplete(this);
}

33
sleepyhead/SleepLib/serialoximeter.h
View File

@ -19,11 +19,25 @@
const int START_TIMEOUT = 30000;
struct OxiRecord
{
quint8 pulse;
quint8 spo2;
OxiRecord():pulse(0), spo2(0) {}
OxiRecord(quint8 p, quint8 s): pulse(p), spo2(s) {}
OxiRecord(const OxiRecord & copy) { pulse = copy.pulse; spo2= copy.spo2; }
};
class SerialOximeter : public MachineLoader
{
Q_OBJECT
public:
SerialOximeter() : MachineLoader() {}
SerialOximeter() : MachineLoader() {
m_importing = m_streaming = false;
m_productID = m_vendorID = 0;
}
virtual ~SerialOximeter() {}
virtual bool Detect(const QString &path)=0;
@ -40,21 +54,32 @@ public:
virtual bool openDevice();
virtual void closeDevice();
inline bool isStreaming() { return m_streaming; }
inline bool isImporting() { return m_importing; }
virtual void process() {}
virtual Machine *CreateMachine(Profile *profile)=0;
QVector<OxiRecord> oxirec;
QDateTime startTime() { return m_startTime; }
signals:
void noDeviceFound();
void deviceDetected();
void updatePlethy(QByteArray plethy);
void importComplete(SerialOximeter *);
protected slots:
virtual void dataAvailable();
virtual void resetImportTimeout() {}
virtual void startImportTimeout() {}
virtual void stopRecording();
// virtual void abortTask();
protected:
virtual void processBytes(QByteArray buffer) { Q_UNUSED(buffer) }
@ -68,8 +93,14 @@ protected:
QTimer startTimer;
QTimer resetTimer;
QDateTime m_startTime;
quint16 m_productID;
quint16 m_vendorID;
bool m_streaming;
bool m_importing;
};
#endif // SERIALOXIMETER_H

109
sleepyhead/oximeterimport.cpp
View File

@ -66,6 +66,8 @@ OximeterImport::OximeterImport(QWidget *parent) :
dummyday = nullptr;
session = nullptr;
ELplethy = nullptr;
pulse = spo2 = -1;
}
OximeterImport::~OximeterImport()
@ -205,10 +207,13 @@ void OximeterImport::on_directImportButton_clicked()
// Can't abort this bit or the oximeter will get confused...
ui->cancelButton->setVisible(false);
while (oximodule->isImporting() && !oximodule->isAborted()) {
QThread::msleep(50);
QApplication::processEvents();
connect(oximodule, SIGNAL(importComplete(SerialOximeter*)), this, SLOT(finishedImport(SerialOximeter*)));
}
void OximeterImport::finishedImport(SerialOximeter * oxi)
{
disconnect(ui->stopButton, SIGNAL(clicked()), this, SLOT(finishedImport()));
ui->cancelButton->setVisible(true);
updateStatus(tr("Oximeter import completed.. Processing data"));
oximodule->process();
@ -221,7 +226,6 @@ void OximeterImport::on_directImportButton_clicked()
ui->calendarWidget->setMaximumDate(PROFILE.LastDay());
on_calendarWidget_clicked(PROFILE.LastDay());
}
void OximeterImport::doUpdateProgress(int v, int t)
@ -296,7 +300,7 @@ void OximeterImport::on_liveImportButton_clicked()
connect(oximodule, SIGNAL(updatePlethy(QByteArray)), this, SLOT(on_updatePlethy(QByteArray)));
ui->liveConnectLabel->setText("Live Oximetery Mode");
liveView->setEmptyText(tr("Recording..."));
liveView->setEmptyText(tr("Starting up..."));
ui->progressBar->hide();
liveView->update();
oximodule->Open("live",p_profile);
@ -304,7 +308,7 @@ void OximeterImport::on_liveImportButton_clicked()
dummyday = new Day(mach);
quint32 starttime = QDateTime::currentDateTime().toTime_t();
quint32 starttime = oximodule->startTime().toTime_t();
ti = qint64(starttime) * 1000L;
start_ti = ti;
@ -321,32 +325,28 @@ void OximeterImport::on_liveImportButton_clicked()
liveView->setDay(dummyday);
QTime time;
time.start();
while (oximodule->isStreaming() && !oximodule->isAborted()) {
QThread::msleep(50);
QApplication::processEvents();
// if (time.elapsed() > 100) {
time.restart();
updateLiveDisplay();
// }
if (!isVisible()) {
disconnect(oximodule, SIGNAL(updatePlethy(QByteArray)), this, SLOT(on_updatePlethy(QByteArray)));
updateTimer.setParent(this);
updateTimer.setInterval(50);
updateTimer.start();
connect(&updateTimer, SIGNAL(timeout()), this, SLOT(updateLiveDisplay()));
connect(ui->stopButton, SIGNAL(clicked()), this, SLOT(finishedRecording()));
}
void OximeterImport::finishedRecording()
{
updateTimer.stop();
oximodule->closeDevice();
delete dummyday;
session = nullptr;
dummyday = nullptr;
return;
}
}
disconnect(&updateTimer, SIGNAL(timeout()), this, SLOT(updateLiveDisplay()));
disconnect(ui->stopButton, SIGNAL(clicked()), this, SLOT(finishedRecording()));
ui->stopButton->setVisible(false);
ui->liveConnectLabel->setText("Live Import Stopped");
liveView->setEmptyText(tr("Live Oximetery Stopped"));
updateStatus(tr("Live Oximetery import has been stopped"));
oximodule->closeDevice();
disconnect(oximodule, SIGNAL(updatePlethy(QByteArray)), this, SLOT(on_updatePlethy(QByteArray)));
// Remember to clear sessionlist before deleting dummyday. or it will destroy session.
// delete dummyday;
//ui->stackedWidget->setCurrentWidget(ui->syncPage);
@ -356,6 +356,7 @@ void OximeterImport::on_liveImportButton_clicked()
ui->calendarWidget->setMaximumDate(PROFILE.LastDay());
plethyGraph->SetMinX(start_ti);
liveView->SetXBounds(start_ti, ti, 0, true);
plethyGraph->setBlockZoom(false);
@ -487,6 +488,8 @@ void OximeterImport::updateLiveDisplay()
if (!session) {
return;
}
if (ui->showLiveGraphs->isChecked()) {
qint64 sti = ti - 20000;
plethyChart->setMinY(ELplethy->Min());
plethyChart->setMaxY(ELplethy->Max());
@ -503,20 +506,74 @@ void OximeterImport::updateLiveDisplay()
session->setMin(OXI_Plethy, ELplethy->Min());
session->setMax(OXI_Plethy, ELplethy->Max());
session->setLast(OXI_Plethy, ti);
session->setCount(OXI_Plethy, session->count(OXI_Plethy));
session->setCount(OXI_Plethy, ELplethy->count());
for (int i = 0; i < liveView->size(); i++) {
(*liveView)[i]->SetXBounds(sti, ti);
}
liveView->updateScale();
liveView->timedRedraw(25);
liveView->redraw();
}
int size = oximodule->oxirec.size();
if (size > 0) {
int i = oximodule->startTime().secsTo(QDateTime::currentDateTime());
int seconds = i % 60;
int minutes = (i / 60) % 60;
int hours = i / 3600;
size--;
bool datagood = oximodule->oxirec[size].pulse > 0;
QString STR_recording = tr("Recording...");
QString STR_nofinger = tr("Finger not detected");
if (datagood & (pulse <= 0)) {
updateStatus(STR_recording);
liveView->setEmptyText(STR_recording);
if (!ui->showLiveGraphs->isChecked()) {
liveView->redraw();
}
} else if (!datagood & (pulse != 0)) {
updateStatus(STR_nofinger);
liveView->setEmptyText(STR_nofinger);
if (!ui->showLiveGraphs->isChecked()) {
liveView->redraw();
}
}
pulse = oximodule->oxirec[size].pulse;
spo2 = oximodule->oxirec[size].spo2;
if (pulse > 0) {
ui->pulseDisplay->display(QString().sprintf("%3i", pulse));
} else {
ui->pulseDisplay->display("---");
}
if (spo2 > 0) {
ui->spo2Display->display(QString().sprintf("%2i", spo2));
} else {
ui->spo2Display->display("--");
}
ui->lcdDuration->display(QString().sprintf("%02i:%02i:%02i",hours, minutes, seconds));
}
}
void OximeterImport::on_cancelButton_clicked()
{
if (oximodule && oximodule->isStreaming()) {
oximodule->closeDevice();
}
reject();
}
void OximeterImport::on_showLiveGraphs_clicked(bool checked)
{
plethyGraph->setVisible(checked);
liveView->redraw();
}

11
sleepyhead/oximeterimport.h
View File

@ -53,13 +53,17 @@ private slots:
void on_cancelButton_clicked();
void on_showLiveGraphs_clicked(bool checked);
protected slots:
void on_updatePlethy(QByteArray plethy);
void finishedRecording();
void finishedImport(SerialOximeter*);
void updateLiveDisplay();
protected:
SerialOximeter * detectOximeter();
void updateStatus(QString msg);
void updateLiveDisplay();
private:
Ui::OximeterImport *ui;
@ -72,6 +76,11 @@ private:
SessionBar * sessbar;
EventList * ELplethy;
qint64 start_ti, ti;
QTimer updateTimer;
int pulse;
int spo2;
};
#endif // OXIMETERIMPORT_H

187
sleepyhead/oximeterimport.ui
View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>851</width>
<width>915</width>
<height>615</height>
</rect>
</property>
@ -620,7 +620,7 @@
<item>
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>4</number>
<number>3</number>
</property>
<widget class="QWidget" name="welcomePage">
<layout class="QVBoxLayout" name="verticalLayout">
@ -895,6 +895,16 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="liveStatusLabel">
<property name="text">
<string>Press Start to commence recording</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QFrame" name="frame_3">
<property name="sizePolicy">
@ -910,10 +920,30 @@ p, li { white-space: pre-wrap; }
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<property name="spacing">
<number>4</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="liveStatusLabel">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QCheckBox" name="showLiveGraphs">
<property name="text">
<string>Press Start to commence recording</string>
<string>Show Live Graphs</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
@ -931,7 +961,28 @@ p, li { white-space: pre-wrap; }
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Duration</string>
</property>
</widget>
</item>
<item>
<widget class="QLCDNumber" name="lcdDuration">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="digitCount">
<number>8</number>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_7">
<property name="text">
@ -940,12 +991,67 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLCDNumber" name="spo2Display"/>
<widget class="QLCDNumber" name="spo2Display">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>60</width>
<height>50</height>
</size>
</property>
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>106</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>106</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>127</red>
<green>127</green>
<blue>127</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="digitCount">
<number>2</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QLabel" name="label_8">
<property name="text">
@ -954,7 +1060,66 @@ p, li { white-space: pre-wrap; }
</widget>
</item>
<item>
<widget class="QLCDNumber" name="pulseDisplay"/>
<widget class="QLCDNumber" name="pulseDisplay">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>80</width>
<height>50</height>
</size>
</property>
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>159</red>
<green>0</green>
<blue>85</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="smallDecimalPoint">
<bool>false</bool>
</property>
<property name="digitCount">
<number>3</number>
</property>
</widget>
</item>
</layout>
</item>