From b147d33beb582ae8e76518c0ae8bb570602dfd5a Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sat, 1 Oct 2011 22:54:20 +1000 Subject: [PATCH] Initial Multi-Profile stuff. --- Graphs/gGraphView.cpp | 55 +++- Graphs/gGraphView.h | 12 +- Graphs/gLineChart.cpp | 11 +- Graphs/gLineOverlay.cpp | 8 +- SleepLib/machine.cpp | 2 +- SleepLib/preferences.cpp | 2 +- SleepLib/profiles.cpp | 18 +- SleepLib/profiles.h | 2 +- SleepyHeadQT.pro | 12 +- main.cpp | 43 ++- mainwindow.cpp | 23 +- newprofile.cpp | 162 ++++++++++ newprofile.h | 33 ++ newprofile.ui | 674 +++++++++++++++++++++++++++++++++++++++ oximetry.cpp | 8 +- preferencesdialog.ui | 2 +- profileselect.cpp | 98 ++++++ profileselect.h | 33 ++ profileselect.ui | 79 +++++ 19 files changed, 1218 insertions(+), 59 deletions(-) create mode 100644 newprofile.cpp create mode 100644 newprofile.h create mode 100644 newprofile.ui create mode 100644 profileselect.cpp create mode 100644 profileselect.h create mode 100644 profileselect.ui diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index a3020a60..cbc55900 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -67,6 +67,48 @@ GLBuffer::~GLBuffer() } /////// +void GLShortBuffer::add(GLshort x, GLshort y) +{ + if (m_cnt0) { + glColorPointer(4, GL_UNSIGNED_BYTE, 0, colors); + glEnableClientState(GL_COLOR_ARRAY); + } else { + glColor4ub(m_color.red(),m_color.green(),m_color.blue(),m_color.alpha()); + } glEnableClientState(GL_VERTEX_ARRAY); - glEnableClientState(GL_COLOR_ARRAY); glDrawArrays(m_type, 0, m_cnt >> 1); glDisableClientState(GL_COLOR_ARRAY); glDisableClientState(GL_VERTEX_ARRAY); - + if (m_colcnt>0) { + glDisableClientState(GL_COLOR_ARRAY); + } //qDebug() << "I Drawed" << m_cnt << "vertices"; m_cnt=0; diff --git a/Graphs/gGraphView.h b/Graphs/gGraphView.h index 456ab228..ddb36cf9 100644 --- a/Graphs/gGraphView.h +++ b/Graphs/gGraphView.h @@ -46,11 +46,13 @@ public: void setSize(float f) { m_size=f; } void setAntiAlias(bool b) { m_antialias=b; } void forceAntiAlias(bool b) { m_forceantialias=b; } + void setColor(QColor col) { m_color=col; } protected: int m_max; int m_type; // type (GL_LINES, GL_QUADS, etc) int m_cnt; // cnt int m_colcnt; + QColor m_color; float m_size; int s1,s2,s3,s4; bool m_scissor; @@ -64,10 +66,14 @@ class GLShortBuffer:public GLBuffer public: GLShortBuffer(int max=2048,int type=GL_LINES); virtual ~GLShortBuffer(); - //void add(GLshort s); - //void add(GLshort x, GLshort y); - //void add(GLshort x1, GLshort y1, GLshort x2, GLshort y2); + // use one or the other.. can't use both + // color free version is faster + void add(GLshort x, GLshort y); + void add(GLshort x1, GLshort y1, GLshort x2, GLshort y2); + void add(GLshort x1, GLshort y1, GLshort x2, GLshort y2, GLshort x3, GLshort y3, GLshort x4, GLshort y4); + + // color per vertex version void add(GLshort x, GLshort y,QColor & col); // add with vertex color void add(GLshort x1, GLshort y1, GLshort x2, GLshort y2,QColor & col); // add with vertex colors void add(GLshort x1, GLshort y1, GLshort x2, GLshort y2,GLshort x3, GLshort y3, GLshort x4, GLshort y4,QColor & col); // add with vertex colors diff --git a/Graphs/gLineChart.cpp b/Graphs/gLineChart.cpp index 9699afd4..6251ee9b 100644 --- a/Graphs/gLineChart.cpp +++ b/Graphs/gLineChart.cpp @@ -17,7 +17,7 @@ gLineChart::gLineChart(ChannelID code,QColor col,bool square_plot, bool disable_ m_line_color=col; m_report_empty=false; addGLBuf(lines=new GLShortBuffer(100000,GL_LINES)); - + lines->setColor(col); lines->setAntiAlias(true); } gLineChart::~gLineChart() @@ -328,7 +328,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height) // ay1=(m_drawlist[i-1].y()+m_drawlist[i].y()+m_drawlist[i+1].y())/3.0; ax1=m_drawlist[i].x(); ay1=m_drawlist[i].y(); - lines->add(xst+i,yst-ax1,xst+i,yst-ay1,m_line_color); + lines->add(xst+i,yst-ax1,xst+i,yst-ay1); if (lines->full()) break; } @@ -357,7 +357,7 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height) firstpx=false; continue; } - lines->add(lastpx,lastpy,px,py,m_line_color); + lines->add(lastpx,lastpy,px,py); if (lines->full()) { done=true; @@ -401,10 +401,9 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height) firstpx=false; } else { if (square_plot) { - lines->add(lastpx,lastpy,px,lastpy,m_line_color); - lines->add(px,lastpy,px,py,m_line_color); + lines->add(lastpx,lastpy,px,lastpy,px,lastpy,px,py); } else { - lines->add(lastpx,lastpy,px,py,m_line_color); + lines->add(lastpx,lastpy,px,py); } //lines->add(px,py,m_line_color); diff --git a/Graphs/gLineOverlay.cpp b/Graphs/gLineOverlay.cpp index bfa052b9..33e8c6b3 100644 --- a/Graphs/gLineOverlay.cpp +++ b/Graphs/gLineOverlay.cpp @@ -13,10 +13,12 @@ gLineOverlayBar::gLineOverlayBar(ChannelID code,QColor color,QString label,FlagT { addGLBuf(points=new GLShortBuffer(1024,GL_POINTS)); points->setSize(4); + points->setColor(m_flag_color); addGLBuf(quads=new GLShortBuffer(2048,GL_QUADS)); //addGLBuf(lines=new GLBuffer(color,1024,GL_LINES)); points->setAntiAlias(true); quads->setAntiAlias(true); + quads->setColor(m_flag_color); //lines->setAntiAlias(true); } gLineOverlayBar::~gLineOverlayBar() @@ -78,12 +80,12 @@ void gLineOverlayBar::paint(gGraph & w, int left, int topp, int width, int heigh if (x2width+left) x1=width+left; //double w1=x2-x1; - quads->add(x1,start_py,x2,start_py,x2,start_py+height,x1,start_py+height,m_flag_color); + quads->add(x1,start_py,x2,start_py,x2,start_py+height,x1,start_py+height); if (quads->full()) { verts_exceeded=true; break; } } else if (m_flt==FT_Dot) { if ((pref["AlwaysShowOverlayBars"].toInt()==0) || (xx<3600000)) { // show the fat dots in the middle - points->add(x1,double(height)/double(yy)*double(-20-w.min_y)+topp,m_flag_color); + points->add(x1,double(height)/double(yy)*double(-20-w.min_y)+topp); if (points->full()) { verts_exceeded=true; break; } } else { // thin lines down the bottom @@ -96,7 +98,7 @@ void gLineOverlayBar::paint(gGraph & w, int left, int topp, int width, int heigh if ((pref["AlwaysShowOverlayBars"].toInt()==0) || (xx<3600000)) { z=top; - points->add(x1,top,m_flag_color); + points->add(x1,top); lines->add(x1,top,x1,bottom,m_flag_color); if (points->full()) { verts_exceeded=true; break; } } else { diff --git a/SleepLib/machine.cpp b/SleepLib/machine.cpp index 2eb58a31..ef683ac1 100644 --- a/SleepLib/machine.cpp +++ b/SleepLib/machine.cpp @@ -40,7 +40,7 @@ Machine::Machine(Profile *p,MachineID id) m_id=temp; } else m_id=id; - qDebug() << "Create Machine: " << hex << m_id; //%lx",m_id); + //qDebug() << "Create Machine: " << hex << m_id; //%lx",m_id); m_type=MT_UNKNOWN; firstsession=true; } diff --git a/SleepLib/preferences.cpp b/SleepLib/preferences.cpp index 0da73508..6506cd75 100644 --- a/SleepLib/preferences.cpp +++ b/SleepLib/preferences.cpp @@ -157,7 +157,7 @@ bool Preferences::Open(QString filename) QDomDocument doc(p_name); QFile file(p_filename); - qDebug() << "Opening " << p_filename; + qDebug() << "Scanning " << p_filename; if (!file.open(QIODevice::ReadOnly)) { qWarning() << "Could not open" << p_filename; return false; diff --git a/SleepLib/profiles.cpp b/SleepLib/profiles.cpp index a38986b4..b2168c52 100644 --- a/SleepLib/profiles.cpp +++ b/SleepLib/profiles.cpp @@ -319,7 +319,7 @@ Profile *Get(QString name) return NULL; } -Profile *Create(QString name,QString realname,QString password) +Profile *Create(QString name) { QString path=pref.Get("{home}/Profiles/")+name; QDir dir(path); @@ -330,7 +330,7 @@ Profile *Create(QString name,QString realname,QString password) profiles[name]=prof; prof->Set("Username",name); //prof->Set("Realname",realname); - if (!password.isEmpty()) prof->Set("Password",SHA1(password)); + //if (!password.isEmpty()) prof->Set("Password",SHA1(password)); prof->Set("DataFolder","{home}/Profiles/{Username}"); Machine *m=new Machine(prof,0); @@ -369,9 +369,9 @@ void Scan() QDir dir(path); if (!dir.exists(path)) { - dir.mkpath(path); + //dir.mkpath(path); // Just silently create a new user record and get on with it. - Create(getUserName(),getUserName(),""); + //Create(getUserName(),getUserName(),""); return; } if (!dir.isReadable()) { @@ -384,11 +384,11 @@ void Scan() QFileInfoList list=dir.entryInfoList(); - QString username=getUserName(); - if (list.size()==0) { // No profiles.. Create one. - Create(username,username,""); - return; - } + //QString username=getUserName(); + //if (list.size()==0) { // No profiles.. Create one. + //Create(username,username,""); + //return; + //} // Iterate through subdirectories and load profiles.. for (int i=0;i profiles; void Scan(); // Initialize and load Profile void Done(); // Save all Profile objects and clear list -Profile *Create(QString name,QString realname,QString password); +Profile *Create(QString name); Profile *Get(QString name); Profile *Get(); diff --git a/SleepyHeadQT.pro b/SleepyHeadQT.pro index 425c2643..e22e1cf8 100644 --- a/SleepyHeadQT.pro +++ b/SleepyHeadQT.pro @@ -54,7 +54,9 @@ SOURCES += main.cpp\ Graphs/gStatsLine.cpp \ report.cpp \ Graphs/gSummaryChart.cpp \ - SleepLib/schema.cpp + SleepLib/schema.cpp \ + profileselect.cpp \ + newprofile.cpp unix:SOURCES += qextserialport/posix_qextserialport.cpp unix:!macx:SOURCES += qextserialport/qextserialenumerator_unix.cpp @@ -105,7 +107,9 @@ HEADERS += \ Graphs/gStatsLine.h \ report.h \ Graphs/gSummaryChart.h \ - SleepLib/schema.h + SleepLib/schema.h \ + profileselect.h \ + newprofile.h FORMS += \ @@ -114,7 +118,9 @@ FORMS += \ mainwindow.ui \ oximetry.ui \ preferencesdialog.ui \ - report.ui + report.ui \ + profileselect.ui \ + newprofile.ui RESOURCES += \ Resources.qrc diff --git a/main.cpp b/main.cpp index 0d376ae2..55401fb7 100644 --- a/main.cpp +++ b/main.cpp @@ -6,6 +6,7 @@ //#include #include +#include #include #include #include @@ -13,6 +14,14 @@ #include "SleepLib/schema.h" #include "mainwindow.h" #include "SleepLib/profiles.h" +#include "profileselect.h" +#include "newprofile.h" + +#include "SleepLib/loader_plugins/prs1_loader.h" +#include "SleepLib/loader_plugins/cms50_loader.h" +#include "SleepLib/loader_plugins/zeo_loader.h" +#include "SleepLib/loader_plugins/resmed_loader.h" + #ifdef Q_WS_X11 #include @@ -60,6 +69,38 @@ int main(int argc, char *argv[]) a.setApplicationName("SleepyHead"); initialize(); + PRS1Loader::Register(); + CMS50Loader::Register(); + ZEOLoader::Register(); + ResmedLoader::Register(); + Profiles::Scan(); + pref["AppName"]="SleepyHead"; + + + QString Version=QString("%1.%2.%3").arg(major_version).arg(minor_version).arg(revision_number); + + if (!Profiles::profiles.size()) { + NewProfile newprof(0); + if (newprof.exec()==NewProfile::Rejected) + return 0; + + // Show New User wizard.. + } else { + if (pref.Exists("VersionString")) { + QString V=pref["VersionString"].toString(); + if (V!=Version) { + QMessageBox::warning(0,"New Version Warning","This is a new version of SleepyHead. If you experience a crash right after clicking Ok, you will need to manually delete the SleepApp folder (it's located in your Documents folder) and reimport your data. After this things should work normally.",QMessageBox::Ok); + } + } + ProfileSelect profsel(0); + if (profsel.exec()==ProfileSelect::Rejected) { + exit(1); + } + } + pref["VersionString"]=Version; + + //if (!pref.Exists("Profile")) pref["Profile"]=getUserName(); + /*int id=QFontDatabase::addApplicationFont(":/fonts/FreeSans.ttf"); QStringList ffam=QFontDatabase::applicationFontFamilies(id); for (QStringList::iterator i=ffam.begin();i!=ffam.end();i++) { @@ -69,9 +110,9 @@ int main(int argc, char *argv[]) a.setFont(QFont("Sans Serif",10)); qInstallMsgHandler(MyOutputHandler); + MainWindow w; mainwin=&w; - w.show(); return a.exec(); } diff --git a/mainwindow.cpp b/mainwindow.cpp index 8f1fdca2..0d35411e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -15,10 +15,6 @@ #include #include "mainwindow.h" #include "ui_mainwindow.h" -#include "SleepLib/loader_plugins/prs1_loader.h" -#include "SleepLib/loader_plugins/cms50_loader.h" -#include "SleepLib/loader_plugins/zeo_loader.h" -#include "SleepLib/loader_plugins/resmed_loader.h" #include "preferencesdialog.h" #include "SleepLib/schema.h" @@ -60,13 +56,9 @@ MainWindow::MainWindow(QWidget *parent) : { logtime.start(); ui->setupUi(this); - this->setWindowTitle(tr("SleepyHead")+QString(" v%1.%2.%3").arg(major_version).arg(minor_version).arg(revision_number)); + this->setWindowTitle(tr("SleepyHead")+QString(" v%1.%2.%3 (%4)").arg(major_version).arg(minor_version).arg(revision_number).arg(pref["Profile"].toString())); ui->tabWidget->setCurrentIndex(0); - PRS1Loader::Register(); - CMS50Loader::Register(); - ZEOLoader::Register(); - ResmedLoader::Register(); /* QGLFormat fmt; fmt.setDepth(false); @@ -99,19 +91,6 @@ MainWindow::MainWindow(QWidget *parent) : ui->statusbar->addPermanentWidget(qstatus,0); ui->statusbar->addPermanentWidget(qprogress,1); ui->statusbar->addPermanentWidget(qstatus2,0); - Profiles::Scan(); - - pref["AppName"]="SleepyHead"; - QString Version=QString("%1.%2.%3").arg(major_version).arg(minor_version).arg(revision_number); - if (pref.Exists("VersionString")) { - QString V=pref["VersionString"].toString(); - if (V!=Version) { - QMessageBox::warning(this,"New Version Warning","This is a new version of SleepyHead. If you experience a crash right after clicking Ok, you will need to manually delete the SleepApp folder (it's located in your Documents folder) and reimport your data. After this things should work normally.",QMessageBox::Ok); - } - } - pref["VersionString"]=Version; - - if (!pref.Exists("Profile")) pref["Profile"]=getUserName(); if (!pref.Exists("ShowDebug")) pref["ShowDebug"]=true; ui->actionDebug->setChecked(pref["ShowDebug"].toBool()); diff --git a/newprofile.cpp b/newprofile.cpp new file mode 100644 index 00000000..ecf62058 --- /dev/null +++ b/newprofile.cpp @@ -0,0 +1,162 @@ +#include +#include +#include "SleepLib/profiles.h" + +#include "newprofile.h" +#include "ui_newprofile.h" + +NewProfile::NewProfile(QWidget *parent) : + QDialog(parent), + ui(new Ui::NewProfile) +{ + ui->setupUi(this); + ui->userNameEdit->setText(getUserName()); + QLocale locale=QLocale::system(); + QString shortformat=locale.dateFormat(QLocale::ShortFormat); + if (!shortformat.toLower().contains("yyyy")) { + shortformat.replace("yy","yyyy"); + } + ui->dobEdit->setDisplayFormat(shortformat); + ui->dateDiagnosedEdit->setDisplayFormat(shortformat); + m_firstPage=0; + ui->backButton->setEnabled(false); + ui->nextButton->setEnabled(false); + + ui->stackedWidget->setCurrentIndex(0); + on_cpapModeCombo_activated(0); +} + +NewProfile::~NewProfile() +{ + delete ui; +} + +void NewProfile::on_nextButton_clicked() +{ + if (!ui->agreeCheckbox->isChecked()) + return; + + int index=ui->stackedWidget->currentIndex(); + switch(index) { + case 1: + if (ui->userNameEdit->text().isEmpty()) { + QMessageBox::information(this,"Error","Empty Username",QMessageBox::Ok); + return; + } + if (ui->genderCombo->currentIndex()==0) { + //QMessageBox::information(this,"Notice","You did not specify Gender.",QMessageBox::Ok); + } + if (ui->passwordGroupBox->isChecked()) { + if (ui->passwordEdit1->text()!=ui->passwordEdit2->text()) { + QMessageBox::information(this,"Error","Passwords don't match",QMessageBox::Ok); + return; + } + if (ui->passwordEdit1->text().isEmpty()) + ui->passwordGroupBox->setChecked(false); + } + + break; + case 2: + break; + case 3: + break; + default: + break; + } + + int max_pages=ui->stackedWidget->count()-1; + if (indexstackedWidget->setCurrentIndex(index); + } else { + // Finish button clicked. + if (QMessageBox::question(this,"Profile Changes","Accept and save this information?",QMessageBox::Yes,QMessageBox::No)==QMessageBox::Yes) { + Profile *profile=Profiles::Get(ui->userNameEdit->text()); + if (!profile) { // No profile, create one. + profile=Profiles::Create(ui->userNameEdit->text()); + } + Profile &prof=*profile; + prof["FirstName"]=ui->firstNameEdit->text(); + prof["LastName"]=ui->lastNameEdit->text(); + prof["DOB"]=ui->dobEdit->date(); + prof["Height"]=ui->heightEdit->value(); + prof["EmailAddress"]=ui->emailEdit->text(); + prof["Phone"]=ui->phoneEdit->text(); + prof["Address"]=ui->addressEdit->toPlainText(); + if (ui->passwordGroupBox->isChecked()) { + QByteArray ba=ui->passwordEdit1->text().toUtf8(); + prof["Password"]=QString(QCryptographicHash::hash(ba,QCryptographicHash::Sha1).toHex()); + } + prof["Password"]=""; + if (ui->genderCombo->currentIndex()==1) { + prof["Gender"]="Male"; + } else if (ui->genderCombo->currentIndex()==2) { + prof["Gender"]="Female"; + } + prof["DateDiagnosed"]=ui->dateDiagnosedEdit->date(); + prof["UntreatedAHI"]=ui->untreatedAHIEdit->value(); + prof["CPAPPrescribedMode"]=ui->cpapModeCombo->currentIndex(); + prof["CPAPPrescribedMinPressure"]=ui->minPressureEdit->value(); + prof["CPAPPrescribedMaxPressure"]=ui->minPressureEdit->value(); + prof["CPAPNotes"]=ui->cpapNotes->toPlainText(); + prof["DoctorName"]=ui->doctorNameEdit->text(); + prof["DcotorPractice"]=ui->doctorPracticeEdit->text(); + prof["DoctorAddress"]=ui->doctorAddressEdit->toPlainText(); + prof["DoctorPhone"]=ui->doctorPhoneEdit->text(); + prof["DoctorEmail"]=ui->doctorEmailEdit->text(); + prof["DoctorPatientID"]=ui->doctorPatientIDEdit->text(); + + + pref["Profile"]=ui->userNameEdit->text(); + + + this->accept(); + } + } + + if (index>=max_pages) { + ui->nextButton->setText("&Finish"); + } else { + ui->nextButton->setText("&Next"); + } + ui->backButton->setEnabled(true); + +} + +void NewProfile::on_backButton_clicked() +{ + ui->nextButton->setText("&Next"); + if (ui->stackedWidget->currentIndex()>m_firstPage) { + ui->stackedWidget->setCurrentIndex(ui->stackedWidget->currentIndex()-1); + } + if (ui->stackedWidget->currentIndex()==m_firstPage) { + ui->backButton->setEnabled(false); + } else { + ui->backButton->setEnabled(true); + } + + +} + + +void NewProfile::on_cpapModeCombo_activated(int index) +{ + if (index==0) { + ui->maxPressureEdit->setVisible(false); + } else { + ui->maxPressureEdit->setVisible(true); + } +} + +void NewProfile::on_agreeCheckbox_clicked(bool checked) +{ + ui->nextButton->setEnabled(checked); +} + +void NewProfile::skipWelcomeScreen() +{ + ui->agreeCheckbox->setChecked(true); + ui->stackedWidget->setCurrentIndex(m_firstPage=1); + ui->backButton->setEnabled(false); + ui->nextButton->setEnabled(true); +} diff --git a/newprofile.h b/newprofile.h new file mode 100644 index 00000000..071eb612 --- /dev/null +++ b/newprofile.h @@ -0,0 +1,33 @@ +#ifndef NEWPROFILE_H +#define NEWPROFILE_H + +#include + +namespace Ui { + class NewProfile; +} + +class NewProfile : public QDialog +{ + Q_OBJECT + +public: + explicit NewProfile(QWidget *parent = 0); + ~NewProfile(); + void skipWelcomeScreen(); +private slots: + void on_nextButton_clicked(); + + void on_backButton_clicked(); + + void on_cpapModeCombo_activated(int index); + + void on_agreeCheckbox_clicked(bool checked); + +private: + Ui::NewProfile *ui; + bool m_editMode; + int m_firstPage; +}; + +#endif // NEWPROFILE_H diff --git a/newprofile.ui b/newprofile.ui new file mode 100644 index 00000000..2d685922 --- /dev/null +++ b/newprofile.ui @@ -0,0 +1,674 @@ + + + NewProfile + + + + 0 + 0 + 605 + 374 + + + + Edit User Profile + + + + + + + + 0 + + + + + 4 + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; font-style:italic;">Welcome to SleepyHead</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This software is being designed to help you review data related to your CPAP treatment.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">It's intended as merely a data viewer, and not a substitute for competent medical guidance from your Doctor. </p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This software has been released freely under the <a href="http://www.gnu.org/copyleft/gpl.html"><span style=" text-decoration: underline; color:#0000ff;">GNU Public License</span></a>, and comes with no warranty, and without ANY claims to fitness for any purpose.</p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Accuracy of any data displayed is not and can not be gauranteed. </p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The author will not be held liable for <span style=" text-decoration: underline;">anything</span> related to the use or misuse of this software. </p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Use at your own risk. </p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This software is copyright ©2011 Mark Watkins </p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> + + + true + + + + + + + I agree to all the conditions above. + + + + + + + + + + + Personal && User Information + + + false + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + User Name + + + + + + + + + + Keep the kids out.. Nothing more.. This isn't meant to be uber security. + + + Password Protect Profile + + + false + + + true + + + false + + + + + + QLineEdit::PasswordEchoOnEdit + + + + + + + QLineEdit::PasswordEchoOnEdit + + + + + + + Password + + + + + + + ...twice... + + + + + + + + + + First Name + + + + + + + + + + Last Name + + + + + + + + + + D.O.B. + + + + + + + + + + + + Gender + + + + + + + + + + + + + Male + + + + + Female + + + + + + + + + + + 0 + 0 + + + + Height + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + 350.000000000000000 + + + + + + + Qt::Horizontal + + + + + + + Qt::Horizontal + + + + + + + + + + + + + + Contact Information + + + + + + Address + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + true + + + + + + + Email + + + + + + + + + + Phone + + + + + + + + + + Qt::Vertical + + + + 250 + 2 + + + + + + + + + true + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:italic;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(This information is just used in reports.)</p></body></html> + + + + + + + + + + + + + + CPAP Treatment Information + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + Date Diagnosed + + + + + + + + + + Untreated AHI + + + + + + + + + + CPAP Mode + + + + + + + + CPAP + + + + + APAP + + + + + Bi-Level + + + + + ASV + + + + + + + + RX Pressure + + + + + + + + + + + + + + + + + true + + + + + + + Qt::Horizontal + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + Doctors Information + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + Name + + + + + + + + + + Practice + + + + + + + + + + Address + + + + + + + true + + + + + + + Phone + + + + + + + + + + Email + + + + + + + + + + Patient ID + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Horizontal + + + + + + + Qt::Horizontal + + + + + + + + + + + + + + + + + + + 0 + 0 + + + + + 14 + 75 + false + true + + + + SleepyHead + + + Qt::AlignHCenter|Qt::AlignTop + + + + + + + + + + :/docs/sheep.png + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + &Cancel + + + false + + + + + + + &Back + + + false + + + + + + + &Next + + + false + + + false + + + + + + + + + + + + + cancelButton + clicked() + NewProfile + reject() + + + 425 + 373 + + + 288 + 197 + + + + + diff --git a/oximetry.cpp b/oximetry.cpp index e4f4b344..d6b931a1 100644 --- a/oximetry.cpp +++ b/oximetry.cpp @@ -146,10 +146,10 @@ void Oximetry::on_RefreshPortsButton_clicked() } } //qDebug() << "Serial Port:" << ports.at(i).qesPORTNAME << ports.at(i).friendName; - qDebug() << "port name:" << ports.at(i).portName; - qDebug() << "phys name:" << ports.at(i).physName; - qDebug() << "friendly name:" << ports.at(i).friendName; - qDebug() << "enumerator name:" << ports.at(i).enumName; + //qDebug() << "port name:" << ports.at(i).portName; + //qDebug() << "phys name:" << ports.at(i).physName; + //qDebug() << "friendly name:" << ports.at(i).friendName; + //qDebug() << "enumerator name:" << ports.at(i).enumName; } if (z>0) { ui->RunButton->setEnabled(true); diff --git a/preferencesdialog.ui b/preferencesdialog.ui index 7f959c72..6a02c2e6 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -29,7 +29,7 @@ - 3 + 2 diff --git a/profileselect.cpp b/profileselect.cpp new file mode 100644 index 00000000..3198d76a --- /dev/null +++ b/profileselect.cpp @@ -0,0 +1,98 @@ +#include "profileselect.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "ui_profileselect.h" +#include "SleepLib/profiles.h" +#include "newprofile.h" + +ProfileSelect::ProfileSelect(QWidget *parent) : + QDialog(parent), + ui(new Ui::ProfileSelect) +{ + ui->setupUi(this); + //ui->listView->setViewMode(QListView::IconMode); + QStringList str; + QStandardItemModel *model=new QStandardItemModel (0,0); + //QList items; + + + int i=0; + for (QHash::iterator p=Profiles::profiles.begin();p!=Profiles::profiles.end();p++) { + //str.append(p.key()); + Profile &profile=**p; + QString name=p.key(); + // if (!profile["FirstName"].toString().isEmpty()) + // name+=" ("+profile["FirstName"].toString()+" "+profile["LastName"].toString()+")"; + QStandardItem *item=new QStandardItem(*new QIcon(":/icons/moon.png"),name); + item->setData(p.key()); + item->setEditable(false); + item->setFont(QFont("Sans Serif",18,QFont::Bold,false)); + model->appendRow(item); + i++; + } + ui->listView->setModel(model); + ui->listView->setSelectionBehavior(QAbstractItemView::SelectRows); + ui->listView->setSelectionMode(QAbstractItemView::SingleSelection); + m_tries=0; +} + +ProfileSelect::~ProfileSelect() +{ + delete ui; +} + +void ProfileSelect::on_selectButton_clicked() +{ + on_listView_activated(ui->listView->currentIndex()); +} + +void ProfileSelect::on_newProfileButton_clicked() +{ + NewProfile newprof(this); + newprof.skipWelcomeScreen(); + newprof.exec(); + accept(); +} + +void ProfileSelect::on_listView_activated(const QModelIndex &index) +{ + QString name=index.data().toString(); + Profile *profile=Profiles::profiles[name]; + if (!profile) return; + if ((*profile)["Password"].toString().isEmpty()) { + m_selectedProfile=name; + pref["Profile"]=name; + } else { + QDialog dialog(this,Qt::Dialog); + QLineEdit *e=new QLineEdit(&dialog); + e->setEchoMode(QLineEdit::Password); + dialog.connect(e,SIGNAL(returnPressed()),&dialog,SLOT(accept())); + dialog.setWindowTitle("Enter Password"); + QVBoxLayout *lay=new QVBoxLayout(); + dialog.setLayout(lay); + lay->addWidget(e); + dialog.exec(); + QByteArray ba=e->text().toUtf8(); + if (QCryptographicHash::hash(ba,QCryptographicHash::Sha1).toHex()==(*profile)["Password"]) { + m_selectedProfile=name; + pref["Profile"]=name; + } else { + m_tries++; + if (m_tries>2) { + QMessageBox::warning(this,"Error","You entered an Incorrect Password too many times. Exiting!",QMessageBox::Ok); + this->reject(); + } else { + QMessageBox::warning(this,"Error","Incorrect Password",QMessageBox::Ok); + } + return; + } + } + accept(); +} diff --git a/profileselect.h b/profileselect.h new file mode 100644 index 00000000..0f2751c3 --- /dev/null +++ b/profileselect.h @@ -0,0 +1,33 @@ +#ifndef PROFILESELECT_H +#define PROFILESELECT_H + +#include +#include + +namespace Ui { + class ProfileSelect; +} + +class ProfileSelect : public QDialog +{ + Q_OBJECT + +public: + explicit ProfileSelect(QWidget *parent = 0); + ~ProfileSelect(); + + QString selectedProfile(); +private slots: + void on_selectButton_clicked(); + + void on_newProfileButton_clicked(); + + void on_listView_activated(const QModelIndex &index); + +private: + Ui::ProfileSelect *ui; + QString m_selectedProfile; + int m_tries; +}; + +#endif // PROFILESELECT_H diff --git a/profileselect.ui b/profileselect.ui new file mode 100644 index 00000000..a39db627 --- /dev/null +++ b/profileselect.ui @@ -0,0 +1,79 @@ + + + ProfileSelect + + + + 0 + 0 + 400 + 300 + + + + Select Profile + + + + + + + + + + + &Quit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + New Profile + + + + + + + &Select User + + + + + + + + + + + quitButton + clicked() + ProfileSelect + reject() + + + 52 + 276 + + + 199 + 149 + + + + +