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

gYAxis fixes, assert removals, and removed TinyXML, replacing with Qt's XML stuff, you have to delete SleepApp here

Browse Source
This commit is contained in:
Mark Watkins 2011-07-25 02:34:53 +10:00
parent c8a796c700
commit 6429b56bb8
30 changed files with 242 additions and 6480 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Graphs/gFlagsLine.cpp
View File

@ -116,8 +116,10 @@ void gFlagsLine::Plot(gGraphWindow & w,float scrx,float scry)
GLshort * vertarray=vertex_array[0]; GLshort * vertarray=vertex_array[0];
qint32 quadcnt=0; qint32 quadcnt=0;
GLshort * quadarray=vertex_array[1]; GLshort * quadarray=vertex_array[1];
assert(vertarray!=NULL); if (!vertarray || !quadarray) {
assert(quadarray!=NULL); qWarning() << "vertarray/quadarray==NULL";
return;
}
// Draw text label // Draw text label
float x,y; float x,y;

5
Graphs/gLineChart.cpp
View File

@ -94,7 +94,10 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
qint32 vertcnt=0; qint32 vertcnt=0;
GLshort * vertarray=vertex_array[0]; GLshort * vertarray=vertex_array[0];
assert(vertarray!=NULL); if (vertarray==NULL){
qWarning() << "VertArray==NULL";
return;
}
float lastpx,lastpy; float lastpx,lastpy;
float px,py; float px,py;

7
Graphs/gLineOverlay.cpp
View File

@ -65,9 +65,10 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry)
GLshort * pointarray=vertex_array[1]; GLshort * pointarray=vertex_array[1];
qint32 quadcnt=0; qint32 quadcnt=0;
GLshort * quadarray=vertex_array[2]; GLshort * quadarray=vertex_array[2];
assert(vertarray!=NULL); if (!vertarray || !quadarray || !pointarray) {
assert(quadarray!=NULL); qWarning() << "VertArray/quadarray/pointarray==NULL";
assert(pointarray!=NULL); return;
}
float bottom=start_py+25, top=start_py+height-25; float bottom=start_py+25, top=start_py+height-25;
QColor & col=color[0]; QColor & col=color[0];

14
Graphs/gSessionTime.cpp
View File

@ -60,7 +60,7 @@ void gSessionTime::Plot(gGraphWindow & w,float scrx,float scry)
float barwidth=float(width-days)/float(days); float barwidth=float(width-days)/float(days);
qint64 dy; qint64 dy;
//double sd; //double sd;
double px1,px2,py1,py2; double px1,py1;//,py2,px2;
QColor & col1=color[0]; QColor & col1=color[0];
QColor col2("light grey"); QColor col2("light grey");
QString str; QString str;
@ -69,7 +69,7 @@ void gSessionTime::Plot(gGraphWindow & w,float scrx,float scry)
QDateTime d; QDateTime d;
QTime t; QTime t;
double start,end,total; double start,total;//end,
float textX,textY; float textX,textY;
map<int,bool> datedrawn; map<int,bool> datedrawn;
@ -82,9 +82,9 @@ void gSessionTime::Plot(gGraphWindow & w,float scrx,float scry)
d=QDateTime::fromTime_t(rp.x()*86400.0); d=QDateTime::fromTime_t(rp.x()*86400.0);
t=d.time(); t=d.time();
start=t.hour()+(t.minute()/60.0)+(t.second()/3600.0); start=t.hour()+(t.minute()/60.0)+(t.second()/3600.0);
d=QDateTime::fromTime_t(rp.y()*86400.0); //d=QDateTime::fromTime_t(rp.y()*86400.0);
t=d.time(); //t=d.time();
end=t.hour()+(t.minute()/60.0)+(t.second()/3600.0); //end=t.hour()+(t.minute()/60.0)+(t.second()/3600.0);
total=(rp.y()-rp.x())*24; total=(rp.y()-rp.x())*24;
@ -101,9 +101,9 @@ void gSessionTime::Plot(gGraphWindow & w,float scrx,float scry)
} }
if (total<0.25) continue; // Hide sessions less than 15 minutes if (total<0.25) continue; // Hide sessions less than 15 minutes
double sd=floor(rp.x()); //double sd=floor(rp.x());
px1=dy*(barwidth+1); // x position for this day px1=dy*(barwidth+1); // x position for this day
px2=px1+barwidth; // plus bar width //px2=px1+barwidth; // plus bar width
py1=height/24.0*start; py1=height/24.0*start;
double h=height/24.0*(total); double h=height/24.0*(total);

5
Graphs/gXAxis.cpp
View File

@ -110,7 +110,10 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry)
qint32 vertcnt=0; qint32 vertcnt=0;
GLshort * vertarray=vertex_array[0]; GLshort * vertarray=vertex_array[0];
assert(vertarray!=NULL); if (vertarray==NULL) {
qWarning() << "VertArray==NULL";
return;
}
if (m_show_minor_ticks) { if (m_show_minor_ticks) {
for (double i=st3; i<=maxx; i+=min_tick/10.0) { for (double i=st3; i<=maxx; i+=min_tick/10.0) {

15
Graphs/gYAxis.cpp
View File

@ -66,7 +66,10 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry)
qint32 vertcnt=0; qint32 vertcnt=0;
GLshort * vertarray=vertex_array[0]; GLshort * vertarray=vertex_array[0];
assert(vertarray!=NULL); if (vertarray==NULL) {
qWarning() << "VertArray==NULL";
return;
}
glColor4ub(linecol1.red(),linecol1.green(),linecol1.blue(),linecol1.alpha()); glColor4ub(linecol1.red(),linecol1.green(),linecol1.blue(),linecol1.alpha());
glLineWidth(1); glLineWidth(1);
@ -92,6 +95,10 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry)
glVertex2f(start_px+width, h); glVertex2f(start_px+width, h);
glEnd(); glEnd();
} }
if (vertcnt>maxverts) {
qWarning() << "vertarray bounds exceeded in gYAxis for " << w.Title() << "graph" << "MinY =" <<miny << "MaxY =" << maxy << "min_ytick=" <<min_ytick;
return;
}
} }
for (double i=miny; i<=maxy+min_ytick-0.00001; i+=min_ytick) { for (double i=miny; i<=maxy+min_ytick-0.00001; i+=min_ytick) {
@ -106,6 +113,10 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry)
vertarray[vertcnt++]=h; vertarray[vertcnt++]=h;
vertarray[vertcnt++]=start_px; vertarray[vertcnt++]=start_px;
vertarray[vertcnt++]=h; vertarray[vertcnt++]=h;
if (vertcnt>maxverts) {
qWarning() << "vertarray bounds exceeded in gYAxis for " << w.Title() << "graph" << "MinY =" <<miny << "MaxY =" << maxy << "min_ytick=" <<min_ytick;
return;
}
if (m_show_major_lines && (i > miny)) { if (m_show_major_lines && (i > miny)) {
glColor4ub(linecol2.red(),linecol2.green(),linecol2.blue(),linecol2.alpha()); glColor4ub(linecol2.red(),linecol2.green(),linecol2.blue(),linecol2.alpha());
@ -116,7 +127,7 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry)
} }
} }
if (vertcnt>=maxverts) { if (vertcnt>=maxverts) {
qDebug() << "maxverts exceeded in gYAxis::Plot()"; qWarning() << "vertarray bounds exceeded in gYAxis for " << w.Title() << "graph";
return; return;
} }

5
Graphs/graphdata_custom.cpp
View File

