chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

gXAxis UTC correction hack

Browse Source
This commit is contained in:
Mark Watkins 2011-09-03 11:24:11 +10:00
parent 4dab8e5c63
commit 8504db82e2
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Graphs/gBarChart.cpp
View File

@ -57,6 +57,7 @@ void gBarChart::SetDay(Day * day)
for (QMap<QDate,QVector<Day *> >::iterator d=m_profile->daylist.begin();d!=m_profile->daylist.end();d++) { for (QMap<QDate,QVector<Day *> >::iterator d=m_profile->daylist.begin();d!=m_profile->daylist.end();d++) {
tt=QDateTime(d.key(),QTime(0,0,0),Qt::UTC).toTime_t(); tt=QDateTime(d.key(),QTime(0,0,0),Qt::UTC).toTime_t();
//tt=QDateTime(d.key(),QTime(12,0,0)).toTime_t();
dn=tt/86400; dn=tt/86400;
tt*=1000L; tt*=1000L;
if (!m_minx || tt<m_minx) m_minx=tt; if (!m_minx || tt<m_minx) m_minx=tt;
@ -91,7 +92,9 @@ void gBarChart::SetDay(Day * day)
//m_minx-=86400000L; //m_minx-=86400000L;
// m_minx=qint64(QDateTime(m_profile->FirstDay(),QTime(0,0,0),Qt::UTC).toTime_t())*1000L; // m_minx=qint64(QDateTime(m_profile->FirstDay(),QTime(0,0,0),Qt::UTC).toTime_t())*1000L;
//m_maxx=qint64(QDateTime(m_profile->LastDay().addDays(1),QTime(0,0,0),Qt::UTC).toTime_t())*1000L; m_maxx=qint64(QDateTime(m_profile->LastDay().addDays(1),QTime(0,0,0),Qt::UTC).toTime_t())*1000L;
//m_maxx=qint64(QDateTime(m_profile->LastDay().addDays(1),QTime(12,0,0)).toTime_t())*1000L;
int i=0; int i=0;
//set miny & maxy here.. how? //set miny & maxy here.. how?
@ -128,9 +131,11 @@ void gBarChart::paint(gGraph & w,int left, int top, int width, int height)
int daynum=0; int daynum=0;
float h,tmp; float h,tmp;
qint64 offs=minx% 86400000L;
qint64 offs=(minx) % 86400000L;
//zz*=86400000L; //zz*=86400000L;
float offset=offs/86400000.0; float offset=(offs)/86400000.0;
//offset+=float(utcoff)/86400000.0;
offset*=barw; offset*=barw;
px=left-offset; px=left-offset;

10
Graphs/gXAxis.cpp
View File

@ -22,6 +22,7 @@ gXAxis::gXAxis(QColor col,bool fadeout)
m_show_minor_lines=false; m_show_minor_lines=false;
m_show_minor_ticks=true; m_show_minor_ticks=true;
m_show_major_ticks=true; m_show_major_ticks=true;
m_utcfix=false;
m_fadeout=fadeout; m_fadeout=fadeout;
QDateTime d=QDateTime::currentDateTime(); QDateTime d=QDateTime::currentDateTime();
QTime t1=d.time(); QTime t1=d.time();
@ -66,14 +67,14 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
//fitmode=-1; //fitmode=-1;
fd="MMM dd"; fd="MMM dd";
} else */ } else */
if (xx>86400000L) { // Day if (xx>=86400000L) { // Day
fd="MMM 00"; fd="MMM 00";
dividx=0; dividx=0;
divmax=15; divmax=7;
fitmode=0; fitmode=0;
} else if (xx>600000) { // Minutes } else if (xx>600000) { // Minutes
fd="00:00"; fd="00:00";
dividx=6; dividx=7;
divmax=24; divmax=24;
fitmode=1; fitmode=1;
} else if (xx>5000) { // Seconds } else if (xx>5000) { // Seconds
@ -140,6 +141,7 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
if (py<start_px) continue; if (py<start_px) continue;
lines->add(py,top,py,top+4,linecol); lines->add(py,top,py,top+4,linecol);
} }
int utcoff=m_utcfix ? QDateTime(QDate(1970,1,1),QTime(0,0,0)).secsTo(QDateTime(QDate(1970,1,1),QTime(0,0,0),Qt::UTC))/3600 : 0;
for (qint64 i=aligned_start;i<maxx;i+=step) { for (qint64 i=aligned_start;i<maxx;i+=step) {
px=double(i-minx)*xmult; px=double(i-minx)*xmult;
@ -148,7 +150,7 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
qint64 j=i+tz_offset; qint64 j=i+tz_offset;
int ms=j % 1000; int ms=j % 1000;
int m=(j/60000L) % 60L; int m=(j/60000L) % 60L;
int h=(j/3600000L) % 24L; int h=((j/3600000L)-utcoff) % 24L;
int s=(j/1000L) % 60L; int s=(j/1000L) % 60L;
if (fitmode==0) { if (fitmode==0) {

3
Graphs/gXAxis.h
View File

@ -23,7 +23,7 @@ class gXAxis:public Layer
void SetShowMajorTicks(bool b) { m_show_major_ticks=b; } void SetShowMajorTicks(bool b) { m_show_major_ticks=b; }
bool ShowMinorTicks() { return m_show_minor_ticks; } bool ShowMinorTicks() { return m_show_minor_ticks; }
bool ShowMajorTicks() { return m_show_major_ticks; } bool ShowMajorTicks() { return m_show_major_ticks; }
void setUtcFix(bool b) { m_utcfix=b; }
protected: protected:
// virtual const wxString & Format(double v) { static wxString t; wxDateTime d; d.Set(v); t=d.Format(wxT("%H:%M")); return t; }; // virtual const wxString & Format(double v) { static wxString t; wxDateTime d; d.Set(v); t=d.Format(wxT("%H:%M")); return t; };
bool m_show_major_lines; bool m_show_major_lines;
@ -31,6 +31,7 @@ class gXAxis:public Layer
bool m_show_minor_ticks; bool m_show_minor_ticks;
bool m_show_major_ticks; bool m_show_major_ticks;
bool m_utcfix;
QColor m_line_color; QColor m_line_color;
QColor m_text_color; QColor m_text_color;

10
daily.cpp
View File

@ -111,7 +111,9 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
bc->addSlice(CPAP_Obstructive,QColor("#40c0ff")); bc->addSlice(CPAP_Obstructive,QColor("#40c0ff"));
bc->addSlice(CPAP_ClearAirway,QColor("purple")); bc->addSlice(CPAP_ClearAirway,QColor("purple"));
BC->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin); BC->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);
BC->AddLayer(new gXAxis(),LayerBottom,0,gXAxis::Margin); gXAxis *gx=new gXAxis();
gx->setUtcFix(true);
BC->AddLayer(gx,LayerBottom,0,gXAxis::Margin);
BC->AddLayer(bc); BC->AddLayer(bc);
BC->AddLayer(new gXGrid()); BC->AddLayer(new gXGrid());
@ -1101,9 +1103,9 @@ Session * Daily::CreateJournalSession(QDate date)
profile->AddMachine(m); profile->AddMachine(m);
} }
Session *sess=new Session(m,0); Session *sess=new Session(m,0);
QDateTime dt; QDateTime dt(date,QTime(17,0));
dt.setDate(date); //dt.setDate(date);
dt.setTime(QTime(17,0)); //5pm to make sure it goes in the right day //dt.setTime(QTime(17,0)); //5pm to make sure it goes in the right day
sess->set_first(qint64(dt.toTime_t())*1000L); sess->set_first(qint64(dt.toTime_t())*1000L);
dt=dt.addSecs(3600); dt=dt.addSecs(3600);
sess->set_last(qint64(dt.toTime_t())*1000L); sess->set_last(qint64(dt.toTime_t())*1000L);