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

Make F3 toggle stats above graphs instead of having to hold in Alt

Browse Source
This commit is contained in:
Mark Watkins 2014-07-21 18:33:04 +10:00
parent 93dc4722b5
commit fedfc4ac15
5 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sleepyhead/Graphs/gGraphView.cpp
View File

@ -1077,6 +1077,10 @@ void gGraphView::paintGL()
void gGraphView::leaveEvent(QEvent * event)
{
Q_UNUSED(event);
if (m_metaselect) {
m_metaselect = false;
timedRedraw(0);
}
releaseKeyboard();
}
@ -1830,11 +1834,16 @@ void gGraphView::wheelEvent(QWheelEvent *event)
void gGraphView::keyPressEvent(QKeyEvent *event)
{
bool meta = m_metaselect;
// bool meta = m_metaselect;
m_metaselect = event->modifiers() & Qt::AltModifier;
if (meta != m_metaselect) {
timedRedraw(30);
// if (meta != m_metaselect) {
// timedRedraw(30);
// }
if (event->key() == Qt::Key_F3) {
p_profile->appearance->setLineCursorMode(!p_profile->appearance->lineCursorMode());
timedRedraw(0);
}
if (event->key() == Qt::Key_Tab) {

2
sleepyhead/Graphs/gLineChart.cpp
View File

@ -274,7 +274,7 @@ void gLineChart::paint(QPainter &painter, gGraph &w, const QRegion &region)
}
}
if (w.graphView()->metaSelect()) {
if (p_profile->appearance->lineCursorMode()) {
qint64 time = w.currentTime();
if ((time > minx) && (time < maxx)) {

4
sleepyhead/Graphs/gLineOverlay.cpp
View File

@ -352,10 +352,8 @@ void gLineOverlaySummary::paint(QPainter &painter, gGraph &w, const QRegion &reg
if ((w.graphView()->selectionInProgress() || w.graphView()->metaSelect()) && (!w.selDurString().isEmpty())) {
a = QObject::tr("Duration")+": "+w.selDurString();
} else {
if (!w.graphView()->metaSelect()) {
a = QObject::tr("Events") + ": " + QString::number(cnt) + ", " +
a = QObject::tr("Events") + ": " + QString::number(cnt) + ", " +
QObject::tr("Duration") + " " + QString().sprintf("%02i:%02i:%02i", h, m, s) + ", " + m_text + ": " + QString::number(val, 'f', 2);
}
}
if (isSpan) {
float sph;

6
sleepyhead/SleepLib/profiles.h
View File

@ -310,6 +310,7 @@ const QString STR_AS_UsePixmapCaching = "UsePixmapCaching";
const QString STR_AS_AllowYAxisScaling = "AllowYAxisScaling";
const QString STR_AS_GraphTooltips = "GraphTooltips";
const QString STR_AS_LineThickness = "LineThickness";
const QString STR_AS_LineCursorMode = "LineCursorMode";
// UserSettings Strings
const QString STR_US_UnitSystem = "UnitSystem";
@ -664,6 +665,7 @@ class AppearanceSettings : public ProfileSettings
initPref(STR_AS_OverlayType, ODT_Bars);
initPref(STR_AS_OverviewLinechartMode, OLC_Bartop);
initPref(STR_AS_LineThickness, 1.0);
initPref(STR_AS_LineCursorMode, false);
}
//! \brief Returns the normal (unscaled) height of a graph
@ -684,6 +686,8 @@ class AppearanceSettings : public ProfileSettings
bool graphTooltips() const { return getPref(STR_AS_GraphTooltips).toBool(); }
//! \brief Pen width of line plots
float lineThickness() const { return getPref(STR_AS_LineThickness).toFloat(); }
//! \brief Whether to show line cursor
bool lineCursorMode() const { return getPref(STR_AS_LineCursorMode).toBool(); }
//! \brief Returns the type of overlay flags (which are displayed over the Flow Waveform)
@ -719,6 +723,8 @@ class AppearanceSettings : public ProfileSettings
}
//! \brief Set the pen width of line plots.
void setLineThickness(float size) { setPref(STR_AS_LineThickness, size); }
//! \brief Sets whether to display Line Cursor
void setLineCursorMode(bool b) { setPref(STR_AS_LineCursorMode, b); }
};
/*! \class UserSettings

4
sleepyhead/daily.cpp
View File

@ -307,10 +307,10 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
// this is class wide because the leak redline can be reset in preferences..
// Better way would be having a search for linechart layers in graphlist[...]
gLineChart *leakchart=new gLineChart(CPAP_LeakTotal, COLOR_LeakTotal, square);
gLineChart *leakchart=new gLineChart(CPAP_Leak, COLOR_LeakTotal, square);
graphlist[schema::channel[CPAP_Leak].label()]->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_LargeLeak, COLOR_LargeLeak, STR_TR_LL, FT_Span)));
leakchart->addPlot(CPAP_Leak, COLOR_Leak, square);
leakchart->addPlot(CPAP_LeakTotal, COLOR_Leak, square);
leakchart->addPlot(CPAP_MaxLeak, COLOR_MaxLeak, square);
schema::channel[CPAP_Leak].setUpperThresholdColor(Qt::red);
schema::channel[CPAP_Leak].setLowerThresholdColor(Qt::green);