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

Clean that last commit up for MinGW

Browse Source
This commit is contained in:
Mark Watkins 2018-06-10 16:07:29 +10:00
parent 1fe066d89b
commit 2600e131a9
3 changed files with 48 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sleepyhead/Graphs/gGraphView.cpp
View File

@ -806,7 +806,7 @@ void gGraphView::DrawTextQueCached(QPainter &painter)
int h,w; int h,w;
QString hstr; QString hstr;
QPixmap pm; QPixmap pm;
float ww, hh, xxx, yyy; float xxx, yyy;
const int buf = 8; const int buf = 8;
int fonta = defaultfont->pointSize(); int fonta = defaultfont->pointSize();
int fontb = mediumfont->pointSize(); int fontb = mediumfont->pointSize();
@ -824,7 +824,6 @@ void gGraphView::DrawTextQueCached(QPainter &painter)
if (!QPixmapCache::find(hstr, &pm)) { if (!QPixmapCache::find(hstr, &pm)) {
QFontMetrics fm(*q.font); QFontMetrics fm(*q.font);
// QRect rect=fm.tightBoundingRect(q.text);
w = fm.width(q.text); w = fm.width(q.text);
h = fm.height()+buf; h = fm.height()+buf;
@ -834,7 +833,6 @@ void gGraphView::DrawTextQueCached(QPainter &painter)
QPainter imgpainter(&pm); QPainter imgpainter(&pm);
imgpainter.setPen(q.color); imgpainter.setPen(q.color);
imgpainter.setFont(*q.font); imgpainter.setFont(*q.font);
imgpainter.setRenderHint(QPainter::TextAntialiasing, q.antialias); imgpainter.setRenderHint(QPainter::TextAntialiasing, q.antialias);
@ -848,7 +846,7 @@ void gGraphView::DrawTextQueCached(QPainter &painter)
w = pm.width(); w = pm.width();
if (q.angle != 0) { if (q.angle != 0) {
xxx = q.x - h - (h / 2); xxx = q.x - h - (h / 2);
yyy = q.y + w / 2; // + buf / 2; yyy = q.y + w / 2;
xxx += 4; xxx += 4;
yyy += 4; yyy += 4;
@ -894,8 +892,8 @@ void gGraphView::DrawTextQueCached(QPainter &painter)
QPixmapCache::insert(hstr, pm); QPixmapCache::insert(hstr, pm);
} else { } else {
hh = pm.height(); h = pm.height();
ww = pm.width(); w = pm.width();
} }
if (q.angle != 0) { if (q.angle != 0) {
xxx = q.rect.x() - h - (h / 2); xxx = q.rect.x() - h - (h / 2);
@ -906,7 +904,7 @@ void gGraphView::DrawTextQueCached(QPainter &painter)
painter.translate(xxx, yyy); painter.translate(xxx, yyy);
painter.rotate(-q.angle); 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.rotate(+q.angle);
painter.translate(-xxx, -yyy); painter.translate(-xxx, -yyy);
} else { } else {

24
sleepyhead/SleepLib/appsettings.h
View File

@ -128,43 +128,43 @@ public:
inline const QString & profileName() const { return m_profileName; } inline const QString & profileName() const { return m_profileName; }
bool autoLaunchImport() const { return getPref(STR_US_AutoLaunchImport).toBool(); } bool autoLaunchImport() const { return getPref(STR_US_AutoLaunchImport).toBool(); }
bool cacheSessions() const { return m_cacheSessions; } 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 showDebug() const { return m_showDebug; }
bool showPerformance() const { return m_showPerformance; } bool showPerformance() const { return m_showPerformance; }
//! \brief Whether to show the calendar //! \brief Whether to show the calendar
bool calendarVisible() const { return getPref(STR_AS_CalendarVisible).toBool(); } bool calendarVisible() const { return getPref(STR_AS_CalendarVisible).toBool(); }
inline const int scrollDampening() const { return m_scrollDampening; } inline int scrollDampening() const { return m_scrollDampening; }
inline const int tooltipTimeout() const { return m_tooltipTimeout; } inline int tooltipTimeout() const { return m_tooltipTimeout; }
//! \brief Returns the normal (unscaled) height of a graph //! \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 //! \brief Returns the normal (unscaled) height of a graph
int dailyPanelWidth() const { return getPref(STR_AS_DailyPanelWidth).toInt(); } int dailyPanelWidth() const { return getPref(STR_AS_DailyPanelWidth).toInt(); }
//! \brief Returns the normal (unscaled) height of a graph //! \brief Returns the normal (unscaled) height of a graph
int rightPanelWidth() const { return getPref(STR_AS_RightPanelWidth).toInt(); } int rightPanelWidth() const { return getPref(STR_AS_RightPanelWidth).toInt(); }
//! \brief Returns true if AntiAliasing (the graphical smoothing method) is enabled //! \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 //! \brief Returns true if renderPixmap function is in use, which takes snapshots of graphs
bool graphSnapshots() const { return getPref(STR_AS_GraphSnapshots).toBool(); } bool graphSnapshots() const { return getPref(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() const { return m_animations; } bool animations() const { return m_animations; }
//! \brief Returns true if PixmapCaching acceleration will be used //! \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) //! \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 //! \brief Whether to allow double clicking on Y-Axis labels to change vertical scaling mode
bool allowYAxisScaling() const { return getPref(STR_AS_AllowYAxisScaling).toBool(); } bool allowYAxisScaling() const { return getPref(STR_AS_AllowYAxisScaling).toBool(); }
//! \brief Whether to show graph tooltips //! \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 //! \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 //! \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 //! \brief Whether to show the right sidebar
bool rightSidebarVisible() const { return getPref(STR_AS_RightSidebarVisible).toBool(); } bool rightSidebarVisible() const { return getPref(STR_AS_RightSidebarVisible).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)
inline const OverlayDisplayType overlayType() const { return m_odt; } inline OverlayDisplayType overlayType() const { return m_odt; }
//! \brief Returns the display type of Overview pages linechart //! \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 userEventPieChart() const { return getPref(STR_CS_UserEventPieChart).toBool(); }
bool showSerialNumbers() const { return getPref(STR_US_ShowSerialNumbers).toBool(); } bool showSerialNumbers() const { return getPref(STR_US_ShowSerialNumbers).toBool(); }
int openTabAtStart() const { return getPref(STR_US_OpenTabAtStart).toInt(); } int openTabAtStart() const { return getPref(STR_US_OpenTabAtStart).toInt(); }

62
sleepyhead/SleepLib/profiles.h
View File

@ -566,24 +566,24 @@ class CPAPSettings : public PrefSettings
EventDataType untreatedAHI() const { return getPref(STR_CS_UntreatedAHI).toFloat(); } EventDataType untreatedAHI() const { return getPref(STR_CS_UntreatedAHI).toFloat(); }
const QString notes() const { return getPref(STR_CS_Notes).toString(); } const QString notes() const { return getPref(STR_CS_Notes).toString(); }
QDate dateDiagnosed() const { return getPref(STR_CS_DateDiagnosed).toDate(); } QDate dateDiagnosed() const { return getPref(STR_CS_DateDiagnosed).toDate(); }
inline const EventDataType userEventRestriction() const { return m_userEventRestriction1; } inline EventDataType userEventRestriction() const { return m_userEventRestriction1; }
inline const EventDataType userEventDuration() const { return m_userEventDuration1; } inline EventDataType userEventDuration() const { return m_userEventDuration1; }
inline const EventDataType userEventRestriction2() const { return m_userEventRestriction2; } inline EventDataType userEventRestriction2() const { return m_userEventRestriction2; }
inline const EventDataType userEventDuration2() const { return m_userEventDuration2; } inline EventDataType userEventDuration2() const { return m_userEventDuration2; }
inline const bool userEventDuplicates() const { return m_userEventDuplicates; } inline bool userEventDuplicates() const { return m_userEventDuplicates; }
inline const EventDataType AHIWindow() const { return m_ahiWindow; } inline EventDataType AHIWindow() const { return m_ahiWindow; }
inline const bool AHIReset() const { return m_ahiReset; } inline bool AHIReset() const { return m_ahiReset; }
inline const bool userEventFlagging() const { return m_userEventFlagging; } inline bool userEventFlagging() const { return m_userEventFlagging; }
inline const int clockDrift() const { return m_clock_drift; } inline int clockDrift() const { return m_clock_drift; }
inline const EventDataType leakRedline() const { return m_leakRedLine; } inline EventDataType leakRedline() const { return m_leakRedLine; }
inline const bool showLeakRedline() const { return m_showLeakRedline; } inline bool showLeakRedline() const { return m_showLeakRedline; }
inline const bool resyncFromUserFlagging() const { return m_resyncFromUserFlagging; } inline bool resyncFromUserFlagging() const { return m_resyncFromUserFlagging; }
bool autoImport() const { return getPref(STR_CS_AutoImport).toBool(); } bool autoImport() const { return getPref(STR_CS_AutoImport).toBool(); }
bool brickWarning() const { return getPref(STR_CS_BrickWarning).toBool(); } bool brickWarning() const { return getPref(STR_CS_BrickWarning).toBool(); }
inline const bool calculateUnintentionalLeaks() const { return m_calcUnintentionalLeaks; } inline bool calculateUnintentionalLeaks() const { return m_calcUnintentionalLeaks; }
inline const double custom4cmH2OLeaks() const { return m_4cmH2OLeaks; } inline double custom4cmH2OLeaks() const { return m_4cmH2OLeaks; }
inline const double custom20cmH2OLeaks() const { return m_20cmH2OLeaks; } inline double custom20cmH2OLeaks() const { return m_20cmH2OLeaks; }
//Setters //Setters
void setMode(CPAPMode mode) { setPref(STR_CS_PrescribedMode, (int)mode); } 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(); m_lockSummarySessions = initPref(STR_IS_LockSummarySessions, true).toBool();
} }
inline const QTime daySplitTime() const { return m_daySplitTime; } inline QTime daySplitTime() const { return m_daySplitTime; }
inline const bool preloadSummaries() const { return m_preloadSummaries; } inline bool preloadSummaries() const { return m_preloadSummaries; }
inline const double combineCloseSessions() const { return m_combineCloseSessions; } inline double combineCloseSessions() const { return m_combineCloseSessions; }
inline const double ignoreShortSessions() const { return m_ignoreShortSessions; } inline double ignoreShortSessions() const { return m_ignoreShortSessions; }
inline const bool compressSessionData() const { return m_compressSessionData; } inline bool compressSessionData() const { return m_compressSessionData; }
inline const bool compressBackupData() const { return m_compressBackupData; } inline bool compressBackupData() const { return m_compressBackupData; }
inline const bool backupCardData() const { return m_backupCardData; } inline bool backupCardData() const { return m_backupCardData; }
inline const bool ignoreOlderSessions() const { return m_ignoreOlderSessions; } inline bool ignoreOlderSessions() const { return m_ignoreOlderSessions; }
inline const QDateTime ignoreOlderSessionsDate() const { return m_ignoreOlderSessionsDate; } inline QDateTime ignoreOlderSessionsDate() const { return m_ignoreOlderSessionsDate; }
inline const bool lockSummarySessions() const { return m_lockSummarySessions; } inline bool lockSummarySessions() const { return m_lockSummarySessions; }
void setDaySplitTime(QTime time) { setPref(STR_IS_DaySplitTime, m_daySplitTime=time); } void setDaySplitTime(QTime time) { setPref(STR_IS_DaySplitTime, m_daySplitTime=time); }
void setPreloadSummaries(bool b) { setPref(STR_IS_PreloadSummaries, m_preloadSummaries=b); } 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(); } UnitSystem unitSystem() const { return (UnitSystem)getPref(STR_US_UnitSystem).toInt(); }
double eventWindowSize() const { return getPref(STR_US_EventWindowSize).toDouble(); } 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(); } bool rebuildCache() const { return getPref(STR_US_RebuildCache).toBool(); }
inline const bool calculateRDI() const { return m_calculateRDI; } inline bool calculateRDI() const { return m_calculateRDI; }
inline const int prefCalcMiddle() const { return m_prefCalcMiddle; } inline int prefCalcMiddle() const { return m_prefCalcMiddle; }
inline const double prefCalcPercentile() const { return m_prefCalcPercentile; } inline double prefCalcPercentile() const { return m_prefCalcPercentile; }
inline const int prefCalcMax() const { return m_prefCalcMax; } inline int prefCalcMax() const { return m_prefCalcMax; }
int statReportMode() const { return getPref(STR_US_StatReportMode).toInt(); } 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(); } int lastOverviewRange() const { return getPref(STR_US_LastOverviewRange).toInt(); }
void setUnitSystem(UnitSystem us) { setPref(STR_US_UnitSystem, (int)us); } void setUnitSystem(UnitSystem us) { setPref(STR_US_UnitSystem, (int)us); }