diff --git a/Graphs/gFlagsLine.cpp b/Graphs/gFlagsLine.cpp index ae61b5be..82e4bbf4 100644 --- a/Graphs/gFlagsLine.cpp +++ b/Graphs/gFlagsLine.cpp @@ -12,7 +12,7 @@ gFlagsGroup::gFlagsGroup() { - static QColor col=Qt::black; + //static QColor col=Qt::black; addGLBuf(quads=new GLShortBuffer(512,GL_QUADS)); addGLBuf(lines=new GLShortBuffer(20,GL_LINE_LOOP)); diff --git a/Graphs/gFooBar.cpp b/Graphs/gFooBar.cpp index 3a6004a4..aa5130f4 100644 --- a/Graphs/gFooBar.cpp +++ b/Graphs/gFooBar.cpp @@ -51,6 +51,10 @@ gFooBar::~gFooBar() } void gFooBar::paint(gGraph & w,int left, int top, int width, int height) { + Q_UNUSED(top); + Q_UNUSED(left); + Q_UNUSED(width); + Q_UNUSED(height); if (!m_visible) return; double xx=w.max_x-w.min_x; @@ -58,9 +62,7 @@ void gFooBar::paint(gGraph & w,int left, int top, int width, int height) if (xx==0) return; - height=height; - - int start_px=left; + //int start_px=left; //int end_px=left+width; //float h=top; diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index 2b30e77a..c7c8a1af 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -20,37 +20,45 @@ void InitGraphs() { if (!_graph_init) { - if (!PREF.Exists("FontGraph")) { - PREF["FontGraph"]="Sans Serif"; - PREF["FontGraphSize"]=10; - PREF["FontGraphBold"]=false; - PREF["FontGraphItalic"]=false; + if (!PREF.Exists("Fonts_Graph_Name")) { + PREF["Fonts_Graph_Name"]="Sans Serif"; + PREF["Fonts_Graph_Size"]=10; + PREF["Fonts_Graph_Bold"]=false; + PREF["Fonts_Graph_Italic"]=false; } - if (!PREF.Exists("FontTitle")) { - PREF["FontTitle"]="Serif"; - PREF["FontTitleSize"]=11; - PREF["FontTitleBold"]=true; - PREF["FontTitleItalic"]=false; + if (!PREF.Exists("Fonts_Title_Name")) { + PREF["Fonts_Title_Name"]="Serif"; + PREF["Fonts_Title_Size"]=11; + PREF["Fonts_Title_Bold"]=true; + PREF["Fonts_Title_Italic"]=false; } - if (!PREF.Exists("FontBig")) { - PREF["FontBig"]="Serif"; - PREF["FontBigSize"]=35; - PREF["FontBigBold"]=false; - PREF["FontBigItalic"]=false; + if (!PREF.Exists("Fonts_Big_Name")) { + PREF["Fonts_Big_Name"]="Serif"; + PREF["Fonts_Big_Size"]=35; + PREF["Fonts_Big_Bold"]=false; + PREF["Fonts_Big_Italic"]=false; } - defaultfont=new QFont(PREF["FontGraph"].toString(),PREF["FontGraphSize"].toInt(),PREF["FontGraphBold"].toBool() ? QFont::Bold : QFont::Normal,PREF["FontGraphItalic"].toBool()); - mediumfont=new QFont(PREF["FontTitle"].toString(),PREF["FontTitleSize"].toInt(),PREF["FontTitleBold"].toBool() ? QFont::Bold : QFont::Normal,PREF["FontTitleItalic"].toBool()); - bigfont=new QFont(PREF["FontBig"].toString(),PREF["FontBigSize"].toInt(),PREF["FontBigBold"].toBool() ? QFont::Bold : QFont::Normal,PREF["FontBigItalic"].toBool()); - - // defaultfont->setPixelSize(11); - //mediumfont=new QFont("Serif",11); - //bigfont=new QFont("Serif",35); + defaultfont=new QFont(PREF["Fonts_Graph_Name"].toString(), + PREF["Fonts_Graph_Size"].toInt(), + PREF["Fonts_Graph_Bold"].toBool() ? QFont::Bold : QFont::Normal, + PREF["Fonts_Graph_Italic"].toBool() + ); + mediumfont=new QFont(PREF["Fonts_Title_Name"].toString(), + PREF["Fonts_Title_Size"].toInt(), + PREF["Fonts_Title_Bold"].toBool() ? QFont::Bold : QFont::Normal, + PREF["Fonts_Title_Italic"].toBool() + ); + bigfont=new QFont(PREF["Fonts_Big_Name"].toString(), + PREF["Fonts_Big_Size"].toInt(), + PREF["Fonts_Big_Bold"].toBool() ? QFont::Bold : QFont::Normal, + PREF["Fonts_Big_Italic"].toBool() + ); defaultfont->setStyleHint(QFont::AnyStyle,QFont::OpenGLCompatible); mediumfont->setStyleHint(QFont::AnyStyle,QFont::OpenGLCompatible); bigfont->setStyleHint(QFont::AnyStyle,QFont::OpenGLCompatible); - //mediumfont->setBold(true); + _graph_init=true; } } @@ -790,7 +798,7 @@ void gThread::run() g=graphview->popGraph(); if (g) { g->paint(g->m_lastbounds.x(),g->m_lastbounds.y(),g->m_lastbounds.width(),g->m_lastbounds.height()); - int i=0; + //int i=0; } else { //mutex.lock(); graphview->masterlock->release(1); // This thread gives up for now.. @@ -1027,7 +1035,7 @@ void gGraph::timedRedraw(int ms) { m_graphview->timedRedraw(ms); } void gGraph::mouseMoveEvent(QMouseEvent * event) { // qDebug() << m_title << "Move" << event->pos() << m_graphview->pointClicked(); - int y=event->pos().y(); + //int y=event->pos().y(); int x=event->pos().x(); int x2=m_graphview->pointClicked().x();//,y2=m_graphview->pointClicked().y(); int w=m_lastbounds.width()-(right+m_marginright); @@ -1036,7 +1044,7 @@ void gGraph::mouseMoveEvent(QMouseEvent * event) double xmult=xx/w; - bool nolayer=false; + //bool nolayer=false; bool doredraw=false; if (m_graphview->m_selected_graph==this) { @@ -1069,7 +1077,7 @@ void gGraph::mouseMoveEvent(QMouseEvent * event) qstatus2->setText(str); } //m_graphview->updateGL(); - nolayer=false; + //nolayer=false; doredraw=true; } else if (event->buttons() & Qt::RightButton) { m_graphview->setPointClicked(event->pos()); @@ -1099,7 +1107,7 @@ void gGraph::mouseMoveEvent(QMouseEvent * event) //if (a2>rmax_x) a2=rmax_x; m_graphview->SetXBounds(min_x,max_x,m_group,false); doredraw=true; - nolayer=true; + //nolayer=true; } else { qint64 qq=rmax_x-rmin_x; xx=max_x-min_x; @@ -1119,7 +1127,7 @@ void gGraph::mouseMoveEvent(QMouseEvent * event) } m_graphview->SetXBounds(min_x,max_x,m_group,false); doredraw=true; - nolayer=true; + //nolayer=true; } } @@ -1710,6 +1718,7 @@ void gGraphView::scrollbarValueChanged(int val) } void gGraphView::ResetBounds(bool refresh) //short group) { + Q_UNUSED(refresh) qint64 m1=0,m2=0; for (int i=0;iResetBounds(); @@ -1868,7 +1877,7 @@ void gGraphView::paintGL() float h,w; //ax=px;//-m_offsetX; - bool threaded; + //bool threaded; // Tempory hack using this pref.. /*if ((*profile)["EnableMultithreading"].toBool()) { // && (m_idealthreads>1)) { @@ -1878,7 +1887,7 @@ void gGraphView::paintGL() m_threads[i]->start(); } } else threaded=false; */ - threaded=false; + //threaded=false; for (int i=0;iisEmpty() || !m_graphs[i]->visible()) continue; numgraphs++; diff --git a/Graphs/gSessionTime.cpp b/Graphs/gSessionTime.cpp index e45617e4..92c3d1b8 100644 --- a/Graphs/gSessionTime.cpp +++ b/Graphs/gSessionTime.cpp @@ -42,6 +42,12 @@ gSessionTime::~gSessionTime() void gSessionTime::paint(gGraph & w,int left, int top, int width, int height) { + Q_UNUSED(w); + Q_UNUSED(left); + Q_UNUSED(top); + Q_UNUSED(width); + Q_UNUSED(height); + if (!m_visible) return; /*if (!data) return; if (!data->IsReady()) return; diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp index b75932c5..df03e2f4 100644 --- a/Graphs/gSummaryChart.cpp +++ b/Graphs/gSummaryChart.cpp @@ -14,7 +14,7 @@ extern QLabel * qstatus2; SummaryChart::SummaryChart(QString label,GraphType type) :Layer(""),m_label(label),m_graphtype(type) { - QColor color=Qt::black; + //QColor color=Qt::black; addGLBuf(quads=new GLShortBuffer(20000,GL_QUADS)); addGLBuf(lines=new GLShortBuffer(20000,GL_LINES)); quads->forceAntiAlias(true); @@ -175,7 +175,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height) barw=(float(width)/float(days)); - qint64 ts; + //qint64 ts; graph=&w; float px=left; @@ -201,7 +201,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height) //QHash lastvalues; int total_days=0; double total_val=0; - qint64 lastQ=0; + //qint64 lastQ=0; bool lastdaygood=false; QVector totalcounts; QVector totalvalues; @@ -329,7 +329,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height) } else lastdaygood=false; px+=barw; daynum++; - lastQ=Q; + //lastQ=Q; } lines->scissor(left,w.flipY(top+height+2),width+1,height+1); @@ -434,8 +434,8 @@ bool SummaryChart::mouseMoveEvent(QMouseEvent *event) QDateTime dt1=QDateTime::fromTime_t(hl_day*86400).toLocalTime(); QDateTime dt2=QDateTime::fromTime_t(hl_day*86400).toUTC(); - QTime t1=dt1.time(); - QTime t2=dt2.time(); + //QTime t1=dt1.time(); + //QTime t2=dt2.time(); QDate dt=dt2.date(); if (d!=m_values.end()) { @@ -452,7 +452,7 @@ bool SummaryChart::mouseMoveEvent(QMouseEvent *event) int t=d.value()[0]*3600.0; int h=t/3600; int m=(t / 60) % 60; - int s=t % 60; + //int s=t % 60; val.sprintf("%02i:%02i",h,m); } else val=QString::number(d.value()[0],'f',2); @@ -495,11 +495,13 @@ bool SummaryChart::mouseMoveEvent(QMouseEvent *event) bool SummaryChart::mousePressEvent(QMouseEvent * event) { + Q_UNUSED(event) return false; } bool SummaryChart::mouseReleaseEvent(QMouseEvent * event) { + Q_UNUSED(event) hl_day=-1; graph->timedRedraw(2000); return false; diff --git a/Graphs/gXAxis.cpp b/Graphs/gXAxis.cpp index 20be523c..b309983d 100644 --- a/Graphs/gXAxis.cpp +++ b/Graphs/gXAxis.cpp @@ -43,6 +43,7 @@ gXAxis::~gXAxis() } void gXAxis::paint(gGraph & w,int left,int top, int width, int height) { + Q_UNUSED(height) double px,py; int start_px=left; @@ -136,7 +137,7 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height) GLShortBuffer *lines=w.backlines(); - int utcoff=m_utcfix ? tz_hours : 0; + //int utcoff=m_utcfix ? tz_hours : 0; //utcoff=0; int num_minor_ticks; @@ -171,7 +172,7 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height) int h=(j/3600000L) % 24L; int s=(j/1000L) % 60L; static QString dow[]={"Sun","Mon","Tue","Wed","Thu","Fri","Sat"}; - int d=(j/86400000) % 7; + //int d=(j/86400000) % 7; if (fitmode==0) { int d=(j/1000); diff --git a/Graphs/gYAxis.cpp b/Graphs/gYAxis.cpp index c5764b75..9516cbef 100644 --- a/Graphs/gYAxis.cpp +++ b/Graphs/gYAxis.cpp @@ -12,11 +12,13 @@ gYSpacer::gYSpacer(int spacer) :Layer("") { + Q_UNUSED(spacer) } gXGrid::gXGrid(QColor col) :Layer("") { + Q_UNUSED(col) m_major_color=QColor(180,180,180,128); m_minor_color=QColor(220,220,220,128); m_show_major_lines=true; @@ -38,7 +40,7 @@ void gXGrid::paint(gGraph & w,int left,int top, int width, int height) w.roundY(miny,maxy); - EventDataType dy=maxy-miny; + //EventDataType dy=maxy-miny; if (height<0) return; @@ -196,7 +198,9 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height) bool gYAxis::mouseMoveEvent(QMouseEvent * event) { - int x=event->x(); - int y=event->y(); + Q_UNUSED(event) + //int x=event->x(); + //int y=event->y(); //qDebug() << "Hover at " << x << y; + return false; } diff --git a/SleepLib/loader_plugins/cms50_loader.cpp b/SleepLib/loader_plugins/cms50_loader.cpp index a78f5190..e6d97552 100644 --- a/SleepLib/loader_plugins/cms50_loader.cpp +++ b/SleepLib/loader_plugins/cms50_loader.cpp @@ -154,6 +154,7 @@ bool CMS50Loader::OpenSPORFile(QString path,Machine *mach,Profile *profile) br=f.read((char *)tmp,2); if (br!=2) return false; some_code=tmp[0] | (tmp[1] << 8); // 512 or 256 observed + Q_UNUSED(some_code); br=f.read((char *)tmp,2); if (br!=2) return false; @@ -173,6 +174,7 @@ bool CMS50Loader::OpenSPORFile(QString path,Machine *mach,Profile *profile) br=f.read((char *)tmp,2); if (br!=2) return false; some_more_code=tmp[0] | (tmp[1] << 8); // == 0 + Q_UNUSED(some_more_code); br=f.read((char *)tmp,34); // Read widechar date record if (br!=34) return false; diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp index de5c5984..8578151f 100644 --- a/SleepLib/loader_plugins/resmed_loader.cpp +++ b/SleepLib/loader_plugins/resmed_loader.cpp @@ -272,10 +272,10 @@ int ResmedLoader::Open(QString & path,Profile *profile) QDateTime dt1=QDateTime::fromTime_t(stredf.startdate/1000L); QDateTime dt2=QDateTime::fromTime_t(stredf.enddate/1000L); - QDate dd1=dt1.date(); - QDate dd2=dt2.date(); + //QDate dd1=dt1.date(); + //QDate dd2=dt2.date(); for (int s=0;snr*stredf.GetNumDataRecords(); qDebug() << "STREDF:" << stredf.edfsignals[s]->label << recs; @@ -398,6 +398,8 @@ int ResmedLoader::Open(QString & path,Profile *profile) if (stredf.lookup.contains("Mode")) mode=(*stredf.lookup["Mode"]).data[dn]; else mode=0; + + // AutoSV machines don't have both fields if (stredf.lookup.contains("EPR")) sess->settings["EPR"]=(*stredf.lookup["EPR"]).data[dn]; if (stredf.lookup.contains("EPRSet")) diff --git a/SleepLib/loader_plugins/zeo_loader.cpp b/SleepLib/loader_plugins/zeo_loader.cpp index e9eb2737..1c89953a 100644 --- a/SleepLib/loader_plugins/zeo_loader.cpp +++ b/SleepLib/loader_plugins/zeo_loader.cpp @@ -28,8 +28,8 @@ ZEOLoader::~ZEOLoader() } int ZEOLoader::Open(QString & path,Profile *profile) { - profile=profile; - path=path; + Q_UNUSED(path) + Q_UNUSED(profile) // ZEO folder structure detection stuff here. return 0; // number of machines affected diff --git a/SleepLib/machine.cpp b/SleepLib/machine.cpp index d816831a..32b45144 100644 --- a/SleepLib/machine.cpp +++ b/SleepLib/machine.cpp @@ -313,7 +313,7 @@ bool Machine::SaveSession(Session *sess) bool Machine::Save() { - int size=0; + //int size; int cnt=0; QString path=profile->Get("DataFolder")+"/"+hexid(); @@ -341,7 +341,7 @@ bool Machine::Save() // Calculate size for progress bar - size=sessionlist.size(); + //size=sessionlist.size(); QHash::iterator s; diff --git a/SleepLib/preferences.cpp b/SleepLib/preferences.cpp index 6506cd75..dad991a3 100644 --- a/SleepLib/preferences.cpp +++ b/SleepLib/preferences.cpp @@ -96,7 +96,7 @@ Preferences::~Preferences() //Save(); // Don't..Save calls a virtual function. } -int Preferences::GetCode(QString s) +/*int Preferences::GetCode(QString s) { int prefcode=0; for (QHash::iterator i=p_codes.begin(); i!=p_codes.end(); i++) { @@ -105,7 +105,7 @@ int Preferences::GetCode(QString s) } p_codes[prefcode]=s; return prefcode; -} +}*/ const QString Preferences::Get(QString name) { diff --git a/SleepLib/preferences.h b/SleepLib/preferences.h index 0d084fbc..2ce22b5f 100644 --- a/SleepLib/preferences.h +++ b/SleepLib/preferences.h @@ -41,29 +41,34 @@ public: //const QString Get(const char * name) { // return Get(name); // }; - const QString Get(int code) { + /*const QString Get(int code) { return Get(p_codes[code]); - }; + }*/ // operator[] will not expand {} macros QVariant & operator[](QString name) { return p_preferences[name]; - }; - QVariant & operator[](int code) { + } + /*QVariant & operator[](int code) { return p_preferences[p_codes[code]]; - }; + }*/ void Set(QString name,QVariant value) { p_preferences[name]=value; - }; - void Set(int code,QVariant value) { + } + /*void Set(int code,QVariant value) { Set(p_codes[code],value); - }; + }*/ bool Exists(QString name) { - return (p_preferences.find(name)!=p_preferences.end()); - }; + return (p_preferences.contains(name)); + } + bool ExistsAndTrue(QString name) { + QHash::iterator i=p_preferences.find(name); + if (i==p_preferences.end()) return false; + return i.value().toBool(); + } void Erase(QString name) { QHash::iterator i=p_preferences.find(name); if (i!=p_preferences.end()) @@ -79,11 +84,11 @@ public: void SetComment(const QString & str) { p_comment=str; }; - int GetCode(QString name); // For registering/looking up new preference code. + //int GetCode(QString name); // For registering/looking up new preference code. QHash p_preferences; protected: - QHash p_codes; + //QHash p_codes; QString p_comment; QString p_name; QString p_filename; diff --git a/SleepLib/schema.cpp b/SleepLib/schema.cpp index de910cf0..700c212a 100644 --- a/SleepLib/schema.cpp +++ b/SleepLib/schema.cpp @@ -119,7 +119,7 @@ bool ChannelList::Load(QString filename) DataType datatype; Channel *chan; QColor color; - bool multi; + //bool multi; ScopeType scope; int line; for (int i=0;im_links.push_back(chan); - int i=0; + //int i=0; } else { qWarning() << "Linked channel must be defined first in" << filename <<"line" << line; } @@ -244,6 +244,7 @@ bool ChannelList::Load(QString filename) } bool ChannelList::Save(QString filename) { + Q_UNUSED(filename) return false; } diff --git a/main.cpp b/main.cpp index 6aa414eb..e0ecb0cd 100644 --- a/main.cpp +++ b/main.cpp @@ -77,6 +77,28 @@ int main(int argc, char *argv[]) QString Version=QString("%1.%2.%3").arg(major_version).arg(minor_version).arg(revision_number); + QDateTime lastchecked, today=QDateTime::currentDateTime(); + if (!PREF.Exists("Updates_AutoCheck")) { + PREF["Updates_AutoCheck"]=true; + PREF["Updates_CheckFrequency"]=3; + } + bool check_updates=false; + if (PREF["Updates_AutoCheck"].toBool()) { + int update_frequency=PREF["Updates_CheckFrequency"].toInt(); + int days=1000; + // p_pref ->Get + lastchecked=PREF["Updates_LastChecked"].toDateTime(); + if (PREF.Exists("Updates_LastChecked")) { + days=lastchecked.secsTo(today); + days/=86400; + }; + if (days>update_frequency) { + //QMessageBox::information(NULL,"Check for updates","Placeholder. Would automatically check for updates here.",QMessageBox::Ok); + check_updates=true; + //PREF["Updates_LastChecked"]=today; + } + } + if (!Profiles::profiles.size()) { NewProfile newprof(0); if (newprof.exec()==NewProfile::Rejected) @@ -96,6 +118,7 @@ int main(int argc, char *argv[]) } } PREF["VersionString"]=Version; + p_profile=Profiles::Get(PREF["Profile"].toString()); //if (!PREF.Exists("Profile")) PREF["Profile"]=getUserName(); @@ -107,20 +130,25 @@ int main(int argc, char *argv[]) qDebug() << "Loaded Font: " << (*i); } */ - if (!PREF.Exists("FontApplication")) { - PREF["FontApplication"]="Sans Serif"; - PREF["FontApplicationSize"]=10; - PREF["FontApplicationBold"]=false; - PREF["FontApplicationItalic"]=false; + if (!PREF.Exists("Fonts_Application_Name")) { + PREF["Fonts_Application_Name"]="Sans Serif"; + PREF["Fonts_Application_Size"]=10; + PREF["Fonts_Application_Bold"]=false; + PREF["Fonts_Application_Italic"]=false; } - QApplication::setFont(QFont(PREF["FontApplication"].toString(),PREF["FontApplicationSize"].toInt(),PREF["FontApplicationBold"].toBool() ? QFont::Bold : QFont::Normal,PREF["FontApplicationItalic"].toBool())); + QApplication::setFont(QFont(PREF["Fonts_Application_Name"].toString(), + PREF["Fonts_Application_Size"].toInt(), + PREF["Fonts_Application_Bold"].toBool() ? QFont::Bold : QFont::Normal, + PREF["Fonts_Application_Italic"].toBool())); qInstallMsgHandler(MyOutputHandler); MainWindow w; mainwin=&w; + + if (check_updates) mainwin->CheckForUpdates(); w.show(); return a.exec(); diff --git a/mainwindow.cpp b/mainwindow.cpp index 958d86c9..ea899a9c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -16,7 +16,6 @@ #include #include "mainwindow.h" #include "ui_mainwindow.h" -#include "preferencesdialog.h" #include "newprofile.h" #include "SleepLib/schema.h" @@ -69,6 +68,7 @@ MainWindow::MainWindow(QWidget *parent) : overview=NULL; daily=NULL; oximetry=NULL; + prefdialog=NULL; /* QGLFormat fmt; fmt.setDepth(false); @@ -366,6 +366,7 @@ void MainWindow::on_action_Reset_Graph_Layout_triggered() void MainWindow::on_action_Preferences_triggered() { PreferencesDialog pd(this,p_profile); + prefdialog=&pd; if (pd.exec()==PreferencesDialog::Accepted) { qDebug() << "Preferences Accepted"; pd.Save(); @@ -378,6 +379,7 @@ void MainWindow::on_action_Preferences_triggered() overview->RedrawGraphs(); } } + prefdialog=NULL; } void MainWindow::on_oximetryButton_clicked() @@ -398,8 +400,21 @@ void MainWindow::on_oximetryButton_clicked() } +void MainWindow::CheckForUpdates() +{ + on_actionCheck_for_Updates_triggered(); +} + void MainWindow::on_actionCheck_for_Updates_triggered() { + if (PREF.Exists("Updates_LastChecked")) { + if (PREF["Updates_LastChecked"].toDateTime().secsTo(QDateTime::currentDateTime())<3600) { + // Instead of doing this, just use the cached crud + if (prefdialog) prefdialog->RefreshLastChecked(); + ui->statusbar->showMessage("No New Updates - You already checked in the last hour...",4000); + return; + } + } netmanager->get(QNetworkRequest(QUrl("http://sleepyhead.sourceforge.net/current_version.txt"))); } void MainWindow::replyFinished(QNetworkReply * reply) @@ -413,12 +428,14 @@ void MainWindow::replyFinished(QNetworkReply * reply) QByteArray data=reply->readAll(); QString a=data; a=a.trimmed(); + PREF["Updates_LastChecked"]=QDateTime::currentDateTime(); + if (prefdialog) prefdialog->RefreshLastChecked(); if (a>PREF["VersionString"].toString()) { if (QMessageBox::question(this,"New Version","A newer version of SleepyHead is available, v"+a+".\nWould you like to update?",QMessageBox::Yes,QMessageBox::No)==QMessageBox::Yes) { QMessageBox::information(this,"Laziness Warning","I'd love to do it for you automatically, but it's not implemented yet.. :)",QMessageBox::Ok); } } else { - QMessageBox::information(this,"SleepyHead v"+PREF["VersionString"].toString(),"You're already up to date!\nLatest version on sourceforge is v"+a,QMessageBox::Ok); + ui->statusbar->showMessage("Checked for Updates and SleepyHead is already up to date (v"+a+")",4000); } } } else { diff --git a/mainwindow.h b/mainwindow.h index 1a08e96b..efaed5dc 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -15,6 +15,7 @@ #include "overview.h" #include "oximetry.h" #include "report.h" +#include "preferencesdialog.h" const int major_version=0; const int minor_version=8; @@ -40,6 +41,7 @@ public: ~MainWindow(); void Log(QString s); QMenu * CreateMenu(QString title); + void CheckForUpdates(); private slots: void on_action_Import_Data_triggered(); @@ -102,7 +104,7 @@ private: bool first_load; //Profile *profile; QNetworkAccessManager *netmanager; - + PreferencesDialog *prefdialog; QMutex loglock,strlock; QStringList logbuffer; QTime logtime; diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp index 2785c4ad..64a1dcc7 100644 --- a/preferencesdialog.cpp +++ b/preferencesdialog.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include "preferencesdialog.h" #include "ui_preferencesdialog.h" #include "SleepLib/machine_common.h" @@ -65,6 +66,14 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) : ui->bigFontBold->setChecked(bigfont->weight()==QFont::Bold); ui->bigFontItalic->setChecked(bigfont->italic()); + if (!PREF.Exists("Updates_AutoCheck")) PREF["Updates_AutoCheck"]=true; + ui->automaticallyCheckUpdates->setChecked(PREF["Updates_AutoCheck"].toBool()); + + if (!PREF.Exists("Updates_CheckFrequency")) PREF["Updates_CheckFrequency"]=3; + ui->updateCheckEvery->setValue(PREF["Updates_CheckFrequency"].toInt()); + if (PREF.Exists("Updates_LastChecked")) { + RefreshLastChecked(); + } else ui->updateLastChecked->setText("Never"); if (val>0) { ui->IgnoreLCD->display(val); @@ -184,25 +193,28 @@ void PreferencesDialog::Save() (*profile)["SyncOximetry"]=ui->oximetrySync->isChecked(); (*profile)["OximeterType"]=ui->oximetryType->currentText(); - PREF["FontApplication"]=ui->applicationFont->currentText(); - PREF["FontApplicationSize"]=ui->applicationFontSize->value(); - PREF["FontApplicationBold"]=ui->applicationFontBold->isChecked(); - PREF["FontApplicationItalic"]=ui->applicationFontItalic->isChecked(); + PREF["Updates_AutoCheck"]=ui->automaticallyCheckUpdates->isChecked(); + PREF["Updates_CheckFrequency"]=ui->updateCheckEvery->value(); - PREF["FontGraph"]=ui->graphFont->currentText(); - PREF["FontGraphSize"]=ui->graphFontSize->value(); - PREF["FontGraphBold"]=ui->graphFontBold->isChecked(); - PREF["FontGraphItalic"]=ui->graphFontItalic->isChecked(); + PREF["Fonts_Application_Name"]=ui->applicationFont->currentText(); + PREF["Fonts_Application_Size"]=ui->applicationFontSize->value(); + PREF["Fonts_Application_Bold"]=ui->applicationFontBold->isChecked(); + PREF["Fonts_Application_Italic"]=ui->applicationFontItalic->isChecked(); - PREF["FontTitle"]=ui->titleFont->currentText(); - PREF["FontTitleSize"]=ui->titleFontSize->value(); - PREF["FontTitleBold"]=ui->titleFontBold->isChecked(); - PREF["FontTitleItalic"]=ui->titleFontItalic->isChecked(); + PREF["Fonts_Graph_Name"]=ui->graphFont->currentText(); + PREF["Fonts_Graph_Size"]=ui->graphFontSize->value(); + PREF["Fonts_Graph_Bold"]=ui->graphFontBold->isChecked(); + PREF["Fonts_Graph_Italic"]=ui->graphFontItalic->isChecked(); - PREF["FontBig"]=ui->bigFont->currentText(); - PREF["FontBigSize"]=ui->bigFontSize->value(); - PREF["FontBigBold"]=ui->bigFontBold->isChecked(); - PREF["FontBigItalic"]=ui->bigFontItalic->isChecked(); + PREF["Fonts_Title_Name"]=ui->titleFont->currentText(); + PREF["Fonts_Title_Size"]=ui->titleFontSize->value(); + PREF["Fonts_Title_Bold"]=ui->titleFontBold->isChecked(); + PREF["Fonts_Title_Italic"]=ui->titleFontItalic->isChecked(); + + PREF["Fonts_Big_Name"]=ui->bigFont->currentText(); + PREF["Fonts_Big_Size"]=ui->bigFontSize->value(); + PREF["Fonts_Big_Bold"]=ui->bigFontBold->isChecked(); + PREF["Fonts_Big_Italic"]=ui->bigFontItalic->isChecked(); QFont font=ui->applicationFont->currentFont(); font.setPointSize(ui->applicationFontSize->value()); @@ -260,3 +272,17 @@ void PreferencesDialog::on_useGraphSnapshots_toggled(bool checked) ui->useGraphSnapshots->setChecked(false); } } + +#include "mainwindow.h" +extern MainWindow * mainwin; +void PreferencesDialog::RefreshLastChecked() +{ + ui->updateLastChecked->setText(PREF["Updates_LastChecked"].toDateTime().toString(Qt::SystemLocaleLongDate)); +} + +void PreferencesDialog::on_checkForUpdatesButton_clicked() +{ + mainwin->statusBar()->showMessage("Checking for Updates"); + ui->updateLastChecked->setText("Checking for Updates"); + mainwin->CheckForUpdates(); +} diff --git a/preferencesdialog.h b/preferencesdialog.h index 71972078..d40ecf49 100644 --- a/preferencesdialog.h +++ b/preferencesdialog.h @@ -23,6 +23,7 @@ public: explicit PreferencesDialog(QWidget *parent, Profile * _profile); ~PreferencesDialog(); void Save(); + void RefreshLastChecked(); private slots: void on_eventTable_doubleClicked(const QModelIndex &index); void on_combineSlider_valueChanged(int value); @@ -31,6 +32,8 @@ private slots: void on_useGraphSnapshots_toggled(bool checked); + void on_checkForUpdatesButton_clicked(); + private: Ui::PreferencesDialog *ui; Profile * profile; diff --git a/preferencesdialog.ui b/preferencesdialog.ui index 6698dc52..a904b302 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -9,15 +9,24 @@ 0 0 - 527 + 500 330 + + + 640 + 16777215 + + Preferences - false + true + + + true @@ -29,7 +38,7 @@ - 5 + 6 @@ -75,23 +84,6 @@ - - - - - 0 - 0 - - - - The Pie Chart in the Daily Views left panel. -This takes extra space, and has been known to cause problems on certain computer configurations, hence it's turned off by default. - - - Graph Snapshots - - - @@ -127,16 +119,6 @@ This takes extra space, and has been known to cause problems on certain computer - - - - Reduces the jagged edges on lines a little. - - - Use Anti-Aliasing - - - @@ -151,8 +133,60 @@ This takes extra space, and has been known to cause problems on certain computer - + + + + Qt::Vertical + + + + 264 + 108 + + + + + + + + + 0 + 0 + + + + The Pie Chart in the Daily Views left panel. +This takes extra space, and has been known to cause problems on certain computer configurations, hence it's turned off by default. + + + Graph Snapshots + + + + + + + + 0 + 0 + + + + Reduces the jagged edges on lines a little. + + + Use Anti-Aliasing + + + + + + + 0 + 0 + + You may need to disable this if your experiencing crashes. It has no effect on single cpu machines. @@ -162,15 +196,15 @@ It has no effect on single cpu machines. - - + + - Qt::Vertical + Qt::Horizontal - 264 - 108 + 40 + 20 @@ -509,28 +543,30 @@ p, li { white-space: pre-wrap; } - Fonts + &Fonts + + 0 + + + 4 + + + 0 + + + 0 + + + 0 + Application Fonts - - - - - 0 - 0 - - - - Application - - - @@ -547,7 +583,7 @@ p, li { white-space: pre-wrap; } - + @@ -560,10 +596,10 @@ p, li { white-space: pre-wrap; } - + - + 6 @@ -576,7 +612,7 @@ p, li { white-space: pre-wrap; } - + @@ -589,10 +625,10 @@ p, li { white-space: pre-wrap; } - + - + 6 @@ -605,17 +641,17 @@ p, li { white-space: pre-wrap; } - + Big Text - + - + 6 @@ -657,7 +693,7 @@ p, li { white-space: pre-wrap; } - + @@ -670,7 +706,7 @@ p, li { white-space: pre-wrap; } - + @@ -683,7 +719,7 @@ p, li { white-space: pre-wrap; } - + @@ -696,7 +732,7 @@ p, li { white-space: pre-wrap; } - + @@ -709,7 +745,7 @@ p, li { white-space: pre-wrap; } - + @@ -722,7 +758,7 @@ p, li { white-space: pre-wrap; } - + @@ -735,7 +771,7 @@ p, li { white-space: pre-wrap; } - + Qt::Vertical @@ -803,6 +839,19 @@ p, li { white-space: pre-wrap; } + + + + + 0 + 0 + + + + Application + + + @@ -810,19 +859,9 @@ p, li { white-space: pre-wrap; } - Oximetry + &Oximetry - - 0 - - - - - Yet another work in progress... - - - @@ -831,8 +870,8 @@ p, li { white-space: pre-wrap; } true - - + + @@ -845,60 +884,149 @@ p, li { white-space: pre-wrap; } - - - - - - - Contec CMS50 - - - - - Overpriced ResMed S9 Oximeter - - - - - - - - - 0 - 0 - - - - Sync with CPAP where possible - - - - - - - - - Please Note: It is impossible to sync oximetry data with CPAP data without a valid timestamp. - -CMS50 data imported from SpO2Review (from .spoR files) or the serial import method does NOT have the correct timestamp needed to do this. - -Live view mode (using a serial cable) is the only way to acheive an accurate sync on CMS50 oximeters. - - - true - - - - - + + - Qt::Vertical + Qt::Horizontal - 452 - 36 + 40 + 20 + + + + + + + + + 0 + 0 + + + + + Contec CMS50 + + + + + Overpriced ResMed S9 Oximeter + + + + + + + + + 0 + 0 + + + + Sync with CPAP where possible + + + + + + + + + + <!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;">Please Note:<span style=" font-style:italic;"> It is impossible to sync oximetry data with CPAP data without a valid timestamp.</span></p> +<p align="justify" 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 align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">CMS50 data imported from SpO2Review (from .spoR files) or the serial import method does <span style=" font-weight:600; text-decoration: underline;">not</span> have the correct timestamp needed to do this.</p> +<p align="justify" 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 align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Live view mode (using a serial cable) is the only way to acheive an accurate sync on CMS50 oximeters.</p></body></html> + + + + + + + + &General + + + + 0 + + + 4 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + Automatically Check For Updates + + + true + + + + + + + 0 + 0 + + + + Check for new version every + + + + + + + 90 + + + + + + + + 0 + 0 + + + + days. + + + + + + + Qt::Horizontal + + + + 40 + 20 @@ -906,6 +1034,120 @@ Live view mode (using a serial cable) is the only way to acheive an accurate syn + + + + + + + 0 + 0 + + + + Last Checked For Updates: + + + + + + + + 0 + 0 + + + + TextLabel + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + 0 + 0 + 255 + + + + + + + + + 0 + 0 + 255 + + + + + + + + + 118 + 118 + 117 + + + + + + + + + 50 + false + false + true + + + + &Check for Updates now + + + Qt::ToolButtonTextOnly + + + true + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + diff --git a/profileselect.cpp b/profileselect.cpp index 723adf22..c31d85d0 100644 --- a/profileselect.cpp +++ b/profileselect.cpp @@ -39,6 +39,8 @@ ProfileSelect::ProfileSelect(QWidget *parent) : } item->setData(p.key()); item->setEditable(false); + + // Profile fonts arern't loaded yet.. Using generic font. item->setFont(QFont("Sans Serif",18,QFont::Bold,false)); model->appendRow(item); i++;