From 38416353816ca19e305a03c7f9394aa79e596669 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 18 Jan 2013 18:37:17 +1000 Subject: [PATCH] Added appearance preference to switch Pixmap Caching on/off --- Graphs/gGraphView.cpp | 14 +++++++++++--- Graphs/gGraphView.h | 4 ++-- Graphs/gXAxis.cpp | 1 + Graphs/gYAxis.cpp | 4 +++- SleepLib/profiles.h | 6 ++++++ mainwindow.cpp | 8 +++++++- preferencesdialog.cpp | 2 ++ preferencesdialog.ui | 34 ++++++++++++++++++++++++---------- 8 files changed, 56 insertions(+), 17 deletions(-) diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index 43989bf3..4206fbb1 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -2177,6 +2177,13 @@ gGraphView::~gGraphView() delete timer; } +bool gGraphView::usePixmapCache() +{ + //use_pixmap_cache is an overide setting + return use_pixmap_cache & PROFILE.appearance->usePixmapCaching(); +} + + void gGraphView::DrawTextQue() { const qint64 expire_after_ms=4000; // expire string pixmaps after this many milliseconds @@ -3112,11 +3119,12 @@ void gGraphView::paintGL() quads->add(width()-m_graphs[0]->marginRight(),0,width()-m_graphs[0]->marginRight(),w,width(),w,width(),0,col.rgba()); quads->draw(); //renderText(0,0,0,ss,*defaultfont); + + int xx=3; #ifndef Q_OS_MAC - AddTextQue(ss,width()+7,w/2+4,90,col,defaultfont); -#else - AddTextQue(ss,width()+3,w/2,90,col,defaultfont); + if (usePixmapCache()) xx+=4; else xx-=3; #endif + AddTextQue(ss,width()+xx,w/2,90,col,defaultfont); DrawTextQue(); } #endif diff --git a/Graphs/gGraphView.h b/Graphs/gGraphView.h index 1426d021..3ab97f7c 100644 --- a/Graphs/gGraphView.h +++ b/Graphs/gGraphView.h @@ -983,11 +983,11 @@ public: //! \brief Use a QGLPixelBuffer to render to a pixmap QImage pbRenderPixmap(int w,int h); - //! \brief Enable or disable the Text Pixmap Caching system (much faster on) + //! \brief Enable or disable the Text Pixmap Caching system preference overide void setUsePixmapCache(bool b) { use_pixmap_cache=b; } //! \brief Return whether or not the Pixmap Cache for text rendering is being used. - bool usePixmapCache() { return use_pixmap_cache; } + bool usePixmapCache(); protected: //! \brief Set up the OpenGL basics for the QGLWidget underneath diff --git a/Graphs/gXAxis.cpp b/Graphs/gXAxis.cpp index 718b1dc8..b7575042 100644 --- a/Graphs/gXAxis.cpp +++ b/Graphs/gXAxis.cpp @@ -6,6 +6,7 @@ #include #include + #include "gXAxis.h" const quint64 divisors[]={ diff --git a/Graphs/gYAxis.cpp b/Graphs/gYAxis.cpp index 9833d77b..9ce4c276 100644 --- a/Graphs/gYAxis.cpp +++ b/Graphs/gYAxis.cpp @@ -7,7 +7,7 @@ #include #include #include "gYAxis.h" -#include "SleepLib/profiles.h" +//#include "SleepLib/profiles.h" gYSpacer::gYSpacer(int spacer) :Layer(NoChannel) @@ -140,6 +140,8 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height) { int x,y,yh=0; + //Todo: clean this up as there is a lot of duplicate code between the sections + if (w.graphView()->usePixmapCache()) { if (w.invalidate_yAxisImage) { diff --git a/SleepLib/profiles.h b/SleepLib/profiles.h index 4645d320..df62571b 100644 --- a/SleepLib/profiles.h +++ b/SleepLib/profiles.h @@ -227,6 +227,7 @@ const QString STR_AS_GraphSnapshots="EnableGraphSnapshots"; const QString STR_AS_Animations="AnimationsAndTransitions"; const QString STR_AS_SquareWave="SquareWavePlots"; const QString STR_AS_OverlayType="OverlayType"; +const QString STR_AS_UsePixmapCaching="UsePixmapCaching"; // UserSettings Strings const QString STR_US_UnitSystem="UnitSystem"; @@ -530,6 +531,7 @@ public: if (!m_profile->contains(STR_AS_GraphSnapshots)) (*m_profile)[STR_AS_GraphSnapshots]=true; if (!m_profile->contains(STR_AS_Animations)) (*m_profile)[STR_AS_Animations]=true; if (!m_profile->contains(STR_AS_SquareWave)) (*m_profile)[STR_AS_SquareWave]=false; + if (!m_profile->contains(STR_AS_UsePixmapCaching)) (*m_profile)[STR_AS_UsePixmapCaching]=true; if (!m_profile->contains(STR_AS_OverlayType)) (*m_profile)[STR_AS_OverlayType]=ODT_Bars; } ~AppearanceSettings() {} @@ -544,6 +546,8 @@ public: bool graphSnapshots() { return (*m_profile)[STR_AS_GraphSnapshots].toBool(); } //! \brief Returns true if Graphical animations & Transitions will be drawn bool animations() { return (*m_profile)[STR_AS_Animations].toBool(); } + //! \brief Returns true if PixmapCaching acceleration will be used + bool usePixmapCaching() { return (*m_profile)[STR_AS_UsePixmapCaching].toBool(); } //! \brief Returns true if Square Wave plots are preferred (where possible) bool squareWavePlots() { return (*m_profile)[STR_AS_SquareWave].toBool(); } //! \brief Returns the type of overlay flags (which are displayed over the Flow Waveform) @@ -557,6 +561,8 @@ public: void setGraphSnapshots(bool gs) { (*m_profile)[STR_AS_GraphSnapshots]=gs; } //! \brief Set to true if Graphical animations & Transitions will be drawn void setAnimations(bool anim) { (*m_profile)[STR_AS_Animations]=anim; } + //! \brief Set to true to use Pixmap Caching of Text and other graphics caching speedup techniques + void setUsePixmapCaching(bool b) { (*m_profile)[STR_AS_UsePixmapCaching]=b; } //! \brief Set whether or not to useSquare Wave plots (where possible) void setSquareWavePlots(bool sw) { (*m_profile)[STR_AS_SquareWave]=sw; } //! \brief Sets the type of overlay flags (which are displayed over the Flow Waveform) diff --git a/mainwindow.cpp b/mainwindow.cpp index 14ebab54..3d9c3475 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -242,10 +242,16 @@ void MainWindow::Startup() PROFILE.LoadMachineData(); SnapshotGraph=new gGraphView(this,daily->graphView()); -#ifndef Q_OS_MAC + + // the following are platform overides for the UsePixmapCache preference settings +#ifdef Q_OS_MAC + //Mac needs this to be able to offscreen render + SnapshotGraph->setUsePixmapCache(true); +#else //Windows & Linux barfs when offscreen rendering with pixmap cached text SnapshotGraph->setUsePixmapCache(false); #endif + SnapshotGraph->setFormat(daily->graphView()->format()); //SnapshotGraph->setMaximumSize(1024,512); //SnapshotGraph->setMinimumSize(1024,512); diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp index 6753336b..68b1308f 100644 --- a/preferencesdialog.cpp +++ b/preferencesdialog.cpp @@ -156,6 +156,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) : ui->maskDescription->setText(profile->cpap->maskDescription()); ui->useAntiAliasing->setChecked(profile->appearance->antiAliasing()); + ui->usePixmapCaching->setChecked(profile->appearance->usePixmapCaching()); ui->useSquareWavePlots->setChecked(profile->appearance->squareWavePlots()); ui->enableGraphSnapshots->setChecked(profile->appearance->graphSnapshots()); ui->skipLoginScreen->setChecked(PREF[STR_GEN_SkipLogin].toBool()); @@ -344,6 +345,7 @@ bool PreferencesDialog::Save() } profile->appearance->setAntiAliasing(ui->useAntiAliasing->isChecked()); + profile->appearance->setUsePixmapCaching(ui->usePixmapCaching->isChecked()); profile->appearance->setSquareWavePlots(ui->useSquareWavePlots->isChecked()); profile->appearance->setGraphSnapshots(ui->enableGraphSnapshots->isChecked()); profile->general->setSkipEmptyDays(ui->skipEmptyDays->isChecked()); diff --git a/preferencesdialog.ui b/preferencesdialog.ui index 78df9578..f6b9fe47 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -1311,16 +1311,16 @@ Try to sync it to your PC's clock (which should be synced to a timeserver)<!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;">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;"></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 sync.</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 one way to acheive an accurate sync on CMS50 oximeters, but does not counter for CPAP clock drift.</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;">If you start your Oximeters recording mode at <span style=" font-style:italic;">exactly </span>the same time you start your CPAP machine, you can now also achieve sync. </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;">The serial import process takes the starting time from last nights first CPAP session. (Remember to import your CPAP data first!)</p></body></html> +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; 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;"></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> +<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;"></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;">Live view mode (using a serial cable) is one way to acheive an accurate sync on CMS50 oximeters, but does not counter for CPAP clock drift.</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;"></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;">If you start your Oximeters recording mode at </span><span style=" font-family:'Sans'; font-size:10pt; font-style:italic;">exactly </span><span style=" font-family:'Sans'; font-size:10pt;">the same time you start your CPAP machine, you can now also achieve sync. </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;"></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;">The serial import process takes the starting time from last nights first CPAP session. (Remember to import your CPAP data first!)</span></p></body></html> @@ -1980,6 +1980,20 @@ this application to be unstable with this feature enabled. + + + + <!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;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Pixmap caching is an graphics acceleration technique. May cause problems with font drawing in graph display area on your platform.</span></p></body></html> + + + Use Pixmap Caching + + +