diff --git a/Graphs/gCandleStick.cpp b/Graphs/gCandleStick.cpp index e183f264..2929ad84 100644 --- a/Graphs/gCandleStick.cpp +++ b/Graphs/gCandleStick.cpp @@ -52,8 +52,9 @@ void gCandleStick::Plot(gGraphWindow & w,float scrx,float scry) QColor col2=QColor("light grey"); QColor c(0,0,0,255); - QString str; + QString str,st; QRect rect; + //Qt::AlignmDirection dir; glLineWidth(1); @@ -98,9 +99,7 @@ void gCandleStick::Plot(gGraphWindow & w,float scrx,float scry) if ((int)m_names.size()>i) { // str=m_names[i]+" "; } - QString st; - st.sprintf("%0.1f",data->point[0][i].x()); - str+=st; + str+=st.sprintf("%0.1f",data->point[0][i].x()); GetTextExtent(str, x, y); //x+=5; if (t2>x+5) { diff --git a/Graphs/gFlagsLine.cpp b/Graphs/gFlagsLine.cpp index 0d71d681..14fb248a 100644 --- a/Graphs/gFlagsLine.cpp +++ b/Graphs/gFlagsLine.cpp @@ -82,12 +82,12 @@ void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry) glVertex2f(start_px+width-1, line_top); glEnd(); - const int maxverts=65536; - int vertcnt=0; - static GLshort vertarray[maxverts+8]; - int quadcnt=0; - static GLshort quadarray[maxverts+8]; - + qint32 vertcnt=0; + GLshort * vertarray=vertex_array[0]; + qint32 quadcnt=0; + GLshort * quadarray=vertex_array[1]; + assert(vertarray!=NULL); + assert(quadarray!=NULL); // Draw text label float x,y; diff --git a/Graphs/gLineChart.cpp b/Graphs/gLineChart.cpp index 701438b2..5ea43db7 100644 --- a/Graphs/gLineChart.cpp +++ b/Graphs/gLineChart.cpp @@ -84,9 +84,9 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry) QColor & col=color[0]; // Selected the plot line color - const long maxverts=65536*4; // Resolution dependant.. - long vertcnt=0; - static GLshort vertarray[maxverts+8]; + qint32 vertcnt=0; + GLshort * vertarray=vertex_array[0]; + assert(vertarray!=NULL); float lastpx,lastpy; float px,py; diff --git a/Graphs/gLineOverlay.cpp b/Graphs/gLineOverlay.cpp index 9701b483..b078580e 100644 --- a/Graphs/gLineOverlay.cpp +++ b/Graphs/gLineOverlay.cpp @@ -58,13 +58,15 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry) glScissor(w.GetLeftMargin(),w.GetBottomMargin(),width,height); glEnable(GL_SCISSOR_TEST); - const int maxverts=65536; - int vertcnt=0; - static GLshort vertarray[maxverts+8]; - int pointcnt=0; - static GLshort pointarray[maxverts+8]; - int quadcnt=0; - static GLshort quadarray[maxverts+8]; + qint32 vertcnt=0; + GLshort * vertarray=vertex_array[0]; + qint32 pointcnt=0; + GLshort * pointarray=vertex_array[1]; + qint32 quadcnt=0; + GLshort * quadarray=vertex_array[2]; + assert(vertarray!=NULL); + assert(quadarray!=NULL); + assert(pointarray!=NULL); float bottom=start_py+25, top=start_py+height-25; QColor & col=color[0]; diff --git a/Graphs/gXAxis.cpp b/Graphs/gXAxis.cpp index 6250ec60..5778f808 100644 --- a/Graphs/gXAxis.cpp +++ b/Graphs/gXAxis.cpp @@ -103,9 +103,9 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry) py=w.GetBottomMargin(); - const int maxverts=4096; - int vertcnt=0; - static GLshort vertarray[maxverts+4]; + qint32 vertcnt=0; + GLshort * vertarray=vertex_array[0]; + assert(vertarray!=NULL); if (m_show_minor_ticks) { for (double i=st3; i<=maxx; i+=min_tick/10.0) { diff --git a/Graphs/gYAxis.cpp b/Graphs/gYAxis.cpp index 4770270e..6d084617 100644 --- a/Graphs/gYAxis.cpp +++ b/Graphs/gYAxis.cpp @@ -62,9 +62,9 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry) float ty,h; - const int maxverts=4096; - int vertcnt=0; - static GLshort vertarray[maxverts+4]; + qint32 vertcnt=0; + GLshort * vertarray=vertex_array[0]; + assert(vertarray!=NULL); glColor4ub(linecol1.red(),linecol1.green(),linecol1.blue(),linecol1.alpha()); glLineWidth(1); diff --git a/Graphs/glcommon.cpp b/Graphs/glcommon.cpp index 4e62db01..56fc2f78 100644 --- a/Graphs/glcommon.cpp +++ b/Graphs/glcommon.cpp @@ -10,30 +10,39 @@ #include "glcommon.h" #include "SleepLib/profiles.h" #include -bool _font_init=false; -QFont * defaultfont; -QFont * mediumfont; -QFont * bigfont; +bool _graph_init=false; + +QFont * defaultfont=NULL; +QFont * mediumfont=NULL; +QFont * bigfont=NULL; + +GLshort *vertex_array[num_vert_arrays]={NULL}; // Must be called from a thread inside the application. -void InitFonts() +void InitGraphs() { - if (!_font_init) { + if (!_graph_init) { defaultfont=new QFont("FreeSans",10); bigfont=new QFont("FreeSans",35); mediumfont=new QFont("FreeSans",18); - - _font_init=true; + for (int i=0;i #include "Graphs/graphwindow.h" -void InitFonts(); -void DoneFonts(); +void InitGraphs(); +void DoneGraphs(); extern QFont * defaultfont; extern QFont * mediumfont; extern QFont * bigfont; +const int num_vert_arrays=4; +const qint32 maxverts=65536*4; // Resolution dependant.. +extern GLshort *vertex_array[num_vert_arrays]; + class gGraphWindow; void GetTextExtent(QString text, float & width, float & height, QFont *font=defaultfont); diff --git a/Graphs/graphdata_custom.cpp b/Graphs/graphdata_custom.cpp index 5e55d468..b2269cc3 100644 --- a/Graphs/graphdata_custom.cpp +++ b/Graphs/graphdata_custom.cpp @@ -31,7 +31,7 @@ void WaveData::Reload(Day *day) bool first=true; int chunk=0; for (vector::iterator s=day->begin();s!=day->end(); s++) { - qDebug("Processing waveform chunk %i",chunk++); + //qDebug("Processing waveform chunk %i",chunk++); if ((*s)->waveforms.find(code)==(*s)->waveforms.end()) continue; for (vector::iterator l=(*s)->waveforms[code].begin();l!=(*s)->waveforms[code].end();l++) { int ps=point.size(); @@ -43,7 +43,7 @@ void WaveData::Reload(Day *day) Waveform *w=(*l); double st=w->start().toMSecsSinceEpoch()/86400000.0; double rate=(w->duration()/w->samples())/86400.0; - qDebug("Waveform Chunk contains %i samples",w->samples()); + //qDebug("Waveform Chunk contains %i samples",w->samples()); for (int i=0;isamples();i++) { QPointD r(st,(*w)[i]); st+=rate; diff --git a/Graphs/graphwindow.cpp b/Graphs/graphwindow.cpp index 5b4030c3..de618eda 100644 --- a/Graphs/graphwindow.cpp +++ b/Graphs/graphwindow.cpp @@ -707,7 +707,7 @@ void gGraphWindow::paintGL() if (m_scrX<=0) return; if (m_scrY<=0) return; - InitFonts(); + InitGraphs(); glDisable(GL_DEPTH_TEST); Render(m_scrX,m_scrY); diff --git a/SleepLib/machine.cpp b/SleepLib/machine.cpp index c18a43d0..88c2c65f 100644 --- a/SleepLib/machine.cpp +++ b/SleepLib/machine.cpp @@ -279,7 +279,7 @@ Day *Machine::AddSession(Session *s,Profile *p) } if (day.find(date)==day.end()) { QString dstr=date.toString("yyyyMMdd"); - qDebug("Adding Profile Day %s",dstr.toAscii().data()); + //qDebug("Adding Profile Day %s",dstr.toAscii().data()); day[date]=new Day(this); // Add this Day record to profile p->AddDay(date.date(),day[date],m_type); diff --git a/SleepLib/preferences.cpp b/SleepLib/preferences.cpp index 00068536..2b9d7000 100644 --- a/SleepLib/preferences.cpp +++ b/SleepLib/preferences.cpp @@ -258,7 +258,7 @@ bool Preferences::Save(QString filename) if (type==QVariant::Invalid) continue; msg=new TiXmlElement(i->first.toLatin1()); - qDebug(i->first.toLatin1()); + //qDebug(i->first.toLatin1()); msg->SetAttribute("type",i->second.typeName()); QString t; diff --git a/SleepLib/profiles.cpp b/SleepLib/profiles.cpp index 2fe915f9..fbd69934 100644 --- a/SleepLib/profiles.cpp +++ b/SleepLib/profiles.cpp @@ -100,7 +100,7 @@ void Profile::ExtraLoad(TiXmlHandle *root) TiXmlElement *elem; elem=root->FirstChild("Machines").FirstChild().Element(); if (!elem) { - qDebug("ExtraLoad: Elem is empty."); + // qDebug("ExtraLoad: Elem is empty."); } for(; elem; elem=elem->NextSiblingElement()) { QString pKey=elem->Value(); diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp index d779bc4e..2f76aa00 100644 --- a/SleepLib/session.cpp +++ b/SleepLib/session.cpp @@ -274,7 +274,7 @@ bool Session::Store(QString path) QString base; base.sprintf("%08lx",s_session); base=path+"/"+base; - qDebug(("Storing Session: "+base).toLatin1()); + //qDebug(("Storing Session: "+base).toLatin1()); bool a,b,c; a=StoreSummary(base+".000"); // if actually has events if (events.size()>0) b=StoreEvents(base+".001"); @@ -356,7 +356,8 @@ bool Session::StoreSummary(QString filename) } bool Session::LoadSummary(QString filename) { - qDebug(("Loading Summary "+filename).toLatin1()); + if (filename.isEmpty()) return false; + //qDebug(("Loading Summary "+filename).toLatin1()); BinaryFile f; if (!f.Open(filename,BF_READ)) { qDebug(("Couldn't open file"+filename).toLatin1()); @@ -492,9 +493,10 @@ bool Session::StoreEvents(QString filename) } bool Session::LoadEvents(QString filename) { + if (filename.isEmpty()) return false; BinaryFile f; if (!f.Open(filename,BF_READ)) { - qDebug(("Couldn't open file"+filename).toLatin1()); + qDebug(("Couldn't open events file"+filename).toLatin1()); return false; } @@ -629,9 +631,11 @@ bool Session::StoreWaveforms(QString filename) bool Session::LoadWaveforms(QString filename) { + if (filename.isEmpty()) return false; + BinaryFile f; if (!f.Open(filename,BF_READ)) { - qDebug(("Couldn't open file "+filename).toLatin1()); + qDebug(("Couldn't open waveform file "+filename).toLatin1()); return false; } diff --git a/daily.cpp b/daily.cpp index ff5d7b05..d1a06833 100644 --- a/daily.cpp +++ b/daily.cpp @@ -257,7 +257,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) : ui->calendar->setWeekdayTextFormat(Qt::Saturday, format); ui->calendar->setWeekdayTextFormat(Qt::Sunday, format); - ui->tabWidget->setCurrentWidget(ui->info); + ui->tabWidget->setCurrentWidget(ui->details); ReloadGraphs(); } @@ -383,7 +383,9 @@ void Daily::Load(QDate date) Day *oxi=profile->GetDay(date,MT_OXIMETER); Day *sleepstage=profile->GetDay(date,MT_SLEEPSTAGE); - QString html=""; + QString html=""; + html+=""; + html+=""; html+="\n"; QString tmp; @@ -791,3 +793,17 @@ void Daily::on_treeWidget_itemSelectionChanged() SNORE->SetXBounds(st,et); } } + +void Daily::on_JournalNotesUnderline_clicked() +{ + QTextCursor cursor = ui->JournalNotes->textCursor(); + if (!cursor.hasSelection()) + cursor.select(QTextCursor::WordUnderCursor); + + QTextCharFormat format=cursor.charFormat(); + + format.setFontUnderline(!format.fontUnderline()); + + cursor.mergeCharFormat(format); + //ui->JournalNotes->mergeCurrentCharFormat(format); +} diff --git a/daily.h b/daily.h index 6bdf744a..4d12ce27 100644 --- a/daily.h +++ b/daily.h @@ -45,6 +45,8 @@ private slots: void on_treeWidget_itemSelectionChanged(); + void on_JournalNotesUnderline_clicked(); + private: Session * CreateJournalSession(QDate date); Session * GetJournalSession(QDate date); diff --git a/daily.ui b/daily.ui index cb7d6576..ffe21a21 100644 --- a/daily.ui +++ b/daily.ui @@ -63,7 +63,7 @@ Sans Serif - 9 + 10 @@ -95,9 +95,9 @@ true - + - Information + Details @@ -185,6 +185,128 @@ 2 + + + + 0 + + + + + 0 + + + + + Journal + + + + + + + + 85 + 16777215 + + + + 3 + + + QComboBox::AdjustToContents + + + + Small + + + + + Medium + + + + + Big + + + + + + + + Color + + + + + + + + true + + + + i + + + Ctrl+I + + + + + + + + true + + + + U + + + + + + + + 75 + true + + + + B + + + Ctrl+B + + + + + + + + + + + + + + + + + Extras + + + + 0 + + + 0 + + + @@ -294,512 +416,33 @@ - - - 0 + + + QAbstractItemView::AllEditTriggers - - - - 0 - - - - - Notes - - - - - - - - 85 - 16777215 - - - - 3 - - - QComboBox::AdjustToContents - - - - Small - - - - - Medium - - - - - Big - - - - - - - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 0 - 0 - - - - - - - 255 - 127 - 127 - - - - - - - 255 - 63 - 63 - - - - - - - 127 - 0 - 0 - - - - - - - 170 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 127 - 127 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 0 - 0 - - - - - - - 255 - 127 - 127 - - - - - - - 255 - 63 - 63 - - - - - - - 127 - 0 - 0 - - - - - - - 170 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 127 - 127 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 127 - 0 - 0 - - - - - - - 255 - 0 - 0 - - - - - - - 255 - 127 - 127 - - - - - - - 255 - 63 - 63 - - - - - - - 127 - 0 - 0 - - - - - - - 170 - 0 - 0 - - - - - - - 127 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 127 - 0 - 0 - - - - - - - 255 - 0 - 0 - - - - - - - 255 - 0 - 0 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 0 - 0 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - Color - - - - - - - - true - - - - i - - - Ctrl+I - - - - - - - - 75 - true - - - - B - - - Ctrl+B - - - - - - - - - + + true + + + 1 + + + + + Medication + + + + + Time + + + + + Dose + + + diff --git a/docs/index.html b/docs/index.html index c784a00b..e05a15d3 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,23 +1,27 @@ - -
-
-
Welcome to SleepyHead
+ + + + + + - diff --git a/main.cpp b/main.cpp index 6bd7c8ba..0cffd92a 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,7 @@ //#include #include #include +#include #include "mainwindow.h" #include "SleepLib/profiles.h" @@ -21,8 +22,14 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); a.setApplicationName("SleepyHead"); - QFontDatabase::addApplicationFont(":/fonts/freesans.ttf"); - a.setFont(QFont("FreeSans")); + int id=QFontDatabase::addApplicationFont(":/fonts/FreeSans.ttf"); + QStringList ffam=QFontDatabase::applicationFontFamilies(id); + for (QStringList::iterator i=ffam.begin();i!=ffam.end();i++) { + qDebug(("Loaded Font: "+*i).toLatin1()); + } + + a.setFont(QFont("FreeSans",10)); + PRS1Loader::Register(); CMS50Loader::Register(); ZEOLoader::Register(); diff --git a/mainwindow.cpp b/mainwindow.cpp index 95c43e90..1f3ea5f4 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -73,7 +73,7 @@ MainWindow::~MainWindow() overview->close(); delete overview; } - DoneFonts(); + DoneGraphs(); delete ui; Profiles::Done(); }
+

Welcome to SleepyHead
+

This software assists you in reviewing data at home for your CPAP Machine, Oximeter, Sleep Stage monitors, as well as help you track general issues related to sleep health.

Currenly supports the following machines:

  • Philips Respironics System One
  • Contec CMS50 Oximeters
    • -

    Project Website: http://sleepyhead.sourceforge.net

    -

    About Sleep Apnea: http://en.wikipedia.org/wiki/Sleep_apnea

    -

    CPAPTalk Forum: http://www.cpaptalk.com

    +

    Project Website: http://sleepyhead.sourceforge.net
    +About Sleep Apnea: http://en.wikipedia.org/wiki/Sleep_apnea
    +CPAPTalk Forum: http://www.cpaptalk.com
    -
    This is a temporary logo
    -(from OpenClipart.org) -
    +
    This is a temporary logo