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

Qt 4.6 compatability fixes..

Browse Source
This commit is contained in:
Mark Watkins 2011-09-01 23:07:26 +10:00
parent ec4c8dde6f
commit c531f31243
13 changed files with 37 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Graphs/gBarChart.h
View File

@ -23,7 +23,7 @@ class gBarChart:public Layer
// d.Set(i+2400000.5+.000001); // JDN vs MJD vs Rounding errors // d.Set(i+2400000.5+.000001); // JDN vs MJD vs Rounding errors
virtual const QString & FormatX(double v) { static QString t; QDateTime d; d=d.fromMSecsSinceEpoch(v*86400000.0); t=d.toString("MMM dd"); return t; } virtual const QString & FormatX(double v) { static QString t; QDateTime d; d=d.fromTime_t(v*86400.0); t=d.toString("MMM dd"); return t; }
//virtual const wxString & FormatX(double v) { static wxString t; wxDateTime d; d.Set(vi*86400000.0); t=d.Format(wxT("HH:mm")); return t; }; //virtual const wxString & FormatX(double v) { static wxString t; wxDateTime d; d.Set(vi*86400000.0); t=d.Format(wxT("HH:mm")); return t; };
//virtual const wxString & FormatX(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; }; //virtual const wxString & FormatX(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; };
virtual const QString & FormatY(double v) { static QString t; t.sprintf("%.1f",v); return t; } virtual const QString & FormatY(double v) { static QString t; t.sprintf("%.1f",v); return t; }

4
Graphs/gFlagsLine.cpp
View File

@ -129,10 +129,8 @@ void gFlagsLine::paint(gGraph & w,int left, int top, int width, int height)
// Draw text label // Draw text label
//int x,y;
//GetTextExtent(m_label,x,y);
//w.DrawStaticText(m_static,left-m_lx-10,top+(height/2)-(m_ly/2));
w.renderText(m_label,left-m_lx-10,top+(height/2)+(m_ly/2)); w.renderText(m_label,left-m_lx-10,top+(height/2)+(m_ly/2));
float x1,x2; float x1,x2;
float bartop=top+2; float bartop=top+2;

3
Graphs/gFlagsLine.h
View File

@ -7,7 +7,6 @@
#ifndef GFLAGSLINE_H #ifndef GFLAGSLINE_H
#define GFLAGSLINE_H #define GFLAGSLINE_H
#include <QStaticText>
#include "gGraphView.h" #include "gGraphView.h"
class gFlagsGroup; class gFlagsGroup;
@ -34,8 +33,6 @@ class gFlagsLine:public Layer
QColor m_flag_color; QColor m_flag_color;
GLBuffer *quads, *lines; GLBuffer *quads, *lines;
int m_lx, m_ly; int m_lx, m_ly;
//QStaticText m_static;
}; };
class gFlagsGroup:public LayerGroup class gFlagsGroup:public LayerGroup

21
Graphs/gGraphView.cpp
View File

