chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added appearance preference to switch Pixmap Caching on/off

Browse Source
This commit is contained in:
Mark Watkins 2013-01-18 18:37:17 +10:00
parent 3539ebf055
commit 3841635381
8 changed files with 56 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Graphs/gGraphView.cpp
View File

@ -2177,6 +2177,13 @@ gGraphView::~gGraphView()
delete timer; delete timer;
} }
bool gGraphView::usePixmapCache()
{
//use_pixmap_cache is an overide setting
return use_pixmap_cache & PROFILE.appearance->usePixmapCaching();
}
void gGraphView::DrawTextQue() void gGraphView::DrawTextQue()
{ {
const qint64 expire_after_ms=4000; // expire string pixmaps after this many milliseconds 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->add(width()-m_graphs[0]->marginRight(),0,width()-m_graphs[0]->marginRight(),w,width(),w,width(),0,col.rgba());
quads->draw(); quads->draw();
//renderText(0,0,0,ss,*defaultfont); //renderText(0,0,0,ss,*defaultfont);
int xx=3;
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
AddTextQue(ss,width()+7,w/2+4,90,col,defaultfont); if (usePixmapCache()) xx+=4; else xx-=3;
#else
AddTextQue(ss,width()+3,w/2,90,col,defaultfont);
#endif #endif
AddTextQue(ss,width()+xx,w/2,90,col,defaultfont);
DrawTextQue(); DrawTextQue();
} }
#endif #endif

4
Graphs/gGraphView.h
View File

@ -983,11 +983,11 @@ public:
//! \brief Use a QGLPixelBuffer to render to a pixmap //! \brief Use a QGLPixelBuffer to render to a pixmap
QImage pbRenderPixmap(int w,int h); 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; } void setUsePixmapCache(bool b) { use_pixmap_cache=b; }
//! \brief Return whether or not the Pixmap Cache for text rendering is being used. //! \brief Return whether or not the Pixmap Cache for text rendering is being used.
bool usePixmapCache() { return use_pixmap_cache; } bool usePixmapCache();
protected: protected:
//! \brief Set up the OpenGL basics for the QGLWidget underneath //! \brief Set up the OpenGL basics for the QGLWidget underneath

1
Graphs/gXAxis.cpp
View File

