diff --git a/sleepyhead/Graphs/gGraphView.cpp b/sleepyhead/Graphs/gGraphView.cpp index 51014538..0981b073 100644 --- a/sleepyhead/Graphs/gGraphView.cpp +++ b/sleepyhead/Graphs/gGraphView.cpp @@ -806,7 +806,7 @@ void gGraphView::DrawTextQueCached(QPainter &painter) int h,w; QString hstr; QPixmap pm; - float ww, hh, xxx, yyy; + float xxx, yyy; const int buf = 8; int fonta = defaultfont->pointSize(); int fontb = mediumfont->pointSize(); @@ -824,7 +824,6 @@ void gGraphView::DrawTextQueCached(QPainter &painter) if (!QPixmapCache::find(hstr, &pm)) { QFontMetrics fm(*q.font); - // QRect rect=fm.tightBoundingRect(q.text); w = fm.width(q.text); h = fm.height()+buf; @@ -834,7 +833,6 @@ void gGraphView::DrawTextQueCached(QPainter &painter) QPainter imgpainter(&pm); imgpainter.setPen(q.color); - imgpainter.setFont(*q.font); imgpainter.setRenderHint(QPainter::TextAntialiasing, q.antialias); @@ -848,7 +846,7 @@ void gGraphView::DrawTextQueCached(QPainter &painter) w = pm.width(); if (q.angle != 0) { xxx = q.x - h - (h / 2); - yyy = q.y + w / 2; // + buf / 2; + yyy = q.y + w / 2; xxx += 4; yyy += 4; @@ -894,8 +892,8 @@ void gGraphView::DrawTextQueCached(QPainter &painter) QPixmapCache::insert(hstr, pm); } else { - hh = pm.height(); - ww = pm.width(); + h = pm.height(); + w = pm.width(); } if (q.angle != 0) { xxx = q.rect.x() - h - (h / 2); @@ -906,7 +904,7 @@ void gGraphView::DrawTextQueCached(QPainter &painter) painter.translate(xxx, yyy); painter.rotate(-q.angle); - painter.drawPixmap(QRect(0, hh / 2, w, h), pm); + painter.drawPixmap(QRect(0, h / 2, w, h), pm); painter.rotate(+q.angle); painter.translate(-xxx, -yyy); } else { diff --git a/sleepyhead/SleepLib/appsettings.h b/sleepyhead/SleepLib/appsettings.h index 70fd98e1..aa9a2673 100644 --- a/sleepyhead/SleepLib/appsettings.h +++ b/sleepyhead/SleepLib/appsettings.h @@ -128,43 +128,43 @@ public: inline const QString & profileName() const { return m_profileName; } bool autoLaunchImport() const { return getPref(STR_US_AutoLaunchImport).toBool(); } bool cacheSessions() const { return m_cacheSessions; } - inline const bool multithreading() const { return m_multithreading; } + inline bool multithreading() const { return m_multithreading; } bool showDebug() const { return m_showDebug; } bool showPerformance() const { return m_showPerformance; } //! \brief Whether to show the calendar bool calendarVisible() const { return getPref(STR_AS_CalendarVisible).toBool(); } - inline const int scrollDampening() const { return m_scrollDampening; } - inline const int tooltipTimeout() const { return m_tooltipTimeout; } + inline int scrollDampening() const { return m_scrollDampening; } + inline int tooltipTimeout() const { return m_tooltipTimeout; } //! \brief Returns the normal (unscaled) height of a graph - inline const int graphHeight() const { return m_graphHeight; } + inline int graphHeight() const { return m_graphHeight; } //! \brief Returns the normal (unscaled) height of a graph int dailyPanelWidth() const { return getPref(STR_AS_DailyPanelWidth).toInt(); } //! \brief Returns the normal (unscaled) height of a graph int rightPanelWidth() const { return getPref(STR_AS_RightPanelWidth).toInt(); } //! \brief Returns true if AntiAliasing (the graphical smoothing method) is enabled - inline const bool antiAliasing() const { return m_antiAliasing; } + inline bool antiAliasing() const { return m_antiAliasing; } //! \brief Returns true if renderPixmap function is in use, which takes snapshots of graphs bool graphSnapshots() const { return getPref(STR_AS_GraphSnapshots).toBool(); } //! \brief Returns true if Graphical animations & Transitions will be drawn bool animations() const { return m_animations; } //! \brief Returns true if PixmapCaching acceleration will be used - inline const bool & usePixmapCaching() const { return m_usePixmapCaching; } + inline bool usePixmapCaching() const { return m_usePixmapCaching; } //! \brief Returns true if Square Wave plots are preferred (where possible) - inline const bool squareWavePlots() const { return m_squareWavePlots; } + inline bool squareWavePlots() const { return m_squareWavePlots; } //! \brief Whether to allow double clicking on Y-Axis labels to change vertical scaling mode bool allowYAxisScaling() const { return getPref(STR_AS_AllowYAxisScaling).toBool(); } //! \brief Whether to show graph tooltips - inline const bool graphTooltips() const { return m_graphTooltips; } + inline bool graphTooltips() const { return m_graphTooltips; } //! \brief Pen width of line plots - inline const float lineThickness() const { return m_lineThickness; } + inline float lineThickness() const { return m_lineThickness; } //! \brief Whether to show line cursor - inline const bool lineCursorMode() const { return m_lineCursorMode; } + inline bool lineCursorMode() const { return m_lineCursorMode; } //! \brief Whether to show the right sidebar bool rightSidebarVisible() const { return getPref(STR_AS_RightSidebarVisible).toBool(); } //! \brief Returns the type of overlay flags (which are displayed over the Flow Waveform) - inline const OverlayDisplayType overlayType() const { return m_odt; } + inline OverlayDisplayType overlayType() const { return m_odt; } //! \brief Returns the display type of Overview pages linechart - inline const OverviewLinechartModes overviewLinechartMode() const { return m_olm; } + inline OverviewLinechartModes overviewLinechartMode() const { return m_olm; } bool userEventPieChart() const { return getPref(STR_CS_UserEventPieChart).toBool(); } bool showSerialNumbers() const { return getPref(STR_US_ShowSerialNumbers).toBool(); } int openTabAtStart() const { return getPref(STR_US_OpenTabAtStart).toInt(); } diff --git a/sleepyhead/SleepLib/profiles.h b/sleepyhead/SleepLib/profiles.h index f0a5c598..14a2e7cf 100644 --- a/sleepyhead/SleepLib/profiles.h +++ b/sleepyhead/SleepLib/profiles.h @@ -566,24 +566,24 @@ class CPAPSettings : public PrefSettings EventDataType untreatedAHI() const { return getPref(STR_CS_UntreatedAHI).toFloat(); } const QString notes() const { return getPref(STR_CS_Notes).toString(); } QDate dateDiagnosed() const { return getPref(STR_CS_DateDiagnosed).toDate(); } - inline const EventDataType userEventRestriction() const { return m_userEventRestriction1; } - inline const EventDataType userEventDuration() const { return m_userEventDuration1; } - inline const EventDataType userEventRestriction2() const { return m_userEventRestriction2; } - inline const EventDataType userEventDuration2() const { return m_userEventDuration2; } - inline const bool userEventDuplicates() const { return m_userEventDuplicates; } - inline const EventDataType AHIWindow() const { return m_ahiWindow; } - inline const bool AHIReset() const { return m_ahiReset; } - inline const bool userEventFlagging() const { return m_userEventFlagging; } - inline const int clockDrift() const { return m_clock_drift; } - inline const EventDataType leakRedline() const { return m_leakRedLine; } - inline const bool showLeakRedline() const { return m_showLeakRedline; } - inline const bool resyncFromUserFlagging() const { return m_resyncFromUserFlagging; } + inline EventDataType userEventRestriction() const { return m_userEventRestriction1; } + inline EventDataType userEventDuration() const { return m_userEventDuration1; } + inline EventDataType userEventRestriction2() const { return m_userEventRestriction2; } + inline EventDataType userEventDuration2() const { return m_userEventDuration2; } + inline bool userEventDuplicates() const { return m_userEventDuplicates; } + inline EventDataType AHIWindow() const { return m_ahiWindow; } + inline bool AHIReset() const { return m_ahiReset; } + inline bool userEventFlagging() const { return m_userEventFlagging; } + inline int clockDrift() const { return m_clock_drift; } + inline EventDataType leakRedline() const { return m_leakRedLine; } + inline bool showLeakRedline() const { return m_showLeakRedline; } + inline bool resyncFromUserFlagging() const { return m_resyncFromUserFlagging; } bool autoImport() const { return getPref(STR_CS_AutoImport).toBool(); } bool brickWarning() const { return getPref(STR_CS_BrickWarning).toBool(); } - inline const bool calculateUnintentionalLeaks() const { return m_calcUnintentionalLeaks; } - inline const double custom4cmH2OLeaks() const { return m_4cmH2OLeaks; } - inline const double custom20cmH2OLeaks() const { return m_20cmH2OLeaks; } + inline bool calculateUnintentionalLeaks() const { return m_calcUnintentionalLeaks; } + inline double custom4cmH2OLeaks() const { return m_4cmH2OLeaks; } + inline double custom20cmH2OLeaks() const { return m_20cmH2OLeaks; } //Setters void setMode(CPAPMode mode) { setPref(STR_CS_PrescribedMode, (int)mode); } @@ -650,16 +650,16 @@ class SessionSettings : public PrefSettings m_lockSummarySessions = initPref(STR_IS_LockSummarySessions, true).toBool(); } - inline const QTime daySplitTime() const { return m_daySplitTime; } - inline const bool preloadSummaries() const { return m_preloadSummaries; } - inline const double combineCloseSessions() const { return m_combineCloseSessions; } - inline const double ignoreShortSessions() const { return m_ignoreShortSessions; } - inline const bool compressSessionData() const { return m_compressSessionData; } - inline const bool compressBackupData() const { return m_compressBackupData; } - inline const bool backupCardData() const { return m_backupCardData; } - inline const bool ignoreOlderSessions() const { return m_ignoreOlderSessions; } - inline const QDateTime ignoreOlderSessionsDate() const { return m_ignoreOlderSessionsDate; } - inline const bool lockSummarySessions() const { return m_lockSummarySessions; } + inline QTime daySplitTime() const { return m_daySplitTime; } + inline bool preloadSummaries() const { return m_preloadSummaries; } + inline double combineCloseSessions() const { return m_combineCloseSessions; } + inline double ignoreShortSessions() const { return m_ignoreShortSessions; } + inline bool compressSessionData() const { return m_compressSessionData; } + inline bool compressBackupData() const { return m_compressBackupData; } + inline bool backupCardData() const { return m_backupCardData; } + inline bool ignoreOlderSessions() const { return m_ignoreOlderSessions; } + inline QDateTime ignoreOlderSessionsDate() const { return m_ignoreOlderSessionsDate; } + inline bool lockSummarySessions() const { return m_lockSummarySessions; } void setDaySplitTime(QTime time) { setPref(STR_IS_DaySplitTime, m_daySplitTime=time); } void setPreloadSummaries(bool b) { setPref(STR_IS_PreloadSummaries, m_preloadSummaries=b); } @@ -717,14 +717,14 @@ class UserSettings : public PrefSettings UnitSystem unitSystem() const { return (UnitSystem)getPref(STR_US_UnitSystem).toInt(); } double eventWindowSize() const { return getPref(STR_US_EventWindowSize).toDouble(); } - inline const bool skipEmptyDays() const { return m_skipEmptyDays; } + inline bool skipEmptyDays() const { return m_skipEmptyDays; } bool rebuildCache() const { return getPref(STR_US_RebuildCache).toBool(); } - inline const bool calculateRDI() const { return m_calculateRDI; } - inline const int prefCalcMiddle() const { return m_prefCalcMiddle; } - inline const double prefCalcPercentile() const { return m_prefCalcPercentile; } - inline const int prefCalcMax() const { return m_prefCalcMax; } + inline bool calculateRDI() const { return m_calculateRDI; } + inline int prefCalcMiddle() const { return m_prefCalcMiddle; } + inline double prefCalcPercentile() const { return m_prefCalcPercentile; } + inline int prefCalcMax() const { return m_prefCalcMax; } int statReportMode() const { return getPref(STR_US_StatReportMode).toInt(); } - inline const bool showUnknownFlags() const { return m_showUnownFlags; } + inline bool showUnknownFlags() const { return m_showUnownFlags; } int lastOverviewRange() const { return getPref(STR_US_LastOverviewRange).toInt(); } void setUnitSystem(UnitSystem us) { setPref(STR_US_UnitSystem, (int)us); }