@ -2,7 +2,8 @@
#include <QFontMetrics> #include <QFontMetrics>
#include "gGraphView.h" #include "gGraphView.h"
#include "SleepLib/profiles.h" #include "SleepLib/profiles.h"
//#include <QtConcurrentRun>
#include <QElapsedTimer>
bool _graph_init=false; bool _graph_init=false;
QFont * defaultfont=NULL; QFont * defaultfont=NULL;
@ -572,6 +573,8 @@ void gGraph::paint(int originX, int originY, int width, int height)
quad->add(originX+m_selection.x()+m_selection.width(),originY+height-top-bottom, originX+m_selection.x(),originY+height-top-bottom); quad->add(originX+m_selection.x()+m_selection.width(),originY+height-top-bottom, originX+m_selection.x(),originY+height-top-bottom);
} }
//sleep(1);
//m_graphview->gl_mutex.lock(); //m_graphview->gl_mutex.lock();
/*QGLFormat fmt=m_graphview->format(); /*QGLFormat fmt=m_graphview->format();
QGLContext ctx(fmt); QGLContext ctx(fmt);
@ -977,10 +980,6 @@ void gGraph::SetMaxY(EventDataType v)
{ {
max_y=v; max_y=v;
} }
void gGraph::DrawStaticText(QStaticText & text, short x, short y)
{
m_graphview->DrawStaticText(text,x,y);
}
GLBuffer * gGraph::lines() GLBuffer * gGraph::lines()
{ {
return m_graphview->lines; return m_graphview->lines;
@ -1110,13 +1109,6 @@ void gGraphView::AddTextQue(QString & text, short x, short y, float angle, QColo
q.color=color; q.color=color;
q.font=font; q.font=font;
} }
void gGraphView::DrawStaticText(QStaticText & text, short x, short y)
{
// don't use this for multithread
QPainter painter(this);
painter.drawStaticText(x,y,text);
painter.end();
}
void gGraphView::AddGraph(gGraph *g,short group) void gGraphView::AddGraph(gGraph *g,short group)
{ {
@ -1264,7 +1256,7 @@ void gGraphView::paintGL()
if (width()<=0) return; if (width()<=0) return;
if (height()<=0) return; if (height()<=0) return;
QTime time; QElapsedTimer time;
time.start(); time.start();
glClearColor(255,255,255,255); glClearColor(255,255,255,255);
@ -1298,6 +1290,7 @@ void gGraphView::paintGL()
threaded=true; threaded=true;
} else threaded=false; } else threaded=false;
// threaded=true;
for (int i=0;i<m_graphs.size();i++) { for (int i=0;i<m_graphs.size();i++) {
if (m_graphs[i]->isEmpty() || !m_graphs[i]->visible()) continue; if (m_graphs[i]->isEmpty() || !m_graphs[i]->visible()) continue;
numgraphs++; numgraphs++;
@ -1311,9 +1304,9 @@ void gGraphView::paintGL()
if ((py + h + graphSpacer) >= 0) { if ((py + h + graphSpacer) >= 0) {
w=width(); w=width();
if (threaded) { if (threaded) {
masterlock->acquire(1); // book an available CPU masterlock->acquire(1); // book an available CPU
//QFuture<void> future = QtConcurrent::run(m_graphs[i],&gGraph::paint,px,py,width()-titleWidth,h);
m_graphs[i]->threadStart(); // this only happens once.. It stays dormant when not in use. m_graphs[i]->threadStart(); // this only happens once.. It stays dormant when not in use.
m_graphs[i]->thread()->paint(px,py,width()-titleWidth,h); m_graphs[i]->thread()->paint(px,py,width()-titleWidth,h);
m_graphs[i]->thread()->setPriority(QThread::HighPriority); m_graphs[i]->thread()->setPriority(QThread::HighPriority);

2
Graphs/gGraphView.h
View File

@ -241,7 +241,6 @@ public:
short group() { return m_group; } short group() { return m_group; }
void setGroup(short group) { m_group=group; } void setGroup(short group) { m_group=group; }
void DrawTextQue(); void DrawTextQue();
void DrawStaticText(QStaticText & text, short x, short y);
void setDay(Day * day); void setDay(Day * day);
gThread * thread() { return m_thread; } gThread * thread() { return m_thread; }
virtual void paint(int originX, int originY, int width, int height); virtual void paint(int originX, int originY, int width, int height);
@ -315,7 +314,6 @@ public:
gGraph *m_selected_graph; gGraph *m_selected_graph;
void AddTextQue(QString & text, short x, short y, float angle, QColor & color, QFont * font); void AddTextQue(QString & text, short x, short y, float angle, QColor & color, QFont * font);
void DrawStaticText(QStaticText & text, short x, short y);
int horizTravel() { return m_horiz_travel; } int horizTravel() { return m_horiz_travel; }
void DrawTextQue(); void DrawTextQue();

2
Graphs/gSessionTime.h
View File

@ -31,7 +31,7 @@ class gSessionTime:public Layer
protected: protected:
Qt::Orientation m_orientation; Qt::Orientation m_orientation;
virtual const QString & FormatX(double v) { static QString t; QDateTime d; d=d.fromMSecsSinceEpoch(v*86400000.0); t=d.toString("MMM dd"); return t; } virtual const QString & FormatX(double v) { static QString t; QDateTime d; d=d.fromTime_t(v*86400.0); t=d.toString("MMM dd"); return t; }
//virtual const wxString & FormatX(double v) { static wxString t; wxDateTime d; d.Set(vi*86400000.0); t=d.Format(wxT("HH:mm")); return t; }; //virtual const wxString & FormatX(double v) { static wxString t; wxDateTime d; d.Set(vi*86400000.0); t=d.Format(wxT("HH:mm")); return t; };
//virtual const wxString & FormatX(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; }; //virtual const wxString & FormatX(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; };
virtual const QString & FormatY(double v) { static QString t; t.sprintf("%.1f",v); return t; } virtual const QString & FormatY(double v) { static QString t; t.sprintf("%.1f",v); return t; }

36
Graphs/gStatsLine.cpp
View File

@ -11,29 +11,27 @@ void gStatsLine::paint(gGraph & w, int left, int top, int width, int height)
if (!m_visible) return; if (!m_visible) return;
//if (m_empty) return; //if (m_empty) return;
height=height; height=height;
//int x,y;
m_text=m_label;
// GetTextExtent(m_text,x,y);
int z=(width+gYAxis::Margin)/5; int z=(width+gYAxis::Margin)/5;
int p=left-gYAxis::Margin; int p=left-gYAxis::Margin;
top+=4; top+=4;
w.DrawStaticText(st_label,p,top); w.renderText(m_label,p,top);
//w.renderText(m_text,p,top,0,m_textcolor); //w.renderText(m_text,p,top,0,m_textcolor);
p+=z; p+=z;
w.DrawStaticText(st_min,p,top); w.renderText(st_min,p,top);
p+=z; p+=z;
w.DrawStaticText(st_avg,p,top); w.renderText(st_avg,p,top);
p+=z; p+=z;
w.DrawStaticText(st_p90,p,top); w.renderText(st_p90,p,top);
p+=z; p+=z;
w.DrawStaticText(st_max,p,top); w.renderText(st_max,p,top);
} }
@ -47,23 +45,9 @@ void gStatsLine::SetDay(Day *d)
m_avg=d->wavg(m_code); m_avg=d->wavg(m_code);
m_p90=d->p90(m_code); m_p90=d->p90(m_code);
st_label.setText(m_label); st_min="Min="+QString::number(m_min,'f',2);
st_min.setText("Min="+QString::number(m_min,'f',2)); st_max="Max="+QString::number(m_max,'f',2);
st_max.setText("Max="+QString::number(m_max,'f',2)); st_avg="Avg="+QString::number(m_avg,'f',2);
st_avg.setText("Avg="+QString::number(m_avg,'f',2)); st_p90="90%="+QString::number(m_p90,'f',2);
st_p90.setText("90%="+QString::number(m_p90,'f',2));
// m_stext.setText(m_text);
// m_empty=true;
/* for (int i=0;i<m_codes.size();i++) {
if (m_day->count(m_codes[i])>0) {
m_empty=false;
break;
}
} */
} }
//bool gStatsLine::isEmpty()
//{
// return m_empty;
//}