@ -6,6 +6,7 @@
#include <math.h> #include <math.h>
#include <QDebug> #include <QDebug>
#include "gXAxis.h" #include "gXAxis.h"
const quint64 divisors[]={ const quint64 divisors[]={

4
Graphs/gYAxis.cpp
View File

@ -7,7 +7,7 @@
#include <math.h> #include <math.h>
#include <QDebug> #include <QDebug>
#include "gYAxis.h" #include "gYAxis.h"
#include "SleepLib/profiles.h" //#include "SleepLib/profiles.h"
gYSpacer::gYSpacer(int spacer) gYSpacer::gYSpacer(int spacer)
:Layer(NoChannel) :Layer(NoChannel)
@ -140,6 +140,8 @@ void gYAxis::paint(gGraph & w,int left,int top, int width, int height)
{ {
int x,y,yh=0; 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.graphView()->usePixmapCache()) {
if (w.invalidate_yAxisImage) { if (w.invalidate_yAxisImage) {

6
SleepLib/profiles.h
View File

@ -227,6 +227,7 @@ const QString STR_AS_GraphSnapshots="EnableGraphSnapshots";
const QString STR_AS_Animations="AnimationsAndTransitions"; const QString STR_AS_Animations="AnimationsAndTransitions";
const QString STR_AS_SquareWave="SquareWavePlots"; const QString STR_AS_SquareWave="SquareWavePlots";
const QString STR_AS_OverlayType="OverlayType"; const QString STR_AS_OverlayType="OverlayType";
const QString STR_AS_UsePixmapCaching="UsePixmapCaching";
// UserSettings Strings // UserSettings Strings
const QString STR_US_UnitSystem="UnitSystem"; 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_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_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_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; if (!m_profile->contains(STR_AS_OverlayType)) (*m_profile)[STR_AS_OverlayType]=ODT_Bars;
} }
~AppearanceSettings() {} ~AppearanceSettings() {}
@ -544,6 +546,8 @@ public:
bool graphSnapshots() { return (*m_profile)[STR_AS_GraphSnapshots].toBool(); } bool graphSnapshots() { return (*m_profile)[STR_AS_GraphSnapshots].toBool(); }
//! \brief Returns true if Graphical animations & Transitions will be drawn //! \brief Returns true if Graphical animations & Transitions will be drawn
bool animations() { return (*m_profile)[STR_AS_Animations].toBool(); } 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) //! \brief Returns true if Square Wave plots are preferred (where possible)
bool squareWavePlots() { return (*m_profile)[STR_AS_SquareWave].toBool(); } bool squareWavePlots() { return (*m_profile)[STR_AS_SquareWave].toBool(); }
//! \brief Returns the type of overlay flags (which are displayed over the Flow Waveform) //! \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; } void setGraphSnapshots(bool gs) { (*m_profile)[STR_AS_GraphSnapshots]=gs; }
//! \brief Set to true if Graphical animations & Transitions will be drawn //! \brief Set to true if Graphical animations & Transitions will be drawn
void setAnimations(bool anim) { (*m_profile)[STR_AS_Animations]=anim; } 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) //! \brief Set whether or not to useSquare Wave plots (where possible)
void setSquareWavePlots(bool sw) { (*m_profile)[STR_AS_SquareWave]=sw; } void setSquareWavePlots(bool sw) { (*m_profile)[STR_AS_SquareWave]=sw; }
//! \brief Sets the type of overlay flags (which are displayed over the Flow Waveform) //! \brief Sets the type of overlay flags (which are displayed over the Flow Waveform)

8
mainwindow.cpp
View File

@ -242,10 +242,16 @@ void MainWindow::Startup()
PROFILE.LoadMachineData(); PROFILE.LoadMachineData();
SnapshotGraph=new gGraphView(this,daily->graphView()); 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 //Windows & Linux barfs when offscreen rendering with pixmap cached text
SnapshotGraph->setUsePixmapCache(false); SnapshotGraph->setUsePixmapCache(false);
#endif #endif
SnapshotGraph->setFormat(daily->graphView()->format()); SnapshotGraph->setFormat(daily->graphView()->format());
//SnapshotGraph->setMaximumSize(1024,512); //SnapshotGraph->setMaximumSize(1024,512);
//SnapshotGraph->setMinimumSize(1024,512); //SnapshotGraph->setMinimumSize(1024,512);

2
preferencesdialog.cpp
View File

@ -156,6 +156,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
ui->maskDescription->setText(profile->cpap->maskDescription()); ui->maskDescription->setText(profile->cpap->maskDescription());
ui->useAntiAliasing->setChecked(profile->appearance->antiAliasing()); ui->useAntiAliasing->setChecked(profile->appearance->antiAliasing());
ui->usePixmapCaching->setChecked(profile->appearance->usePixmapCaching());
ui->useSquareWavePlots->setChecked(profile->appearance->squareWavePlots()); ui->useSquareWavePlots->setChecked(profile->appearance->squareWavePlots());
ui->enableGraphSnapshots->setChecked(profile->appearance->graphSnapshots()); ui->enableGraphSnapshots->setChecked(profile->appearance->graphSnapshots());
ui->skipLoginScreen->setChecked(PREF[STR_GEN_SkipLogin].toBool()); ui->skipLoginScreen->setChecked(PREF[STR_GEN_SkipLogin].toBool());
@ -344,6 +345,7 @@ bool PreferencesDialog::Save()
} }
profile->appearance->setAntiAliasing(ui->useAntiAliasing->isChecked()); profile->appearance->setAntiAliasing(ui->useAntiAliasing->isChecked());
profile->appearance->setUsePixmapCaching(ui->usePixmapCaching->isChecked());
profile->appearance->setSquareWavePlots(ui->useSquareWavePlots->isChecked()); profile->appearance->setSquareWavePlots(ui->useSquareWavePlots->isChecked());
profile->appearance->setGraphSnapshots(ui->enableGraphSnapshots->isChecked()); profile->appearance->setGraphSnapshots(ui->enableGraphSnapshots->isChecked());
profile->general->setSkipEmptyDays(ui->skipEmptyDays->isChecked()); profile->general->setSkipEmptyDays(ui->skipEmptyDays->isChecked());

34
preferencesdialog.ui
View File

@ -1311,16 +1311,16 @@ Try to sync it to your PC's clock (which should be synced to a timeserver)</stri
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Syncing Oximetry and CPAP Data&lt;/span&gt;&lt;/p&gt; &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; font-weight:600;&quot;&gt;Syncing Oximetry and CPAP Data&lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt; &lt;p align=&quot;justify&quot; style=&quot;-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;&quot;&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;CMS50 data imported from SpO2Review (from .spoR files) or the serial import method does &lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;not&lt;/span&gt; have the correct timestamp needed to sync.&lt;/p&gt; &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;CMS50 data imported from SpO2Review (from .spoR files) or the serial import method does &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; font-weight:600; text-decoration: underline;&quot;&gt;not&lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt; have the correct timestamp needed to sync.&lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt; &lt;p align=&quot;justify&quot; style=&quot;-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;&quot;&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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.&lt;/p&gt; &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;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.&lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt; &lt;p align=&quot;justify&quot; style=&quot;-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;&quot;&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;If you start your Oximeters recording mode at &lt;span style=&quot; font-style:italic;&quot;&gt;exactly &lt;/span&gt;the same time you start your CPAP machine, you can now also achieve sync. &lt;/p&gt; &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;If you start your Oximeters recording mode at &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; font-style:italic;&quot;&gt;exactly &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;the same time you start your CPAP machine, you can now also achieve sync. &lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt; &lt;p align=&quot;justify&quot; style=&quot;-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;&quot;&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The serial import process takes the starting time from last nights first CPAP session. (Remember to import your CPAP data first!)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;The serial import process takes the starting time from last nights first CPAP session. (Remember to import your CPAP data first!)&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -1980,6 +1980,20 @@ this application to be unstable with this feature enabled.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="usePixmapCaching">
<property name="toolTip">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Pixmap caching is an graphics acceleration technique. May cause problems with font drawing in graph display area on your platform.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Use Pixmap Caching</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QCheckBox" name="animationsAndTransitionsCheckbox"> <widget class="QCheckBox" name="animationsAndTransitionsCheckbox">
<property name="toolTip"> <property name="toolTip">