chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Missing Pressure Graph bug fixes

Browse Source
This commit is contained in:
Mark Watkins 2011-08-07 16:30:20 +10:00
parent 1655fae05e
commit c2507011e9
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SleepLib/session.cpp
View File

@ -436,7 +436,7 @@ EventDataType Session::min(ChannelID id)
EventDataType min,t1; EventDataType min,t1;
for (int i=0;i<evec.size();i++) { for (int i=0;i<evec.size();i++) {
t1=evec[i]->min(); t1=evec[i]->min();
if (t1==evec[i]->max()) continue; if (t1==0 && t1==evec[i]->max()) continue;
if (first) { if (first) {
min=t1; min=t1;
first=false; first=false;
@ -462,7 +462,7 @@ EventDataType Session::max(ChannelID id)
EventDataType max,t1; EventDataType max,t1;
for (int i=0;i<evec.size();i++) { for (int i=0;i<evec.size();i++) {
t1=evec[i]->max(); t1=evec[i]->max();
if (t1==evec[i]->min()) continue; if (t1==0 && t1==evec[i]->min()) continue;
if (first) { if (first) {
max=t1; max=t1;
first=false; first=false;
@ -524,6 +524,13 @@ qint64 Session::last(ChannelID id)
m_lastchan[id]=max; m_lastchan[id]=max;
return max; return max;
} }
bool Session::hasChannel(ChannelID id)
{
QHash<ChannelID,QVector<EventList *> >::iterator j=eventlist.find(id);
if (j==eventlist.end())
return false;
return true;
}
int Session::count(ChannelID id) int Session::count(ChannelID id)
{ {

1
SleepLib/session.h
View File

@ -111,6 +111,7 @@ public:
EventDataType percentile(ChannelID id,EventDataType percentile); EventDataType percentile(ChannelID id,EventDataType percentile);
bool hasChannel(ChannelID id);
bool IsLoneSession() { return s_lonesession; } bool IsLoneSession() { return s_lonesession; }
void SetLoneSession(bool b) { s_lonesession=b; } void SetLoneSession(bool b) { s_lonesession=b; }

7
daily.cpp
View File

@ -61,16 +61,13 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw)
ui->graphLayout->addWidget(scrollArea,1); ui->graphLayout->addWidget(scrollArea,1);
scrollArea->setWidgetResizable(true); scrollArea->setWidgetResizable(true);
//QVBoxLayout *lay=new QVBoxLayout(scrollArea);
//scrollArea->setWidget(lay);
GraphLayout=new QWidget(scrollArea); GraphLayout=new QWidget(scrollArea);
scrollArea->setWidget(GraphLayout); scrollArea->setWidget(GraphLayout);
//lay->addWidget(GraphLayout,1);
//ui->webView->setStyleSheet("QWebView { background-color: qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5, stop: 0 #FF92BB, stop: 1 white); }");
//ui->treeWidget->setAlternatingRowColors(true);
splitter=new QVBoxLayout(GraphLayout); splitter=new QVBoxLayout(GraphLayout);
GraphLayout->setLayout(splitter); GraphLayout->setLayout(splitter);
splitter->setSpacing(0);
splitter->setMargin(0); splitter->setMargin(0);
splitter->setContentsMargins(0,0,0,0); splitter->setContentsMargins(0,0,0,0);