6
Graphs/gStatsLine.h
View File

@ -2,7 +2,6 @@
#define GSTATSLINE_H #define GSTATSLINE_H
#include "SleepLib/machine.h" #include "SleepLib/machine.h"
#include <QStaticText>
#include "gGraphView.h" #include "gGraphView.h"
class gStatsLine : public Layer class gStatsLine : public Layer
@ -11,15 +10,12 @@ public:
gStatsLine(ChannelID code,QString label="",QColor textcolor=Qt::black); gStatsLine(ChannelID code,QString label="",QColor textcolor=Qt::black);
virtual void paint(gGraph & w, int left, int top, int width, int height); virtual void paint(gGraph & w, int left, int top, int width, int height);
void SetDay(Day *d); void SetDay(Day *d);
//bool isEmpty();
protected: protected:
QString m_label; QString m_label;
QColor m_textcolor; QColor m_textcolor;
//bool m_empty;
EventDataType m_min,m_max,m_avg,m_p90; EventDataType m_min,m_max,m_avg,m_p90;
QString m_text; QString st_min,st_max,st_avg,st_p90;
QStaticText st_label,st_min,st_max,st_avg,st_p90;
float m_tx,m_ty; float m_tx,m_ty;
}; };

6
SleepLib/loader_plugins/cms50_loader.cpp
View File

@ -194,15 +194,15 @@ bool CMS50Loader::OpenSPORFile(QString path,Machine *mach,Profile *profile)
qDebug() << "Invalid date time retreieved in CMS50::OpenSPO[R2]File"; qDebug() << "Invalid date time retreieved in CMS50::OpenSPO[R2]File";
return false; return false;
} }
starttime=date.toMSecsSinceEpoch(); starttime=qint64(date.toTime_t())*1000L;
} else if (dt.isValid()) { // Else take the filenames date } else if (dt.isValid()) { // Else take the filenames date
date=dt; date=dt;
starttime=dt.toMSecsSinceEpoch(); starttime=qint64(dt.toTime_t())*1000L;
} else { // Has nothing, so add it up to current time } else { // Has nothing, so add it up to current time
qDebug() << "CMS50: Couldn't get any start date indication"; qDebug() << "CMS50: Couldn't get any start date indication";
date=QDateTime::currentDateTime(); date=QDateTime::currentDateTime();
date=date.addSecs(-seconds); date=date.addSecs(-seconds);
starttime=date.toMSecsSinceEpoch(); starttime=qint64(date.toTime_t())*1000L;
} }
f.seek(data_starts); f.seek(data_starts);

