From 8203ef887386a7b38a772b1c655ddaf88bb6806a Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 27 May 2011 21:35:45 +1000 Subject: [PATCH] Added pressure pulse to flow rate waveform overlays --- SleepyHead.depend | 8 ++++---- SleepyHeadMain.cpp | 1 + graphs/graph.cpp | 34 ++++++++++++++++++++-------------- graphs/graph.h | 4 +++- version.h | 12 ++++++------ 5 files changed, 34 insertions(+), 25 deletions(-) diff --git a/SleepyHead.depend b/SleepyHead.depend index 956660e5..bf3e7483 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -7866,11 +7866,11 @@ "tinyxml/tinyxml.h" -1306493511 /home/mark/projects/git/sleepyhead/graphs/graph.h +1306495853 /home/mark/projects/git/sleepyhead/graphs/graph.h -1306494170 /home/mark/projects/git/sleepyhead/version.h +1306496086 /home/mark/projects/git/sleepyhead/version.h 1306415077 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h "machine.h" @@ -7887,7 +7887,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1306494168 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp +1306495914 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -7901,7 +7901,7 @@ "SleepyHeadMain.h" "sleeplib/profiles.h" -1306493295 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp +1306495959 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp index 45a42e1f..94b58939 100644 --- a/SleepyHeadMain.cpp +++ b/SleepyHeadMain.cpp @@ -337,6 +337,7 @@ Daily::Daily(wxWindow *win) AddData(flags[9]=new FlagData(PRS1_Unknown0E,1)); FRW->AddLayer(new gLineChart(frw,wxBLACK,200000,true)); + FRW->AddLayer(new gLineOverlayBar(flags[7],wxRED,wxT("PR"),LOT_Dot)); FRW->AddLayer(new gLineOverlayBar(flags[6],wxYELLOW,wxT("RE"))); FRW->AddLayer(new gLineOverlayBar(flags[9],wxDARK_GREEN,wxT("U0E"))); FRW->AddLayer(new gLineOverlayBar(flags[5],wxRED,wxT("VS"))); diff --git a/graphs/graph.cpp b/graphs/graph.cpp index 88ff58d3..e18650a0 100644 --- a/graphs/graph.cpp +++ b/graphs/graph.cpp @@ -372,7 +372,7 @@ void gGraphWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) //wxLogMessage(wxT("Paint")); //dc.DrawText(m_title,m_marginLeft,3); - for (auto l=layers.rbegin();l!=layers.rend();l++) { + for (auto l=layers.begin();l!=layers.end();l++) { (*l)->Plot(dc,*this); } @@ -1316,8 +1316,8 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w) DrawXTicks(dc,w); } -gLineOverlayBar::gLineOverlayBar(gPointData *d,const wxColor * col,wxString _label) -:gLayer(d),label(_label) +gLineOverlayBar::gLineOverlayBar(gPointData *d,const wxColor * col,wxString _label,LO_Type _lot) +:gLayer(d),label(_label),lo_type(_lot) { color.clear(); color.push_back(col); @@ -1349,6 +1349,7 @@ void gLineOverlayBar::Plot(wxDC & dc, gGraphWindow & w) double xx=w.max_x-w.min_x; if (xx<=0) return; + wxPen sfp3(*color[0], 4, wxSOLID); wxPen sfp2(*color[0], 5, wxSOLID); wxPen sfp1(*color[0], 1, wxSOLID); @@ -1382,18 +1383,23 @@ void gLineOverlayBar::Plot(wxDC & dc, gGraphWindow & w) double w1=x2-x1; dc.SetPen(sfp1); int x,y; - if (rp.x==rp.y) { - if (xx<(1800.0/86400)) { - //dc.SetTextForeground(*color[0]); - dc.GetTextExtent(label,&x,&y); - dc.DrawText(label,x1-(x/2),start_py+20-y); + if (lo_type==LOT_Bar) { + if (rp.x==rp.y) { + if (xx<(1800.0/86400)) { + //dc.SetTextForeground(*color[0]); + dc.GetTextExtent(label,&x,&y); + dc.DrawText(label,x1-(x/2),start_py+20-y); + } + dc.DrawLine(x1,start_py+25,x1,start_py+height-25); + dc.SetPen(sfp2); + dc.DrawLine(x1,start_py+25,x1,start_py+25); + } else { + // if ((x1>w.GetLeftMargin()) && (x1w.GetLeftMargin()) && (x1