diff --git a/Graphs/graphdata.cpp b/Graphs/graphdata.cpp index 83b1ee34..aa9ced8c 100644 --- a/Graphs/graphdata.cpp +++ b/Graphs/graphdata.cpp @@ -35,7 +35,6 @@ bool gGraphData::isEmpty() return b; } - gPointData::gPointData(int mp) :gGraphData(mp,gDT_Point) { @@ -52,3 +51,51 @@ void gPointData::AddSegment(int max_points) QPointD *p=new QPointD [max_points]; point.push_back(p); } +double gPointData::CalcAverage() +{ + double x,val=0; + int cnt=0; + for (int i=0;imax_x)) continue; + val+=point[0][i].y(); + cnt++; + } + if (!cnt) return 0; + val/=cnt; + return val; +} +double gPointData::CalcMinY() +{ + double x,val=0; + double min; + bool first=true; + for (int i=0;imax_x)) continue; + val=point[0][i].y(); + if (first) { + min=val; + first=false; + } else + if (min>val) min=val; + } + return min; +} +double gPointData::CalcMaxY() +{ + double x,val=0; + double max; + bool first=true; + for (int i=0;imax_x)) continue; + val=point[0][i].y(); + if (first) { + max=val; + first=false; + } else + if (max point; }; diff --git a/Graphs/graphdata_custom.cpp b/Graphs/graphdata_custom.cpp index 31244cf6..0ff2ae6a 100644 --- a/Graphs/graphdata_custom.cpp +++ b/Graphs/graphdata_custom.cpp @@ -566,20 +566,7 @@ void HistoryData::Reload(Day *day) real_max_y=max_y; m_ready=true; } -double HistoryData::GetAverage() -{ - double x,val=0; - int cnt=0; - for (int i=0;imax_x)) continue; - val+=point[0][i].y(); - cnt++; - } - if (!cnt) return 0; - val/=cnt; - return val; -} + void HistoryData::SetDateRange(QDate start,QDate end) { qint64 x1=QDateTime(start).toMSecsSinceEpoch()/86400000.0; diff --git a/Graphs/graphdata_custom.h b/Graphs/graphdata_custom.h index 4300cca9..72ec5fa0 100644 --- a/Graphs/graphdata_custom.h +++ b/Graphs/graphdata_custom.h @@ -95,7 +95,7 @@ public: void SetProfile(Profile *_profile) { profile=_profile; Reload(); } Profile * GetProfile() { return profile; } - double GetAverage(); + //double GetAverage(); virtual double Calc(Day *day); virtual void Reload(Day *day=NULL); diff --git a/Graphs/graphwindow.cpp b/Graphs/graphwindow.cpp index 974bf629..65e96d0f 100644 --- a/Graphs/graphwindow.cpp +++ b/Graphs/graphwindow.cpp @@ -704,7 +704,7 @@ void gGraphWindow::OnMouseLeftRelease(QMouseEvent * event) } } else { int xp=x; - xp=0; + //xp=0; double zoom_fact=0.5; if (event->modifiers() & Qt::ControlModifier) zoom_fact=0.25; ZoomX(zoom_fact,xp); //event.GetX()); // adds origin to zoom in.. Doesn't look that cool. diff --git a/README b/README index ac0152fa..94dfdc36 100644 --- a/README +++ b/README @@ -12,8 +12,9 @@ Copyright (C) 2011 Licence Stuff ------------- -This software is released under the GNU Public License. +This software is released under the GNU Public License, at a GPL version of my choosing at a later date. Exceptions: Incorporates TinyXML.. see their readme for details in ./libs/tinyxml -Incorporates QextSerialPort. Insert New BSD license here. +Incorporates QextSerialPort. Insert New BSD license here? (Apparently PD.. need to verify) + diff --git a/overview.cpp b/overview.cpp index 6e1b0285..ec0c57af 100644 --- a/overview.cpp +++ b/overview.cpp @@ -152,6 +152,31 @@ void Overview::UpdateGraphs() } session_times->SetDateRange(first,last); RedrawGraphs(); + QString html="
"; + html+=""; + html+=""; + html+=""; + html+=QString("\n") + .arg(ahidata->CalcMinY(),2,'f',2,'0') + .arg(ahidata->CalcAverage(),2,'f',2,'0') + .arg(ahidata->CalcMaxY(),2,'f',2,'0'); + html+=QString("") + .arg(leak->CalcMinY(),2,'f',2,'0') + .arg(leak->CalcAverage(),2,'f',2,'0') + .arg(leak->CalcMaxY(),2,'f',2,'0'); + html+=QString("") + .arg(pressure->CalcMinY(),2,'f',2,'0') + .arg(pressure->CalcAverage(),2,'f',2,'0') + .arg(pressure->CalcMaxY(),2,'f',2,'0'); + html+=QString("") + .arg(usage->CalcMinY(),2,'f',2,'0') + .arg(usage->CalcAverage(),2,'f',2,'0') + .arg(usage->CalcMaxY(),2,'f',2,'0'); + + html+="
Statistics
DetailsMinAvgMax
AHI%1%2%3
Leak%1%2%3
Pressure%1%2%3
Usage%1%2%3
" + "
"; + ui->webView->setHtml(html); + } diff --git a/overview.ui b/overview.ui index af0fce6e..1a8ecb4b 100644 --- a/overview.ui +++ b/overview.ui @@ -39,37 +39,40 @@ Summary - + + + 0 + + + 0 + - - - This whole page is still being figured out. + + + 0 - - true - - - - - - - - 200 - 0 - - - - - 200 - 16777215 - - - - - about:blank - - - + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + about:blank + + + + + @@ -86,7 +89,7 @@ 0 0 - 828 + 800 282 diff --git a/oximetry.cpp b/oximetry.cpp index e2a6d426..05a9a67f 100644 --- a/oximetry.cpp +++ b/oximetry.cpp @@ -47,7 +47,8 @@ Oximetry::Oximetry(QWidget *parent) : AddData(plethy=new WaveData(OXI_Plethy)); plethy->AddSegment(1000000); - plethy->np[0]=0; + + plethy->np.push_back(0); plethy->SetMaxY(100); plethy->SetMinY(0); PLETHY=new gGraphWindow(gSplitter,tr("Plethysomogram"),PULSE);