From a734902d49c10f54854595c730bb8237dea90228 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 13 Jun 2018 14:13:47 +1000 Subject: [PATCH] Smarted up GFXEngine selection stuff a bit underneath --- sleepyhead/SleepLib/common.cpp | 53 +++++++++---------- sleepyhead/SleepLib/common.h | 15 ++---- .../loader_plugins/cms50f37_loader.cpp | 3 +- .../SleepLib/loader_plugins/cms50f37_loader.h | 2 +- sleepyhead/main.cpp | 4 +- sleepyhead/preferencesdialog.cpp | 19 +++++-- sleepyhead/preferencesdialog.ui | 24 ++------- sleepyhead/sessionbar.cpp | 2 +- 8 files changed, 57 insertions(+), 65 deletions(-) diff --git a/sleepyhead/SleepLib/common.cpp b/sleepyhead/SleepLib/common.cpp index ef927efd..1e244d80 100644 --- a/sleepyhead/SleepLib/common.cpp +++ b/sleepyhead/SleepLib/common.cpp @@ -67,34 +67,33 @@ const QString getDefaultAppRoot() return approot; } - -unsigned int currentGFXEngine() +bool gfxEgnineIsSupported(GFXEngine e) { - QSettings settings; - - return qMin(settings.value(GFXEngineSetting, 2).toUInt(), (unsigned int) 2); -} -void setCurrentGFXEngine(unsigned int r) -{ - QSettings settings; - - settings.setValue(GFXEngineSetting, qMin(r, (unsigned int)2)); -} - -QString GFXEngineName(unsigned int r) -{ - switch (r) { - case 0: - return STR_GFXEngine_Software; - case 1: - return STR_GFXEngine_ANGLE; - case 2: +#if Q_OS_WIN32 + return true; +#else + switch(e) { + case GFX_OpenGL: + case GFX_Software: + return true; + case GFX_ANGLE: default: - return STR_GFXEngine_OpenGL; + return false; } +#endif } +GFXEngine currentGFXEngine() +{ + QSettings settings; + return (GFXEngine)qMin(settings.value(GFXEngineSetting, GFX_OpenGL).toUInt(), (unsigned int)MaxGFXEngine); +} +void setCurrentGFXEngine(GFXEngine e) +{ + QSettings settings; + settings.setValue(GFXEngineSetting, qMin((unsigned int)e, (unsigned int)MaxGFXEngine)); +} QString getOpenGLVersionString() { @@ -267,9 +266,7 @@ void copyPath(QString src, QString dst) } } -QString STR_GFXEngine_Software; -QString STR_GFXEngine_ANGLE; -QString STR_GFXEngine_OpenGL; +QString GFXEngineNames[MaxGFXEngine+1]; // Set by initializeStrings() QString STR_UNIT_M; QString STR_UNIT_CM; @@ -473,9 +470,9 @@ QString STR_TR_WAvg; // Short form of Weighted Average void initializeStrings() { - STR_GFXEngine_Software = QObject::tr("Software Engine"); - STR_GFXEngine_ANGLE = QObject::tr("ANGLE / OpenGLES"); - STR_GFXEngine_OpenGL = QObject::tr("Desktop OpenGL"); + GFXEngineNames[GFX_Software] = QObject::tr("Software Engine"); + GFXEngineNames[GFX_ANGLE] = QObject::tr("ANGLE / OpenGLES"); + GFXEngineNames[GFX_OpenGL] = QObject::tr("Desktop OpenGL"); STR_UNIT_M = QObject::tr(" m"); STR_UNIT_CM = QObject::tr(" cm"); diff --git a/sleepyhead/SleepLib/common.h b/sleepyhead/SleepLib/common.h index 649ff24f..de818b4b 100644 --- a/sleepyhead/SleepLib/common.h +++ b/sleepyhead/SleepLib/common.h @@ -19,24 +19,24 @@ #include #include "Graphs/glcommon.h" +enum GFXEngine { GFX_OpenGL=0, GFX_ANGLE, GFX_Software, MaxGFXEngine=GFX_Software}; const QString GFXEngineSetting = "GFXEngine"; +extern QString GFXEngineNames[MaxGFXEngine+1]; // Set by initializeStrings() const QString CSTR_GFX_ANGLE = "ANGLE"; const QString CSTR_GFX_OpenGL = "OpenGL"; const QString CSTR_GFX_BrokenGL = "LegacyGFX"; - //! \brief Gets the first day of week from the system locale, to show in the calendars. Qt::DayOfWeek firstDayOfWeekFromLocale(); QString getBranchVersion(); QString getGFXEngine(); -unsigned int currentGFXEngine(); -void setCurrentGFXEngine(unsigned int r); -QString GFXEngineName(unsigned int r); - +bool gfxEgnineIsSupported(GFXEngine e); +GFXEngine currentGFXEngine(); +void setCurrentGFXEngine(GFXEngine e); QString appResourcePath(); QString getGraphicsEngine(); @@ -172,11 +172,6 @@ const QString STR_AppRoot = "SleepyHeadData"; // Commonly used translatable text strings /////////////////////////////////////////////////////////////////////////////////////////////// -extern QString STR_GFXEngine_Software; -extern QString STR_GFXEngine_ANGLE; -extern QString STR_GFXEngine_OpenGL; - - extern QString STR_UNIT_M; extern QString STR_UNIT_CM; extern QString STR_UNIT_INCH; diff --git a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp index 3c1dcfde..0872f8a2 100644 --- a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.cpp @@ -668,8 +668,9 @@ void CMS50F37Loader::eraseSession(int user, int session) } -void CMS50F37Loader::setDeviceID(QString str) +void CMS50F37Loader::setDeviceID(const QString & newid) { + QString str = newid; str.truncate(7); if (str.length() < 7) { str = QString(" ").repeated(7-str.length()) + str; diff --git a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h index f1fa68cb..9369e931 100644 --- a/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/cms50f37_loader.h @@ -61,7 +61,7 @@ Q_OBJECT virtual void syncClock(); virtual QString getDeviceID(); - virtual void setDeviceID(QString); + virtual void setDeviceID(const QString &); virtual void setDuration(int d) { duration=d; } diff --git a/sleepyhead/main.cpp b/sleepyhead/main.cpp index c1c2dec2..d839c51e 100644 --- a/sleepyhead/main.cpp +++ b/sleepyhead/main.cpp @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) QCoreApplication::setOrganizationName(getDeveloperName()); QSettings settings; - unsigned int gfxEngine = qMin(settings.value(GFXEngineSetting, 0).toUInt(), (unsigned int)2); + GFXEngine gfxEngine = (GFXEngine)qMin((unsigned int)settings.value(GFXEngineSetting, (unsigned int)GFX_OpenGL).toUInt(), (unsigned int)MaxGFXEngine); switch (gfxEngine) { case 0: @@ -128,6 +128,8 @@ int main(int argc, char *argv[]) initializeStrings(); // This must be called AFTER translator is installed, but before mainwindow is setup + QFontDatabase::addApplicationFont("://fonts/FreeSans.ttf"); + a.setFont(QFont("FreeSans", 11, QFont::Normal, false)); mainwin = new MainWindow; #ifdef BROKEN_OPENGL_BUILD diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp index e93ed282..ef1f5e8b 100644 --- a/sleepyhead/preferencesdialog.cpp +++ b/sleepyhead/preferencesdialog.cpp @@ -87,7 +87,20 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : ui->resmedPrefCalcsNotice->setVisible(haveResMed); #endif - ui->gfxEngineCombo->setCurrentIndex(currentGFXEngine()); + int gfxEngine=(int)currentGFXEngine(); + + int selIdx = 0; + for (int j=0, i=0; i<=(int)MaxGFXEngine; ++i) { + if (gfxEgnineIsSupported((GFXEngine) i)) { + ui->gfxEngineCombo->addItem(GFXEngineNames[i], i); + if (i==gfxEngine) { + selIdx = j; + } + ++j; + } + } + ui->gfxEngineCombo->setCurrentIndex(selIdx); + ui->culminativeIndices->setEnabled(false); @@ -689,8 +702,8 @@ bool PreferencesDialog::Save() needs_reload = true; } - if ((unsigned int)ui->gfxEngineCombo->currentIndex() != currentGFXEngine()) { - setCurrentGFXEngine(ui->gfxEngineCombo->currentIndex()); + if ((GFXEngine)ui->gfxEngineCombo->currentData().toUInt() != currentGFXEngine()) { + setCurrentGFXEngine((GFXEngine)ui->gfxEngineCombo->currentData().toUInt()); needs_restart = true; } diff --git a/sleepyhead/preferencesdialog.ui b/sleepyhead/preferencesdialog.ui index 5a3b76de..ab48f5b6 100644 --- a/sleepyhead/preferencesdialog.ui +++ b/sleepyhead/preferencesdialog.ui @@ -9,8 +9,8 @@ 0 0 - 696 - 610 + 945 + 721 @@ -1749,7 +1749,7 @@ as this is the only value available on summary-only days. <!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:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; 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-family:'Sans'; font-size:10pt; font-weight:600;">Syncing Oximetry and CPAP Data</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; font-family:'Sans'; font-size:10pt;"><br /></p> <p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">CMS50 data imported from SpO2Review (from .spoR files) or the serial import method does </span><span style=" font-family:'Sans'; font-size:10pt; font-weight:600; text-decoration: underline;">not</span><span style=" font-family:'Sans'; font-size:10pt;"> have the correct timestamp needed to sync.</span></p> @@ -2737,23 +2737,7 @@ this application to be unstable with this feature enabled. - - - - Desktop OpenGL - - - - - ANGLE / OpenGLES - - - - - MESA (Software Renderer) - - - + diff --git a/sleepyhead/sessionbar.cpp b/sleepyhead/sessionbar.cpp index 5d647e62..d8380f02 100644 --- a/sleepyhead/sessionbar.cpp +++ b/sleepyhead/sessionbar.cpp @@ -225,7 +225,7 @@ void SessionBar::paintEvent(QPaintEvent *) double sx, ex; QVector::iterator i; - QRect selectRect; + //QRect selectRect; int cnt = 0; for (i = segments.begin(); i != segments.end(); ++i) {