Slightly more less squishy YAxis labels

This commit is contained in:
Mark Watkins 2016-03-08 02:16:20 +10:00
parent b4624a8d71
commit a5edc3dbdb
3 changed files with 18 additions and 2 deletions

View File

@ -215,6 +215,10 @@ void MinutesAtPressure::paint(QPainter &painter, gGraph &graph, const QRegion &r
if (r < h+4) { if (r < h+4) {
r = double(height+3) / (peak/1200.0); r = double(height+3) / (peak/1200.0);
g = 20.0; g = 20.0;
if (r < h+4) {
r = double(height+3) / (peak/2400.0);
g = 40.0;
}
} }
yp = bot; yp = bot;
for (float f=0.0; f<=peak/60.0+0.01; f+=g) { for (float f=0.0; f<=peak/60.0+0.01; f+=g) {

View File

@ -304,6 +304,7 @@ const QString STR_CS_AHIReset = "AHIReset";
const QString STR_CS_ClockDrift = "ClockDrift"; const QString STR_CS_ClockDrift = "ClockDrift";
const QString STR_CS_LeakRedline = "LeakRedline"; const QString STR_CS_LeakRedline = "LeakRedline";
const QString STR_CS_ShowLeakRedline = "ShowLeakRedline"; const QString STR_CS_ShowLeakRedline = "ShowLeakRedline";
const QString STR_CS_AllowEventRenaming = "AllowEventRenaming";
const QString STR_CS_CalculateUnintentionalLeaks = "CalculateUnintentionalLeaks"; const QString STR_CS_CalculateUnintentionalLeaks = "CalculateUnintentionalLeaks";
const QString STR_CS_4cmH2OLeaks = "Custom4cmH2OLeaks"; const QString STR_CS_4cmH2OLeaks = "Custom4cmH2OLeaks";
@ -574,6 +575,8 @@ class CPAPSettings : public ProfileSettings
initPref(STR_CS_4cmH2OLeaks, 20.167); initPref(STR_CS_4cmH2OLeaks, 20.167);
initPref(STR_CS_20cmH2OLeaks, 48.333); initPref(STR_CS_20cmH2OLeaks, 48.333);
initPref(STR_CS_AllowEventRenaming, false);
initPref(STR_CS_ClockDrift, (int)0); initPref(STR_CS_ClockDrift, (int)0);
m_clock_drift = getPref(STR_CS_ClockDrift).toInt(); m_clock_drift = getPref(STR_CS_ClockDrift).toInt();
} }
@ -606,6 +609,7 @@ class CPAPSettings : public ProfileSettings
bool resyncFromUserFlagging() const { return getPref(STR_CS_ResyncFromUserFlagging).toBool(); } bool resyncFromUserFlagging() const { return getPref(STR_CS_ResyncFromUserFlagging).toBool(); }
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(); }
bool allowEventRenaming() const { return getPref(STR_CS_AllowEventRenaming).toBool(); }
bool calculateUnintentionalLeaks() const { return getPref(STR_CS_CalculateUnintentionalLeaks).toBool(); } bool calculateUnintentionalLeaks() const { return getPref(STR_CS_CalculateUnintentionalLeaks).toBool(); }
double custom4cmH2OLeaks() const { return getPref(STR_CS_4cmH2OLeaks).toDouble(); } double custom4cmH2OLeaks() const { return getPref(STR_CS_4cmH2OLeaks).toDouble(); }
@ -643,6 +647,7 @@ class CPAPSettings : public ProfileSettings
void setResyncFromUserFlagging(bool b) { setPref(STR_CS_ResyncFromUserFlagging, b); } void setResyncFromUserFlagging(bool b) { setPref(STR_CS_ResyncFromUserFlagging, b); }
void setAutoImport(bool b) { setPref(STR_CS_AutoImport, b); } void setAutoImport(bool b) { setPref(STR_CS_AutoImport, b); }
void setBrickWarning(bool b) { setPref(STR_CS_BrickWarning, b); } void setBrickWarning(bool b) { setPref(STR_CS_BrickWarning, b); }
void setAllowEventRenaming(bool b) { setPref(STR_CS_AllowEventRenaming, b); }
void setCalculateUnintentionalLeaks(bool b) { setPref(STR_CS_CalculateUnintentionalLeaks, b); } void setCalculateUnintentionalLeaks(bool b) { setPref(STR_CS_CalculateUnintentionalLeaks, b); }
void setCustom4cmH2OLeaks(double val) { setPref(STR_CS_4cmH2OLeaks, val); } void setCustom4cmH2OLeaks(double val) { setPref(STR_CS_4cmH2OLeaks, val); }

View File

@ -9,8 +9,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>826</width> <width>845</width>
<height>600</height> <height>656</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -1244,6 +1244,13 @@ Defaults to 60 minutes.. Highly recommend it's left at this value.</string>
</item> </item>
</widget> </widget>
</item> </item>
<item row="3" column="2" colspan="2">
<widget class="QCheckBox" name="allowEventRenaming">
<property name="text">
<string>Allow Event Renaming</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>