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

Can not share flowparser object in multithreaded mode. (Fixes crash)

Browse Source
This commit is contained in:
Mark Watkins 2012-01-10 21:38:14 +10:00
parent 1d1d9435c1
commit a7dc182975
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SleepLib/session.cpp
View File

@ -740,7 +740,6 @@ void Session::updateCountSummary(ChannelID code)
m_timesummary[code]=timesum; m_timesummary[code]=timesum;
} }
FlowParser flowparserobject;
void Session::UpdateSummaries() void Session::UpdateSummaries()
{ {
ChannelID id; ChannelID id;
@ -748,7 +747,7 @@ void Session::UpdateSummaries()
calcAHIGraph(this); calcAHIGraph(this);
// Calculates RespRate and related waveforms (Tv, MV, Te, Ti) if missing // Calculates RespRate and related waveforms (Tv, MV, Te, Ti) if missing
calcRespRate(this, &flowparserobject); calcRespRate(this);
calcLeaks(this); calcLeaks(this);
calcSPO2Drop(this); calcSPO2Drop(this);

4
daily.cpp
View File

@ -155,13 +155,13 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
fg->AddLayer((new gFlagsLine(CPAP_FlowLimit,QColor("black"),tr("FL")))); fg->AddLayer((new gFlagsLine(CPAP_FlowLimit,QColor("black"),tr("FL"))));
fg->AddLayer((new gFlagsLine(CPAP_RERA,QColor("gold"),tr("RE")))); fg->AddLayer((new gFlagsLine(CPAP_RERA,QColor("gold"),tr("RE"))));
fg->AddLayer((new gFlagsLine(CPAP_VSnore,QColor("red"),tr("VS")))); fg->AddLayer((new gFlagsLine(CPAP_VSnore,QColor("red"),tr("VS"))));
fg->AddLayer((new gFlagsLine(CPAP_VSnore2,QColor("red"),tr("VS2"))));
if (PROFILE.cpap->userEventFlagging()) { if (PROFILE.cpap->userEventFlagging()) {
fg->AddLayer((new gFlagsLine(CPAP_UserFlag1,QColor("yellow"),tr("UF1")))); fg->AddLayer((new gFlagsLine(CPAP_UserFlag1,QColor("yellow"),tr("UF1"))));
fg->AddLayer((new gFlagsLine(CPAP_UserFlag2,QColor("green"),tr("UF2")))); fg->AddLayer((new gFlagsLine(CPAP_UserFlag2,QColor("green"),tr("UF2"))));
fg->AddLayer((new gFlagsLine(CPAP_UserFlag3,QColor("brown"),tr("UF3")))); fg->AddLayer((new gFlagsLine(CPAP_UserFlag3,QColor("brown"),tr("UF3"))));
} }
//fg->AddLayer((new gFlagsLine(PRS1_0B,QColor("dark green"),tr("U0B")))); //fg->AddLayer((new gFlagsLine(PRS1_0B,QColor("dark green"),tr("U0B"))));
fg->AddLayer((new gFlagsLine(CPAP_VSnore2,QColor("red"),tr("VS2"))));
SF->setBlockZoom(true); SF->setBlockZoom(true);
SF->AddLayer(new gShadowArea()); SF->AddLayer(new gShadowArea());
SF->AddLayer(new gYSpacer(),LayerLeft,gYAxis::Margin); SF->AddLayer(new gYSpacer(),LayerLeft,gYAxis::Margin);
@ -200,7 +200,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_UserFlag3,QColor("brown"),tr("U3"),FT_Bar))); FRW->AddLayer(AddCPAP(new gLineOverlayBar(CPAP_UserFlag3,QColor("brown"),tr("U3"),FT_Bar)));
} }
FRW->AddLayer(AddOXI(new gLineOverlayBar(OXI_SPO2Drop,QColor("red"),tr("O2")))); FRW->AddLayer(AddOXI(new gLineOverlayBar(OXI_SPO2Drop,QColor("red"),tr("O2"))));
FRW->AddLayer(AddOXI(new gLineOverlayBar(OXI_PulseChange,QColor("blue"),tr("PC"),FT_Dot))); //FRW->AddLayer(AddOXI(new gLineOverlayBar(OXI_PulseChange,QColor("blue"),tr("PC"),FT_Dot)));
FRW->AddLayer(AddCPAP(los)); FRW->AddLayer(AddCPAP(los));