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

Fix preferences apply bug, and enabled multithreading for recalculation

Browse Source
This commit is contained in:
Mark Watkins 2012-01-10 17:37:15 +10:00
parent 5e642eb75c
commit c8ee271ec7
7 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Graphs/gLineOverlay.cpp
View File

@ -90,7 +90,6 @@ void gLineOverlayBar::paint(gGraph & w, int left, int topp, int width, int heigh
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Skip data previous to minx bounds // Skip data previous to minx bounds
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
quint32 idx;
for (; dptr < eptr; dptr++) { for (; dptr < eptr; dptr++) {
X=stime + *tptr; X=stime + *tptr;
if (X >= w.min_x) if (X >= w.min_x)

1
SleepLib/calcs.cpp
View File

@ -188,7 +188,6 @@ void FlowParser::openFlow(Session * session, EventList * flow)
// Begin with the second internal buffer // Begin with the second internal buffer
EventDataType * buf=m_filtered; EventDataType * buf=m_filtered;
EventDataType c;
// Apply gain to waveform // Apply gain to waveform
EventStoreType *eptr=inraw+m_samples; EventStoreType *eptr=inraw+m_samples;

4
SleepLib/event.cpp
View File

@ -158,7 +158,6 @@ void EventList::AddWaveform(qint64 start, qint16 * data, int recs, qint64 durati
EventStoreType *edata=m_data.data(); EventStoreType *edata=m_data.data();
EventStoreType raw; EventStoreType raw;
EventDataType val;
qint16 * ep=data+recs; qint16 * ep=data+recs;
qint16 * sp; qint16 * sp;
EventStoreType * dp=&edata[r]; EventStoreType * dp=&edata[r];
@ -175,9 +174,10 @@ void EventList::AddWaveform(qint64 start, qint16 * data, int recs, qint64 durati
m_min=min; m_min=min;
m_max=max; m_max=max;
} else { } else {
//register EventDataType val,gain=m_gain;
for (sp=data; sp < ep; sp++) { for (sp=data; sp < ep; sp++) {
*dp++=raw=*sp; *dp++=raw=*sp;
val=EventDataType(raw)*m_gain+m_offset; //val=EventDataType(raw)*gain;
} }
} }

1
SleepLib/session.cpp
View File

@ -1255,7 +1255,6 @@ EventDataType Session::avg(ChannelID id)
double val=0,gain; double val=0,gain;
int cnt=0; int cnt=0;
EventStoreType * dptr, * eptr; EventStoreType * dptr, * eptr;
int es;
for (int i=0;i<evec.size();i++) { for (int i=0;i<evec.size();i++) {
EventList & ev=*(evec[i]); EventList & ev=*(evec[i]);
dptr=ev.rawData(); dptr=ev.rawData();

14
mainwindow.cpp
View File

@ -2493,8 +2493,11 @@ void MainWindow::doReprocessEvents()
// For each day in history // For each day in history
int daycount=first.daysTo(date); int daycount=first.daysTo(date);
int idx=0; int idx=0;
QList<Machine *> machines=PROFILE.GetMachines(MT_UNKNOWN);
if (qprogress) { if (qprogress) {
qstatus->setText(tr("Recalculating Summaries")); qstatus->setText(tr("Loading Event Data"));
qprogress->setValue(0); qprogress->setValue(0);
qprogress->setVisible(true); qprogress->setVisible(true);
} }
@ -2521,8 +2524,8 @@ void MainWindow::doReprocessEvents()
sess->UpdateSummaries(); sess->UpdateSummaries();
sess->SetChanged(true); sess->SetChanged(true);
sess->machine()->SaveSession(sess); //sess->machine()->SaveSession(sess);
if (!isopen) sess->TrashEvents(); //if (!isopen) sess->TrashEvents();
} }
} }
date=date.addDays(-1); date=date.addDays(-1);
@ -2532,6 +2535,11 @@ void MainWindow::doReprocessEvents()
// } // }
} while (date>=first); } while (date>=first);
qstatus->setText(tr("Recalculating Summaries"));
for (int i=0;i<machines.size();i++) {
machines.at(i)->Save();
}
qstatus->setText(tr("")); qstatus->setText(tr(""));
qprogress->setVisible(false); qprogress->setVisible(false);
if (!m_restartRequired) { if (!m_restartRequired) {

2
overview.cpp
View File

@ -227,7 +227,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
//PR->setRecMinY(4.0); //PR->setRecMinY(4.0);
//PR->setRecMaxY(12.0); //PR->setRecMaxY(12.0);
CPAPMode mode=(CPAPMode)(int)PROFILE.calcSettingsMax(CPAP_Mode,MT_CPAP,PROFILE.FirstDay(MT_CPAP),PROFILE.LastDay(MT_CPAP)); //CPAPMode mode=(CPAPMode)(int)PROFILE.calcSettingsMax(CPAP_Mode,MT_CPAP,PROFILE.FirstDay(MT_CPAP),PROFILE.LastDay(MT_CPAP));
// //if (mode>=MODE_BIPAP) { // //if (mode>=MODE_BIPAP) {
// pr->addSlice(CPAP_EPAP,QColor("green"),ST_SETMIN,true); // pr->addSlice(CPAP_EPAP,QColor("green"),ST_SETMIN,true);

5
preferencesdialog.cpp
View File

@ -302,9 +302,10 @@ bool PreferencesDialog::Save()
// Restart if turning user event flagging on/off // Restart if turning user event flagging on/off
if (profile->cpap->userEventFlagging()!=ui->customEventGroupbox->isChecked()) { if (profile->cpap->userEventFlagging()!=ui->customEventGroupbox->isChecked()) {
if (!profile->cpap->userEventFlagging()) // Don't bother recalculating, just switch off if (profile->cpap->userEventFlagging()) {
// Don't bother recalculating, just switch off
needs_restart=true; needs_restart=true;
else recalc_events=true; } else recalc_events=true;
} }
if (profile->session->compressSessionData()!=ui->compressSessionData->isChecked()) if (profile->session->compressSessionData()!=ui->compressSessionData->isChecked())