@ -227,7 +227,10 @@ void TAPData::Reload(Day *day)
for (vector<Event *>::iterator e=(*s)->events[code].begin(); e!=(*s)->events[code].end(); e++) { for (vector<Event *>::iterator e=(*s)->events[code].begin(); e!=(*s)->events[code].end(); e++) {
Event & ev =(*(*e)); Event & ev =(*(*e));
val=ev[field]*10.0; val=ev[field]*10.0;
assert(field<ev.fields()); if (field>=ev.fields()) {
qWarning() << "Invalid Event field in TAPData::Reload";
return;
}
//if (field > ev.fields()) throw BoundsError(); //if (field > ev.fields()) throw BoundsError();
if (first) { if (first) {
first=false; // only bother setting lastval (below) this time. first=false; // only bother setting lastval (below) this time.

7
Graphs/graphwindow.cpp
View File

@ -417,9 +417,6 @@ void gGraphWindow::mouseMoveEvent(QMouseEvent * event)
} }
void gGraphWindow::mouseDoubleClickEvent(QMouseEvent * event) void gGraphWindow::mouseDoubleClickEvent(QMouseEvent * event)
{ {
QVector<double> s;
s.push_back(32);
double * test=new double [s.size()];
// TODO: Retest.. QT might not be so retarded // TODO: Retest.. QT might not be so retarded
if (event->buttons() & Qt::LeftButton) OnMouseLeftDown(event); if (event->buttons() & Qt::LeftButton) OnMouseLeftDown(event);
else if (event->buttons() & Qt::RightButton) OnMouseRightDown(event); else if (event->buttons() & Qt::RightButton) OnMouseRightDown(event);
@ -700,13 +697,13 @@ void gGraphWindow::OnMouseLeftRelease(QMouseEvent * event)
int height=m_scrY-GetBottomMargin()-GetTopMargin(); int height=m_scrY-GetBottomMargin()-GetTopMargin();
QRect hot1(GetLeftMargin(),GetTopMargin(),width,height); // Graph data area. QRect hot1(GetLeftMargin(),GetTopMargin(),width,height); // Graph data area.
bool was_dragging_foo=false; //bool was_dragging_foo=false;
bool did_draw=false; bool did_draw=false;
// Finished Dragging the FooBar? // Finished Dragging the FooBar?
if (foobar && m_drag_foobar) { if (foobar && m_drag_foobar) {
m_drag_foobar=false; m_drag_foobar=false;
was_dragging_foo=true; //was_dragging_foo=true;
if (m_foobar_moved<5) { if (m_foobar_moved<5) {
double zoom_fact=0.5; double zoom_fact=0.5;
if (event->modifiers() & Qt::ControlModifier) zoom_fact=0.25; if (event->modifiers() & Qt::ControlModifier) zoom_fact=0.25;

12
SleepLib/loader_plugins/cms50_loader.cpp
View File

@ -48,7 +48,10 @@ int CMS50Loader::Open(QString & path,Profile *profile)
// Data Folder // Data Folder
// SpO2 Review.ini // SpO2 Review.ini
// SpO2.ini // SpO2.ini
assert(profile!=NULL); if (!profile) {
qWarning() << "Empty Profile in CMS50Loader::Open()";
return 0;
}
QDir dir(path); QDir dir(path);
QString tmp=path+"/Data"; QString tmp=path+"/Data";
@ -103,8 +106,8 @@ int CMS50Loader::OpenCMS50(QString & path, Profile *profile)
} }
bool CMS50Loader::OpenSPORFile(QString path,Machine *mach,Profile *profile) bool CMS50Loader::OpenSPORFile(QString path,Machine *mach,Profile *profile)
{ {
assert(mach!=NULL); if (!mach || !profile)
assert(profile!=NULL); return false;
QFile f(path); QFile f(path);
unsigned char tmp[256]; unsigned char tmp[256];
@ -269,7 +272,8 @@ bool CMS50Loader::OpenSPORFile(QString path,Machine *mach,Profile *profile)
} }
Machine *CMS50Loader::CreateMachine(Profile *profile) Machine *CMS50Loader::CreateMachine(Profile *profile)
{ {
assert(profile!=NULL); if (!profile)
return NULL;
// NOTE: This only allows for one CMS50 machine per profile.. // NOTE: This only allows for one CMS50 machine per profile..
// Upgrading their oximeter will use this same record.. // Upgrading their oximeter will use this same record..

6
SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -64,8 +64,9 @@ PRS1Loader::~PRS1Loader()
} }
Machine *PRS1Loader::CreateMachine(QString serial,Profile *profile) Machine *PRS1Loader::CreateMachine(QString serial,Profile *profile)
{ {
if (!profile)
return NULL;
qDebug() << "Create Machine " << serial; qDebug() << "Create Machine " << serial;
assert(profile!=NULL);
vector<Machine *> ml=profile->GetMachines(MT_CPAP); vector<Machine *> ml=profile->GetMachines(MT_CPAP);
bool found=false; bool found=false;
@ -419,9 +420,6 @@ bool PRS1Loader::OpenSummary(Session *session,QString filename)
ext=header[6]; ext=header[6];
htype=header[3]; // 00 = normal // 01=waveform // could be a bool? htype=header[3]; // 00 = normal // 01=waveform // could be a bool?
version=header[4]; version=header[4];
if (sequence==127) {
int i=0;
}
sequence=sequence; sequence=sequence;
version=version; // don't need it here? version=version; // don't need it here?

2
SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -185,7 +185,7 @@ ResmedLoader::~ResmedLoader()
Machine *ResmedLoader::CreateMachine(QString serial,Profile *profile) Machine *ResmedLoader::CreateMachine(QString serial,Profile *profile)
{ {
assert(profile!=NULL); if (!profile) return NULL;
vector<Machine *> ml=profile->GetMachines(MT_CPAP); vector<Machine *> ml=profile->GetMachines(MT_CPAP);
bool found=false; bool found=false;
for (vector<Machine *>::iterator i=ml.begin(); i!=ml.end(); i++) { for (vector<Machine *>::iterator i=ml.begin(); i!=ml.end(); i++) {

3
SleepLib/loader_plugins/zeo_loader.cpp
View File

@ -34,7 +34,8 @@ int ZEOLoader::Open(QString & path,Profile *profile)
} }
Machine *ZEOLoader::CreateMachine(Profile *profile) Machine *ZEOLoader::CreateMachine(Profile *profile)
{ {
assert(profile!=NULL); if (!profile)
return NULL;
// NOTE: This only allows for one ZEO machine per profile.. // NOTE: This only allows for one ZEO machine per profile..
// Upgrading their ZEO will use this same record.. // Upgrading their ZEO will use this same record..

11
SleepLib/machine.cpp
View File

@ -227,9 +227,14 @@ Session *Machine::SessionExists(SessionID session)
Day *Machine::AddSession(Session *s,Profile *p) Day *Machine::AddSession(Session *s,Profile *p)
{ {
double span=0; double span=0;
assert(s!=NULL); if (!s) {
assert(p!=NULL); qWarning() << "Empty Session in Machine::AddSession()";
return NULL;
}
if (!p) {
qWarning() << "Empty Profile in Machine::AddSession()";
return NULL;
}
if (s->session()>highest_sessionid) if (s->session()>highest_sessionid)
highest_sessionid=s->session(); highest_sessionid=s->session();

1
SleepLib/machine.h
View File

@ -15,7 +15,6 @@
#include <vector> #include <vector>
#include <list> #include <list>
#include "tinyxml/tinyxml.h"
#include "SleepLib/preferences.h" #include "SleepLib/preferences.h"
#include "SleepLib/machine_common.h" #include "SleepLib/machine_common.h"

1
SleepLib/machine_loader.cpp
View File

@ -6,7 +6,6 @@
#include <QFile> #include <QFile>
#include <QDir> #include <QDir>
#include "tinyxml/tinyxml.h"
#include "machine_loader.h" #include "machine_loader.h"

190
SleepLib/preferences.cpp
View File

@ -7,11 +7,10 @@ License: GPL
*/ */
//#include <wx/wx.h>
//#include <wx/filename.h>
//#include <wx/stdpaths.h>
#include <QString> #include <QString>
#include <QDomDocument>
#include <QDomElement>
#include <QDomNode>
#include <QVariant> #include <QVariant>
#include <QDateTime> #include <QDateTime>
#include <QDir> #include <QDir>
@ -20,6 +19,7 @@ License: GPL
#include "preferences.h" #include "preferences.h"
//const QString AppName="SleepyHead";
const QString & getUserName() const QString & getUserName()
{ {
@ -30,7 +30,7 @@ const QString & getUserName()
userName="Windows User"; userName="Windows User";
// FIXME: I DONT KNOW QT'S WINDOWS DEFS // FIXME: I DONT KNOW QT'S WINDOWS DEFS
#if defined (WINDOWS) #if defined (Q_WS_WIN32)
#if defined(UNICODE) #if defined(UNICODE)
if ( qWinVersion() & Qt::WV_NT_based ) { if ( qWinVersion() & Qt::WV_NT_based ) {
TCHAR winUserName[UNLEN + 1]; // UNLEN is defined in LMCONS.H TCHAR winUserName[UNLEN + 1]; // UNLEN is defined in LMCONS.H
@ -148,78 +148,96 @@ const QString Preferences::Get(QString name)
return temp; return temp;
} }
bool Preferences::Open(QString filename) bool Preferences::Open(QString filename)
{ {
if (!filename.isEmpty()) p_filename=filename; if (!filename.isEmpty())
p_filename=filename;
QDomDocument doc(p_name);
QFile file(p_filename);
qDebug() << "Opening " << p_filename; qDebug() << "Opening " << p_filename;
TiXmlDocument xml(p_filename.toLatin1()); if (!file.open(QIODevice::ReadOnly)) {
if (!xml.LoadFile()) { qWarning() << "Could not open" << p_filename;
return false; return false;
} }
TiXmlHandle hDoc(&xml); if (!doc.setContent(&file)) {
TiXmlElement* pElem; qWarning() << "Invalid XML Content in" << p_filename;
TiXmlHandle hRoot(0); return false;
}
file.close();
QDomElement root=doc.documentElement();
if (root.tagName() != AppName) {
return false;
}
root=root.firstChildElement();
if (root.tagName() != p_name) {
return false;
}
bool ok;
p_preferences.clear(); p_preferences.clear();
QDomNode n=root.firstChild();
pElem=hDoc.FirstChildElement().Element(); while (!n.isNull()) {
// should always have a valid root but handle gracefully if it does QDomElement e=n.toElement();
if (!pElem) return false; if (!e.isNull()) {
QString name=e.tagName();
hRoot=TiXmlHandle(pElem); QString type=e.attribute("type").toLower();
QString value=e.text();;
std::map<QString,QString> p_types;
pElem=hRoot.FirstChild(p_name.toLatin1()).FirstChild().Element();
for( ; pElem; pElem=pElem->NextSiblingElement()) {
TiXmlAttribute *attr=pElem->FirstAttribute();
if (!attr) {
qWarning() << "Preferences::Open() attr==NULL!";
return false;
}
QString type=attr->Value();
type=type.toLower();
QString pKey=pElem->Value();
QString pText=pElem->GetText();
bool ok;
if (!pKey.isEmpty() && !pText.isEmpty()) {
if (type=="double") { if (type=="double") {
double d=pText.toDouble(&ok); double d;
if (!ok) d=value.toDouble(&ok);
qDebug() << "String to number conversion error in Preferences::Open()"; if (ok) {
else p_preferences[name]=d;
p_preferences[pKey]=d; } else {
} else if (type=="qlonglong") { qDebug() << "XML Error:" << name << "=" << value << "??";
qlonglong d=pText.toLongLong(&ok); }
if (!ok) } else
qDebug() << "String to number conversion error in Preferences::Open()"; if (type=="qlonglong") {
else qint64 d;
p_preferences[pKey]=d; d=value.toLongLong(&ok);
} else if (type=="bool") { if (ok) {
int d=pText.toInt(&ok); p_preferences[name]=d;
if (!ok) { } else {
if (pText.toLower()=="true") qDebug() << "XML Error:" << name << "=" << value << "??";
p_preferences[pKey]=true; }
else if (pText.toLower()=="false") } else
p_preferences[pKey]=false; if (type=="bool") {
else QString v=value.toLower();
qDebug() << "String to number conversion error in Preferences::Open()"; if ((v=="true") || (v=="on") || (v=="yes")) {
p_preferences[name]=true;
} else } else
p_preferences[pKey]=(bool)d; if ((v=="false") || (v=="off") || (v=="no")) {
p_preferences[name]=false;
} else {
int d;
d=value.toInt(&ok);
if (ok) {
p_preferences[name]=d!=0;
} else {
qDebug() << "XML Error:" << name << "=" << value << "??";
}
}
} else if (type=="qdatetime") { } else if (type=="qdatetime") {
QDateTime d; QDateTime d;
d.fromString("yyyy-MM-dd HH:mm:ss"); d.fromString(value,"yyyy-MM-dd HH:mm:ss");
if (d.isValid()) if (d.isValid())
p_preferences[pKey]=d; p_preferences[name]=d;
else else
qWarning() << "Invalid DateTime record in " << filename; qWarning() << "XML Error: Invalid DateTime record" << name << value;
} else { // Assume string } else {
p_preferences[pKey]=pText; p_preferences[name]=value;
} }
} }
n=n.nextSibling();
} }
ExtraLoad(&hRoot); root=root.nextSiblingElement();
ExtraLoad(root);
return true; return true;
} }
@ -228,45 +246,39 @@ bool Preferences::Save(QString filename)
if (!filename.isEmpty()) if (!filename.isEmpty())
p_filename=filename; p_filename=filename;
TiXmlDocument xml; QDomDocument doc(p_name);
TiXmlElement* msg;
TiXmlComment * comment;
TiXmlDeclaration *decl=new TiXmlDeclaration( "1.0", "", "" );
xml.LinkEndChild(decl);
TiXmlElement *root=new TiXmlElement(AppName.toLatin1());
xml.LinkEndChild(root);
if (!p_comment.isEmpty()) { QDomElement droot = doc.createElement(AppName);
comment = new TiXmlComment(); doc.appendChild( droot );
QString s=" "+p_comment+" ";
comment->SetValue(s.toLatin1()); QDomElement root=doc.createElement(p_name);
root->LinkEndChild(comment); droot.appendChild(root);
}
TiXmlElement * msgs = new TiXmlElement(p_name.toLatin1());
root->LinkEndChild(msgs);
for (std::map<QString,QVariant>::iterator i=p_preferences.begin(); i!=p_preferences.end(); i++) { for (std::map<QString,QVariant>::iterator i=p_preferences.begin(); i!=p_preferences.end(); i++) {
QVariant::Type type=i->second.type(); QVariant::Type type=i->second.type();
if (type==QVariant::Invalid) continue; if (type==QVariant::Invalid) continue;
msg=new TiXmlElement(i->first.toLatin1()); QDomElement cn=doc.createElement(i->first);
//qDebug() << i->first; cn.setAttribute("type",i->second.typeName());
msg->SetAttribute("type",i->second.typeName());
QString t;
if (type==QVariant::DateTime) { if (type==QVariant::DateTime) {
t=i->second.toDateTime().toString("yyyy-MM-dd HH:mm:ss"); cn.appendChild(doc.createTextNode(i->second.toDateTime().toString("yyyy-MM-dd HH:mm:ss")));
} else { } else {
t=i->second.toString(); cn.appendChild(doc.createTextNode(i->second.toString()));
} }
msg->LinkEndChild(new TiXmlText(t.toLatin1()));
msgs->LinkEndChild(msg);
}
TiXmlElement *extra=ExtraSave();
if (extra) root->LinkEndChild(extra);
xml.SaveFile(p_filename.toLatin1()); root.appendChild(cn);
}
droot.appendChild(ExtraSave(doc));
QFile file(p_filename);
if (!file.open(QIODevice::WriteOnly)) {
return false;
}
QTextStream ts(&file);
ts << doc.toString();
file.close();
return true; return true;
} }

23
SleepLib/preferences.h
View File

@ -12,11 +12,12 @@ License: GPL
#include <QString> #include <QString>
#include <QVariant> #include <QVariant>
#include <QDomElement>
#include <QDomDocument>
#include <map> #include <map>
#include "tinyxml/tinyxml.h"
const QString AppName="Application"; // Outer tag of XML files const QString AppName="SleepyHead"; // Outer tag of XML files
const QString AppRoot="SleepApp"; // The Folder Name const QString AppRoot="SleepApp"; // The Folder Name
extern const QString & GetAppRoot(); //returns app root path plus trailing path separator. extern const QString & GetAppRoot(); //returns app root path plus trailing path separator.
@ -48,9 +49,6 @@ public:
QVariant & operator[](QString name) { QVariant & operator[](QString name) {
return p_preferences[name]; return p_preferences[name];
}; };
QVariant & operator[](const char * name) {
return p_preferences[name];
};
QVariant & operator[](int code) { QVariant & operator[](int code) {
return p_preferences[p_codes[code]]; return p_preferences[p_codes[code]];
}; };
@ -58,10 +56,6 @@ public:
void Set(QString name,QVariant value) { void Set(QString name,QVariant value) {
p_preferences[name]=value; p_preferences[name]=value;
}; };
/*void Set(const char * name,QVariant value) {
QString t=name;
p_preferences[t]=value;
}; */
void Set(int code,QVariant value) { void Set(int code,QVariant value) {
Set(p_codes[code],value); Set(p_codes[code],value);
}; };
@ -69,16 +63,9 @@ public:
bool Exists(QString name) { bool Exists(QString name) {
return (p_preferences.find(name)!=p_preferences.end()); return (p_preferences.find(name)!=p_preferences.end());
}; };
/*bool Exists(const char * name) {
//QString t(name,wxConvUTF8);
return Exists(name);
}; */
//bool Exists(int code) { return Exists(p_codes[code]); };
virtual void ExtraLoad(TiXmlHandle *root) { root=root; }; virtual void ExtraLoad(QDomElement & root) { root=root; }
virtual TiXmlElement * ExtraSave() { virtual QDomElement ExtraSave(QDomDocument & doc) { doc=doc; QDomElement e; return e; }
return NULL;
};
virtual bool Open(QString filename=""); virtual bool Open(QString filename="");
virtual bool Save(QString filename=""); virtual bool Save(QString filename="");

74
SleepLib/profiles.cpp
View File

@ -17,7 +17,6 @@ License: GPL
#include "profiles.h" #include "profiles.h"
#include "machine.h" #include "machine.h"
#include "machine_loader.h" #include "machine_loader.h"
#include "tinyxml/tinyxml.h"
Preferences *p_pref; Preferences *p_pref;
Preferences *p_layout; Preferences *p_layout;
@ -90,26 +89,34 @@ void Profile::LoadMachineData()
* @brief Machine XML section in profile. * @brief Machine XML section in profile.
* @param root * @param root
*/ */
void Profile::ExtraLoad(TiXmlHandle *root) void Profile::ExtraLoad(QDomElement & root)
{ {
TiXmlElement *elem; if (root.tagName()!="Machines") {
elem=root->FirstChild("Machines").FirstChild().Element(); qDebug() << "No Machines Tag in Profiles.xml";
if (!elem) { return;
// qDebug("ExtraLoad: Elem is empty.");
} }
for(; elem; elem=elem->NextSiblingElement()) { QDomElement elem=root.firstChildElement();
QString pKey=elem->Value(); while (!elem.isNull()) {
QString pKey=elem.tagName();
if (pKey!="Machine") { if (pKey!="Machine") {
qWarning() << "Profile::ExtraLoad() pKey!=\"Machine\""; qWarning() << "Profile::ExtraLoad() pKey!=\"Machine\"";
elem=elem.nextSiblingElement();
continue; continue;
} }
int m_id; int m_id;
elem->QueryIntAttribute("id",&m_id); bool ok;
m_id=elem.attribute("id","").toInt(&ok);
int mt; int mt;
elem->QueryIntAttribute("type",&mt); mt=elem.attribute("type","").toInt(&ok);
MachineType m_type=(MachineType)mt; MachineType m_type=(MachineType)mt;
QString m_class=elem->Attribute("class");
QString m_class=elem.attribute("class","");
//MachineLoader *ml=GetLoader(m_class);
Machine *m; Machine *m;
//if (ml) {
// ml->CreateMachine
//}
if (m_type==MT_CPAP) m=new CPAP(this,m_id); if (m_type==MT_CPAP) m=new CPAP(this,m_id);
else if (m_type==MT_OXIMETER) m=new Oximeter(this,m_id); else if (m_type==MT_OXIMETER) m=new Oximeter(this,m_id);
else if (m_type==MT_SLEEPSTAGE) m=new SleepStage(this,m_id); else if (m_type==MT_SLEEPSTAGE) m=new SleepStage(this,m_id);
@ -119,43 +126,51 @@ void Profile::ExtraLoad(TiXmlHandle *root)
} }
m->SetClass(m_class); m->SetClass(m_class);
AddMachine(m); AddMachine(m);
TiXmlElement *e=elem->FirstChildElement(); QDomElement e=elem.firstChildElement();
for (; e; e=e->NextSiblingElement()) { for (; !e.isNull(); e=e.nextSiblingElement()) {
QString pKey=e->Value(); QString pKey=e.tagName();
m->properties[pKey]=e->GetText(); m->properties[pKey]=e.text();
} }
elem=elem.nextSiblingElement();
} }
} }
void Profile::AddMachine(Machine *m) { void Profile::AddMachine(Machine *m) {
assert(m!=NULL); if (!m) {
qWarning() << "Empty Machine in Profile::AddMachine()";
return;
}
machlist[m->id()]=m; machlist[m->id()]=m;
}; };
void Profile::DelMachine(Machine *m) { void Profile::DelMachine(Machine *m) {
assert(m!=NULL); if (!m) {
qWarning() << "Empty Machine in Profile::AddMachine()";
return;
}
machlist.erase(m->id()); machlist.erase(m->id());
}; };
TiXmlElement * Profile::ExtraSave()
// Potential Memory Leak Here..
QDomElement Profile::ExtraSave(QDomDocument & doc)
{ {
TiXmlElement *mach=new TiXmlElement("Machines"); QDomElement mach=doc.createElement("Machines");
for (map<MachineID,Machine *>::iterator i=machlist.begin(); i!=machlist.end(); i++) { for (map<MachineID,Machine *>::iterator i=machlist.begin(); i!=machlist.end(); i++) {
TiXmlElement *me=new TiXmlElement("Machine"); QDomElement me=doc.createElement("Machine");
Machine *m=i->second; Machine *m=i->second;
//QString t=wxT("0x")+m->hexid(); //QString t=wxT("0x")+m->hexid();
me->SetAttribute("id",m->id()); me.setAttribute("id",(int)m->id());
me->SetAttribute("type",(int)m->GetType()); me.setAttribute("type",(int)m->GetType());
char *cc=m->GetClass().toLatin1().data(); me.setAttribute("class",m->GetClass());
me->SetAttribute("class",cc);
i->second->properties["path"]="{DataFolder}/"+m->hexid(); i->second->properties["path"]="{DataFolder}/"+m->hexid();
for (map<QString,QString>::iterator j=i->second->properties.begin(); j!=i->second->properties.end(); j++) { for (map<QString,QString>::iterator j=i->second->properties.begin(); j!=i->second->properties.end(); j++) {
TiXmlElement *mp=new TiXmlElement(j->first.toLatin1()); QDomElement mp=doc.createElement(j->first);
mp->LinkEndChild(new TiXmlText(j->second.toLatin1())); mp.appendChild(doc.createTextNode(j->second));
me->LinkEndChild(mp); //mp->LinkEndChild(new QDomText(j->second.toLatin1()));
me.appendChild(mp);
} }
mach->LinkEndChild(me); mach.appendChild(me);
} }
//root->LinkEndChild(mach);
return mach; return mach;
} }
@ -293,7 +308,6 @@ Profile *Create(QString name,QString realname,QString password)
QDir dir(path); QDir dir(path);
if (!dir.exists(path)) dir.mkpath(path); if (!dir.exists(path)) dir.mkpath(path);
//path+="/"+name; //path+="/"+name;
//if (!dir.exists(path)) wxMkdir(path);
Profile *prof=new Profile(path); Profile *prof=new Profile(path);
prof->Open(); prof->Open();
profiles[name]=prof; profiles[name]=prof;

6
SleepLib/profiles.h
View File

@ -15,7 +15,6 @@ License: GPL
#include "machine.h" #include "machine.h"
#include "machine_loader.h" #include "machine_loader.h"
#include "preferences.h" #include "preferences.h"
#include "tinyxml/tinyxml.h"
class Machine; class Machine;
/** /**
@ -46,8 +45,9 @@ public:
Machine * GetMachine(MachineType t,QDate date); Machine * GetMachine(MachineType t,QDate date);
Machine * GetMachine(MachineType t); Machine * GetMachine(MachineType t);
virtual void ExtraLoad(TiXmlHandle *root); virtual void ExtraLoad(QDomElement & root);
virtual TiXmlElement * ExtraSave(); virtual QDomElement ExtraSave(QDomDocument & doc);
map<QDate,vector<Day *> > daylist; map<QDate,vector<Day *> > daylist;
const QDate & FirstDay() { return m_first; } const QDate & FirstDay() { return m_first; }
const QDate & LastDay() { return m_last; } const QDate & LastDay() { return m_last; }

34
SleepLib/session.cpp
View File

@ -42,8 +42,12 @@ double Session::min_event_field(MachineCode mc,int field)
bool first=true; bool first=true;
double min=0; double min=0;
vector<Event *>::iterator i; vector<Event *>::iterator i;
for (i=events[mc].begin(); i!=events[mc].end(); i++) { for (i=events[mc].begin(); i!=events[mc].end(); i++) {
assert(field<(*i)->e_fields); if (field>=(*i)->e_fields) {
qWarning() << "Invalid Event field in Session::min_event_field";
return 0;
}
if (first) { if (first) {
first=false; first=false;
min=(*(*i))[field]; min=(*(*i))[field];
@ -61,7 +65,10 @@ double Session::max_event_field(MachineCode mc,int field)
double max=0; double max=0;
vector<Event *>::iterator i; vector<Event *>::iterator i;
for (i=events[mc].begin(); i!=events[mc].end(); i++) { for (i=events[mc].begin(); i!=events[mc].end(); i++) {
assert(field<(*i)->e_fields); if (field>=(*i)->e_fields) {
qWarning() << "Invalid Event field in Session::max_event_field";
return 0;
}
if (first) { if (first) {
first=false; first=false;
max=(*(*i))[field]; max=(*(*i))[field];
@ -80,7 +87,10 @@ double Session::sum_event_field(MachineCode mc,int field)
vector<Event *>::iterator i; vector<Event *>::iterator i;
for (i=events[mc].begin(); i!=events[mc].end(); i++) { for (i=events[mc].begin(); i!=events[mc].end(); i++) {
assert(field<(*i)->e_fields); if (field>=(*i)->e_fields) {
qWarning() << "Invalid Event field in Session::sum_event_field";
return 0;
}
sum+=(*(*i))[field]; sum+=(*(*i))[field];
} }
return sum; return sum;
@ -94,7 +104,10 @@ double Session::avg_event_field(MachineCode mc,int field)
vector<Event *>::iterator i; vector<Event *>::iterator i;
for (i=events[mc].begin(); i!=events[mc].end(); i++) { for (i=events[mc].begin(); i!=events[mc].end(); i++) {
assert(field<(*i)->e_fields); if (field>=(*i)->e_fields) {
qWarning() << "Invalid Event field in Session::avg_event_field";
return 0;
}
sum+=(*(*i))[field]; sum+=(*(*i))[field];
cnt++; cnt++;
} }
@ -156,7 +169,10 @@ double Session::weighted_avg_event_field(MachineCode mc,int field)
for (i=events[mc].begin(); i!=events[mc].end(); i++) { for (i=events[mc].begin(); i!=events[mc].end(); i++) {
Event & e =(*(*i)); Event & e =(*(*i));
val=e[field]*mult; val=e[field]*mult;
assert(field<e.e_fields); if (field>=(*i)->e_fields) {
qWarning() << "Invalid Event field in Session::weighted_avg_event_field";
return 0;
}
if (first) { if (first) {
first=false; first=false;
} else { } else {
@ -279,12 +295,12 @@ bool Session::Store(QString path)
base.sprintf("%08lx",s_session); base.sprintf("%08lx",s_session);
base=path+"/"+base; base=path+"/"+base;
//qDebug() << "Storing Session: " << base; //qDebug() << "Storing Session: " << base;
bool a,b,c; bool a;
a=StoreSummary(base+".000"); // if actually has events a=StoreSummary(base+".000"); // if actually has events
//qDebug() << " Summary done"; //qDebug() << " Summary done";
if (events.size()>0) b=StoreEvents(base+".001"); if (events.size()>0) StoreEvents(base+".001");
//qDebug() << " Events done"; //qDebug() << " Events done";
if (waveforms.size()>0) c=StoreWaveforms(base+".002"); if (waveforms.size()>0) StoreWaveforms(base+".002");
//qDebug() << " Waveform done"; //qDebug() << " Waveform done";
if (a) { if (a) {
s_changed=false; s_changed=false;
@ -633,13 +649,11 @@ bool Session::StoreWaveforms(QString filename)
map<MachineCode,vector<Waveform *> >::iterator i; map<MachineCode,vector<Waveform *> >::iterator i;
vector<Waveform *>::iterator j; vector<Waveform *>::iterator j;
int zz=0;
for (i=waveforms.begin(); i!=waveforms.end(); i++) { for (i=waveforms.begin(); i!=waveforms.end(); i++) {
//qDebug() << "Storing Waveform" << zz++ << filename; //qDebug() << "Storing Waveform" << zz++ << filename;
out << (quint16)i->first; // Machine Code out << (quint16)i->first; // Machine Code
t16=i->second.size(); t16=i->second.size();
out << t16; // Number of (hopefully non-linear) waveform chunks out << t16; // Number of (hopefully non-linear) waveform chunks
int chnk=0;
for (j=i->second.begin(); j!=i->second.end(); j++) { for (j=i->second.begin(); j!=i->second.end(); j++) {
//qDebug() << "Storing Waveform Chunk" << chnk++; //qDebug() << "Storing Waveform Chunk" << chnk++;

530
SleepLib/tinyxml/readme.txt
View File

@ -1,530 +0,0 @@
/** @mainpage
<h1> TinyXML </h1>
TinyXML is a simple, small, C++ XML parser that can be easily
integrated into other programs.
<h2> What it does. </h2>
In brief, TinyXML parses an XML document, and builds from that a
Document Object Model (DOM) that can be read, modified, and saved.
XML stands for "eXtensible Markup Language." It allows you to create
your own document markups. Where HTML does a very good job of marking
documents for browsers, XML allows you to define any kind of document
markup, for example a document that describes a "to do" list for an
organizer application. XML is a very structured and convenient format.
All those random file formats created to store application data can
all be replaced with XML. One parser for everything.
The best place for the complete, correct, and quite frankly hard to
read spec is at <a href="http://www.w3.org/TR/2004/REC-xml-20040204/">
http://www.w3.org/TR/2004/REC-xml-20040204/</a>. An intro to XML
(that I really like) can be found at
<a href="http://skew.org/xml/tutorial/">http://skew.org/xml/tutorial</a>.
There are different ways to access and interact with XML data.
TinyXML uses a Document Object Model (DOM), meaning the XML data is parsed
into a C++ objects that can be browsed and manipulated, and then
written to disk or another output stream. You can also construct an XML document
from scratch with C++ objects and write this to disk or another output
stream.
TinyXML is designed to be easy and fast to learn. It is two headers
and four cpp files. Simply add these to your project and off you go.
There is an example file - xmltest.cpp - to get you started.
TinyXML is released under the ZLib license,
so you can use it in open source or commercial code. The details
of the license are at the top of every source file.
TinyXML attempts to be a flexible parser, but with truly correct and
compliant XML output. TinyXML should compile on any reasonably C++
compliant system. It does not rely on exceptions or RTTI. It can be
compiled with or without STL support. TinyXML fully supports
the UTF-8 encoding, and the first 64k character entities.
<h2> What it doesn't do. </h2>
TinyXML doesn't parse or use DTDs (Document Type Definitions) or XSLs
(eXtensible Stylesheet Language.) There are other parsers out there
(check out www.sourceforge.org, search for XML) that are much more fully
featured. But they are also much bigger, take longer to set up in
your project, have a higher learning curve, and often have a more
restrictive license. If you are working with browsers or have more
complete XML needs, TinyXML is not the parser for you.
The following DTD syntax will not parse at this time in TinyXML:
@verbatim
<!DOCTYPE Archiv [
<!ELEMENT Comment (#PCDATA)>
]>
@endverbatim
because TinyXML sees this as a !DOCTYPE node with an illegally
embedded !ELEMENT node. This may be addressed in the future.
<h2> Tutorials. </h2>
For the impatient, here is a tutorial to get you going. A great way to get started,
but it is worth your time to read this (very short) manual completely.
- @subpage tutorial0
<h2> Code Status. </h2>
TinyXML is mature, tested code. It is very stable. If you find
bugs, please file a bug report on the sourceforge web site
(www.sourceforge.net/projects/tinyxml). We'll get them straightened
out as soon as possible.
There are some areas of improvement; please check sourceforge if you are
interested in working on TinyXML.
<h2> Related Projects </h2>
TinyXML projects you may find useful! (Descriptions provided by the projects.)
<ul>
<li> <b>TinyXPath</b> (http://tinyxpath.sourceforge.net). TinyXPath is a small footprint
XPath syntax decoder, written in C++.</li>
<li> <b>TinyXML++</b> (http://code.google.com/p/ticpp/). TinyXML++ is a completely new
interface to TinyXML that uses MANY of the C++ strengths. Templates,
exceptions, and much better error handling.</li>
</ul>
<h2> Features </h2>
<h3> Using STL </h3>
TinyXML can be compiled to use or not use STL. When using STL, TinyXML
uses the std::string class, and fully supports std::istream, std::ostream,
operator<<, and operator>>. Many API methods have both 'const char*' and
'const std::string&' forms.
When STL support is compiled out, no STL files are included whatsoever. All
the string classes are implemented by TinyXML itself. API methods
all use the 'const char*' form for input.
Use the compile time #define:
TIXML_USE_STL
to compile one version or the other. This can be passed by the compiler,
or set as the first line of "tinyxml.h".
Note: If compiling the test code in Linux, setting the environment
variable TINYXML_USE_STL=YES/NO will control STL compilation. In the
Windows project file, STL and non STL targets are provided. In your project,
It's probably easiest to add the line "#define TIXML_USE_STL" as the first
line of tinyxml.h.
<h3> UTF-8 </h3>
TinyXML supports UTF-8 allowing to manipulate XML files in any language. TinyXML
also supports "legacy mode" - the encoding used before UTF-8 support and
probably best described as "extended ascii".
Normally, TinyXML will try to detect the correct encoding and use it. However,
by setting the value of TIXML_DEFAULT_ENCODING in the header file, TinyXML
can be forced to always use one encoding.
TinyXML will assume Legacy Mode until one of the following occurs:
<ol>
<li> If the non-standard but common "UTF-8 lead bytes" (0xef 0xbb 0xbf)
begin the file or data stream, TinyXML will read it as UTF-8. </li>
<li> If the declaration tag is read, and it has an encoding="UTF-8", then
TinyXML will read it as UTF-8. </li>
<li> If the declaration tag is read, and it has no encoding specified, then TinyXML will
read it as UTF-8. </li>
<li> If the declaration tag is read, and it has an encoding="something else", then TinyXML
will read it as Legacy Mode. In legacy mode, TinyXML will work as it did before. It's
not clear what that mode does exactly, but old content should keep working.</li>
<li> Until one of the above criteria is met, TinyXML runs in Legacy Mode.</li>
</ol>
What happens if the encoding is incorrectly set or detected? TinyXML will try
to read and pass through text seen as improperly encoded. You may get some strange results or
mangled characters. You may want to force TinyXML to the correct mode.
You may force TinyXML to Legacy Mode by using LoadFile( TIXML_ENCODING_LEGACY ) or
LoadFile( filename, TIXML_ENCODING_LEGACY ). You may force it to use legacy mode all
the time by setting TIXML_DEFAULT_ENCODING = TIXML_ENCODING_LEGACY. Likewise, you may
force it to TIXML_ENCODING_UTF8 with the same technique.
For English users, using English XML, UTF-8 is the same as low-ASCII. You
don't need to be aware of UTF-8 or change your code in any way. You can think
of UTF-8 as a "superset" of ASCII.
UTF-8 is not a double byte format - but it is a standard encoding of Unicode!
TinyXML does not use or directly support wchar, TCHAR, or Microsoft's _UNICODE at this time.
It is common to see the term "Unicode" improperly refer to UTF-16, a wide byte encoding
of unicode. This is a source of confusion.
For "high-ascii" languages - everything not English, pretty much - TinyXML can
handle all languages, at the same time, as long as the XML is encoded
in UTF-8. That can be a little tricky, older programs and operating systems
tend to use the "default" or "traditional" code page. Many apps (and almost all
modern ones) can output UTF-8, but older or stubborn (or just broken) ones
still output text in the default code page.
For example, Japanese systems traditionally use SHIFT-JIS encoding.
Text encoded as SHIFT-JIS can not be read by TinyXML.
A good text editor can import SHIFT-JIS and then save as UTF-8.
The <a href="http://skew.org/xml/tutorial/">Skew.org link</a> does a great
job covering the encoding issue.
The test file "utf8test.xml" is an XML containing English, Spanish, Russian,
and Simplified Chinese. (Hopefully they are translated correctly). The file
"utf8test.gif" is a screen capture of the XML file, rendered in IE. Note that
if you don't have the correct fonts (Simplified Chinese or Russian) on your
system, you won't see output that matches the GIF file even if you can parse
it correctly. Also note that (at least on my Windows machine) console output
is in a Western code page, so that Print() or printf() cannot correctly display
the file. This is not a bug in TinyXML - just an OS issue. No data is lost or
destroyed by TinyXML. The console just doesn't render UTF-8.
<h3> Entities </h3>
TinyXML recognizes the pre-defined "character entities", meaning special
characters. Namely:
@verbatim
&amp; &
&lt; <
&gt; >
&quot; "
&apos; '
@endverbatim
These are recognized when the XML document is read, and translated to there
UTF-8 equivalents. For instance, text with the XML of:
@verbatim
Far &amp; Away
@endverbatim
will have the Value() of "Far & Away" when queried from the TiXmlText object,
and will be written back to the XML stream/file as an ampersand. Older versions
of TinyXML "preserved" character entities, but the newer versions will translate
them into characters.
Additionally, any character can be specified by its Unicode code point:
The syntax "&#xA0;" or "&#160;" are both to the non-breaking space characher.
<h3> Printing </h3>
TinyXML can print output in several different ways that all have strengths and limitations.
- Print( FILE* ). Output to a std-C stream, which includes all C files as well as stdout.
- "Pretty prints", but you don't have control over printing options.
- The output is streamed directly to the FILE object, so there is no memory overhead
in the TinyXML code.
- used by Print() and SaveFile()
- operator<<. Output to a c++ stream.
- Integrates with standart C++ iostreams.
- Outputs in "network printing" mode without line breaks. Good for network transmission
and moving XML between C++ objects, but hard for a human to read.
- TiXmlPrinter. Output to a std::string or memory buffer.
- API is less concise
- Future printing options will be put here.
- Printing may change slightly in future versions as it is refined and expanded.
<h3> Streams </h3>
With TIXML_USE_STL on TinyXML supports C++ streams (operator <<,>>) streams as well
as C (FILE*) streams. There are some differences that you may need to be aware of.
C style output:
- based on FILE*
- the Print() and SaveFile() methods
Generates formatted output, with plenty of white space, intended to be as
human-readable as possible. They are very fast, and tolerant of ill formed
XML documents. For example, an XML document that contains 2 root elements
and 2 declarations, will still print.
C style input:
- based on FILE*
- the Parse() and LoadFile() methods
A fast, tolerant read. Use whenever you don't need the C++ streams.
C++ style output:
- based on std::ostream
- operator<<
Generates condensed output, intended for network transmission rather than
readability. Depending on your system's implementation of the ostream class,
these may be somewhat slower. (Or may not.) Not tolerant of ill formed XML:
a document should contain the correct one root element. Additional root level
elements will not be streamed out.
C++ style input:
- based on std::istream
- operator>>
Reads XML from a stream, making it useful for network transmission. The tricky
part is knowing when the XML document is complete, since there will almost
certainly be other data in the stream. TinyXML will assume the XML data is
complete after it reads the root element. Put another way, documents that
are ill-constructed with more than one root element will not read correctly.
Also note that operator>> is somewhat slower than Parse, due to both
implementation of the STL and limitations of TinyXML.
<h3> White space </h3>
The world simply does not agree on whether white space should be kept, or condensed.
For example, pretend the '_' is a space, and look at "Hello____world". HTML, and
at least some XML parsers, will interpret this as "Hello_world". They condense white
space. Some XML parsers do not, and will leave it as "Hello____world". (Remember
to keep pretending the _ is a space.) Others suggest that __Hello___world__ should become
Hello___world.
It's an issue that hasn't been resolved to my satisfaction. TinyXML supports the
first 2 approaches. Call TiXmlBase::SetCondenseWhiteSpace( bool ) to set the desired behavior.
The default is to condense white space.
If you change the default, you should call TiXmlBase::SetCondenseWhiteSpace( bool )
before making any calls to Parse XML data, and I don't recommend changing it after
it has been set.
<h3> Handles </h3>
Where browsing an XML document in a robust way, it is important to check
for null returns from method calls. An error safe implementation can
generate a lot of code like:
@verbatim
TiXmlElement* root = document.FirstChildElement( "Document" );
if ( root )
{
TiXmlElement* element = root->FirstChildElement( "Element" );
if ( element )
{
TiXmlElement* child = element->FirstChildElement( "Child" );
if ( child )
{
TiXmlElement* child2 = child->NextSiblingElement( "Child" );
if ( child2 )
{
// Finally do something useful.
@endverbatim
Handles have been introduced to clean this up. Using the TiXmlHandle class,
the previous code reduces to:
@verbatim
TiXmlHandle docHandle( &document );
TiXmlElement* child2 = docHandle.FirstChild( "Document" ).FirstChild( "Element" ).Child( "Child", 1 ).ToElement();
if ( child2 )
{
// do something useful
@endverbatim
Which is much easier to deal with. See TiXmlHandle for more information.
<h3> Row and Column tracking </h3>
Being able to track nodes and attributes back to their origin location
in source files can be very important for some applications. Additionally,
knowing where parsing errors occured in the original source can be very
time saving.
TinyXML can tracks the row and column origin of all nodes and attributes
in a text file. The TiXmlBase::Row() and TiXmlBase::Column() methods return
the origin of the node in the source text. The correct tabs can be
configured in TiXmlDocument::SetTabSize().
<h2> Using and Installing </h2>
To Compile and Run xmltest:
A Linux Makefile and a Windows Visual C++ .dsw file is provided.
Simply compile and run. It will write the file demotest.xml to your
disk and generate output on the screen. It also tests walking the
DOM by printing out the number of nodes found using different
techniques.
The Linux makefile is very generic and runs on many systems - it
is currently tested on mingw and
MacOSX. You do not need to run 'make depend'. The dependecies have been
hard coded.
<h3>Windows project file for VC6</h3>
<ul>
<li>tinyxml: tinyxml library, non-STL </li>
<li>tinyxmlSTL: tinyxml library, STL </li>
<li>tinyXmlTest: test app, non-STL </li>
<li>tinyXmlTestSTL: test app, STL </li>
</ul>
<h3>Makefile</h3>
At the top of the makefile you can set:
PROFILE, DEBUG, and TINYXML_USE_STL. Details (such that they are) are in
the makefile.
In the tinyxml directory, type "make clean" then "make". The executable
file 'xmltest' will be created.
<h3>To Use in an Application:</h3>
Add tinyxml.cpp, tinyxml.h, tinyxmlerror.cpp, tinyxmlparser.cpp, tinystr.cpp, and tinystr.h to your
project or make file. That's it! It should compile on any reasonably
compliant C++ system. You do not need to enable exceptions or
RTTI for TinyXML.
<h2> How TinyXML works. </h2>
An example is probably the best way to go. Take:
@verbatim
<?xml version="1.0" standalone=no>
<!-- Our to do list data -->
<ToDo>
<Item priority="1"> Go to the <bold>Toy store!</bold></Item>
<Item priority="2"> Do bills</Item>
</ToDo>
@endverbatim
Its not much of a To Do list, but it will do. To read this file
(say "demo.xml") you would create a document, and parse it in:
@verbatim
TiXmlDocument doc( "demo.xml" );
doc.LoadFile();
@endverbatim
And its ready to go. Now lets look at some lines and how they
relate to the DOM.
@verbatim
<?xml version="1.0" standalone=no>
@endverbatim
The first line is a declaration, and gets turned into the
TiXmlDeclaration class. It will be the first child of the
document node.
This is the only directive/special tag parsed by TinyXML.
Generally directive tags are stored in TiXmlUnknown so the
commands wont be lost when it is saved back to disk.
@verbatim
<!-- Our to do list data -->
@endverbatim
A comment. Will become a TiXmlComment object.
@verbatim
<ToDo>
@endverbatim
The "ToDo" tag defines a TiXmlElement object. This one does not have
any attributes, but does contain 2 other elements.
@verbatim
<Item priority="1">
@endverbatim
Creates another TiXmlElement which is a child of the "ToDo" element.
This element has 1 attribute, with the name "priority" and the value
"1".
@verbatim
Go to the
@endverbatim
A TiXmlText. This is a leaf node and cannot contain other nodes.
It is a child of the "Item" TiXmlElement.
@verbatim
<bold>
@endverbatim
Another TiXmlElement, this one a child of the "Item" element.
Etc.
Looking at the entire object tree, you end up with:
@verbatim
TiXmlDocument "demo.xml"
TiXmlDeclaration "version='1.0'" "standalone=no"
TiXmlComment " Our to do list data"
TiXmlElement "ToDo"
TiXmlElement "Item" Attribtutes: priority = 1
TiXmlText "Go to the "
TiXmlElement "bold"
TiXmlText "Toy store!"
TiXmlElement "Item" Attributes: priority=2
TiXmlText "Do bills"
@endverbatim
<h2> Documentation </h2>
The documentation is build with Doxygen, using the 'dox'
configuration file.
<h2> License </h2>
TinyXML is released under the zlib license:
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any
damages arising from the use of this software.
Permission is granted to anyone to use this software for any
purpose, including commercial applications, and to alter it and
redistribute it freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must
not claim that you wrote the original software. If you use this
software in a product, an acknowledgment in the product documentation
would be appreciated but is not required.
2. Altered source versions must be plainly marked as such, and
must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source
distribution.
<h2> References </h2>
The World Wide Web Consortium is the definitive standard body for
XML, and their web pages contain huge amounts of information.
The definitive spec: <a href="http://www.w3.org/TR/2004/REC-xml-20040204/">
http://www.w3.org/TR/2004/REC-xml-20040204/</a>
I also recommend "XML Pocket Reference" by Robert Eckstein and published by
OReilly...the book that got the whole thing started.
<h2> Contributors, Contacts, and a Brief History </h2>
Thanks very much to everyone who sends suggestions, bugs, ideas, and
encouragement. It all helps, and makes this project fun. A special thanks
to the contributors on the web pages that keep it lively.
So many people have sent in bugs and ideas, that rather than list here
we try to give credit due in the "changes.txt" file.
TinyXML was originally written by Lee Thomason. (Often the "I" still
in the documentation.) Lee reviews changes and releases new versions,
with the help of Yves Berquin, Andrew Ellerton, and the tinyXml community.
We appreciate your suggestions, and would love to know if you
use TinyXML. Hopefully you will enjoy it and find it useful.
Please post questions, comments, file bugs, or contact us at:
www.sourceforge.net/projects/tinyxml
Lee Thomason, Yves Berquin, Andrew Ellerton
*/

112
SleepLib/tinyxml/tinystr.cpp
View File

@ -1,112 +0,0 @@
/*
www.sourceforge.net/projects/tinyxml
Original file by Yves Berquin.
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any
damages arising from the use of this software.
Permission is granted to anyone to use this software for any
purpose, including commercial applications, and to alter it and
redistribute it freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must
not claim that you wrote the original software. If you use this
software in a product, an acknowledgment in the product documentation
would be appreciated but is not required.
2. Altered source versions must be plainly marked as such, and
must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source
distribution.
*/
/*
* THIS FILE WAS ALTERED BY Tyge Løvset, 7. April 2005.
*/
#ifndef TIXML_USE_STL
#include "tinystr.h"
// Error value for find primitive
const TiXmlString::size_type TiXmlString::npos = static_cast< TiXmlString::size_type >(-1);
// Null rep.
TiXmlString::Rep TiXmlString::nullrep_ = { 0, 0, { '\0' } };
void TiXmlString::reserve (size_type cap)
{
if (cap > capacity()) {
TiXmlString tmp;
tmp.init(length(), cap);
memcpy(tmp.start(), data(), length());
swap(tmp);
}
}
TiXmlString& TiXmlString::assign(const char* str, size_type len)
{
size_type cap = capacity();
if (len > cap || cap > 3*(len + 8)) {
TiXmlString tmp;
tmp.init(len);
memcpy(tmp.start(), str, len);
swap(tmp);
} else {
memmove(start(), str, len);
set_size(len);
}
return *this;
}
TiXmlString& TiXmlString::append(const char* str, size_type len)
{
size_type newsize = length() + len;
if (newsize > capacity()) {
reserve (newsize + capacity());
}
memmove(finish(), str, len);
set_size(newsize);
return *this;
}
TiXmlString operator + (const TiXmlString & a, const TiXmlString & b)
{
TiXmlString tmp;
tmp.reserve(a.length() + b.length());
tmp += a;
tmp += b;
return tmp;
}
TiXmlString operator + (const TiXmlString & a, const char* b)
{
TiXmlString tmp;
TiXmlString::size_type b_len = static_cast<TiXmlString::size_type>( strlen(b) );
tmp.reserve(a.length() + b_len);
tmp += a;
tmp.append(b, b_len);
return tmp;
}
TiXmlString operator + (const char* a, const TiXmlString & b)
{
TiXmlString tmp;
TiXmlString::size_type a_len = static_cast<TiXmlString::size_type>( strlen(a) );
tmp.reserve(a_len + b.length());
tmp.append(a, a_len);
tmp += b;
return tmp;
}
#endif // TIXML_USE_STL

338
SleepLib/tinyxml/tinystr.h
View File

@ -1,338 +0,0 @@
/*
www.sourceforge.net/projects/tinyxml
Original file by Yves Berquin.
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any
damages arising from the use of this software.
Permission is granted to anyone to use this software for any
purpose, including commercial applications, and to alter it and
redistribute it freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must
not claim that you wrote the original software. If you use this
software in a product, an acknowledgment in the product documentation
would be appreciated but is not required.
2. Altered source versions must be plainly marked as such, and
must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source
distribution.
*/
/*
* THIS FILE WAS ALTERED BY Tyge Lovset, 7. April 2005.
*
* - completely rewritten. compact, clean, and fast implementation.
* - sizeof(TiXmlString) = pointer size (4 bytes on 32-bit systems)
* - fixed reserve() to work as per specification.
* - fixed buggy compares operator==(), operator<(), and operator>()
* - fixed operator+=() to take a const ref argument, following spec.
* - added "copy" constructor with length, and most compare operators.
* - added swap(), clear(), size(), capacity(), operator+().
*/
#ifndef TIXML_USE_STL
#ifndef TIXML_STRING_INCLUDED
#define TIXML_STRING_INCLUDED
#include <assert.h>
#include <string.h>
/* The support for explicit isn't that universal, and it isn't really
required - it is used to check that the TiXmlString class isn't incorrectly
used. Be nice to old compilers and macro it here:
*/
#if defined(_MSC_VER) && (_MSC_VER >= 1200 )
// Microsoft visual studio, version 6 and higher.
#define TIXML_EXPLICIT explicit
#elif defined(__GNUC__) && (__GNUC__ >= 3 )
// GCC version 3 and higher.s
#define TIXML_EXPLICIT explicit
#else
#define TIXML_EXPLICIT
#endif
/*
TiXmlString is an emulation of a subset of the std::string template.
Its purpose is to allow compiling TinyXML on compilers with no or poor STL support.
Only the member functions relevant to the TinyXML project have been implemented.
The buffer allocation is made by a simplistic power of 2 like mechanism : if we increase
a string and there's no more room, we allocate a buffer twice as big as we need.
*/
class TiXmlString
{
public :
// The size type used
typedef size_t size_type;
// Error value for find primitive
static const size_type npos; // = -1;
// TiXmlString empty constructor
TiXmlString () : rep_(&nullrep_) {
}
// TiXmlString copy constructor
TiXmlString ( const TiXmlString & copy) : rep_(0) {
init(copy.length());
memcpy(start(), copy.data(), length());
}
// TiXmlString constructor, based on a string
TIXML_EXPLICIT TiXmlString ( const char * copy) : rep_(0) {
init( static_cast<size_type>( strlen(copy) ));
memcpy(start(), copy, length());
}
// TiXmlString constructor, based on a string
TIXML_EXPLICIT TiXmlString ( const char * str, size_type len) : rep_(0) {
init(len);
memcpy(start(), str, len);
}
// TiXmlString destructor
~TiXmlString () {
quit();
}
// = operator
TiXmlString& operator = (const char * copy) {
return assign( copy, (size_type)strlen(copy));
}
// = operator
TiXmlString& operator = (const TiXmlString & copy) {
return assign(copy.start(), copy.length());
}
// += operator. Maps to append
TiXmlString& operator += (const char * suffix) {
return append(suffix, static_cast<size_type>( strlen(suffix) ));
}
// += operator. Maps to append
TiXmlString& operator += (char single) {
return append(&single, 1);
}
// += operator. Maps to append
TiXmlString& operator += (const TiXmlString & suffix) {
return append(suffix.data(), suffix.length());
}
// Convert a TiXmlString into a null-terminated char *
const char * c_str () const {
return rep_->str;
}
// Convert a TiXmlString into a char * (need not be null terminated).
const char * data () const {
return rep_->str;
}
// Return the length of a TiXmlString
size_type length () const {
return rep_->size;
}
// Alias for length()
size_type size () const {
return rep_->size;
}
// Checks if a TiXmlString is empty
bool empty () const {
return rep_->size == 0;
}
// Return capacity of string
size_type capacity () const {
return rep_->capacity;
}
// single char extraction
const char& at (size_type index) const {
assert( index < length() );
return rep_->str[ index ];
}
// [] operator
char& operator [] (size_type index) const {
assert( index < length() );
return rep_->str[ index ];
}
// find a char in a string. Return TiXmlString::npos if not found
size_type find (char lookup) const {
return find(lookup, 0);
}
// find a char in a string from an offset. Return TiXmlString::npos if not found
size_type find (char tofind, size_type offset) const {
if (offset >= length()) return npos;
for (const char* p = c_str() + offset; *p != '\0'; ++p) {
if (*p == tofind) return static_cast< size_type >( p - c_str() );
}
return npos;
}
void clear () {
//Lee:
//The original was just too strange, though correct:
// TiXmlString().swap(*this);
//Instead use the quit & re-init:
quit();
init(0,0);
}
/* Function to reserve a big amount of data when we know we'll need it. Be aware that this
function DOES NOT clear the content of the TiXmlString if any exists.
*/
void reserve (size_type cap);
TiXmlString& assign (const char* str, size_type len);
TiXmlString& append (const char* str, size_type len);
void swap (TiXmlString& other) {
Rep* r = rep_;
rep_ = other.rep_;
other.rep_ = r;
}
private:
void init(size_type sz) {
init(sz, sz);
}
void set_size(size_type sz) {
rep_->str[ rep_->size = sz ] = '\0';
}
char* start() const {
return rep_->str;
}
char* finish() const {
return rep_->str + rep_->size;
}
struct Rep {
size_type size, capacity;
char str[1];
};
void init(size_type sz, size_type cap) {
if (cap) {
// Lee: the original form:
// rep_ = static_cast<Rep*>(operator new(sizeof(Rep) + cap));
// doesn't work in some cases of new being overloaded. Switching
// to the normal allocation, although use an 'int' for systems
// that are overly picky about structure alignment.
const size_type bytesNeeded = sizeof(Rep) + cap;
const size_type intsNeeded = ( bytesNeeded + sizeof(int) - 1 ) / sizeof( int );
rep_ = reinterpret_cast<Rep*>( new int[ intsNeeded ] );
rep_->str[ rep_->size = sz ] = '\0';
rep_->capacity = cap;
} else {
rep_ = &nullrep_;
}
}
void quit() {
if (rep_ != &nullrep_) {
// The rep_ is really an array of ints. (see the allocator, above).
// Cast it back before delete, so the compiler won't incorrectly call destructors.
delete [] ( reinterpret_cast<int*>( rep_ ) );
}
}
Rep * rep_;
static Rep nullrep_;
} ;
inline bool operator == (const TiXmlString & a, const TiXmlString & b)
{
return ( a.length() == b.length() ) // optimization on some platforms
&& ( strcmp(a.c_str(), b.c_str()) == 0 ); // actual compare
}
inline bool operator < (const TiXmlString & a, const TiXmlString & b)
{
return strcmp(a.c_str(), b.c_str()) < 0;
}
inline bool operator != (const TiXmlString & a, const TiXmlString & b)
{
return !(a == b);
}
inline bool operator > (const TiXmlString & a, const TiXmlString & b)
{
return b < a;
}
inline bool operator <= (const TiXmlString & a, const TiXmlString & b)
{
return !(b < a);
}
inline bool operator >= (const TiXmlString & a, const TiXmlString & b)
{
return !(a < b);
}
inline bool operator == (const TiXmlString & a, const char* b)
{
return strcmp(a.c_str(), b) == 0;
}
inline bool operator == (const char* a, const TiXmlString & b)
{
return b == a;
}
inline bool operator != (const TiXmlString & a, const char* b)
{
return !(a == b);
}
inline bool operator != (const char* a, const TiXmlString & b)
{
return !(b == a);
}
TiXmlString operator + (const TiXmlString & a, const TiXmlString & b);
TiXmlString operator + (const TiXmlString & a, const char* b);
TiXmlString operator + (const char* a, const TiXmlString & b);
/*
TiXmlOutStream is an emulation of std::ostream. It is based on TiXmlString.
Only the operators that we need for TinyXML have been developped.
*/
class TiXmlOutStream : public TiXmlString
{
public :
// TiXmlOutStream << operator.
TiXmlOutStream & operator << (const TiXmlString & in) {
*this += in;
return *this;
}
// TiXmlOutStream << operator.
TiXmlOutStream & operator << (const char * in) {
*this += in;
return *this;
}
} ;
#endif // TIXML_STRING_INCLUDED
#endif // TIXML_USE_STL

1748
SleepLib/tinyxml/tinyxml.cpp
View File

File diff suppressed because it is too large Load Diff

2040
SleepLib/tinyxml/tinyxml.h
View File

File diff suppressed because it is too large Load Diff

52
SleepLib/tinyxml/tinyxmlerror.cpp
View File

@ -1,52 +0,0 @@
/*
www.sourceforge.net/projects/tinyxml
Original code (2.0 and earlier )copyright (c) 2000-2006 Lee Thomason (www.grinninglizard.com)
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any
damages arising from the use of this software.
Permission is granted to anyone to use this software for any
purpose, including commercial applications, and to alter it and
redistribute it freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must
not claim that you wrote the original software. If you use this
software in a product, an acknowledgment in the product documentation
would be appreciated but is not required.
2. Altered source versions must be plainly marked as such, and
must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source
distribution.
*/
#include "tinyxml.h"
// The goal of the seperate error file is to make the first
// step towards localization. tinyxml (currently) only supports
// english error messages, but the could now be translated.
//
// It also cleans up the code a bit.
//
const char* TiXmlBase::errorString[ TIXML_ERROR_STRING_COUNT ] = {
"No error",
"Error",
"Failed to open file",
"Error parsing Element.",
"Failed to read Element name",
"Error reading Element value.",
"Error reading Attributes.",
"Error: empty tag.",
"Error reading end tag.",
"Error parsing Unknown.",
"Error parsing Comment.",
"Error parsing Declaration.",
"Error document empty.",
"Error null (0) or unexpected EOF found in input stream.",
"Error parsing CDATA.",
"Error when TiXmlDocument added to document, because TiXmlDocument can only be at the root.",
};

1457
SleepLib/tinyxml/tinyxmlparser.cpp
View File

File diff suppressed because it is too large Load Diff

8
SleepyHeadQT.pro
View File

@ -4,7 +4,7 @@
# #
#------------------------------------------------- #-------------------------------------------------
QT += core gui webkit opengl QT += core gui webkit opengl xml
CONFIG += rtti CONFIG += rtti
@ -31,10 +31,6 @@ SOURCES += main.cpp\
SleepLib/loader_plugins/cms50_loader.cpp \ SleepLib/loader_plugins/cms50_loader.cpp \
SleepLib/loader_plugins/prs1_loader.cpp \ SleepLib/loader_plugins/prs1_loader.cpp \
SleepLib/loader_plugins/zeo_loader.cpp \ SleepLib/loader_plugins/zeo_loader.cpp \
SleepLib/tinyxml/tinystr.cpp \
SleepLib/tinyxml/tinyxml.cpp \
SleepLib/tinyxml/tinyxmlerror.cpp \
SleepLib/tinyxml/tinyxmlparser.cpp \
daily.cpp \ daily.cpp \
overview.cpp \ overview.cpp \
mainwindow.cpp \ mainwindow.cpp \
@ -85,8 +81,6 @@ HEADERS += \
SleepLib/loader_plugins/cms50_loader.h \ SleepLib/loader_plugins/cms50_loader.h \
SleepLib/loader_plugins/prs1_loader.h \ SleepLib/loader_plugins/prs1_loader.h \
SleepLib/loader_plugins/zeo_loader.h \ SleepLib/loader_plugins/zeo_loader.h \
SleepLib/tinyxml/tinystr.h \
SleepLib/tinyxml/tinyxml.h \
daily.h \ daily.h \
overview.h \ overview.h \
mainwindow.h \ mainwindow.h \

7
daily.cpp
View File

@ -89,7 +89,6 @@ Daily::Daily(QWidget *parent,QGLWidget * shared) :
SF->setMinimumHeight(160); SF->setMinimumHeight(160);
int sfc=7; int sfc=7;
bool extras=false; //true;
fg=new gFlagsGroup(); fg=new gFlagsGroup();
fg->AddLayer(new gFlagsLine(flags[0],QColor("light green"),"CSR",false,0,sfc)); fg->AddLayer(new gFlagsLine(flags[0],QColor("light green"),"CSR",false,0,sfc));
fg->AddLayer(new gFlagsLine(flags[1],QColor("purple"),"CA",true,1,sfc)); fg->AddLayer(new gFlagsLine(flags[1],QColor("purple"),"CA",true,1,sfc));
@ -290,13 +289,9 @@ Daily::Daily(QWidget *parent,QGLWidget * shared) :
gSplitter->refresh(); gSplitter->refresh();
// Turning off collapse feature on Mac
gSplitter->setChildrenCollapsible(false); // We set this per widget..
/*#ifndef Q_WS_MAC
gSplitter->setChildrenCollapsible(true); // We set this per widget.. gSplitter->setChildrenCollapsible(true); // We set this per widget..
gSplitter->setCollapsible(gSplitter->indexOf(SF),false); gSplitter->setCollapsible(gSplitter->indexOf(SF),false);
gSplitter->setStretchFactor(gSplitter->indexOf(SF),0); gSplitter->setStretchFactor(gSplitter->indexOf(SF),0);
#endif */
ui->graphSizer->layout(); ui->graphSizer->layout();
@ -881,7 +876,7 @@ void Daily::RedrawGraphs()
// could recall Min & Max stuff here to reset cache // could recall Min & Max stuff here to reset cache
// instead of using the dodgy notify calls. // instead of using the dodgy notify calls.
for (int i=0;i<Graphs.size();i++) { for (unsigned i=0;i<Graphs.size();i++) {
Graphs[i]->updateGL(); Graphs[i]->updateGL();
} }
} }

3
mainwindow.cpp
View File

@ -31,9 +31,6 @@ QStatusBar *qstatusbar;
void MainWindow::Log(QString s) void MainWindow::Log(QString s)
{ {
ui->logText->appendPlainText(s); ui->logText->appendPlainText(s);
if (s.startsWith("Warning")) {
int i=5;
}
} }