From 8c788b30c6ada0dba28df07be42029d97d812bf4 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 27 Jul 2011 20:47:50 +1000 Subject: [PATCH] Free memory when leaving day --- Graphs/glcommon.cpp | 2 +- Graphs/graphwindow.cpp | 6 ------ SleepLib/machine.cpp | 1 + SleepLib/session.cpp | 5 +++++ daily.cpp | 8 ++++++++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Graphs/glcommon.cpp b/Graphs/glcommon.cpp index d7609185..40f7d25b 100644 --- a/Graphs/glcommon.cpp +++ b/Graphs/glcommon.cpp @@ -136,7 +136,7 @@ void DrawText(gGraphWindow &wid,QString text, int x, int y, float angle, QColor { if (angle==90) { //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 { wid.qglColor(color); wid.renderText(x,wid.GetScrY()-y,0,text,*font); diff --git a/Graphs/graphwindow.cpp b/Graphs/graphwindow.cpp index df797da3..8cacaa05 100644 --- a/Graphs/graphwindow.cpp +++ b/Graphs/graphwindow.cpp @@ -632,12 +632,6 @@ void gGraphWindow::OnMouseLeftDown(QMouseEvent * event) if (xsetText("BiteMe"); - drag->setMimeData(mimeData); - - Qt::DropAction dropAction = drag->exec(); */ return; } int width=m_scrX-GetRightMargin()-GetLeftMargin(); diff --git a/SleepLib/machine.cpp b/SleepLib/machine.cpp index b82e551b..944082f2 100644 --- a/SleepLib/machine.cpp +++ b/SleepLib/machine.cpp @@ -441,6 +441,7 @@ bool Machine::Save() cnt++; if (qprogress) qprogress->setValue(66.0+(float(cnt)/float(size)*33.0)); if ((*s)->IsChanged()) (*s)->Store(path); + (*s)->TrashEvents(); } //qDebug() << "Day Save Completed"; diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp index fb8d5047..db9ae698 100644 --- a/SleepLib/session.cpp +++ b/SleepLib/session.cpp @@ -44,6 +44,7 @@ void Session::TrashEvents() delete *j; } } + s_events_loaded=false; eventlist.clear(); } @@ -77,11 +78,15 @@ bool Session::Store(QString path) bool a; a=StoreSummary(base+".000"); // if actually has events //qDebug() << " Summary done"; + s_eventfile=base+".001"; if (eventlist.size()>0) StoreEvents(base+".001"); //qDebug() << " Events done"; if (a) { s_changed=false; + s_events_loaded=true; + //TrashEvents(); } + return a; } diff --git a/daily.cpp b/daily.cpp index 9ed0c9fe..1737d85b 100644 --- a/daily.cpp +++ b/daily.cpp @@ -411,11 +411,18 @@ void Daily::on_calendar_selectionChanged() } void Daily::Load(QDate date) { + static Day * lastcpapday=NULL; previous_date=date; Day *cpap=profile->GetDay(date,MT_CPAP); Day *oxi=profile->GetDay(date,MT_OXIMETER); // Day *sleepstage=profile->GetDay(date,MT_SLEEPSTAGE); + if (lastcpapday && (lastcpapday!=cpap)) { + for (vector::iterator s=lastcpapday->begin();s!=lastcpapday->end();s++) { + (*s)->TrashEvents(); + } + } + lastcpapday=cpap; QString html="" "" "" @@ -823,6 +830,7 @@ void Daily::UpdateCPAPGraphs(Day *day) void Daily::UpdateOXIGraphs(Day *day) { //if (!day) return; + if (day) { day->OpenEvents(); }