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

Added pressure pulse to flow rate waveform overlays

Browse Source
This commit is contained in:
Mark Watkins 2011-05-27 21:35:45 +10:00
parent 04fe23e9bf
commit 8203ef8873
5 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SleepyHead.depend
View File

@ -7866,11 +7866,11 @@
<map> <map>
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1306493511 /home/mark/projects/git/sleepyhead/graphs/graph.h 1306495853 /home/mark/projects/git/sleepyhead/graphs/graph.h
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
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 1306415077 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -7887,7 +7887,7 @@
"preferences.h" "preferences.h"
"tinyxml/tinyxml.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" "wx_pch.h"
"version.h" "version.h"
<wx/app.h> <wx/app.h>
@ -7901,7 +7901,7 @@
"SleepyHeadMain.h" "SleepyHeadMain.h"
"sleeplib/profiles.h" "sleeplib/profiles.h"
1306493295 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp 1306495959 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp
<wx/settings.h> <wx/settings.h>
<wx/dcbuffer.h> <wx/dcbuffer.h>
<wx/log.h> <wx/log.h>

1
SleepyHeadMain.cpp
View File

@ -337,6 +337,7 @@ Daily::Daily(wxWindow *win)
AddData(flags[9]=new FlagData(PRS1_Unknown0E,1)); AddData(flags[9]=new FlagData(PRS1_Unknown0E,1));
FRW->AddLayer(new gLineChart(frw,wxBLACK,200000,true)); 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[6],wxYELLOW,wxT("RE")));
FRW->AddLayer(new gLineOverlayBar(flags[9],wxDARK_GREEN,wxT("U0E"))); FRW->AddLayer(new gLineOverlayBar(flags[9],wxDARK_GREEN,wxT("U0E")));
FRW->AddLayer(new gLineOverlayBar(flags[5],wxRED,wxT("VS"))); FRW->AddLayer(new gLineOverlayBar(flags[5],wxRED,wxT("VS")));

12
graphs/graph.cpp
View File

@ -372,7 +372,7 @@ void gGraphWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
//wxLogMessage(wxT("Paint")); //wxLogMessage(wxT("Paint"));
//dc.DrawText(m_title,m_marginLeft,3); //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); (*l)->Plot(dc,*this);
} }
@ -1316,8 +1316,8 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w)
DrawXTicks(dc,w); DrawXTicks(dc,w);
} }
gLineOverlayBar::gLineOverlayBar(gPointData *d,const wxColor * col,wxString _label) gLineOverlayBar::gLineOverlayBar(gPointData *d,const wxColor * col,wxString _label,LO_Type _lot)
:gLayer(d),label(_label) :gLayer(d),label(_label),lo_type(_lot)
{ {
color.clear(); color.clear();
color.push_back(col); color.push_back(col);
@ -1349,6 +1349,7 @@ void gLineOverlayBar::Plot(wxDC & dc, gGraphWindow & w)
double xx=w.max_x-w.min_x; double xx=w.max_x-w.min_x;
if (xx<=0) return; if (xx<=0) return;
wxPen sfp3(*color[0], 4, wxSOLID);
wxPen sfp2(*color[0], 5, wxSOLID); wxPen sfp2(*color[0], 5, wxSOLID);
wxPen sfp1(*color[0], 1, wxSOLID); wxPen sfp1(*color[0], 1, wxSOLID);
@ -1382,6 +1383,7 @@ void gLineOverlayBar::Plot(wxDC & dc, gGraphWindow & w)
double w1=x2-x1; double w1=x2-x1;
dc.SetPen(sfp1); dc.SetPen(sfp1);
int x,y; int x,y;
if (lo_type==LOT_Bar) {
if (rp.x==rp.y) { if (rp.x==rp.y) {
if (xx<(1800.0/86400)) { if (xx<(1800.0/86400)) {
//dc.SetTextForeground(*color[0]); //dc.SetTextForeground(*color[0]);
@ -1395,6 +1397,10 @@ void gLineOverlayBar::Plot(wxDC & dc, gGraphWindow & w)
// if ((x1>w.GetLeftMargin()) && (x1<w.GetLeftMargin()+w.Width())) // if ((x1>w.GetLeftMargin()) && (x1<w.GetLeftMargin()+w.Width()))
dc.DrawRectangle(x1,start_py,w1,height); dc.DrawRectangle(x1,start_py,w1,height);
} }
} else if (lo_type==LOT_Dot) {
dc.SetPen(sfp3);
dc.DrawLine(x1,start_py+(height/2)-10,x1,start_py+(height/2)-10);
}
if (done) break; if (done) break;

4
graphs/graph.h
View File

@ -331,16 +331,18 @@ class gLineChart:public gLayer
}; };
enum LO_Type { LOT_Bar, LOT_Dot };
class gLineOverlayBar:public gLayer class gLineOverlayBar:public gLayer
{ {
public: public:
gLineOverlayBar(gPointData *d=NULL,const wxColor * col=wxBLACK,wxString _label=wxT("")); gLineOverlayBar(gPointData *d=NULL,const wxColor * col=wxBLACK,wxString _label=wxT(""),LO_Type _lot=LOT_Bar);
virtual ~gLineOverlayBar(); virtual ~gLineOverlayBar();
virtual void Plot(wxDC & dc, gGraphWindow & w); virtual void Plot(wxDC & dc, gGraphWindow & w);
protected: protected:
wxString label; wxString label;
LO_Type lo_type;
}; };
class gFlagsLine:public gLayer class gFlagsLine:public gLayer

12
version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long MAJOR = 0; static const long MAJOR = 0;
static const long MINOR = 7; static const long MINOR = 7;
static const long BUILD = 1331; static const long BUILD = 1339;
static const long REVISION = 1749; static const long REVISION = 1809;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 4984; static const long BUILDS_COUNT = 5005;
#define RC_FILEVERSION 0,7,1331,1749 #define RC_FILEVERSION 0,7,1339,1809
#define RC_FILEVERSION_STRING "0, 7, 1331, 1749\0" #define RC_FILEVERSION_STRING "0, 7, 1339, 1809\0"
static const char FULLVERSION_STRING[] = "0.7.1331.1749"; static const char FULLVERSION_STRING[] = "0.7.1339.1809";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 62; static const long BUILD_HISTORY = 62;