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 regression introduced by cb57643.

Browse Source 
The Test1/2 channels were no longer initialized. As a result, all
Test1/2 data got merged into channel 0.
This commit is contained in:
sawinglogz 2020-03-08 16:27:18 -04:00
parent aaaaef0d41
commit d4fd330a31
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -2713,6 +2713,9 @@ void PRS1Import::CreateEventChannels(const PRS1DataChunk* chunk)
EventList* PRS1Import::GetImportChannel(ChannelID channel) EventList* PRS1Import::GetImportChannel(ChannelID channel)
{ {
if (!channel) {
qCritical() << this->sessionid << "channel in import table has not been added to schema!";
}
EventList* C = m_importChannels[channel]; EventList* C = m_importChannels[channel];
if (C == nullptr) { if (C == nullptr) {
C = session->AddEventList(channel, EVL_Event); C = session->AddEventList(channel, EVL_Event);

4
oscar/SleepLib/schema.cpp
View File

@ -338,8 +338,8 @@ void init()
// <channel id="0x111e" class="data" name="TestChan1" details="Debugging Channel #1" label="Test #1" unit="" color="pink"/> // <channel id="0x111e" class="data" name="TestChan1" details="Debugging Channel #1" label="Test #1" unit="" color="pink"/>
// <channel id="0x111f" class="data" name="TestChan2" details="Debugging Channel #2" label="Test #2" unit="" color="blue"/> // <channel id="0x111f" class="data" name="TestChan2" details="Debugging Channel #2" label="Test #2" unit="" color="blue"/>
// schema::channel.add(GRP_CPAP, ch=new Channel(CPAP_Test1 = 0x111e, DATA, MT_CPAP, SESSION, STR_GRAPH_TestChan1, QObject::tr("Debugging channel #1"), QObject::tr("Top secret internal stuff you're not supposed to see ;)"), QObject::tr("Test #1"), QString(), INTEGER, QColor("pink"))); schema::channel.add(GRP_CPAP, ch=new Channel(CPAP_Test1 = 0x111e, DATA, MT_CPAP, SESSION, STR_GRAPH_TestChan1, QObject::tr("Debugging channel #1"), QObject::tr("Top secret internal stuff you're not supposed to see ;)"), QObject::tr("Test #1"), QString(), INTEGER, QColor("pink")));
// schema::channel.add(GRP_CPAP, ch=new Channel(CPAP_Test2 = 0x111f, DATA, MT_CPAP, SESSION, STR_GRAPH_TestChan2, QObject::tr("Debugging channel #2"), QObject::tr("Top secret internal stuff you're not supposed to see ;)"), QObject::tr("Test #2"), QString(), INTEGER, Qt::blue)); schema::channel.add(GRP_CPAP, ch=new Channel(CPAP_Test2 = 0x111f, DATA, MT_CPAP, SESSION, STR_GRAPH_TestChan2, QObject::tr("Debugging channel #2"), QObject::tr("Top secret internal stuff you're not supposed to see ;)"), QObject::tr("Test #2"), QString(), INTEGER, Qt::blue));
RMS9_E01 = schema::channel["RMS9_E01"].id(); RMS9_E01 = schema::channel["RMS9_E01"].id();
RMS9_E02 = schema::channel["RMS9_E02"].id(); RMS9_E02 = schema::channel["RMS9_E02"].id();