From e340809ca89c9d869ef8b5bff1d67b80acd3b0f2 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Mon, 5 Dec 2011 18:32:46 +1000 Subject: [PATCH] Show Units ToolTips hovering over graph title area --- Graphs/gGraphView.cpp | 37 ++++++++++++++++++++++-------- Graphs/gGraphView.h | 7 +++++- daily.cpp | 53 +++++++++++++++++++++---------------------- daily.h | 2 +- docs/channels.xml | 4 ++-- overview.cpp | 38 +++++++++++++++---------------- overview.h | 2 +- oximetry.cpp | 8 +++---- report.cpp | 14 ++++++------ 9 files changed, 94 insertions(+), 71 deletions(-) diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index fee2952f..5b17923e 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -13,6 +13,7 @@ #include #include "mainwindow.h" +#include "Graphs/gYAxis.h" extern MainWindow *mainwin; @@ -589,17 +590,25 @@ gToolTip::~gToolTip() disconnect(timer,SLOT(timerDone())); delete timer; } +void gToolTip::calcSize(QString text,int &w, int &h) +{ + /*GetTextExtent(text,w,h); + w+=m_spacer*2; + h+=m_spacer*2; */ +} void gToolTip::display(QString text, int x, int y, int timeout) { m_text=text; - m_pos.setX(x); - m_pos.setY(y); m_visible=true; // TODO: split multiline here - GetTextExtent(m_text,tw,th); - tw+=m_spacer*2; - th+=m_spacer*2; + //calcSize(m_text,tw,th); + + m_pos.setX(x); + m_pos.setY(y); + + //tw+=m_spacer*2; + //th+=m_spacer*2; //th*=2; if (timer->isActive()) { timer->stop(); @@ -640,9 +649,13 @@ void gToolTip::paint() //actually paints it. QRect rect(x,y,0,0); painter.setFont(*defaultfont); rect=painter.boundingRect(rect,Qt::AlignCenter,m_text); - rect.setLeft(rect.x()-m_spacer); + int w=rect.width()+m_spacer*2; + int xx=rect.x()-m_spacer; + if (xx<0) xx=0; + rect.setLeft(xx); rect.setTop(rect.y()-rect.height()/2); - rect.setWidth(rect.width()+m_spacer*2); + rect.setWidth(w); + //rect.setHeight(rect.height()); QBrush brush(QColor(255,255,128,200)); painter.setBrush(brush); @@ -875,9 +888,10 @@ void gThread::run() } #endif -gGraph::gGraph(gGraphView *graphview,QString title,int height,short group) : +gGraph::gGraph(gGraphView *graphview,QString title,QString units, int height,short group) : m_graphview(graphview), m_title(title), + m_units(units), m_height(height), m_visible(true) { @@ -2273,7 +2287,7 @@ void gGraphView::mouseMoveEvent(QMouseEvent * event) if (m_button_down || ((py + h + graphSpacer) >= 0)) { if (m_button_down || ((y >= py) && (y < py + h))) { - if (m_button_down || (x >= titleWidth+(20))) { + if (m_button_down || (x >= titleWidth+(gYAxis::Margin-20))) { this->setCursor(Qt::ArrowCursor); m_horiz_travel+=qAbs(x-m_lastxpos)+qAbs(y-m_lastypos); m_lastxpos=x; @@ -2284,8 +2298,13 @@ void gGraphView::mouseMoveEvent(QMouseEvent * event) m_graphs[i]->mouseMoveEvent(&e); } else { //qDebug() << "Hovering over" << m_graphs[i]->title(); + if (!m_graphs[i]->units().isEmpty()) { + m_tooltip->display(m_graphs[i]->units(),x,y-20,800); + updateGL(); + } this->setCursor(Qt::OpenHandCursor); } + } else if ((y >= py + h) && (y <= py + h + graphSpacer + 1)) { this->setCursor(Qt::SplitVCursor); } diff --git a/Graphs/gGraphView.h b/Graphs/gGraphView.h index ade79365..58c77190 100644 --- a/Graphs/gGraphView.h +++ b/Graphs/gGraphView.h @@ -244,6 +244,7 @@ class gToolTip: public QObject public: gToolTip(gGraphView * graphview); virtual ~gToolTip(); + void calcSize(QString text, int & w, int & h); virtual void display(QString text, int x, int y, int timeout=2000); virtual void paint(); //actually paints it. void cancel(); @@ -266,7 +267,7 @@ public: friend class gGraphView; //gGraph(); - gGraph(gGraphView * graphview=NULL, QString title="",int height=100,short group=0); + gGraph(gGraphView * graphview=NULL, QString title="", QString units="", int height=100,short group=0); virtual ~gGraph(); void deselect(); void Trigger(int ms); @@ -294,6 +295,9 @@ public: void drawGLBuf(); QString title() { return m_title; } + QString units() { return m_units; } + void setTitle(const QString title) { m_title=title; } + void setUnits(const QString units) { m_units=units; } //virtual void repaint(); // Repaint individual graph.. @@ -369,6 +373,7 @@ protected: gGraphView * m_graphview; QString m_title; + QString m_units; QVector m_layers; float m_height,m_width; diff --git a/daily.cpp b/daily.cpp index 0dfad022..c172757e 100644 --- a/daily.cpp +++ b/daily.cpp @@ -89,34 +89,34 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw) layout->addWidget(scrollbar,0); int default_height=PROFILE["GraphHeight"].toInt(); - SF=new gGraph(GraphView,"Event Flags",default_height); - FRW=new gGraph(GraphView,"Flow Rate",default_height); - AHI=new gGraph(GraphView,"AHI",default_height); - MP=new gGraph(GraphView,"Mask Pressure",default_height); - PRD=new gGraph(GraphView,"Pressure",default_height); - LEAK=new gGraph(GraphView,"Leak",default_height); - SNORE=new gGraph(GraphView,"Snore",default_height); - RR=new gGraph(GraphView,"Resp. Rate",default_height); - TV=new gGraph(GraphView,"Tidal Volume",default_height); - MV=new gGraph(GraphView,"Minute Vent.",default_height); - FLG=new gGraph(GraphView,"Flow Limit.",default_height); - PTB=new gGraph(GraphView,"Patient Tr. Br.",default_height); - RE=new gGraph(GraphView,"Resp. Event",default_height); - IE=new gGraph(GraphView,"I:E",default_height); - TE=new gGraph(GraphView,"Te",default_height); - TI=new gGraph(GraphView,"Ti",default_height); - TgMV=new gGraph(GraphView,"TgMV",default_height); - INTPULSE=new gGraph(GraphView,"R-Pulse",default_height); - INTSPO2=new gGraph(GraphView,"R-SPO2",default_height); + SF=new gGraph(GraphView,"Event Flags","Event Flags",default_height); + FRW=new gGraph(GraphView,schema::channel[CPAP_FlowRate].label(),schema::channel[CPAP_FlowRate].description()+"\n("+schema::channel[CPAP_FlowRate].units()+")",default_height); + AHI=new gGraph(GraphView,schema::channel[CPAP_AHI].label(),schema::channel[CPAP_AHI].description()+"\n("+schema::channel[CPAP_AHI].units()+")",default_height); + MP=new gGraph(GraphView,schema::channel[CPAP_MaskPressure].label(),schema::channel[CPAP_MaskPressure].description()+"\n("+schema::channel[CPAP_MaskPressure].units()+")",default_height); + PRD=new gGraph(GraphView,schema::channel[CPAP_Pressure].label(),schema::channel[CPAP_Pressure].description()+"\n("+schema::channel[CPAP_Pressure].units()+")",default_height); + LEAK=new gGraph(GraphView,schema::channel[CPAP_Leak].label(),schema::channel[CPAP_Leak].description()+"\n("+schema::channel[CPAP_Leak].units()+")",default_height); + SNORE=new gGraph(GraphView,schema::channel[CPAP_Snore].label(),schema::channel[CPAP_Snore].description()+"\n("+schema::channel[CPAP_Snore].units()+")",default_height); + RR=new gGraph(GraphView,schema::channel[CPAP_RespRate].label(),schema::channel[CPAP_RespRate].description()+"\n("+schema::channel[CPAP_RespRate].units()+")",default_height); + TV=new gGraph(GraphView,schema::channel[CPAP_TidalVolume].label(),schema::channel[CPAP_TidalVolume].description()+"\n("+schema::channel[CPAP_TidalVolume].units()+")",default_height); + MV=new gGraph(GraphView,schema::channel[CPAP_MinuteVent].label(),schema::channel[CPAP_MinuteVent].description()+"\n("+schema::channel[CPAP_MinuteVent].units()+")",default_height); + FLG=new gGraph(GraphView,schema::channel[CPAP_FLG].label(),schema::channel[CPAP_FLG].description()+"\n("+schema::channel[CPAP_FLG].units()+")",default_height); + PTB=new gGraph(GraphView,schema::channel[CPAP_PTB].label(),schema::channel[CPAP_PTB].description()+"\n("+schema::channel[CPAP_PTB].units()+")",default_height); + RE=new gGraph(GraphView,schema::channel[CPAP_RespEvent].label(),schema::channel[CPAP_RespEvent].description()+"\n("+schema::channel[CPAP_RespEvent].units()+")",default_height); + IE=new gGraph(GraphView,schema::channel[CPAP_IE].label(),schema::channel[CPAP_IE].description()+"\n("+schema::channel[CPAP_IE].units()+")",default_height); + TE=new gGraph(GraphView,schema::channel[CPAP_Te].label(),schema::channel[CPAP_Te].description()+"\n("+schema::channel[CPAP_Te].units()+")",default_height); + TI=new gGraph(GraphView,schema::channel[CPAP_Ti].label(),schema::channel[CPAP_Ti].description()+"\n("+schema::channel[CPAP_Ti].units()+")",default_height); + TgMV=new gGraph(GraphView,schema::channel[CPAP_TgMV].label(),schema::channel[CPAP_TgMV].description()+"\n("+schema::channel[CPAP_TgMV].units()+")",default_height); + //INTPULSE=new gGraph(GraphView,"R-Pulse",schema::channel[CPAP_Te].units(),default_height); + //INTSPO2=new gGraph(GraphView,"R-SPO2",default_height); int oxigrp=PROFILE.ExistsAndTrue("SyncOximetry") ? 0 : 1; - PULSE=new gGraph(GraphView,"Pulse",default_height,oxigrp); - SPO2=new gGraph(GraphView,"SpO2",default_height,oxigrp); - PLETHY=new gGraph(GraphView,"Plethy",default_height,oxigrp); + PULSE=new gGraph(GraphView,schema::channel[OXI_Pulse].label(),schema::channel[OXI_Pulse].description()+"\n("+schema::channel[OXI_Pulse].units()+")",default_height,oxigrp); + SPO2=new gGraph(GraphView,schema::channel[OXI_SPO2].label(),schema::channel[OXI_SPO2].description()+"\n("+schema::channel[OXI_SPO2].units()+")",default_height,oxigrp); + PLETHY=new gGraph(GraphView,schema::channel[OXI_Plethy].label(),schema::channel[OXI_Plethy].description()+"\n("+schema::channel[OXI_Plethy].units()+")",default_height,oxigrp); // Event Pie Chart (for snapshot purposes) // TODO: Convert snapGV to generic for snapshotting multiple graphs (like reports does) - GAHI=new gGraph(snapGV,"Breakdown",172); + GAHI=new gGraph(snapGV,"Breakdown","events",172); gSegmentChart * evseg=new gSegmentChart(GST_Pie); evseg->AddSlice(CPAP_Hypopnea,QColor(0x40,0x40,0xff,0xff),"H"); evseg->AddSlice(CPAP_Apnea,QColor(0x20,0x80,0x20,0xff),"A"); @@ -178,7 +178,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw) FRW->AddLayer(AddCPAP(los)); - gGraph *graphs[]={ PRD, LEAK, AHI, SNORE, PTB, MP, RR, MV, TV, FLG, IE, TI, TE, TgMV, SPO2, PLETHY, PULSE, INTPULSE, INTSPO2 }; + gGraph *graphs[]={ PRD, LEAK, AHI, SNORE, PTB, MP, RR, MV, TV, FLG, IE, TI, TE, TgMV, SPO2, PLETHY, PULSE }; int ng=sizeof(graphs)/sizeof(gGraph*); for (int i=0;iAddLayer(new gXGrid()); @@ -225,8 +225,8 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw) TE->AddLayer(AddCPAP(new gLineChart(CPAP_Te,Qt::darkGreen,square))); TI->AddLayer(AddCPAP(new gLineChart(CPAP_Ti,Qt::darkBlue,square))); TgMV->AddLayer(AddCPAP(new gLineChart(CPAP_TgMV,Qt::darkCyan,square))); - INTPULSE->AddLayer(AddCPAP(new gLineChart(OXI_Pulse,Qt::red,square))); - INTSPO2->AddLayer(AddCPAP(new gLineChart(OXI_SPO2,Qt::blue,square))); + //INTPULSE->AddLayer(AddCPAP(new gLineChart(OXI_Pulse,Qt::red,square))); + //INTSPO2->AddLayer(AddCPAP(new gLineChart(OXI_SPO2,Qt::blue,square))); PULSE->AddLayer(AddOXI(new gLineOverlayBar(OXI_PulseChange,QColor("light gray"),"PD",FT_Span))); SPO2->AddLayer(AddOXI(new gLineOverlayBar(OXI_SPO2Drop,QColor("light blue"),"O2",FT_Span))); @@ -237,7 +237,6 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw) PTB->setForceMaxY(100); SPO2->setForceMaxY(100); - INTSPO2->setForceMaxY(100); //FRW->setRecMinY(-120); //FRW->setRecMaxY(0); diff --git a/daily.h b/daily.h index 8bb3cb53..95e36b3a 100644 --- a/daily.h +++ b/daily.h @@ -101,7 +101,7 @@ private: void UpdateEventsTree(QTreeWidget * tree,Day *day); gGraph *PRD,*FRW,*GAHI,*TAP,*LEAK,*SF,*TAP_EAP,*TAP_IAP,*PULSE,*SPO2, - *SNORE,*RR,*MP,*MV,*TV,*FLG,*PTB,*OF,*INTPULSE,*INTSPO2, *THPR, + *SNORE,*RR,*MP,*MV,*TV,*FLG,*PTB,*OF, *THPR, *PLETHY,*TI,*TE, *RE, *IE, *TgMV, *AHI; QList OXIData; diff --git a/docs/channels.xml b/docs/channels.xml index 298081d3..3d865a9e 100644 --- a/docs/channels.xml +++ b/docs/channels.xml @@ -31,8 +31,8 @@ One id code per item - - + + diff --git a/overview.cpp b/overview.cpp index 592f7d1f..72e19c91 100644 --- a/overview.cpp +++ b/overview.cpp @@ -87,31 +87,31 @@ Overview::Overview(QWidget *parent,gGraphView * shared) : // TODO: Automate graph creation process // The following code (to the closing marker) is crap ---> - AHI=createGraph("AHI"); - UC=createGraph("Usage"); + AHI=createGraph("AHI","Apnea\nHypopnea\nIndex"); + UC=createGraph("Usage","Usage\n(time)"); int default_height=PROFILE["GraphHeight"].toInt(); - US=new gGraph(GraphView,"Session Usage",default_height,0); + US=new gGraph(GraphView,"Session Times","Session Times\n(time)",default_height,0); US->AddLayer(new gYAxisTime(),LayerLeft,gYAxis::Margin); gXAxis *x=new gXAxis(); x->setUtcFix(true); US->AddLayer(x,LayerBottom,0,gXAxis::Margin); US->AddLayer(new gXGrid()); - PR=createGraph("Pressure"); - SET=createGraph("Settings"); - LK=createGraph("Leaks"); - SES=createGraph("Sessions"); - NPB=createGraph("% in PB"); - RR=createGraph("Resp. Rate"); - TV=createGraph("Tidal Volume"); - MV=createGraph("Minute Vent."); - PTB=createGraph("Pat. Trig. Br."); - PULSE=createGraph("Pulse Rate"); - SPO2=createGraph("SpO2"); - WEIGHT=createGraph("Weight"); - BMI=createGraph("BMI"); - ZOMBIE=createGraph("Zombie"); + PR=createGraph("Pressure","Pressure\n(cmH2O)"); + SET=createGraph("Settings","Settings"); + LK=createGraph("Leaks","Leak Rate\n(L/min)"); + SES=createGraph("Sessions","Sessions\n(count)"); + NPB=createGraph("% in PB","Periodic\nBreathing\n(% of night)"); + RR=createGraph("Resp. Rate","Respiratory\nRate\n(breaths/min)"); + TV=createGraph("Tidal Volume","Tidal\nVolume\n(ml)"); + MV=createGraph("Minute Vent.","Minute\nVentilation\n(L/min)"); + PTB=createGraph("Pat. Trig. Br.","Patient\nTriggered\nBreaths\n(%)"); + PULSE=createGraph("Pulse Rate","Pulse Rate\n(bpm)"); + SPO2=createGraph("SpO2","Oxygen Saturation\n(%)"); + WEIGHT=createGraph("Weight","Weight\n(kg)"); + BMI=createGraph("BMI","Body\nMass\nIndex"); + ZOMBIE=createGraph("Zombie","How you felt\n(% awesome)"); weight=new SummaryChart("Weight",GT_LINE); weight->setMachineType(MT_JOURNAL); @@ -234,10 +234,10 @@ Overview::~Overview() } delete ui; } -gGraph * Overview::createGraph(QString name) +gGraph * Overview::createGraph(QString name,QString units) { int default_height=PROFILE["GraphHeight"].toInt(); - gGraph *g=new gGraph(GraphView,name,default_height,0); + gGraph *g=new gGraph(GraphView,name,units,default_height,0); g->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin); gXAxis *x=new gXAxis(); x->setUtcFix(true); diff --git a/overview.h b/overview.h index 1b4baf6b..49ebf0d7 100644 --- a/overview.h +++ b/overview.h @@ -33,7 +33,7 @@ public: void ReloadGraphs(); void ResetGraphLayout(); void RedrawGraphs(); - gGraph * createGraph(QString name); + gGraph * createGraph(QString name,QString units=""); void PrintReport(); diff --git a/oximetry.cpp b/oximetry.cpp index b6b9d9db..3ae4cdaa 100644 --- a/oximetry.cpp +++ b/oximetry.cpp @@ -725,10 +725,10 @@ Oximetry::Oximetry(QWidget *parent,gGraphView * shared) : layout->layout(); - PLETHY=new gGraph(GraphView,tr("Plethy"),120); - CONTROL=new gGraph(GraphView,tr("Control"),75); - PULSE=new gGraph(GraphView,tr("Pulse Rate"),120); - SPO2=new gGraph(GraphView,tr("SPO2"),120); + PLETHY=new gGraph(GraphView,schema::channel[OXI_Plethy].label(),schema::channel[OXI_Plethy].units(),120); + CONTROL=new gGraph(GraphView,tr("Control"),"",75); + PULSE=new gGraph(GraphView,schema::channel[OXI_Pulse].label(),schema::channel[OXI_Pulse].units(),120); + SPO2=new gGraph(GraphView,schema::channel[OXI_SPO2].label(),schema::channel[OXI_SPO2].units(),120); foobar=new gShadowArea(); CONTROL->AddLayer(foobar); Layer *cl=new gLineChart(OXI_Plethy); diff --git a/report.cpp b/report.cpp index cb1e7b69..b7ff0b7b 100644 --- a/report.cpp +++ b/report.cpp @@ -35,25 +35,25 @@ Report::Report(QWidget *parent, gGraphView * shared, Overview * overview) : // Reusing the layer data from overview screen, // (Can't reuse the graphs objects without breaking things) - graphs["Usage"]=UC=new gGraph(GraphView,"Usage",graph_print_height,0); + graphs["Usage"]=UC=new gGraph(GraphView,"Usage","",graph_print_height,0); UC->AddLayer(m_overview->uc); - graphs["AHI"]=AHI=new gGraph(GraphView,"AHI",graph_print_height,0); + graphs["AHI"]=AHI=new gGraph(GraphView,"AHI","",graph_print_height,0); AHI->AddLayer(m_overview->bc); - graphs["Pressure"]=PR=new gGraph(GraphView,"Pressure",graph_print_height,0); + graphs["Pressure"]=PR=new gGraph(GraphView,"Pressure","",graph_print_height,0); PR->AddLayer(m_overview->pr); - graphs["Leaks"]=LK=new gGraph(GraphView,"Leaks",graph_print_height,0); + graphs["Leaks"]=LK=new gGraph(GraphView,"Leaks","",graph_print_height,0); LK->AddLayer(m_overview->lk); - graphs["%PB"]=NPB=new gGraph(GraphView,"% in PB",graph_print_height,0); + graphs["%PB"]=NPB=new gGraph(GraphView,"% in PB","",graph_print_height,0); NPB->AddLayer(m_overview->npb); - graphs["Settings"]=SET=new gGraph(GraphView,"Settings",graph_print_height,0); + graphs["Settings"]=SET=new gGraph(GraphView,"Settings","",graph_print_height,0); SET->AddLayer(m_overview->set); - graphs["Sessions"]=SES=new gGraph(GraphView,"Sessions",graph_print_height,0); + graphs["Sessions"]=SES=new gGraph(GraphView,"Sessions","",graph_print_height,0); SES->AddLayer(m_overview->ses);