4
SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -566,8 +566,6 @@ bool PRS1Loader::Parse002(Session *session,unsigned char *buffer,int size,qint64
pos+=2; pos+=2;
t+=qint64(delta)*1000L; t+=qint64(delta)*1000L;
tt=t;; tt=t;;
//QDateTime d=QDateTime::fromMSecsSinceEpoch(t);
//qDebug()<< d.toString("yyyy-MM-dd HH:mm:ss") << ": " << hex << pos+15 << " " << hex << int(code) << int(delta);
} }
cnt++; cnt++;
@ -787,8 +785,6 @@ bool PRS1Loader::Parse002ASV(Session *session,unsigned char *buffer,int size,qin
qDebug() << "Illegal PRS1 code " << hex << int(code) << " appeared at " << hex << pos+16; qDebug() << "Illegal PRS1 code " << hex << int(code) << " appeared at " << hex << pos+16;
return false; return false;
} }
//QDateTime d=QDateTime::fromMSecsSinceEpoch(t);
//qDebug()<< d.toString("yyyy-MM-dd HH:mm:ss") << ": " << hex << pos+15 << " " << hex << int(code) ;
if (code==0) { if (code==0) {
} else } else
if (code!=0x12) { if (code!=0x12) {

2
SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -91,7 +91,7 @@ bool EDFParser::Parse()
qDebug() << "Invalid date time retreieved parsing EDF File " << filename; qDebug() << "Invalid date time retreieved parsing EDF File " << filename;
return false; return false;
} }
startdate=startDate.toMSecsSinceEpoch(); startdate=qint64(startDate.toTime_t())*1000L;
//qDebug() << startDate.toString("yyyy-MM-dd HH:mm:ss"); //qDebug() << startDate.toString("yyyy-MM-dd HH:mm:ss");

8
SleepLib/machine.cpp
View File

