chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Work on Live Oximetery mode

Browse Source
This commit is contained in:
Mark Watkins 2014-05-26 02:20:33 +10:00
parent ce1e03e86a
commit 17a7ac924b
12 changed files with 450 additions and 542 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sleepyhead/Graphs/gGraphView.cpp
View File

@ -839,7 +839,7 @@ bool gGraphView::renderGraphs(QPainter &painter)
queGraph(m_graphs[i], px + tw, py, width() - tw, h); queGraph(m_graphs[i], px + tw, py, width() - tw, h);
if (m_showsplitter) { if ((m_graphs.size() > 1) && m_showsplitter) {
// draw the splitter handle // draw the splitter handle
painter.setPen(QColor(158,158,158,255)); painter.setPen(QColor(158,158,158,255));
painter.drawLine(0, py + h, w, py + h); painter.drawLine(0, py + h, w, py + h);
@ -897,7 +897,7 @@ bool gGraphView::renderGraphs(QPainter &painter)
queGraph(m_graphs[i], px + tw, py, width() - tw, h); queGraph(m_graphs[i], px + tw, py, width() - tw, h);
if (m_showsplitter) { if ((m_graphs.size() > 1) && m_showsplitter) {
// draw the splitter handle // draw the splitter handle
painter.setPen(QColor(220, 220, 220, 255)); painter.setPen(QColor(220, 220, 220, 255));
painter.drawLine(0, py + h, w, py + h); painter.drawLine(0, py + h, w, py + h);

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

@ -29,8 +29,6 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QPushButton> #include <QPushButton>
#include <QtSerialPort/QSerialPortInfo>
using namespace std; using namespace std;
#include "cms50_loader.h" #include "cms50_loader.h"
@ -39,105 +37,75 @@ using namespace std;
extern QProgressBar *qprogress; extern QProgressBar *qprogress;
const int START_TIMEOUT = 30000; CMS50Loader::CMS50Loader()
// Possibly need to replan this to include oximetry
bool SerialLoader::scanDevice(QString keyword,quint16 vendor_id, quint16 product_id)
{ {
QStringList ports; m_type = MT_OXIMETER;
m_abort = false;
//qDebug() << "Scanning for USB Serial devices";
QList<QSerialPortInfo> list=QSerialPortInfo::availablePorts();
// How does the mac detect this as a SPO2 device?
for (int i=0;i<list.size();i++) {
const QSerialPortInfo * info=&list.at(i);
QString name=info->portName();
QString desc=info->description();
if ((!keyword.isEmpty() && desc.contains(keyword)) ||
((info->hasVendorIdentifier() && (info->vendorIdentifier()==vendor_id))
&& (info->hasProductIdentifier() && (info->productIdentifier()==product_id))))
{
ports.push_back(name);
QString dbg=QString("Found Serial Port: %1 %2 %3 %4").arg(name).arg(desc).arg(info->manufacturer()).arg(info->systemLocation());
if (info->hasProductIdentifier()) //60000
dbg+=QString(" PID: %1").arg(info->productIdentifier());
if (info->hasVendorIdentifier()) // 4292
dbg+=QString(" VID: %1").arg(info->vendorIdentifier());
qDebug() << dbg.toLocal8Bit().data();
break;
}
}
if (ports.isEmpty()) {
return false;
}
if (ports.size()>1) {
qDebug() << "More than one serial device matching these parameters was found, choosing the first by default";
}
port=ports.at(0);
return true;
}
void SerialLoader::closeDevice()
{
killTimers();
disconnect(&serial,SIGNAL(readyRead()), this, SLOT(dataAvailable()));
serial.close();
m_streaming = false; m_streaming = false;
qDebug() << "Port" << port << "closed"; m_importing = false;
imp_callbacks = 0;
m_vendorID = 0x10c4;
m_productID = 0xea60;
startTimer.setParent(this);
resetTimer.setParent(this);
} }
bool SerialLoader::openDevice() CMS50Loader::~CMS50Loader()
{ {
if (port.isEmpty()) { }
if (!scanDevice("",m_vendorID, m_productID))
bool CMS50Loader::Detect(const QString &path)
{
Q_UNUSED(path);
return false; return false;
} }
serial.setPortName(port);
if (!serial.open(QSerialPort::ReadWrite))
return false;
// forward this stuff int CMS50Loader::Open(QString path, Profile *profile)
{
// Set up serial port attributes // Only one active Oximeter module at a time, set in preferences
serial.setBaudRate(QSerialPort::Baud19200); Q_UNUSED(profile)
serial.setParity(QSerialPort::OddParity);
serial.setStopBits(QSerialPort::OneStop); m_itemCnt = 0;
serial.setDataBits(QSerialPort::Data8); m_itemTotal = 0;
serial.setFlowControl(QSerialPort::NoFlowControl);
m_streaming = true;
m_abort = false; m_abort = false;
m_importing = false; m_importing = false;
// connect relevant signals started_import = false;
connect(&serial,SIGNAL(readyRead()), this, SLOT(dataAvailable())); started_reading = false;
finished_import = false;
return true; imp_callbacks = 0;
cb_reset = 0;
m_time.start();
// Cheating using path for two serial oximetry modes
if (path.compare("import") == 0) {
setStatus(IMPORTING);
startTimer.stop();
startImportTimeout();
return 1;
} else if (path.compare("live") == 0) {
oxitime = QDateTime::currentDateTime();
setStatus(LIVE);
return 1;
}
QString ext = path.section(".",1);
if ((ext.compare("spo", Qt::CaseInsensitive)==0) || (ext.compare("spor", Qt::CaseInsensitive)==0)) {
// try to read and process SpoR file..
return readSpoRFile(path) ? 1 : 0;
} }
void SerialLoader::dataAvailable() return 0;
{
QByteArray bytes;
int available = serial.bytesAvailable();
bytes.resize(available);
int bytesread = serial.read(bytes.data(), available);
if (bytesread == 0)
return;
if (m_abort) {
closeDevice();
return;
} }
processBytes(bytes);
}
void CMS50Loader::processBytes(QByteArray bytes) void CMS50Loader::processBytes(QByteArray bytes)
{ {
@ -315,7 +283,9 @@ int CMS50Loader::doLiveMode()
{ {
int available = buffer.size(); int available = buffer.size();
int idx = 0; int idx = 0;
while (idx < available) {
QByteArray plethy;
while (idx < available-5) {
if (((unsigned char)buffer.at(idx) & 0x80) != 0x80) { if (((unsigned char)buffer.at(idx) & 0x80) != 0x80) {
idx++; idx++;
continue; continue;
@ -324,8 +294,20 @@ int CMS50Loader::doLiveMode()
int pbeat=(unsigned char)buffer.at(idx + 2); int pbeat=(unsigned char)buffer.at(idx + 2);
int pulse=((unsigned char)buffer.at(idx + 3) & 0x7f) | ((pbeat & 0x40) << 1); int pulse=((unsigned char)buffer.at(idx + 3) & 0x7f) | ((pbeat & 0x40) << 1);
int spo2=(unsigned char)buffer.at(idx + 4) & 0x7f; int spo2=(unsigned char)buffer.at(idx + 4) & 0x7f;
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; idx += 5;
} }
emit updatePlethy(plethy);
return idx; return idx;
} }
@ -435,68 +417,6 @@ void CMS50Loader::resetImportTimeout()
CMS50Loader::CMS50Loader()
{
m_type = MT_OXIMETER;
m_abort = false;
m_streaming = false;
m_importing = false;
imp_callbacks = 0;
m_vendorID = 0x10c4;
m_productID = 0xea60;
startTimer.setParent(this);
resetTimer.setParent(this);
}
CMS50Loader::~CMS50Loader()
{
}
bool CMS50Loader::Detect(const QString &path)
{
Q_UNUSED(path);
return false;
}
int CMS50Loader::Open(QString path, Profile *profile)
{
// Only one active Oximeter module at a time, set in preferences
Q_UNUSED(profile)
m_itemCnt = 0;
m_itemTotal = 0;
m_abort = false;
m_importing = false;
started_import = false;
started_reading = false;
finished_import = false;
imp_callbacks = 0;
cb_reset = 0;
// Cheating using path for two serial oximetry modes
if (path.compare("import") == 0) {
setStatus(IMPORTING);
m_time.start();
startTimer.stop();
startImportTimeout();
return 1;
} else if (path.compare("live") == 0) {
setStatus(LIVE);
return 1;
}
// try to read and process SpoR file..
return readSpoRFile(path);
}
bool CMS50Loader::readSpoRFile(QString path) bool CMS50Loader::readSpoRFile(QString path)
{ {
@ -505,12 +425,6 @@ bool CMS50Loader::readSpoRFile(QString path)
return false; return false;
} }
QString ext = path.section(".",1);
if ((ext.compare("spo",Qt::CaseInsensitive)==0)
&& (ext.compare("spor",Qt::CaseInsensitive)==0)) {
return false;
}
file.open(QFile::ReadOnly); file.open(QFile::ReadOnly);
QByteArray data; QByteArray data;
@ -548,7 +462,6 @@ bool CMS50Loader::readSpoRFile(QString path)
return true; return true;
} }
Machine *CMS50Loader::CreateMachine(Profile *profile) Machine *CMS50Loader::CreateMachine(Profile *profile)
{ {
if (!profile) { if (!profile) {
@ -582,222 +495,23 @@ Machine *CMS50Loader::CreateMachine(Profile *profile)
return m; return m;
} }
Qt::DayOfWeek firstDayOfWeekFromLocale();
#include <QAction>
DateTimeDialog::DateTimeDialog(QString message, QWidget * parent, Qt::WindowFlags flags)
:QDialog(parent, flags)
{
layout = new QVBoxLayout(this);
setModal(true);
font.setPointSize(25);
m_msglabel = new QLabel(message);
m_msglabel->setAlignment(Qt::AlignHCenter);
m_msglabel->setFont(font);
layout->addWidget(m_msglabel);
m_cal = new QCalendarWidget(this);
m_cal->setFirstDayOfWeek(Qt::Sunday);
QTextCharFormat format = m_cal->weekdayTextFormat(Qt::Saturday);
format.setForeground(QBrush(Qt::black, Qt::SolidPattern));
m_cal->setWeekdayTextFormat(Qt::Saturday, format);
m_cal->setWeekdayTextFormat(Qt::Sunday, format);
m_cal->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader);
Qt::DayOfWeek dow=firstDayOfWeekFromLocale();
m_cal->setFirstDayOfWeek(dow);
m_timeedit = new MyTimeEdit(this);
m_timeedit->setDisplayFormat("hh:mm:ss ap");
m_timeedit->setMinimumHeight(m_timeedit->height() + 10);
m_timeedit->setFont(font);
m_timeedit->setCurrentSectionIndex(0);
m_timeedit->editor()->setStyleSheet(
"selection-color: white;"
"selection-background-color: lightgray;"
);
layout->addWidget(m_cal);
m_bottomlabel = new QLabel(this);
m_bottomlabel->setVisible(false);
m_bottomlabel->setAlignment(Qt::AlignCenter);
layout->addWidget(m_bottomlabel);
sessbar = new SessionBar(this);
sessbar->setMinimumHeight(40);
sessbar->setSelectMode(true);
sessbar->setMouseTracking(true);
connect(sessbar, SIGNAL(sessionClicked(Session*)), this, SLOT(onSessionSelected(Session*)));
layout->addWidget(sessbar,1);
layout2 = new QHBoxLayout();
layout->addLayout(layout2);
acceptbutton = new QPushButton (QObject::tr("&Accept"));
resetbutton = new QPushButton (QObject::tr("&Abort"));
resetbutton->setShortcut(QKeySequence(Qt::Key_Escape));
// shortcutQuit = new QShortcut(, this, SLOT(reject()), SLOT(reject()));
layout2->addWidget(m_timeedit);
layout2->addWidget(acceptbutton);
layout2->addWidget(resetbutton);
connect(resetbutton, SIGNAL(clicked()), this, SLOT(reject()));
connect(acceptbutton, SIGNAL(clicked()), this, SLOT(accept()));
connect(m_cal, SIGNAL(clicked(QDate)), this, SLOT(onDateSelected(QDate)));
connect(m_cal, SIGNAL(activated(QDate)), this, SLOT(onDateSelected(QDate)));
connect(m_cal, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
connect(m_cal, SIGNAL(currentPageChanged(int,int)), this, SLOT(onCurrentPageChanged(int,int)));
}
DateTimeDialog::~DateTimeDialog()
{
disconnect(m_cal, SIGNAL(currentPageChanged(int,int)), this, SLOT(onCurrentPageChanged(int,int)));
disconnect(m_cal, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
disconnect(m_cal, SIGNAL(activated(QDate)), this, SLOT(onDateSelected(QDate)));
disconnect(m_cal, SIGNAL(clicked(QDate)), this, SLOT(onDateSelected(QDate)));
disconnect(acceptbutton, SIGNAL(clicked()), this, SLOT(accept()));
disconnect(resetbutton, SIGNAL(clicked()), this, SLOT(reject()));
disconnect(sessbar, SIGNAL(sessionClicked(Session*)), this, SLOT(onSessionSelected(Session*)));
}
void DateTimeDialog::onCurrentPageChanged(int year, int month)
{
Q_UNUSED(year);
Q_UNUSED(month);
onDateSelected(m_cal->selectedDate());
}
void DateTimeDialog::onSelectionChanged()
{
onDateSelected(m_cal->selectedDate());
}
void DateTimeDialog::onDateSelected(QDate date)
{
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()));
}
//sessbar->setVisible(true);
setBottomMessage(QString("%1 session(s), starting at %2").arg(day->size()).arg(time.time().toString("hh:mm:ssap")));
} else {
setBottomMessage("No CPAP Data available for this date");
// sessbar->setVisible(false);
}
sessbar->update();
}
void DateTimeDialog::onSessionSelected(Session * session)
{
QDateTime time=QDateTime::fromMSecsSinceEpoch(session->first());
m_timeedit->setTime(time.time());
}
QDateTime DateTimeDialog::execute(QDateTime datetime)
{
m_timeedit->setTime(datetime.time());
m_cal->setCurrentPage(datetime.date().year(), datetime.date().month());
m_cal->setSelectedDate(datetime.date());
m_cal->setMinimumDate(PROFILE.FirstDay());
m_cal->setMaximumDate(QDate::currentDate());
onDateSelected(datetime.date());
if (QDialog::exec() == QDialog::Accepted) {
return QDateTime(m_cal->selectedDate(), m_timeedit->time());
} else {
return datetime;
}
}
void DateTimeDialog::reject()
{
if (QMessageBox::question(this,STR_MessageBox_Warning,
QObject::tr("Closing this dialog will leave this time unedited.")+"<br/><br/>"+
QObject::tr("Are you sure you want to do this?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::Yes) {
QDialog::reject();
}
}
void CMS50Loader::process() void CMS50Loader::process()
{ {
int size=oxirec.size(); int size=oxirec.size();
if (size<10) if (size<10)
return; return;
return;
QDateTime cpaptime; // EventList *PULSE=new EventList(EVL_Event);
Day *day = PROFILE.GetDay(PROFILE.LastDay(), MT_CPAP); // EventList *SPO2=new EventList(EVL_Event);
if (day) {
int ti = day->first() / 1000L;
cpaptime = QDateTime::fromTime_t(ti);
if (cms50dplus) {
if (QMessageBox::question(nullptr, STR_MessageBox_Question,
"<h2>"+tr("Oximeter import completed")+"</h2><br/><br/>"+
tr("Oximeter import completed successfully, but your device did not record a starting time.")+"<br/><br/>"+
tr("If you remembered to start your oximeter at exactly the same time as your CPAP session, you can sync to the first CPAP session of the day last recorded.")+
tr("Otherwise you can adjust the time yourself."), tr("Use CPAP"), tr("Set Manually"), "", 0, 1)==0) {
oxitime=cpaptime;
} else {
DateTimeDialog dlg(tr("Oximeter starting time"));
oxitime = dlg.execute(oxitime);
}
} else {
if (qAbs(oxitime.secsTo(cpaptime)) > 60) {
if (QMessageBox::question(nullptr, STR_MessageBox_Question,
"<h2>"+tr("Oximeter import completed")+"</h2><br/>"+
tr("Which devices starting time do you wish to use for this oximetry session?")+"<br/><br/>"+
tr("If you started both devices at exactly the same time, or don't know if the clock is set correctly on either devices, choose CPAP."),STR_TR_CPAP, STR_TR_Oximeter, "", 0, -1)==0) {
oxitime=cpaptime;
qDebug() << "Chose CPAP starting time";
} else {
DateTimeDialog dlg(tr("Oximeter starting time"));
oxitime = dlg.execute(oxitime);
qDebug() << "Chose Oximeter starting time";
}
} else {
// don't bother asking.. use CPAP
oxitime=cpaptime;
}
}
} else {
if (cms50dplus) {
QMessageBox::information(nullptr, STR_MessageBox_Information,
"<h2>"+tr("Oximeter import completed")+"</h2><br/>"+
tr("Your oximeter does not record a starting time, and no CPAP session is available to match it to")+"<br/><br/>"+
tr("You will have to adjust the starting time of this oximetery session manually."),
QMessageBox::Ok, QMessageBox::Ok);
DateTimeDialog dlg(tr("Oximeter starting time"));
oxitime = dlg.execute(oxitime);
}
}
EventList *PULSE=new EventList(EVL_Event);
EventList *SPO2=new EventList(EVL_Event);
quint64 ti = oxitime.toMSecsSinceEpoch(); // quint64 ti = oxitime.toMSecsSinceEpoch();
for (int i=0; i < size; ++i) { // for (int i=0; i < size; ++i) {
//PULSE->AddWaveform // //PULSE->AddWaveform
} // }
qDebug() << "Processing" << oxirec.size() << "oximetry records"; // qDebug() << "Processing" << oxirec.size() << "oximetry records";
} }

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

@ -12,10 +12,7 @@
#ifndef CMS50LOADER_H #ifndef CMS50LOADER_H
#define CMS50LOADER_H #define CMS50LOADER_H
#include <QtSerialPort/QSerialPort> #include "SleepLib/serialoximeter.h"
#include <QTimer>
#include "SleepLib/machine_loader.h"
const QString cms50_class_name = "CMS50"; const QString cms50_class_name = "CMS50";
const int cms50_data_version = 4; const int cms50_data_version = 4;
@ -29,59 +26,11 @@ struct OxiRecord
OxiRecord(const OxiRecord & copy) { pulse = copy.pulse; spo2= copy.spo2; } OxiRecord(const OxiRecord & copy) { pulse = copy.pulse; spo2= copy.spo2; }
}; };
class SerialLoader : public MachineLoader
{
Q_OBJECT
public:
SerialLoader() : MachineLoader() {}
virtual ~SerialLoader() {};
virtual bool Detect(const QString &path)=0;
virtual int Open(QString path, Profile *profile)=0;
static void Register() {}
virtual int Version()=0;
virtual const QString &ClassName()=0;
// Serial Stuff
virtual bool scanDevice(QString keyword="",quint16 vendor_id=0, quint16 product_id=0);
virtual bool openDevice();
virtual void closeDevice();
virtual void process() {}
signals:
void noDeviceFound();
void deviceDetected();
protected slots:
virtual void dataAvailable();
virtual void resetImportTimeout() {}
virtual void startImportTimeout() {}
protected:
virtual void processBytes(QByteArray buffer) { Q_UNUSED(buffer) }
virtual void killTimers() {}
virtual void resetDevice() {}
virtual void requestData() {}
QString port;
QSerialPort serial;
QTimer startTimer;
QTimer resetTimer;
quint16 m_productID;
quint16 m_vendorID;
};
/*! \class CMS50Loader /*! \class CMS50Loader
\brief Bulk Importer for CMS50 SPO2Review format.. Deprecated, as the Oximetry module does a better job \brief Bulk Importer for CMS50 SPO2Review format.. Deprecated, as the Oximetry module does a better job
*/ */
class CMS50Loader : public SerialLoader class CMS50Loader : public SerialOximeter
{ {
Q_OBJECT Q_OBJECT
public: public:
@ -149,69 +98,5 @@ protected:
}; };
#include <QTimeEdit>
#include <QCalendarWidget>
#include <QHBoxLayout>
#include <QTextCharFormat>
#include <QFont>
#include <QShortcut>
#include <QLineEdit>
class MyTimeEdit: public QDateTimeEdit
{
public:
MyTimeEdit(QWidget *parent):QDateTimeEdit(parent) {
setKeyboardTracking(true);
this->setDisplayFormat("hh:mm:ssap");
editor()->setAlignment(Qt::AlignCenter);
}
QLineEdit * editor() const {
return this->lineEdit();
}
};
#include <QLabel>
#include <QDialog>
#include "sessionbar.h"
class DateTimeDialog : public QDialog
{
Q_OBJECT
public:
DateTimeDialog(QString message, QWidget * parent = nullptr, Qt::WindowFlags flags = Qt::Dialog);
~DateTimeDialog();
QDateTime execute(QDateTime datetime);
void setMessage(QString msg) { m_msglabel->setText(msg); }
void setBottomMessage(QString msg) { m_bottomlabel->setText(msg); m_bottomlabel->setVisible(true);}
QCalendarWidget * cal() { return m_cal; }
signals:
public slots:
void reject();
void onDateSelected(QDate date);
void onSelectionChanged();
void onCurrentPageChanged(int year, int month);
void onSessionSelected(Session *);
protected:
QVBoxLayout * layout;
QHBoxLayout * layout2;
QPushButton *acceptbutton;
QPushButton *resetbutton;
QLabel * m_msglabel;
QLabel * m_bottomlabel;
QCalendarWidget * m_cal;
MyTimeEdit * m_timeedit;
SessionBar * sessbar;
QFont font;
QShortcut * shortcutQuit;
};
#endif // CMS50LOADER_H #endif // CMS50LOADER_H

1
sleepyhead/SleepLib/machine_loader.h
View File

@ -75,6 +75,7 @@ class MachineLoader: public QObject
signals: signals:
void updateProgress(int cnt, int total); void updateProgress(int cnt, int total);
void updateDisplay(MachineLoader *);
protected slots: protected slots:
virtual void dataAvailable() {} virtual void dataAvailable() {}

127
sleepyhead/SleepLib/serialoximeter.cpp Normal file
View File

@ -0,0 +1,127 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib Machine Loader Class 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 <QtSerialPort/QSerialPortInfo>
#include "serialoximeter.h"
// Possibly need to replan this to include oximetry
QList<SerialOximeter *> GetOxiLoaders()
{
QList<SerialOximeter *> oxiloaders;
QList<MachineLoader *> loaders = GetLoaders(MT_OXIMETER);
Q_FOREACH(MachineLoader * loader, loaders) {
SerialOximeter * oxi = qobject_cast<SerialOximeter *>(loader);
oxiloaders.push_back(oxi);
}
return oxiloaders;
}
bool SerialOximeter::scanDevice(QString keyword,quint16 vendor_id, quint16 product_id)
{
QStringList ports;
//qDebug() << "Scanning for USB Serial devices";
QList<QSerialPortInfo> list=QSerialPortInfo::availablePorts();
// How does the mac detect this as a SPO2 device?
for (int i=0;i<list.size();i++) {
const QSerialPortInfo * info=&list.at(i);
QString name=info->portName();
QString desc=info->description();
if ((!keyword.isEmpty() && desc.contains(keyword)) ||
((info->hasVendorIdentifier() && (info->vendorIdentifier()==vendor_id))
&& (info->hasProductIdentifier() && (info->productIdentifier()==product_id))))
{
ports.push_back(name);
QString dbg=QString("Found Serial Port: %1 %2 %3 %4").arg(name).arg(desc).arg(info->manufacturer()).arg(info->systemLocation());
if (info->hasProductIdentifier()) //60000
dbg+=QString(" PID: %1").arg(info->productIdentifier());
if (info->hasVendorIdentifier()) // 4292
dbg+=QString(" VID: %1").arg(info->vendorIdentifier());
qDebug() << dbg.toLocal8Bit().data();
break;
}
}
if (ports.isEmpty()) {
return false;
}
if (ports.size()>1) {
qDebug() << "More than one serial device matching these parameters was found, choosing the first by default";
}
port=ports.at(0);
return true;
}
void SerialOximeter::closeDevice()
{
killTimers();
disconnect(&serial,SIGNAL(readyRead()), this, SLOT(dataAvailable()));
serial.close();
m_streaming = false;
qDebug() << "Port" << port << "closed";
}
bool SerialOximeter::openDevice()
{
if (port.isEmpty()) {
if (!scanDevice("",m_vendorID, m_productID))
return false;
}
serial.setPortName(port);
if (!serial.open(QSerialPort::ReadWrite))
return false;
// forward this stuff
// Set up serial port attributes
serial.setBaudRate(QSerialPort::Baud19200);
serial.setParity(QSerialPort::OddParity);
serial.setStopBits(QSerialPort::OneStop);
serial.setDataBits(QSerialPort::Data8);
serial.setFlowControl(QSerialPort::NoFlowControl);
m_streaming = true;
m_abort = false;
m_importing = false;
// connect relevant signals
connect(&serial,SIGNAL(readyRead()), this, SLOT(dataAvailable()));
return true;
}
void SerialOximeter::dataAvailable()
{
QByteArray bytes;
int available = serial.bytesAvailable();
bytes.resize(available);
int bytesread = serial.read(bytes.data(), available);
if (bytesread == 0)
return;
if (m_abort) {
closeDevice();
return;
}
processBytes(bytes);
}

75
sleepyhead/SleepLib/serialoximeter.h Normal file
View File

@ -0,0 +1,75 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sts=4 et sw=4 tw=99:
*
* SleepLib MachineLoader Base Class 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 SERIALOXIMETER_H
#define SERIALOXIMETER_H
#include <QTimer>
#include <QtSerialPort/QSerialPort>
#include "SleepLib/machine_loader.h"
const int START_TIMEOUT = 30000;
class SerialOximeter : public MachineLoader
{
Q_OBJECT
public:
SerialOximeter() : MachineLoader() {}
virtual ~SerialOximeter() {}
virtual bool Detect(const QString &path)=0;
virtual int Open(QString path, Profile *profile)=0;
static void Register() {}
virtual int Version()=0;
virtual const QString &ClassName()=0;
// Serial Stuff
virtual bool scanDevice(QString keyword="",quint16 vendor_id=0, quint16 product_id=0);
virtual bool openDevice();
virtual void closeDevice();
virtual void process() {}
virtual Machine *CreateMachine(Profile *profile)=0;
signals:
void noDeviceFound();
void deviceDetected();
void updatePlethy(QByteArray plethy);
protected slots:
virtual void dataAvailable();
virtual void resetImportTimeout() {}
virtual void startImportTimeout() {}
protected:
virtual void processBytes(QByteArray buffer) { Q_UNUSED(buffer) }
virtual void killTimers() {}
virtual void resetDevice() {}
virtual void requestData() {}
QString port;
QSerialPort serial;
QTimer startTimer;
QTimer resetTimer;
quint16 m_productID;
quint16 m_vendorID;
};
#endif // SERIALOXIMETER_H

140
sleepyhead/oximeterimport.cpp
View File

@ -12,6 +12,7 @@
#include "SleepLib/loader_plugins/cms50_loader.h" #include "SleepLib/loader_plugins/cms50_loader.h"
Qt::DayOfWeek firstDayOfWeekFromLocale(); Qt::DayOfWeek firstDayOfWeekFromLocale();
QList<SerialOximeter *> GetOxiLoaders();
OximeterImport::OximeterImport(QWidget *parent) : OximeterImport::OximeterImport(QWidget *parent) :
QDialog(parent), QDialog(parent),
@ -31,10 +32,14 @@ OximeterImport::OximeterImport(QWidget *parent) :
lvlayout->setMargin(0); lvlayout->setMargin(0);
ui->liveViewFrame->setLayout(lvlayout); ui->liveViewFrame->setLayout(lvlayout);
lvlayout->addWidget(liveView); lvlayout->addWidget(liveView);
PLETHY = new gGraph(liveView, STR_TR_Plethy, STR_UNIT_Hz); plethyGraph = new gGraph(liveView, STR_TR_Plethy, STR_UNIT_Hz);
PLETHY->AddLayer(new gYAxis(), LayerLeft, gYAxis::Margin);
PLETHY->AddLayer(new gXAxis(), LayerBottom, 0, 20); plethyGraph->AddLayer(new gYAxis(), LayerLeft, gYAxis::Margin);
PLETHY->AddLayer(plethyChart = new gLineChart(OXI_Plethy)); plethyGraph->AddLayer(new gXAxis(), LayerBottom, 0, 20);
plethyGraph->AddLayer(plethyChart = new gLineChart(OXI_Plethy));
plethyGraph->setVisible(true);
plethyGraph->setRecMinY(0);
plethyGraph->setRecMaxY(128);
ui->calendarWidget->setFirstDayOfWeek(Qt::Sunday); ui->calendarWidget->setFirstDayOfWeek(Qt::Sunday);
QTextCharFormat format = ui->calendarWidget->weekdayTextFormat(Qt::Saturday); QTextCharFormat format = ui->calendarWidget->weekdayTextFormat(Qt::Saturday);
@ -48,7 +53,6 @@ OximeterImport::OximeterImport(QWidget *parent) :
ui->dateTimeEdit->setMinimumHeight(ui->dateTimeEdit->height() + 10); ui->dateTimeEdit->setMinimumHeight(ui->dateTimeEdit->height() + 10);
ui->syncCPAPGroup->setVisible(false); ui->syncCPAPGroup->setVisible(false);
QVBoxLayout * layout = new QVBoxLayout; QVBoxLayout * layout = new QVBoxLayout;
layout->setMargin(0); layout->setMargin(0);
ui->sessBarFrame->setLayout(layout); ui->sessBarFrame->setLayout(layout);
@ -58,10 +62,21 @@ OximeterImport::OximeterImport(QWidget *parent) :
sessbar->setMinimumHeight(40); sessbar->setMinimumHeight(40);
connect(sessbar, SIGNAL(sessionClicked(Session*)), this, SLOT(onSessionSelected(Session*))); connect(sessbar, SIGNAL(sessionClicked(Session*)), this, SLOT(onSessionSelected(Session*)));
layout->addWidget(sessbar, 1); layout->addWidget(sessbar, 1);
dummyday = nullptr;
session = nullptr;
ELplethy = nullptr;
} }
OximeterImport::~OximeterImport() OximeterImport::~OximeterImport()
{ {
if (!dummyday) {
delete dummyday;
}
if (!session) {
delete session;
}
disconnect(sessbar, SIGNAL(sessionClicked(Session*)), this, SLOT(onSessionSelected(Session*))); disconnect(sessbar, SIGNAL(sessionClicked(Session*)), this, SLOT(onSessionSelected(Session*)));
delete ui; delete ui;
} }
@ -96,7 +111,7 @@ void OximeterImport::updateStatus(QString msg)
} }
MachineLoader * OximeterImport::detectOximeter() SerialOximeter * OximeterImport::detectOximeter()
{ {
const int PORTSCAN_TIMEOUT=30000; const int PORTSCAN_TIMEOUT=30000;
const int delay=100; const int delay=100;
@ -104,7 +119,7 @@ MachineLoader * OximeterImport::detectOximeter()
ui->retryButton->setVisible(false); ui->retryButton->setVisible(false);
QList<MachineLoader *> loaders = GetLoaders(MT_OXIMETER); QList<SerialOximeter *> loaders = GetOxiLoaders();
updateStatus(tr("Scanning for compatible oximeters")); updateStatus(tr("Scanning for compatible oximeters"));
@ -118,9 +133,9 @@ MachineLoader * OximeterImport::detectOximeter()
int elapsed=0; int elapsed=0;
do { do {
for (int i=0; i < loaders.size(); ++i) { for (int i=0; i < loaders.size(); ++i) {
MachineLoader * loader = loaders[i]; SerialOximeter * oxi = loaders[i];
if (loader->openDevice()) { if (oxi->openDevice()) {
oximodule = loader; oximodule = oxi;
break; break;
} }
} }
@ -231,12 +246,12 @@ void OximeterImport::on_fileImportButton_clicked()
if (filename.isEmpty()) if (filename.isEmpty())
return; return;
QList<MachineLoader *> loaders = GetLoaders(MT_OXIMETER); QList<SerialOximeter *> loaders = GetOxiLoaders();
bool success = false; bool success = false;
oximodule = nullptr; oximodule = nullptr;
Q_FOREACH(MachineLoader * loader, loaders) { Q_FOREACH(SerialOximeter * loader, loaders) {
if (loader->Open(filename,p_profile)) { if (loader->Open(filename,p_profile)) {
success = true; success = true;
oximodule = loader; oximodule = loader;
@ -267,7 +282,7 @@ void OximeterImport::on_liveImportButton_clicked()
liveView->setVisible(true); liveView->setVisible(true);
QApplication::processEvents(); QApplication::processEvents();
MachineLoader * oximodule = detectOximeter(); SerialOximeter * oximodule = detectOximeter();
if (!oximodule) { if (!oximodule) {
updateStatus("Couldn't access oximeter"); updateStatus("Couldn't access oximeter");
@ -276,15 +291,53 @@ void OximeterImport::on_liveImportButton_clicked()
return; return;
} }
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("Live Oximetery Mode");
liveView->setEmptyText(tr("Still Under Construction")); // Recording... liveView->setEmptyText(tr("Recording..."));
ui->progressBar->hide(); ui->progressBar->hide();
liveView->update(); liveView->update();
oximodule->Open("live",p_profile); oximodule->Open("live",p_profile);
ui->stopButton->setVisible(true); ui->stopButton->setVisible(true);
dummyday = new Day(mach);
quint32 starttime = QDateTime::currentDateTime().toTime_t();
ti = qint64(starttime) * 1000L;
start_ti = ti;
session = new Session(mach, starttime);
ELplethy = session->AddEventList(OXI_Plethy, EVL_Waveform, 1.0, 0.0, 0.0, 0.0, 20);
ELplethy->setFirst(start_ti);
session->really_set_first(start_ti);
dummyday->AddSession(session);
plethyChart->setMinX(start_ti);
plethyGraph->SetMinX(start_ti);
liveView->setDay(dummyday);
QTime time;
time.start();
while (oximodule->isStreaming() && !oximodule->isAborted()) { while (oximodule->isStreaming() && !oximodule->isAborted()) {
QThread::msleep(50); QThread::msleep(50);
QApplication::processEvents(); QApplication::processEvents();
// if (time.elapsed() > 100) {
time.restart();
updateLiveDisplay();
// }
if (!isVisible()) {
disconnect(oximodule, SIGNAL(updatePlethy(QByteArray)), this, SLOT(on_updatePlethy(QByteArray)));
oximodule->closeDevice();
delete dummyday;
session = nullptr;
dummyday = nullptr;
return;
}
} }
ui->stopButton->setVisible(false); ui->stopButton->setVisible(false);
ui->liveConnectLabel->setText("Live Import Stopped"); ui->liveConnectLabel->setText("Live Import Stopped");
@ -292,6 +345,16 @@ void OximeterImport::on_liveImportButton_clicked()
updateStatus(tr("Live Oximetery import has been stopped")); updateStatus(tr("Live Oximetery import has been stopped"));
oximodule->closeDevice(); oximodule->closeDevice();
disconnect(oximodule, SIGNAL(updatePlethy(QByteArray)), this, SLOT(on_updatePlethy(QByteArray)));
// delete dummyday;
//ui->stackedWidget->setCurrentWidget(ui->syncPage);
ui->syncSaveButton->setVisible(true);
ui->calendarWidget->setMinimumDate(PROFILE.FirstDay());
ui->calendarWidget->setMaximumDate(PROFILE.LastDay());
// detect oximeter // detect oximeter
} }
@ -402,3 +465,52 @@ void OximeterImport::on_syncSaveButton_clicked()
{ {
} }
void OximeterImport::on_updatePlethy(QByteArray plethy)
{
if (!session) {
return;
}
int size = plethy.size();
quint64 dur = qint64(size) * 20L;
ELplethy->AddWaveform(ti, plethy.data(), size, dur);
ti += dur;
}
void OximeterImport::updateLiveDisplay()
{
if (!session) {
return;
}
qint64 sti = ti - 20000;
plethyChart->setMinY(ELplethy->Min());
plethyChart->setMaxY(ELplethy->Max());
plethyGraph->SetMinY(ELplethy->Min());
plethyGraph->SetMaxY(ELplethy->Max());
plethyGraph->SetMinX(start_ti);
plethyGraph->SetMaxX(ti);
ELplethy->setLast(ti);
session->really_set_last(ti);
//liveView->SetXBounds(sti, ti, 0, true);
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));
for (int i = 0; i < liveView->size(); i++) {
(*liveView)[i]->SetXBounds(sti, ti);
}
liveView->updateScale();
liveView->timedRedraw(25);
}
void OximeterImport::on_cancelButton_clicked()
{
reject();
}

19
sleepyhead/oximeterimport.h
View File

@ -5,7 +5,7 @@
#include "Graphs/gGraphView.h" #include "Graphs/gGraphView.h"
#include "Graphs/gLineChart.h" #include "Graphs/gLineChart.h"
#include "SleepLib/machine_loader.h" #include "SleepLib/serialoximeter.h"
#include "sessionbar.h" #include "sessionbar.h"
namespace Ui { namespace Ui {
@ -51,18 +51,27 @@ private slots:
void on_syncSaveButton_clicked(); void on_syncSaveButton_clicked();
void on_cancelButton_clicked();
protected slots:
void on_updatePlethy(QByteArray plethy);
protected: protected:
MachineLoader * detectOximeter(); SerialOximeter * detectOximeter();
void updateStatus(QString msg); void updateStatus(QString msg);
void updateLiveDisplay();
private: private:
Ui::OximeterImport *ui; Ui::OximeterImport *ui;
MachineLoader * oximodule; SerialOximeter * oximodule;
gGraphView * liveView; gGraphView * liveView;
gGraph * PLETHY; gGraph * plethyGraph;
Session * session;
Day * dummyday;
gLineChart * plethyChart; gLineChart * plethyChart;
SessionBar * sessbar; SessionBar * sessbar;
EventList * ELplethy;
qint64 start_ti, ti;
}; };
#endif // OXIMETERIMPORT_H #endif // OXIMETERIMPORT_H

19
sleepyhead/oximeterimport.ui
View File

@ -1269,22 +1269,5 @@ p, li { white-space: pre-wrap; }
<resources> <resources>
<include location="Resources.qrc"/> <include location="Resources.qrc"/>
</resources> </resources>
<connections> <connections/>
<connection>
<sender>cancelButton</sender>
<signal>clicked()</signal>
<receiver>OximeterImport</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>718</x>
<y>499</y>
</hint>
<hint type="destinationlabel">
<x>425</x>
<y>265</y>
</hint>
</hints>
</connection>
</connections>
</ui> </ui>

42
sleepyhead/oximetry.cpp
View File

@ -43,7 +43,7 @@ extern QLabel *qstatus2;
extern MainWindow *mainwin; extern MainWindow *mainwin;
int lastpulse; int lastpulse;
SerialOximeter::SerialOximeter(QObject *parent, QString oxiname, QString portname, ZSerialOximeter::ZSerialOximeter(QObject *parent, QString oxiname, QString portname,
BaudRateType baud, FlowType flow, ParityType parity, DataBitsType databits, BaudRateType baud, FlowType flow, ParityType parity, DataBitsType databits,
StopBitsType stopbits) : StopBitsType stopbits) :
QObject(parent), QObject(parent),
@ -76,7 +76,7 @@ SerialOximeter::SerialOximeter(QObject *parent, QString oxiname, QString portnam
m_mode = SO_WAIT; m_mode = SO_WAIT;
} }
SerialOximeter::~SerialOximeter() ZSerialOximeter::~ZSerialOximeter()
{ {
if (m_opened) { if (m_opened) {
if (m_port) { m_port->close(); } if (m_port) { m_port->close(); }
@ -86,14 +86,14 @@ SerialOximeter::~SerialOximeter()
delete timer; delete timer;
} }
void SerialOximeter::Timeout() void ZSerialOximeter::Timeout()
{ {
qDebug() << "Timeout!"; qDebug() << "Timeout!";
if (!import_mode) { emit(liveStopped(session)); } if (!import_mode) { emit(liveStopped(session)); }
} }
bool SerialOximeter::Open(QextSerialPort::QueryMode mode) bool ZSerialOximeter::Open(QextSerialPort::QueryMode mode)
{ {
if (m_portname.isEmpty()) { if (m_portname.isEmpty()) {
qDebug() << "Tried to open with empty portname"; qDebug() << "Tried to open with empty portname";
@ -134,7 +134,7 @@ bool SerialOximeter::Open(QextSerialPort::QueryMode mode)
} }
} }
void SerialOximeter::Close() void ZSerialOximeter::Close()
{ {
qDebug() << "Closing serial port" << m_portname; qDebug() << "Closing serial port" << m_portname;
@ -154,7 +154,7 @@ void SerialOximeter::Close()
m_opened = false; m_opened = false;
} }
void SerialOximeter::setPortName(QString portname) void ZSerialOximeter::setPortName(QString portname)
{ {
if (m_opened) { if (m_opened) {
qDebug() << "Can't change serial PortName settings while port is open!"; qDebug() << "Can't change serial PortName settings while port is open!";
@ -164,7 +164,7 @@ void SerialOximeter::setPortName(QString portname)
m_portname = portname; m_portname = portname;
} }
void SerialOximeter::setBaudRate(BaudRateType baud) void ZSerialOximeter::setBaudRate(BaudRateType baud)
{ {
if (m_opened) { if (m_opened) {
qDebug() << "Can't change serial BaudRate settings while port is open!"; qDebug() << "Can't change serial BaudRate settings while port is open!";
@ -174,7 +174,7 @@ void SerialOximeter::setBaudRate(BaudRateType baud)
m_baud = baud; m_baud = baud;
} }
void SerialOximeter::setFlowControl(FlowType flow) void ZSerialOximeter::setFlowControl(FlowType flow)
{ {
if (m_opened) { if (m_opened) {
qDebug() << "Can't change serial FlowControl settings while port is open!"; qDebug() << "Can't change serial FlowControl settings while port is open!";
@ -184,7 +184,7 @@ void SerialOximeter::setFlowControl(FlowType flow)
m_flow = flow; m_flow = flow;
} }
void SerialOximeter::setParity(ParityType parity) void ZSerialOximeter::setParity(ParityType parity)
{ {
if (m_opened) { if (m_opened) {
qDebug() << "Can't change serial Parity settings while port is open!"; qDebug() << "Can't change serial Parity settings while port is open!";
@ -194,7 +194,7 @@ void SerialOximeter::setParity(ParityType parity)
m_parity = parity; m_parity = parity;
} }
void SerialOximeter::setDataBits(DataBitsType databits) void ZSerialOximeter::setDataBits(DataBitsType databits)
{ {
if (m_opened) { if (m_opened) {
qDebug() << "Can't change serial DataBit settings while port is open!"; qDebug() << "Can't change serial DataBit settings while port is open!";
@ -204,7 +204,7 @@ void SerialOximeter::setDataBits(DataBitsType databits)
m_databits = databits; m_databits = databits;
} }
void SerialOximeter::setStopBits(StopBitsType stopbits) void ZSerialOximeter::setStopBits(StopBitsType stopbits)
{ {
if (m_opened) { if (m_opened) {
qDebug() << "Can't change serial StopBit settings while port is open!"; qDebug() << "Can't change serial StopBit settings while port is open!";
@ -214,7 +214,7 @@ void SerialOximeter::setStopBits(StopBitsType stopbits)
m_stopbits = stopbits; m_stopbits = stopbits;
} }
void SerialOximeter::addPulse(qint64 time, EventDataType pr) void ZSerialOximeter::addPulse(qint64 time, EventDataType pr)
{ {
//EventDataType min=0,max=0; //EventDataType min=0,max=0;
if (pr > 0) { if (pr > 0) {
@ -254,7 +254,7 @@ void SerialOximeter::addPulse(qint64 time, EventDataType pr)
emit(updatePulse(pr)); emit(updatePulse(pr));
} }
void SerialOximeter::addSpO2(qint64 time, EventDataType o2) void ZSerialOximeter::addSpO2(qint64 time, EventDataType o2)
{ {
//EventDataType min=0,max=0; //EventDataType min=0,max=0;
if (o2 > 0) { if (o2 > 0) {
@ -293,7 +293,7 @@ void SerialOximeter::addSpO2(qint64 time, EventDataType o2)
emit(updateSpO2(o2)); emit(updateSpO2(o2));
} }
void SerialOximeter::addPlethy(qint64 time, EventDataType pleth) void ZSerialOximeter::addPlethy(qint64 time, EventDataType pleth)
{ {
if (!plethy) { if (!plethy) {
plethy = new EventList(EVL_Event); plethy = new EventList(EVL_Event);
@ -310,14 +310,14 @@ void SerialOximeter::addPlethy(qint64 time, EventDataType pleth)
session->set_last(time); session->set_last(time);
plethy->setLast(time); plethy->setLast(time);
} }
void SerialOximeter::compactToWaveform(EventList *el) void ZSerialOximeter::compactToWaveform(EventList *el)
{ {
double rate = double(el->duration()) / double(el->count()); double rate = double(el->duration()) / double(el->count());
el->setType(EVL_Waveform); el->setType(EVL_Waveform);
el->setRate(rate); el->setRate(rate);
el->getTime().clear(); el->getTime().clear();
} }
void SerialOximeter::compactToEvent(EventList *el) void ZSerialOximeter::compactToEvent(EventList *el)
{ {
if (el->count() < 2) { return; } if (el->count() < 2) { return; }
@ -380,7 +380,7 @@ void SerialOximeter::compactToEvent(EventList *el)
el->getTime() = nel.getTime(); el->getTime() = nel.getTime();
} }
void SerialOximeter::compactAll() void ZSerialOximeter::compactAll()
{ {
if (!session) { return; } if (!session) { return; }
@ -443,7 +443,7 @@ void SerialOximeter::compactAll()
if (tmaxx > 0) { session->really_set_last(tmaxx); } if (tmaxx > 0) { session->really_set_last(tmaxx); }
} }
Session *SerialOximeter::createSession(QDateTime date) Session *ZSerialOximeter::createSession(QDateTime date)
{ {
if (session) { if (session) {
delete session; delete session;
@ -475,7 +475,7 @@ Session *SerialOximeter::createSession(QDateTime date)
return session; return session;
} }
bool SerialOximeter::startLive() bool ZSerialOximeter::startLive()
{ {
import_mode = false; import_mode = false;
killTimers(); killTimers();
@ -491,7 +491,7 @@ bool SerialOximeter::startLive()
return true; return true;
} }
void SerialOximeter::stopLive() void ZSerialOximeter::stopLive()
{ {
if (timer->isActive()) { timer->stop(); } if (timer->isActive()) { timer->stop(); }
@ -505,7 +505,7 @@ void SerialOximeter::stopLive()
} }
CMS50Serial::CMS50Serial(QObject *parent, QString portname = "") : CMS50Serial::CMS50Serial(QObject *parent, QString portname = "") :
SerialOximeter(parent, "CMS50", portname, BAUD19200, FLOW_OFF, PAR_ODD, DATA_8, STOP_1) ZSerialOximeter(parent, "CMS50", portname, BAUD19200, FLOW_OFF, PAR_ODD, DATA_8, STOP_1)
{ {
cms50timer = new QTimer(this); cms50timer = new QTimer(this);
cms50timer2 = new QTimer(this); cms50timer2 = new QTimer(this);

10
sleepyhead/oximetry.h
View File

@ -35,14 +35,14 @@ enum SerialOxMode { SO_OFF, SO_IMPORT, SO_LIVE, SO_WAIT };
\author Mark Watkins <jedimark_at_users.sourceforge.net> \author Mark Watkins <jedimark_at_users.sourceforge.net>
\brief Base class for Serial Oximeters \brief Base class for Serial Oximeters
*/ */
class SerialOximeter: public QObject class ZSerialOximeter: public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit SerialOximeter(QObject *parent, QString oxiname, QString portname = "", explicit ZSerialOximeter(QObject *parent, QString oxiname, QString portname = "",
BaudRateType baud = BAUD19200, FlowType flow = FLOW_OFF, ParityType parity = PAR_ODD, BaudRateType baud = BAUD19200, FlowType flow = FLOW_OFF, ParityType parity = PAR_ODD,
DataBitsType databits = DATA_8, StopBitsType stopbits = STOP_1); DataBitsType databits = DATA_8, StopBitsType stopbits = STOP_1);
virtual ~SerialOximeter(); virtual ~ZSerialOximeter();
virtual void setSession(Session *sess) { session = sess; } virtual void setSession(Session *sess) { session = sess; }
@ -227,7 +227,7 @@ class SerialOximeter: public QObject
\author Mark Watkins <jedimark_at_users.sourceforge.net> \author Mark Watkins <jedimark_at_users.sourceforge.net>
\brief Serial Import & Live module \brief Serial Import & Live module
*/ */
class CMS50Serial: public SerialOximeter class CMS50Serial: public ZSerialOximeter
{ {
Q_OBJECT Q_OBJECT
public: public:
@ -412,7 +412,7 @@ class Oximetry : public QWidget
Layer *foobar; Layer *foobar;
gGraphView *m_shared; gGraphView *m_shared;
SerialOximeter *oximeter; ZSerialOximeter *oximeter;
qint64 saved_starttime; qint64 saved_starttime;
bool firstSPO2Update; bool firstSPO2Update;
bool firstPulseUpdate; bool firstPulseUpdate;

6
sleepyhead/sleepyhead.pro
View File

@ -143,7 +143,8 @@ SOURCES += \
SleepLib/loader_plugins/zeo_loader.cpp \ SleepLib/loader_plugins/zeo_loader.cpp \
translation.cpp \ translation.cpp \
statistics.cpp \ statistics.cpp \
oximeterimport.cpp oximeterimport.cpp \
SleepLib/serialoximeter.cpp
HEADERS += \ HEADERS += \
common_gui.h \ common_gui.h \
@ -195,7 +196,8 @@ HEADERS += \
SleepLib/loader_plugins/zeo_loader.h \ SleepLib/loader_plugins/zeo_loader.h \
translation.h \ translation.h \
statistics.h \ statistics.h \
oximeterimport.h oximeterimport.h \
SleepLib/serialoximeter.h
FORMS += \ FORMS += \
daily.ui \ daily.ui \