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

Free memory when leaving day

Browse Source
This commit is contained in:
Mark Watkins 2011-07-27 20:47:50 +10:00
parent e8c7222143
commit 8c788b30c6
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Graphs/glcommon.cpp
View File

@ -136,7 +136,7 @@ void DrawText(gGraphWindow &wid,QString text, int x, int y, float angle, QColor
{ {
if (angle==90) { if (angle==90) {
//TextBuffer *b=new TextBuffer(text,x,y,angle,color,font); //TextBuffer *b=new TextBuffer(text,x,y,angle,color,font);
TextQueRot.push_back(TextBuffer(text,x,y,angle,color,font)); // TextQueRot.push_back(TextBuffer(text,x,y,angle,color,font));
} else { } else {
wid.qglColor(color); wid.qglColor(color);
wid.renderText(x,wid.GetScrY()-y,0,text,*font); wid.renderText(x,wid.GetScrY()-y,0,text,*font);

6
Graphs/graphwindow.cpp
View File

@ -632,12 +632,6 @@ void gGraphWindow::OnMouseLeftDown(QMouseEvent * event)
if (x<GetLeftMargin()) { if (x<GetLeftMargin()) {
LastGraphLDown=this; LastGraphLDown=this;
m_dragGraph=true; m_dragGraph=true;
/* QDrag *drag = new QDrag(this);
QMimeData *mimeData = new QMimeData;
mimeData->setText("BiteMe");
drag->setMimeData(mimeData);
Qt::DropAction dropAction = drag->exec(); */
return; return;
} }
int width=m_scrX-GetRightMargin()-GetLeftMargin(); int width=m_scrX-GetRightMargin()-GetLeftMargin();

1
SleepLib/machine.cpp
View File

@ -441,6 +441,7 @@ bool Machine::Save()
cnt++; cnt++;
if (qprogress) qprogress->setValue(66.0+(float(cnt)/float(size)*33.0)); if (qprogress) qprogress->setValue(66.0+(float(cnt)/float(size)*33.0));
if ((*s)->IsChanged()) (*s)->Store(path); if ((*s)->IsChanged()) (*s)->Store(path);
(*s)->TrashEvents();
} }
//qDebug() << "Day Save Completed"; //qDebug() << "Day Save Completed";

5
SleepLib/session.cpp
View File

@ -44,6 +44,7 @@ void Session::TrashEvents()
delete *j; delete *j;
} }
} }
s_events_loaded=false;
eventlist.clear(); eventlist.clear();
} }
@ -77,11 +78,15 @@ bool Session::Store(QString path)
bool a; bool a;
a=StoreSummary(base+".000"); // if actually has events a=StoreSummary(base+".000"); // if actually has events
//qDebug() << " Summary done"; //qDebug() << " Summary done";
s_eventfile=base+".001";
if (eventlist.size()>0) StoreEvents(base+".001"); if (eventlist.size()>0) StoreEvents(base+".001");
//qDebug() << " Events done"; //qDebug() << " Events done";
if (a) { if (a) {
s_changed=false; s_changed=false;
s_events_loaded=true;
//TrashEvents();
} }
return a; return a;
} }

8
daily.cpp
View File

@ -411,11 +411,18 @@ void Daily::on_calendar_selectionChanged()
} }
void Daily::Load(QDate date) void Daily::Load(QDate date)
{ {
static Day * lastcpapday=NULL;
previous_date=date; previous_date=date;
Day *cpap=profile->GetDay(date,MT_CPAP); Day *cpap=profile->GetDay(date,MT_CPAP);
Day *oxi=profile->GetDay(date,MT_OXIMETER); Day *oxi=profile->GetDay(date,MT_OXIMETER);
// Day *sleepstage=profile->GetDay(date,MT_SLEEPSTAGE); // Day *sleepstage=profile->GetDay(date,MT_SLEEPSTAGE);
if (lastcpapday && (lastcpapday!=cpap)) {
for (vector<Session *>::iterator s=lastcpapday->begin();s!=lastcpapday->end();s++) {
(*s)->TrashEvents();
}
}
lastcpapday=cpap;
QString html="<html><head><style type='text/css'>p,a,td,body { font-family: 'FreeSans', 'Sans Serif'; } p,a,td,body { font-size: 12px; } </style>" QString html="<html><head><style type='text/css'>p,a,td,body { font-family: 'FreeSans', 'Sans Serif'; } p,a,td,body { font-size: 12px; } </style>"
"</head>" "</head>"
"<body leftmargin=0 rightmargin=0 topmargin=0 marginwidth=0 marginheight=0>" "<body leftmargin=0 rightmargin=0 topmargin=0 marginwidth=0 marginheight=0>"
@ -823,6 +830,7 @@ void Daily::UpdateCPAPGraphs(Day *day)
void Daily::UpdateOXIGraphs(Day *day) void Daily::UpdateOXIGraphs(Day *day)
{ {
//if (!day) return; //if (!day) return;
if (day) { if (day) {
day->OpenEvents(); day->OpenEvents();
} }