@ -374,7 +374,7 @@ Day *Machine::AddSession(Session *s,Profile *p)
sessionlist[s->session()]=s; // To make sure it get's saved later even if it's not wanted. sessionlist[s->session()]=s; // To make sure it get's saved later even if it's not wanted.
QDateTime d1,d2=QDateTime::fromMSecsSinceEpoch(s->first()); QDateTime d1,d2=QDateTime::fromTime_t(s->first()/1000);
QDate date=d2.date(); QDate date=d2.date();
QTime time=d2.time(); QTime time=d2.time();
@ -390,7 +390,7 @@ Day *Machine::AddSession(Session *s,Profile *p)
} else if (combine_sessions > 0) { } else if (combine_sessions > 0) {
dit=day.find(date.addDays(-1)); // Check Day Before dit=day.find(date.addDays(-1)); // Check Day Before
if (dit!=day.end()) { if (dit!=day.end()) {
QDateTime lt=QDateTime::fromMSecsSinceEpoch(dit.value()->last()); QDateTime lt=QDateTime::fromTime_t(dit.value()->last()/1000);
closest_session=lt.secsTo(d2)/60; closest_session=lt.secsTo(d2)/60;
if (closest_session<combine_sessions) { if (closest_session<combine_sessions) {
date=date.addDays(-1); date=date.addDays(-1);
@ -398,7 +398,7 @@ Day *Machine::AddSession(Session *s,Profile *p)
} else { } else {
nextday=day.find(date.addDays(1));// Check Day Afterwards nextday=day.find(date.addDays(1));// Check Day Afterwards
if (nextday!=day.end()) { if (nextday!=day.end()) {
QDateTime lt=QDateTime::fromMSecsSinceEpoch(nextday.value()->first()); QDateTime lt=QDateTime::fromTime_t(nextday.value()->first()/1000);
closest_session=d2.secsTo(lt)/60; closest_session=d2.secsTo(lt)/60;
if (closest_session < combine_sessions) { if (closest_session < combine_sessions) {
// add todays here. pull all tomorrows records to this date. // add todays here. pull all tomorrows records to this date.
@ -430,8 +430,6 @@ Day *Machine::AddSession(Session *s,Profile *p)
dd=new Day(this); dd=new Day(this);
day[date]=dd; day[date]=dd;
// Add this Day record to profile // Add this Day record to profile
//QDateTime d=QDateTime::fromMSecsSinceEpoch(date);
//qDebug() << "New day: " << d.toString("yyyy-MM-dd HH:mm:ss");
p->AddDay(date,dd,m_type); p->AddDay(date,dd,m_type);
} else { } else {
dd=*dit; dd=*dit;

18
daily.cpp
View File

@ -649,7 +649,7 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day)
t-=float(m.value()[z]->raw(o)/2.0)*1000.0; t-=float(m.value()[z]->raw(o)/2.0)*1000.0;
} }
QStringList a; QStringList a;
QDateTime d=QDateTime::fromMSecsSinceEpoch(t); QDateTime d=QDateTime::fromTime_t(t/1000);
QString s=QString("#%1: %2 (%3)").arg((int)++mccnt[code],(int)3,(int)10,QChar('0')).arg(d.toString("HH:mm:ss")).arg(m.value()[z]->raw(o)); QString s=QString("#%1: %2 (%3)").arg((int)++mccnt[code],(int)3,(int)10,QChar('0')).arg(d.toString("HH:mm:ss")).arg(m.value()[z]->raw(o));
a.append(s); a.append(s);
a.append(d.toString("yyyy-MM-dd HH:mm:ss")); a.append(d.toString("yyyy-MM-dd HH:mm:ss"));
@ -814,8 +814,8 @@ void Daily::Load(QDate date)
html+="<tr><td align='center'><b>Date</b></td><td align='center'><b>"+tr("Sleep")+"</b></td><td align='center'><b>"+tr("Wake")+"</b></td><td align='center'><b>"+tr("Hours")+"</b></td></tr>"; html+="<tr><td align='center'><b>Date</b></td><td align='center'><b>"+tr("Sleep")+"</b></td><td align='center'><b>"+tr("Wake")+"</b></td><td align='center'><b>"+tr("Hours")+"</b></td></tr>";
int tt=cpap->total_time()/1000.0; int tt=cpap->total_time()/1000.0;
QDateTime date=QDateTime::fromMSecsSinceEpoch(cpap->first()); QDateTime date=QDateTime::fromTime_t(cpap->first()/1000);
QDateTime date2=QDateTime::fromMSecsSinceEpoch(cpap->last()); QDateTime date2=QDateTime::fromTime_t(cpap->last()/1000);
int h=tt/3600.0; int h=tt/3600.0;
int m=(tt/60)%60; int m=(tt/60)%60;
@ -953,8 +953,8 @@ void Daily::Load(QDate date)
QDateTime fd,ld; QDateTime fd,ld;
bool corrupted_waveform=false; bool corrupted_waveform=false;
for (QVector<Session *>::iterator s=cpap->begin();s!=cpap->end();s++) { for (QVector<Session *>::iterator s=cpap->begin();s!=cpap->end();s++) {
fd=QDateTime::fromMSecsSinceEpoch((*s)->first()); fd=QDateTime::fromTime_t((*s)->first()/1000);
ld=QDateTime::fromMSecsSinceEpoch((*s)->last()); ld=QDateTime::fromTime_t((*s)->last()/1000);
QHash<ChannelID,QVariant>::iterator i=(*s)->settings.find(CPAP_BrokenWaveform); QHash<ChannelID,QVariant>::iterator i=(*s)->settings.find(CPAP_BrokenWaveform);
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=center>%08i</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()); tmp.sprintf(("<tr><td align=center>%08i</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());
@ -1090,9 +1090,9 @@ Session * Daily::CreateJournalSession(QDate date)
QDateTime dt; QDateTime dt;
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(dt.toMSecsSinceEpoch()); sess->set_first(qint64(dt.toTime_t())*1000L);
dt=dt.addSecs(3600); dt=dt.addSecs(3600);
sess->set_last(dt.toMSecsSinceEpoch()); sess->set_last(qint64(dt.toTime_t())*1000L);
sess->SetChanged(true); sess->SetChanged(true);
m->AddSession(sess,profile); m->AddSession(sess,profile);
return sess; return sess;
@ -1157,8 +1157,8 @@ void Daily::on_treeWidget_itemSelectionChanged()
QDateTime d; QDateTime d;
if (!item->text(1).isEmpty()) { if (!item->text(1).isEmpty()) {
d=d.fromString(item->text(1),"yyyy-MM-dd HH:mm:ss"); d=d.fromString(item->text(1),"yyyy-MM-dd HH:mm:ss");
double st=(d.addSecs(-120)).toMSecsSinceEpoch(); double st=qint64((d.addSecs(-120)).toTime_t())*1000L;
double et=(d.addSecs(120)).toMSecsSinceEpoch(); double et=qint64((d.addSecs(120)).toTime_t())*1000L;
GraphView->SetXBounds(st,et); GraphView->SetXBounds(st,et);
} }
} }