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

Session Times chart time display fix

Browse Source
This commit is contained in:
Mark Watkins 2011-12-07 22:52:25 +10:00
parent db2c4866dd
commit 4756c734f5
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Graphs/gSummaryChart.cpp
View File

@ -555,7 +555,7 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
QString formatTime(EventDataType v, bool show_seconds=false, bool duration=false,bool show_12hr=false) QString formatTime(EventDataType v, bool show_seconds=false, bool duration=false,bool show_12hr=false)
{ {
int h=int(v+12); int h=int(v);
if (!duration) { if (!duration) {
h%=24; h%=24;
@ -567,7 +567,7 @@ QString formatTime(EventDataType v, bool show_seconds=false, bool duration=false
char pm[3]={"am"}; char pm[3]={"am"};
if (show_12hr) { if (show_12hr) {
h>=12 ? pm[0]='p' : pm[0]='a'; // yes, inverted.. h>=12 ? pm[0]='p' : pm[0]='a';
h %= 12; h %= 12;
if (h==0) h=12; if (h==0) h=12;

5
Graphs/gYAxis.cpp
View File

@ -255,14 +255,15 @@ gYAxisTime::~gYAxisTime()
const QString gYAxisTime::Format(EventDataType v, int dp) const QString gYAxisTime::Format(EventDataType v, int dp)
{ {
int h=int(v+12) % 24; int h=int(v) % 24;
int m=int(v*60) % 60; int m=int(v*60) % 60;
int s=int(v*3600) % 60; int s=int(v*3600) % 60;
char pm[3]={"am"}; char pm[3]={"am"};
if (show_12hr) { if (show_12hr) {
h>=12 ? pm[0]='a' : pm[0]='p';
h>=12 ? pm[0]='p' : pm[0]='a';
h %= 12; h %= 12;
if (h==0) h=12; if (h==0) h=12;
} else { } else {

6
daily.cpp
View File

@ -832,7 +832,7 @@ void Daily::Load(QDate date)
} */ } */
//} //}
html+="</table><hr height=2><form method='get' action='sessions.php'><table cellpadding=0 cellspacing=0 border=0 width=100%>"; html+="</table><hr height=2><table cellpadding=0 cellspacing=0 border=0 width=100%>";
QDateTime fd,ld; QDateTime fd,ld;
bool corrupted_waveform=false; bool corrupted_waveform=false;
QString tooltip; QString tooltip;
@ -849,7 +849,7 @@ void Daily::Load(QDate date)
QHash<ChannelID,QVariant>::iterator i=(*s)->settings.find("BrokenWaveform"); QHash<ChannelID,QVariant>::iterator i=(*s)->settings.find("BrokenWaveform");
tooltip=cpap->machine->GetClass()+" CPAP "+QString().sprintf("%2ih&nbsp;%2im&nbsp;%2is",h,m,s1); tooltip=cpap->machine->GetClass()+" CPAP "+QString().sprintf("%2ih&nbsp;%2im&nbsp;%2is",h,m,s1);
if ((i!=(*s)->settings.end()) && i.value().toBool()) corrupted_waveform=true; if ((i!=(*s)->settings.end()) && i.value().toBool()) corrupted_waveform=true;
tmp.sprintf(("<tr><td align=left><input type=checkbox on_click='dosession("+QString::number((*s)->session())+")'><a href='cpap=%i' title='"+tooltip+"'>%08i</a></td><td align=center>"+fd.date().toString(Qt::SystemLocaleShortDate)+"</td><td align=center>"+fd.toString("HH:mm ")+"</td><td align=center>"+ld.toString("HH:mm")+"</td></tr>").toLatin1(),(*s)->session(),(*s)->session()); tmp.sprintf(("<tr><td align=left><a href='cpap=%i' title='"+tooltip+"'>%08i</a></td><td align=center>"+fd.date().toString(Qt::SystemLocaleShortDate)+"</td><td align=center>"+fd.toString("HH:mm ")+"</td><td align=center>"+ld.toString("HH:mm")+"</td></tr>").toLatin1(),(*s)->session(),(*s)->session());
html+=tmp; html+=tmp;
} }
//if (oxi) html+="<tr><td colspan=4><hr></td></tr>"; //if (oxi) html+="<tr><td colspan=4><hr></td></tr>";
@ -871,7 +871,7 @@ void Daily::Load(QDate date)
html+=tmp; html+=tmp;
} }
} }
html+="</table><input type=submit name='submit'></form>"; html+="</table>";
if (corrupted_waveform) { if (corrupted_waveform) {
html+="<hr><div align=center><i>One or more waveform record for this session had faulty source data. Some waveform overlay points may not match up correctly.</i></div>"; html+="<hr><div align=center><i>One or more waveform record for this session had faulty source data. Some waveform overlay points may not match up correctly.</i></div>";
} }