From 529acbe16e5ad5ee18fc5b6088fb9f8525442205 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 26 Aug 2011 00:42:10 +1000 Subject: [PATCH] Swapped ScrollWheel modifier to keep my sanity. Ctrl key+scrollwheel now zooms, and scrollwheel by itself vertically scrolls. --- Graphs/gGraphView.cpp | 2 +- daily.cpp | 8 +++++++- daily.ui | 6 ------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index 28ba2c6a..8336ab19 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -1137,7 +1137,7 @@ void gGraphView::wheelEvent(QWheelEvent * event) { // Hmm.. I could optionalize this to change mousewheel behaviour without affecting the scrollbar now.. - if (!(event->modifiers() & Qt::ControlModifier)) { + if ((event->modifiers() & Qt::ControlModifier)) { int x=event->x(); int y=event->y(); diff --git a/daily.cpp b/daily.cpp index f35146aa..dc5fab11 100644 --- a/daily.cpp +++ b/daily.cpp @@ -73,7 +73,8 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw) RR=new gGraph(GraphView,"Respiratory Rate",180); TV=new gGraph(GraphView,"Tidal Volume",180); MV=new gGraph(GraphView,"Minute Ventilation",180); - FLG=new gGraph(GraphView,"Flow Limitation Graph",180); + FLG=new gGraph(GraphView,"Flow Limitation",180); + PTB=new gGraph(GraphView,"Patient Trig. Breath",180); gFlagsGroup *fg=new gFlagsGroup(); fg->AddLayer((new gFlagsLine(CPAP_CSR,QColor("light green"),"CSR",false,FT_Span))); @@ -132,6 +133,11 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw) SNORE->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin); SNORE->AddLayer(new gXAxis(),LayerBottom,0,20); + PTB->AddLayer(new gXGrid()); + PTB->AddLayer(AddCPAP(new gLineChart(CPAP_PatientTriggeredBreaths,Qt::gray,true))); + PTB->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin); + PTB->AddLayer(new gXAxis(),LayerBottom,0,20); + MP->AddLayer(new gXGrid()); MP->AddLayer(AddCPAP(new gLineChart(CPAP_MaskPressure,Qt::blue,false))); MP->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin); diff --git a/daily.ui b/daily.ui index d9ca84c2..b949b67b 100644 --- a/daily.ui +++ b/daily.ui @@ -54,12 +54,6 @@ 0 - - - Sans Serif - 10 - - Qt::Monday