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

Started deprecating channels.xml and replacing with translatable channels

Browse Source
This commit is contained in:
Mark Watkins 2013-10-26 15:06:56 +10:00
parent 0cf324c2c6
commit f5264d657b
18 changed files with 4285 additions and 660 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

749
Translations/Bulgarian.bg.ts
View File

File diff suppressed because it is too large Load Diff

749
Translations/Deutsch.de_DE.ts
View File

File diff suppressed because it is too large Load Diff

749
Translations/Espaniol.es.ts
View File

File diff suppressed because it is too large Load Diff

749
Translations/Francais.fr.ts
View File

File diff suppressed because it is too large Load Diff

745
Translations/Nederlands.nl_NL.ts
View File

File diff suppressed because it is too large Load Diff

749
Translations/Svenska.se.ts
View File

File diff suppressed because it is too large Load Diff

4
sleepyhead/Graphs/gLineOverlay.cpp
View File

@ -267,7 +267,7 @@ void gLineOverlaySummary::paint(gGraph & w,int left, int top, int width, int hei
QString a="Events="+QString::number(cnt)+" Duration="+QString().sprintf("%02i:%02i:%02i",h,m,s)+", "+m_text+"="+QString::number(val,'f',2); QString a=QObject::tr("Events")+"="+QString::number(cnt)+" "+QObject::tr("Duration")+" "+QString().sprintf("%02i:%02i:%02i",h,m,s)+", "+m_text+"="+QString::number(val,'f',2);
if (isSpan) { if (isSpan) {
float sph; float sph;
@ -275,7 +275,7 @@ void gLineOverlaySummary::paint(gGraph & w,int left, int top, int width, int hei
sph=(100.0/float(time))*(sum/3600.0); sph=(100.0/float(time))*(sum/3600.0);
if (sph>100) sph=100; if (sph>100) sph=100;
} }
a+=QString(" (\%%1 in events)").arg(sph,0,'f',2); a+=" "+QObject::tr("(\%%1 in events)").arg(sph,0,'f',2); // eg: %num of time in a span, like Periodic Breathing
} }
w.renderText(a,left+m_x,top+m_y); w.renderText(a,left+m_x,top+m_y);
} }

271
sleepyhead/SleepLib/schema.cpp
View File

@ -11,10 +11,13 @@
#include <QDomNode> #include <QDomNode>
#include <QMessageBox> #include <QMessageBox>
#include <QApplication> #include <QApplication>
#include "common.h"
#include "schema.h" #include "schema.h"
namespace schema { namespace schema {
ChannelList channel; ChannelList channel;
@ -32,8 +35,8 @@ void init()
if (schema_initialized) return; if (schema_initialized) return;
schema_initialized=true; schema_initialized=true;
EmptyChannel=Channel(0,DATA,DAY,"Empty","Empty Channel","",""); EmptyChannel=Channel(0,DATA,DAY,"Empty","Empty", "Empty Channel","","");
SessionEnabledChannel=new Channel(1,DATA,DAY,"Enabled","Session Enabled","",""); SessionEnabledChannel=new Channel(1,DATA,DAY,"Enabled","Enabled","Session Enabled","","");
channel.channels[1]=SessionEnabledChannel; channel.channels[1]=SessionEnabledChannel;
channel.names["Enabled"]=SessionEnabledChannel; channel.names["Enabled"]=SessionEnabledChannel;
@ -58,57 +61,178 @@ void init()
DataTypes["time"]=TIME; DataTypes["time"]=TIME;
if (!schema::channel.Load(":/docs/channels.xml")) { if (!schema::channel.Load(":/docs/channels.xml")) {
QMessageBox::critical(0,"Ugh!","Couldn't parse Channels.xml, this build is seriously borked, no choice but to abort!!",QMessageBox::Ok); QMessageBox::critical(0,QObject::tr("Error"),QObject::tr("Couldn't parse Channels.xml, this build is seriously borked, no choice but to abort!!"),QMessageBox::Ok);
QApplication::exit(-1); QApplication::exit(-1);
} }
// <channel id="0x110c" class="data" name="Pressure" details="Pressure" label="Pressure" unit="cmH20" color="dark green"/>
// <channel id="0x110d" class="data" name="IPAP" details="Inspiratory Pressure" label="IPAP" unit="cmH20" color="orange"/>
// <channel id="0x110e" class="data" name="EPAP" details="Expiratory Pressure" label="EPAP" unit="cmH20" color="light blue"/>
// <channel id="0x110f" class="data" name="PS" details="Pressure Support" label="PS" unit="cmH20" color="dark blue"/>
// <channel id="0x1110" class="data" name="IPAPLo" details="Inspiratory Pressure Lo" label="IPAP Lo" unit="cmH20" color="grey"/>
// <channel id="0x1111" class="data" name="IPAPHi" details="Inspiratory Pressure Hi" label="IPAP Hi" unit="cmH20" color="grey"/>
// <channel id="0x111a" class="setting" name="PSMin" details="Pressure Support Min" label="PS Min" unit="cmH20" color="dark cyan"/>
// <channel id="0x111b" class="setting" name="PSMax" details="Pressure Support Max" label="PS Max" unit="cmH20" color="dark magenta"/>
// <channel id="0x1020" class="data" name="PressureMin" details="Min Therapy Pressure" label="Pressure" color="black"/>
// <channel id="0x1021" class="data" name="PressureMax" details="Max Therapy Pressure" label="Pressure" color="black"/>
// <channel id="0x1022" class="data" name="RampTime" details="Ramp Time" label="Ramp Time" color="black"/>
// <channel id="0x1023" class="data" name="RampPressure" details="Ramp Starting Pressure" label="Ramp Pr." color="black"/>
QString GRP_CPAP="CPAP";
QString GRP_OXI="OXI";
// Pressure Related Settings
// Lookup Code strings are used internally and not meant to be tranlsated
// Group ChannelID Code Type Scope Lookup Code Translable Name Description Shortened Name Units String FieldType Default Color
schema::channel.add(GRP_CPAP,new Channel(CPAP_Pressure = 0x110C, DATA, SESSION, "Pressure", STR_TR_Pressure, QObject::tr("Therapy Pressure"), STR_TR_Pressure, STR_UNIT_CMH2O, DEFAULT, QColor("dark green")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_IPAP = 0x110D, DATA, SESSION, "IPAP", STR_TR_IPAP, QObject::tr("Inspiratory Pressure"), STR_TR_IPAP, STR_UNIT_CMH2O, DEFAULT, QColor("orange")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_IPAPLo = 0x1110, DATA, SESSION, "IPAPLo", STR_TR_IPAPLo, QObject::tr("Lower Inspiratory Pressure"), STR_TR_IPAPLo, STR_UNIT_CMH2O, DEFAULT, QColor("orange")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_IPAPHi = 0x1111, DATA, SESSION, "IPAPHi", STR_TR_IPAPHi, QObject::tr("Higher Inspiratory Pressure"), STR_TR_IPAPHi, STR_UNIT_CMH2O, DEFAULT, QColor("orange")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_EPAP = 0x110E, DATA, SESSION, "EPAP", STR_TR_EPAP, QObject::tr("Expiratory Pressure"), STR_TR_EPAP, STR_UNIT_CMH2O, DEFAULT, QColor("light blue")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_PS = 0x110F, DATA, SESSION, "PS", STR_TR_PS, QObject::tr("Pressure Support"), STR_TR_PS, STR_UNIT_CMH2O, DEFAULT, QColor("grey")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_PSMin = 0x111A, SETTING, SESSION, "PSMin", QObject::tr("PS Min") , QObject::tr("Pressure Support Minimum"), QObject::tr("PS Min"), STR_UNIT_CMH2O, DEFAULT, QColor("dark cyan")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_PSMax = 0x111B, SETTING, SESSION, "PSMax", QObject::tr("PS Max"), QObject::tr("Pressure Support Maximum"), QObject::tr("PS Max"), STR_UNIT_CMH2O, DEFAULT, QColor("dark magenta")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_PressureMin = 0x1020, SETTING, SESSION, "PressureMin", QObject::tr("Min Pressure") , QObject::tr("Minimum Therapy Pressure"), QObject::tr("Pr. Min"), STR_UNIT_CMH2O, DEFAULT, QColor("black")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_PressureMax = 0x1021, SETTING, SESSION, "PressureMax", QObject::tr("Max Pressure"), QObject::tr("Maximum Therapy Pressure"), QObject::tr("Pr. Max"), STR_UNIT_CMH2O, DEFAULT, QColor("black")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_RampTime = 0x1022, SETTING, SESSION, "RampTime", QObject::tr("Ramp Time") , QObject::tr("Ramp Delay Period"), QObject::tr("Ramp Time"), QObject::tr("minutes"), DEFAULT, QColor("black")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_RampPressure = 0x1023, SETTING, SESSION, "RampPressure", QObject::tr("Ramp Pressure"), QObject::tr("Starting Ramp Pressure"), QObject::tr("Ramp Pr."), STR_UNIT_CMH2O, DEFAULT, QColor("black")));
// <channel id="0x1000" class="data" name="CSR" details="Periodic Breathing" label="PB" unit="% of night" color="light green"/>
// <channel id="0x1001" class="data" name="ClearAirway" details="Clear Airway Apnea" label="CA" unit="events/hour" color="purple"/>
// <channel id="0x1002" class="data" name="Obstructive" details="Obstructive Apnea" label="OA" unit="events/hour" color="#40c0ff"/>
// <channel id="0x1003" class="data" name="Hypopnea" details="Hypopnea" label="H" unit="events/hour" color="blue"/>
// <channel id="0x1004" class="data" name="Apnea" details="Unspecified Apnea" label="UA" unit="events/hour" color="dark green"/>
// <channel id="0x1005" class="data" name="FlowLimit" details="Flow Limitation" label="FL" unit="events/hour" color="#404040"/>
// <channel id="0x1006" class="data" name="RERA" details="Resp. Effort Related Arousal" unit="events/hour" label="RERA" color="gold"/>
// <channel id="0x1007" class="data" name="VSnore" details="Vibratory Snore" label="VS" unit="events/hour" color="red"/>
// <channel id="0x1008" class="data" name="VSnore2" details="Vibratory Snore #2" label="VS2" unit="events/hour" color="orange"/>
// <channel id="0x1009" class="data" name="PressurePulse" details="Pressure Pulse" label="PP" unit="events/hour" color="dark red"/>
// <channel id="0x100a" class="data" name="LeakFlag" details="Leak Event" label="L" unit="events/hour" color="dark blue"/>
// <channel id="0x100b" class="data" name="NRI" details="Non-Responding Event" label="NRI" unit="events/hour" color="orange"/>
// <channel id="0x100c" class="data" name="ExP" details="Exhale Puff" label="EP" unit="events/hour" color="dark magenta"/>
// <channel id="0x101e" class="data" name="UserFlag1" details="User Flag #1" label="UF1" unit="events/hour" color="dark cyan"/>
// <channel id="0x101f" class="data" name="UserFlag2" details="User Flag #2" label="UF2" unit="events/hour" color="dark blue"/>
// <channel id="0x1024" class="data" name="UserFlag3" details="User Flag #3" label="UF3" unit="events/hour" color="dark grey"/>
schema::channel.add(GRP_CPAP,new Channel(CPAP_CSR = 0x1000, DATA, SESSION, "CSR", QObject::tr("Periodic Breathing"), QObject::tr("A period of periodic breathing"), QObject::tr("PB"), QObject::tr("%"), DEFAULT, QColor("light green")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_ClearAirway = 0x1001, DATA, SESSION, "ClearAirway", QObject::tr("Clear Airway Apnea"), QObject::tr("An apnea where the airway is open"), QObject::tr("CA"), QObject::tr("events/hr"), DEFAULT, QColor("purple")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_Obstructive = 0x1002, DATA, SESSION, "Obstructive", QObject::tr("Obstructive Apnea"), QObject::tr("An apnea caused by airway obstruction"), QObject::tr("OA"), QObject::tr("events/hr"), DEFAULT, QColor("#40c0ff")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_Hypopnea = 0x1003, DATA, SESSION, "Hypopnea", QObject::tr("Hypopnea"), QObject::tr("A partially obstructed airway"), QObject::tr("H"), QObject::tr("events/hr"), DEFAULT, QColor("blue")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_Apnea = 0x1004, DATA, SESSION, "Apnea", QObject::tr("Unclassified Apnea"), QObject::tr("An apnea that could not fit into a category"), QObject::tr("UA"), QObject::tr("events/hr"), DEFAULT, QColor("dark green")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_FlowLimit = 0x1005, DATA, SESSION, "FlowLimit", QObject::tr("Flow Limitation"), QObject::tr("An restriction in breathing from normal, causing a flattening of the flow waveform."), QObject::tr("FL"), QObject::tr("events/hr"), DEFAULT, QColor("#404040")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_RERA = 0x1006, DATA, SESSION, "RERA", QObject::tr("Respiratory Effort Related Arousal"), QObject::tr("An restriction in breathing that causes an either an awakening or sleep disturbance."), QObject::tr("RE"), QObject::tr("events/hr"), DEFAULT, QColor("gold")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_VSnore = 0x1007, DATA, SESSION, "VSnore", QObject::tr("Vibratory Snore"), QObject::tr("A vibratory snore"), QObject::tr("VS"), QObject::tr("events/hr"), DEFAULT, QColor("red")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_VSnore2 = 0x1008, DATA, SESSION, "VSnore2", QObject::tr("Vibratory Snore"), QObject::tr("A vibratory snore as detcted by a System One machine"), QObject::tr("VS2"), QObject::tr("events/hr"), DEFAULT, QColor("red")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_PressurePulse = 0x1009, DATA, SESSION, "PressurePulse", QObject::tr("Pressure Pulse"), QObject::tr("A pulse of pressure 'pinged' to detect a closed airway."), QObject::tr("PP"), QObject::tr("events/hr"), DEFAULT, QColor("dark red")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_LeakFlag = 0x100a, DATA, SESSION, "LeakFlag", QObject::tr("Large Leak"), QObject::tr("A large mask leak affecting machine performance."), QObject::tr("LL"), QObject::tr("events/hr"), DEFAULT, QColor("dark blue")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_NRI = 0x100b, DATA, SESSION, "NRI", QObject::tr("Non Responding Event"), QObject::tr("A type of respiratory event that won't respond to a pressure increase."), QObject::tr("NR"), QObject::tr("events/hr"), DEFAULT, QColor("orange")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_ExP = 0x100c, DATA, SESSION, "ExP", QObject::tr("Expiratory Puff"), QObject::tr("Intellipap event where you breathe out your mouth."), QObject::tr("EP"), QObject::tr("events/hr"), DEFAULT, QColor("dark magenta")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_UserFlag1 = 0x101e, DATA, SESSION, "UserFlag1", QObject::tr("User Flag #1"), QObject::tr("A user definable event detected by SleepyHead's flow waveform processor."), QObject::tr("UF1"), QObject::tr("events/hr"), DEFAULT, QColor("dark cyan")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_UserFlag2 = 0x101f, DATA, SESSION, "UserFlag2", QObject::tr("User Flag #2"), QObject::tr("A user definable event detected by SleepyHead's flow waveform processor."), QObject::tr("UF2"), QObject::tr("events/hr"), DEFAULT, QColor("dark blue")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_UserFlag3 = 0x1024, DATA, SESSION, "UserFlag3", QObject::tr("User Flag #3"), QObject::tr("A user definable event detected by SleepyHead's flow waveform processor."), QObject::tr("UF3"), QObject::tr("events/hr"), DEFAULT, QColor("dark grey")));
// <channel id="0x1800" class="data" name="Pulse" details="Pulse Rate" label="Pulse Rate" unit="bpm" color="red"/>
// <channel id="0x1801" class="data" name="SPO2" details="Oxygen Saturation" label="SpO2" unit="%" color="blue"/>
// <channel id="0x1802" class="data" name="Plethy" details="Plethysomogram" label="Plethy" color="black"/>
// <channel id="0x1803" class="data" name="PulseChange" details="Pulse Change" label="Pulse Change" color="light gray"/>
// <channel id="0x1804" class="data" name="SPO2Drop" details="SPO2Drop" label="SPO2 Drop" color="light blue"/>
schema::channel.add(GRP_OXI,new Channel(OXI_Pulse = 0x1800, DATA, SESSION, "Pulse", QObject::tr("Pulse Rate"), QObject::tr("Heart rate in beats per minute"), QObject::tr("Pulse Rate"), QObject::tr("%"), DEFAULT, QColor("red")));
schema::channel.add(GRP_OXI,new Channel(OXI_SPO2 = 0x1801, DATA, SESSION, "SPO2", QObject::tr("SpO2 %"), QObject::tr("Blood-oxygen saturation percentage"), QObject::tr("SpO2"), QObject::tr("bpm"), DEFAULT, QColor("blue")));
schema::channel.add(GRP_OXI,new Channel(OXI_Plethy = 0x1802, DATA, SESSION, "Plethy", QObject::tr("Plethysomogram"), QObject::tr("An optical Photo-plethysomogram showing heart rhythm"), QObject::tr("Plethy"), QObject::tr("hz"), DEFAULT, QColor("#404040")));
schema::channel.add(GRP_OXI,new Channel(OXI_PulseChange = 0x1803, DATA, SESSION, "PulseChange", QObject::tr("Pulse Change"), QObject::tr("A sudden (user definable) change in heart rate"), QObject::tr("PC"), QObject::tr("events/hr"), DEFAULT, QColor("light grey")));
schema::channel.add(GRP_OXI,new Channel(OXI_SPO2Drop = 0x1804, DATA, SESSION, "SPO2Drop", QObject::tr("SpO2 Drop"), QObject::tr("A sudden (user definable) drop in blood oxygen saturation"), QObject::tr("SD"), QObject::tr("events/hr"), DEFAULT, QColor("light blue")));
// <channel id="0x1100" class="data" name="FlowRate" details="Flow Rate" label="Flow Rate" unit="L/min" color="black"/>
// <channel id="0x1101" class="data" name="MaskPressure" details="Mask Pressure" label="Mask Pressure" unit="cmH20" color="blue"/>
// <channel id="0x1102" class="data" name="MaskPressureHi" details="Mask Pressure" label="Mask Pressure (Hi-Res)" unit="cmH20" color="blue" link="0x1101"/>
// <channel id="0x1103" class="data" name="TidalVolume" details="Tidal Volume" label="Tidal Volume" unit="ml" color="magenta"/>
// <channel id="0x1104" class="data" name="Snore" details="Snore" label="Snore" unit="unknown" color="grey"/>
// <channel id="0x1105" class="data" name="MinuteVent" details="Minute Ventilation" label="Minute Vent." unit="L/min" color="dark cyan"/>
// <channel id="0x1106" class="data" name="RespRate" details="Respiratory Rate" label="Resp. Rate" unit="breaths/min" color="dark magenta"/>
// <channel id="0x1107" class="data" name="PTB" details="Patient Triggered Breaths" label="Pat. Trig. Breaths" unit="%" color="dark grey"/>
// <channel id="0x1108" class="data" name="Leak" details="Leak Rate" label="Leaks" unit="L/min" color="dark green"/>
// <channel id="0x1109" class="data" name="IE" details="Inspiratory:Expiratory" label="I:E" unit="ratio" color="dark red"/>
// <channel id="0x110a" class="data" name="Te" details="Expiratory Time" label="Exp Time" unit="seconds" color="dark green"/>
// <channel id="0x110b" class="data" name="Ti" details="Inspiratory Time" label="Insp Time" unit="seconds" color="dark blue"/>
// <channel id="0x1112" class="data" name="RespEvent" details="Respiratory Events" label="Resp Events" unit="" color="black"/>
// <channel id="0x1113" class="data" name="FLG" details="Flow Limit Graph" label="Flow Limit" unit="0-1" color="dark grey"/>
// <channel id="0x1114" class="data" name="TgMV" details="Target Minute Ventilation" label="Target Vent." unit="" color="dark cyan"/>
// <channel id="0x1115" class="data" name="MaxLeak" details="Maximum Leak" label="MaxLeaks" unit="L/min" color="dark red"/>
// <channel id="0x1116" class="data" name="AHI" details="Apnea / Hypopnea Index" label="AHI/Hr" unit="events/hr" color="dark red"/>
// <channel id="0x1117" class="data" name="LeakTotal" details="Total Leak Rate" label="Total Leaks" unit="L/min" color="dark green"/>
// <channel id="0x1118" class="data" name="LeakMedian" details="Median Leak Rate" label="Median Leaks" unit="L/min" color="dark green"/>
// <channel id="0x1119" class="data" name="RDI" details="Respiratory Disturbance Index" label="RDI" unit="events/hr" color="dark red"/>
schema::channel.add(GRP_CPAP,new Channel(CPAP_FlowRate = 0x1100, DATA, SESSION, "FlowRate", QObject::tr("Flow Rate"), QObject::tr("Breathing flow rate waveform"), QObject::tr("Flow Rate"), QObject::tr("L/min"), DEFAULT, QColor("black")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_MaskPressure = 0x1101, DATA, SESSION, "MaskPressure", QObject::tr("Mask Pressure"), QObject::tr("Mask Pressure"), QObject::tr("Mask Pressure"), QObject::tr("cmH2O"), DEFAULT, QColor("black")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_MaskPressureHi = 0x1102, DATA, SESSION, "MaskPressureHi", QObject::tr("Mask Pressure"), QObject::tr("Mask Pressure (High resolution)"), QObject::tr("Mask Pressure"), QObject::tr("cmH2O"), DEFAULT, QColor("black"),0x1101)); // linked to CPAP_MaskPressure
schema::channel.add(GRP_CPAP,new Channel(CPAP_TidalVolume = 0x1103, DATA, SESSION, "TidalVolume", QObject::tr("Tidal Volume"), QObject::tr("Amount of air displaced per breath"), QObject::tr("Tidal Volume"), QObject::tr("L/min"), DEFAULT, QColor("magenta")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_Snore = 0x1104, DATA, SESSION, "Snore", QObject::tr("Snore"), QObject::tr("Graph displaying snore volume"), QObject::tr("Snore"), QObject::tr("??"), DEFAULT, QColor("grey")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_MinuteVent = 0x1105, DATA, SESSION, "MinuteVent", QObject::tr("Minute Ventilation"), QObject::tr("Amount of air displaced per minute"), QObject::tr("Minute Vent."), QObject::tr("L/min"), DEFAULT, QColor("dark cyan")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_RespRate = 0x1106, DATA, SESSION, "RespRate", QObject::tr("Respiratory Rate"), QObject::tr("Rate of breaths per minute"), QObject::tr("Resp. Rate"), QObject::tr("Bpm"), DEFAULT, QColor("dark magenta")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_PTB = 0x1107, DATA, SESSION, "PTB", QObject::tr("Patient Triggered Breaths"), QObject::tr("Percentage of breaths triggered by patient"), QObject::tr("Pat. Trig. Breaths"), QObject::tr("%"), DEFAULT, QColor("dark grey")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_Leak = 0x1108, DATA, SESSION, "Leak", QObject::tr("Leak Rate"), QObject::tr("Rate of detected mask leakage"), QObject::tr("Leak Rate"), QObject::tr("L/min"), DEFAULT, QColor("dark green")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_IE = 0x1109, DATA, SESSION, "IE", QObject::tr("I:E Ratio"), QObject::tr("Ratio between Inspiratory and Expiratory time"),QObject::tr("I:E Ratio"), QObject::tr("ratio"), DEFAULT, QColor("dark red")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_Te = 0x110A, DATA, SESSION, "Te", QObject::tr("Expiratory Time"), QObject::tr("Time taken to breathe out"), QObject::tr("Exp. Time"), QObject::tr("seconds"), DEFAULT, QColor("dark green")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_Ti = 0x110B, DATA, SESSION, "Ti", QObject::tr("Inspiratory Time"), QObject::tr("Time taken to breathe in"), QObject::tr("Insp. Time"), QObject::tr("seconds"), DEFAULT, QColor("dark blue")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_RespEvent = 0x1112, DATA, SESSION, "RespEvent", QObject::tr("Respiratory Event"), QObject::tr("A ResMed data source showing Respiratory Events"), QObject::tr("Resp. Event"), QObject::tr("events"), DEFAULT, QColor("black")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_FLG = 0x1113, DATA, SESSION, "FLG", QObject::tr("Flow Limitation"), QObject::tr("Graph showing severity of flow limitations"), QObject::tr("Flow Limit."), QObject::tr("0-1"), DEFAULT, QColor("dark gray")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_TgMV = 0x1114, DATA, SESSION, "TgMV", QObject::tr("Target Minute Ventilation"), QObject::tr("Target Minute Ventilation?"), QObject::tr("Target Vent."), QObject::tr("??"), DEFAULT, QColor("dark cyan")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_MaxLeak = 0x1115, DATA, SESSION, "MaxLeak", QObject::tr("Maximum Leak"), QObject::tr("The maximum rate of mask leakage"), QObject::tr("Max Leaks"), QObject::tr("L/min"), DEFAULT, QColor("dark red")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_AHI = 0x1116, DATA, SESSION, "AHI", QObject::tr("Apnea Hypopnea Index"), QObject::tr("Graph showing running AHI for the past hour"), QObject::tr("AHI"), QObject::tr("events/hour"), DEFAULT, QColor("dark red")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_LeakTotal = 0x1117, DATA, SESSION, "LeakTotal", QObject::tr("Total Leak Rate"), QObject::tr("Detected mask leakage including natural Mask leakages"), QObject::tr("Total Leaks"), QObject::tr("L/min"), DEFAULT, QColor("dark green")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_LeakMedian = 0x1118, DATA, SESSION, "LeakMedian", QObject::tr("Median Leak Rate"), QObject::tr("Median rate of detected mask leakage"), QObject::tr("Median Leaks"), QObject::tr("L/min"), DEFAULT, QColor("dark green")));
schema::channel.add(GRP_CPAP,new Channel(CPAP_RDI = 0x1119, DATA, SESSION, "RDI", QObject::tr("Respiratory Disturbance Index"), QObject::tr("Graph showing running RDI for the past hour"), QObject::tr("RDI"), QObject::tr("events/hour"), DEFAULT, QColor("dark red")));
NoChannel=0; NoChannel=0;
CPAP_IPAP=schema::channel["IPAP"].id(); // CPAP_IPAP=schema::channel["IPAP"].id();
CPAP_IPAPLo=schema::channel["IPAPLo"].id(); // CPAP_IPAPLo=schema::channel["IPAPLo"].id();
CPAP_IPAPHi=schema::channel["IPAPHi"].id(); // CPAP_IPAPHi=schema::channel["IPAPHi"].id();
CPAP_EPAP=schema::channel["EPAP"].id(); // CPAP_EPAP=schema::channel["EPAP"].id();
CPAP_Pressure=schema::channel["Pressure"].id(); // CPAP_Pressure=schema::channel["Pressure"].id();
CPAP_PS=schema::channel["PS"].id(); // CPAP_PS=schema::channel["PS"].id();
CPAP_PSMin=schema::channel["PSMin"].id(); // CPAP_PSMin=schema::channel["PSMin"].id();
CPAP_PSMax=schema::channel["PSMax"].id(); // CPAP_PSMax=schema::channel["PSMax"].id();
CPAP_Mode=schema::channel["PAPMode"].id(); CPAP_Mode=schema::channel["PAPMode"].id();
CPAP_BrokenSummary=schema::channel["BrokenSummary"].id(); CPAP_BrokenSummary=schema::channel["BrokenSummary"].id();
CPAP_BrokenWaveform=schema::channel["BrokenWaveform"].id(); CPAP_BrokenWaveform=schema::channel["BrokenWaveform"].id();
CPAP_PressureMin=schema::channel["PressureMin"].id(); // CPAP_PressureMin=schema::channel["PressureMin"].id();
CPAP_PressureMax=schema::channel["PressureMax"].id(); // CPAP_PressureMax=schema::channel["PressureMax"].id();
CPAP_RampTime=schema::channel["RampTime"].id(); // CPAP_RampTime=schema::channel["RampTime"].id();
CPAP_RampPressure=schema::channel["RampPressure"].id(); // CPAP_RampPressure=schema::channel["RampPressure"].id();
CPAP_Obstructive=schema::channel["Obstructive"].id(); // CPAP_Obstructive=schema::channel["Obstructive"].id();
CPAP_Hypopnea=schema::channel["Hypopnea"].id(); // CPAP_Hypopnea=schema::channel["Hypopnea"].id();
CPAP_ClearAirway=schema::channel["ClearAirway"].id(); // CPAP_ClearAirway=schema::channel["ClearAirway"].id();
CPAP_Apnea=schema::channel["Apnea"].id(); // CPAP_Apnea=schema::channel["Apnea"].id();
CPAP_CSR=schema::channel["CSR"].id(); // CPAP_CSR=schema::channel["CSR"].id();
CPAP_LeakFlag=schema::channel["LeakFlag"].id(); // CPAP_LeakFlag=schema::channel["LeakFlag"].id();
CPAP_ExP=schema::channel["ExP"].id(); // CPAP_ExP=schema::channel["ExP"].id();
CPAP_NRI=schema::channel["NRI"].id(); // CPAP_NRI=schema::channel["NRI"].id();
CPAP_VSnore=schema::channel["VSnore"].id(); // CPAP_VSnore=schema::channel["VSnore"].id();
CPAP_VSnore2=schema::channel["VSnore2"].id(); // CPAP_VSnore2=schema::channel["VSnore2"].id();
CPAP_RERA=schema::channel["RERA"].id(); // CPAP_RERA=schema::channel["RERA"].id();
CPAP_PressurePulse=schema::channel["PressurePulse"].id(); // CPAP_PressurePulse=schema::channel["PressurePulse"].id();
CPAP_FlowLimit=schema::channel["FlowLimit"].id(); // CPAP_FlowLimit=schema::channel["FlowLimit"].id();
CPAP_FlowRate=schema::channel["FlowRate"].id(); // CPAP_FlowRate=schema::channel["FlowRate"].id();
CPAP_MaskPressure=schema::channel["MaskPressure"].id(); // CPAP_MaskPressure=schema::channel["MaskPressure"].id();
CPAP_MaskPressureHi=schema::channel["MaskPressureHi"].id(); // CPAP_MaskPressureHi=schema::channel["MaskPressureHi"].id();
CPAP_RespEvent=schema::channel["RespEvent"].id(); // CPAP_RespEvent=schema::channel["RespEvent"].id();
CPAP_Snore=schema::channel["Snore"].id(); // CPAP_Snore=schema::channel["Snore"].id();
CPAP_MinuteVent=schema::channel["MinuteVent"].id(); // CPAP_MinuteVent=schema::channel["MinuteVent"].id();
CPAP_RespRate=schema::channel["RespRate"].id(); // CPAP_RespRate=schema::channel["RespRate"].id();
CPAP_TidalVolume=schema::channel["TidalVolume"].id(); // CPAP_TidalVolume=schema::channel["TidalVolume"].id();
CPAP_PTB=schema::channel["PTB"].id(); // CPAP_PTB=schema::channel["PTB"].id();
CPAP_Leak=schema::channel["Leak"].id(); // CPAP_Leak=schema::channel["Leak"].id();
CPAP_LeakMedian=schema::channel["LeakMedian"].id(); // CPAP_LeakMedian=schema::channel["LeakMedian"].id();
CPAP_LeakTotal=schema::channel["LeakTotal"].id(); // CPAP_LeakTotal=schema::channel["LeakTotal"].id();
CPAP_MaxLeak=schema::channel["MaxLeak"].id(); // CPAP_MaxLeak=schema::channel["MaxLeak"].id();
CPAP_FLG=schema::channel["FLG"].id(); // CPAP_FLG=schema::channel["FLG"].id();
CPAP_IE=schema::channel["IE"].id(); // CPAP_IE=schema::channel["IE"].id();
CPAP_Te=schema::channel["Te"].id(); // CPAP_Te=schema::channel["Te"].id();
CPAP_Ti=schema::channel["Ti"].id(); // CPAP_Ti=schema::channel["Ti"].id();
CPAP_TgMV=schema::channel["TgMV"].id(); // CPAP_TgMV=schema::channel["TgMV"].id();
CPAP_Test1=schema::channel["TestChan1"].id(); CPAP_Test1=schema::channel["TestChan1"].id();
CPAP_Test2=schema::channel["TestChan2"].id(); CPAP_Test2=schema::channel["TestChan2"].id();
@ -116,9 +240,9 @@ void init()
CPAP_PresReliefMode=schema::channel["PresRelMode"].id(); CPAP_PresReliefMode=schema::channel["PresRelMode"].id();
CPAP_PresReliefType=schema::channel["PresRelType"].id(); CPAP_PresReliefType=schema::channel["PresRelType"].id();
CPAP_UserFlag1=schema::channel["UserFlag1"].id(); // CPAP_UserFlag1=schema::channel["UserFlag1"].id();
CPAP_UserFlag2=schema::channel["UserFlag2"].id(); // CPAP_UserFlag2=schema::channel["UserFlag2"].id();
CPAP_UserFlag3=schema::channel["UserFlag3"].id(); // CPAP_UserFlag3=schema::channel["UserFlag3"].id();
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();
RMS9_EPR=schema::channel["EPR"].id(); RMS9_EPR=schema::channel["EPR"].id();
@ -148,13 +272,13 @@ void init()
PRS1_ShowAHI=schema::channel["ShowAHI"].id(); PRS1_ShowAHI=schema::channel["ShowAHI"].id();
INTELLIPAP_Unknown1=schema::channel["IntUnk1"].id(); INTELLIPAP_Unknown1=schema::channel["IntUnk1"].id();
INTELLIPAP_Unknown2=schema::channel["IntUnk2"].id(); INTELLIPAP_Unknown2=schema::channel["IntUnk2"].id();
OXI_Pulse=schema::channel["Pulse"].id(); // OXI_Pulse=schema::channel["Pulse"].id();
OXI_SPO2=schema::channel["SPO2"].id(); // OXI_SPO2=schema::channel["SPO2"].id();
OXI_PulseChange=schema::channel["PulseChange"].id(); // OXI_PulseChange=schema::channel["PulseChange"].id();
OXI_SPO2Drop=schema::channel["SPO2Drop"].id(); // OXI_SPO2Drop=schema::channel["SPO2Drop"].id();
OXI_Plethy=schema::channel["Plethy"].id(); // OXI_Plethy=schema::channel["Plethy"].id();
CPAP_AHI=schema::channel["AHI"].id(); // CPAP_AHI=schema::channel["AHI"].id();
CPAP_RDI=schema::channel["RDI"].id(); // CPAP_RDI=schema::channel["RDI"].id();
Journal_Notes=schema::channel["Journal"].id(); Journal_Notes=schema::channel["Journal"].id();
Journal_Weight=schema::channel["Weight"].id(); Journal_Weight=schema::channel["Weight"].id();
Journal_BMI=schema::channel["BMI"].id(); Journal_BMI=schema::channel["BMI"].id();
@ -174,13 +298,14 @@ void init()
ZEO_TimeToZ=schema::channel["TimeToZ"].id(); ZEO_TimeToZ=schema::channel["TimeToZ"].id();
} }
Channel::Channel(int id, ChanType type, ScopeType scope, QString name, QString description, QString label, QString unit, DataType datatype, QColor color, int link): Channel::Channel(int id, ChanType type, ScopeType scope, QString code, QString fullname, QString description, QString label, QString unit, DataType datatype, QColor color, int link):
m_id(id), m_id(id),
m_type(type), m_type(type),
m_scope(scope), m_scope(scope),
m_name(name), m_code(code),
m_description(description), m_fullname(fullname),
m_label(label), m_label(label),
m_description(description),
m_unit(unit), m_unit(unit),
m_datatype(datatype), m_datatype(datatype),
m_defaultcolor(color), m_defaultcolor(color),
@ -333,7 +458,7 @@ bool ChannelList::Load(QString filename)
qWarning() << "Schema already contains name" << name << "in" << filename <<"line" << line; qWarning() << "Schema already contains name" << name << "in" << filename <<"line" << line;
continue; continue;
} }
chan=new Channel(id,type,scope,name,details,label,unit,datatype,color,linkid); chan=new Channel(id,type,scope,name,name,details,label,unit,datatype,color,linkid);
channels[id]=chan; channels[id]=chan;
names[name]=chan; names[name]=chan;
//qDebug() << "Channel" << id << name << label; //qDebug() << "Channel" << id << name << label;
@ -369,6 +494,32 @@ bool ChannelList::Load(QString filename)
return true; return true;
} }
void ChannelList::add(QString group,Channel * chan)
{
Q_ASSERT(chan!=NULL);
if (channels.contains(chan->id())) {
qWarning() << "Channels already contains id" << chan->id() << chan->code();
Q_ASSERT(false);
return;
}
if (names.contains(chan->code())) {
qWarning() << "Channels already contains name" << chan->id() << chan->code();
Q_ASSERT(false);
return;
}
channels[chan->id()]=chan;
names[chan->code()]=chan;
groups[group][chan->code()]=chan;
if (channels.contains(chan->linkid())) {
Channel *it=channels[chan->linkid()];
it->m_links.push_back(chan);
//int i=0;
} else {
qWarning() << "Linked channel must be defined first for" << chan->code();
}
}
bool ChannelList::Save(QString filename) bool ChannelList::Save(QString filename)
{ {
Q_UNUSED(filename) Q_UNUSED(filename)

12
sleepyhead/SleepLib/schema.h
View File

@ -48,16 +48,18 @@ class Channel
{ {
public: public:
Channel() { m_id=0; } Channel() { m_id=0; }
Channel(int id, ChanType type, ScopeType scope, QString name, QString description, QString label, QString unit,DataType datatype=DEFAULT, QColor=Qt::black, int link=0); Channel(int id, ChanType type, ScopeType scope, QString code, QString fullname, QString description, QString label, QString unit,DataType datatype=DEFAULT, QColor=Qt::black, int link=0);
void addColor(Function f, QColor color) { m_colors[f]=color; } void addColor(Function f, QColor color) { m_colors[f]=color; }
void addOption(int i, QString option) { m_options[i]=option; } void addOption(int i, QString option) { m_options[i]=option; }
const int & id() { return m_id; } const int & id() { return m_id; }
const ChanType & type() { return m_type; } const ChanType & type() { return m_type; }
const QString & name() { return m_name; } const QString & code() { return m_code; }
const QString & fullname() { return m_fullname; }
const QString & description() { return m_description; } const QString & description() { return m_description; }
const QString & label() { return m_label; } const QString & label() { return m_label; }
const QString & units() { return m_unit; } const QString & units() { return m_unit; }
const int linkid() { return m_link; }
void setLabel(QString label) { m_label=label; } void setLabel(QString label) { m_label=label; }
void setUnit(QString unit) { m_unit=unit; } void setUnit(QString unit) { m_unit=unit; }
@ -77,7 +79,9 @@ protected:
int m_id; int m_id;
ChanType m_type; ChanType m_type;
ScopeType m_scope; ScopeType m_scope;
QString m_name; QString m_code; // Untranslatable
QString m_fullname; // Translatable Name
QString m_description; QString m_description;
QString m_label; QString m_label;
QString m_unit; QString m_unit;
@ -102,6 +106,8 @@ public:
//! \brief Stores Channel list to XML file specified by filename //! \brief Stores Channel list to XML file specified by filename
bool Save(QString filename); bool Save(QString filename);
void add(QString group,Channel * chan);
//! \brief Looks up Channel in this List with the index idx, returns EmptyChannel if not found //! \brief Looks up Channel in this List with the index idx, returns EmptyChannel if not found
Channel & operator[](ChannelID idx) { Channel & operator[](ChannelID idx) {
if (channels.contains(idx)) if (channels.contains(idx))

81
sleepyhead/daily.cpp
View File

@ -119,35 +119,35 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
int default_height=PROFILE.appearance->graphHeight(); int default_height=PROFILE.appearance->graphHeight();
SF=new gGraph(GraphView,STR_TR_EventFlags,STR_TR_EventFlags,default_height); SF=new gGraph(GraphView,STR_TR_EventFlags,STR_TR_EventFlags,default_height);
FRW=new gGraph(GraphView,STR_TR_FlowRate,schema::channel[CPAP_FlowRate].description()+"\n("+schema::channel[CPAP_FlowRate].units()+")",default_height); FRW=new gGraph(GraphView,STR_TR_FlowRate, schema::channel[CPAP_FlowRate].fullname()+"\n"+schema::channel[CPAP_FlowRate].description()+"\n("+schema::channel[CPAP_FlowRate].units()+")",default_height);
if (PROFILE.general->calculateRDI()) { if (PROFILE.general->calculateRDI()) {
AHI=new gGraph(GraphView,STR_TR_RDI,schema::channel[CPAP_RDI].description()+"\n("+schema::channel[CPAP_RDI].units()+")",default_height); AHI=new gGraph(GraphView,STR_TR_RDI, schema::channel[CPAP_RDI].fullname()+"\n"+schema::channel[CPAP_RDI].description()+"\n("+schema::channel[CPAP_RDI].units()+")",default_height);
} else AHI=new gGraph(GraphView,STR_TR_AHI,schema::channel[CPAP_AHI].description()+"\n("+schema::channel[CPAP_AHI].units()+")",default_height); } else AHI=new gGraph(GraphView,STR_TR_AHI,schema::channel[CPAP_AHI].fullname()+"\n"+schema::channel[CPAP_AHI].description()+"\n("+schema::channel[CPAP_AHI].units()+")",default_height);
MP=new gGraph(GraphView,STR_TR_MaskPressure,schema::channel[CPAP_MaskPressure].description()+"\n("+schema::channel[CPAP_MaskPressure].units()+")",default_height); MP=new gGraph(GraphView,schema::channel[CPAP_MaskPressure].label(), schema::channel[CPAP_MaskPressure].fullname()+"\n"+schema::channel[CPAP_MaskPressure].description()+"\n("+schema::channel[CPAP_MaskPressure].units()+")",default_height);
PRD=new gGraph(GraphView,STR_TR_Pressure,schema::channel[CPAP_Pressure].description()+"\n("+schema::channel[CPAP_Pressure].units()+")",default_height); PRD=new gGraph(GraphView,schema::channel[CPAP_Pressure].label(), schema::channel[CPAP_Pressure].fullname()+"\n"+schema::channel[CPAP_Pressure].description()+"\n("+schema::channel[CPAP_Pressure].units()+")",default_height);
LEAK=new gGraph(GraphView,STR_TR_Leak,schema::channel[CPAP_Leak].description()+"\n("+schema::channel[CPAP_Leak].units()+")",default_height); LEAK=new gGraph(GraphView,STR_TR_Leak, schema::channel[CPAP_Leak].fullname()+"\n"+schema::channel[CPAP_Leak].description()+"\n("+schema::channel[CPAP_Leak].units()+")",default_height);
SNORE=new gGraph(GraphView,STR_TR_Snore,schema::channel[CPAP_Snore].description()+"\n("+schema::channel[CPAP_Snore].units()+")",default_height); SNORE=new gGraph(GraphView,STR_TR_Snore, schema::channel[CPAP_Snore].fullname()+"\n"+schema::channel[CPAP_Snore].description()+"\n("+schema::channel[CPAP_Snore].units()+")",default_height);
RR=new gGraph(GraphView,STR_TR_RespRate,schema::channel[CPAP_RespRate].description()+"\n("+schema::channel[CPAP_RespRate].units()+")",default_height); RR=new gGraph(GraphView,STR_TR_RespRate, schema::channel[CPAP_RespRate].fullname()+"\n"+schema::channel[CPAP_RespRate].description()+"\n("+schema::channel[CPAP_RespRate].units()+")",default_height);
TV=new gGraph(GraphView,STR_TR_TidalVolume,schema::channel[CPAP_TidalVolume].description()+"\n("+schema::channel[CPAP_TidalVolume].units()+")",default_height); TV=new gGraph(GraphView,STR_TR_TidalVolume, schema::channel[CPAP_TidalVolume].fullname()+"\n"+schema::channel[CPAP_TidalVolume].description()+"\n("+schema::channel[CPAP_TidalVolume].units()+")",default_height);
MV=new gGraph(GraphView,STR_TR_MinuteVent,schema::channel[CPAP_MinuteVent].description()+"\n("+schema::channel[CPAP_MinuteVent].units()+")",default_height); MV=new gGraph(GraphView,STR_TR_MinuteVent, schema::channel[CPAP_MinuteVent].fullname()+"\n"+schema::channel[CPAP_MinuteVent].description()+"\n("+schema::channel[CPAP_MinuteVent].units()+")",default_height);
//TgMV=new gGraph(GraphView,STR_TR_TgtMinVent,schema::channel[CPAP_TgMV].description()+"\n("+schema::channel[CPAP_TgMV].units()+")",default_height); //TgMV=new gGraph(GraphView,STR_TR_TgtMinVent, schema::channel[CPAP_TgMV].fullname()+"\n"+schema::channel[CPAP_TgMV].description()+"\n("+schema::channel[CPAP_TgMV].units()+")",default_height);
FLG=new gGraph(GraphView,STR_TR_FlowLimit,schema::channel[CPAP_FLG].description()+"\n("+schema::channel[CPAP_FLG].units()+")",default_height); FLG=new gGraph(GraphView,STR_TR_FlowLimit, schema::channel[CPAP_FLG].fullname()+"\n"+schema::channel[CPAP_FLG].description()+"\n("+schema::channel[CPAP_FLG].units()+")",default_height);
PTB=new gGraph(GraphView,STR_TR_PatTrigBreath,schema::channel[CPAP_PTB].description()+"\n("+schema::channel[CPAP_PTB].units()+")",default_height); PTB=new gGraph(GraphView,STR_TR_PatTrigBreath, schema::channel[CPAP_PTB].fullname()+"\n"+schema::channel[CPAP_PTB].description()+"\n("+schema::channel[CPAP_PTB].units()+")",default_height);
RE=new gGraph(GraphView,STR_TR_RespEvent,schema::channel[CPAP_RespEvent].description()+"\n("+schema::channel[CPAP_RespEvent].units()+")",default_height); RE=new gGraph(GraphView,STR_TR_RespEvent, schema::channel[CPAP_RespEvent].fullname()+"\n"+schema::channel[CPAP_RespEvent].description()+"\n("+schema::channel[CPAP_RespEvent].units()+")",default_height);
TI=new gGraph(GraphView,STR_TR_InspTime,schema::channel[CPAP_Ti].description()+"\n("+schema::channel[CPAP_Ti].units()+")",default_height); TI=new gGraph(GraphView,STR_TR_InspTime, schema::channel[CPAP_Ti].fullname()+"\n"+schema::channel[CPAP_Ti].description()+"\n("+schema::channel[CPAP_Ti].units()+")",default_height);
TE=new gGraph(GraphView,STR_TR_ExpTime,schema::channel[CPAP_Te].description()+"\n("+schema::channel[CPAP_Te].units()+")",default_height); TE=new gGraph(GraphView,STR_TR_ExpTime, schema::channel[CPAP_Te].fullname()+"\n"+schema::channel[CPAP_Te].description()+"\n("+schema::channel[CPAP_Te].units()+")",default_height);
IE=new gGraph(GraphView,STR_TR_IE,schema::channel[CPAP_IE].description()+"\n("+schema::channel[CPAP_IE].units()+")",default_height); IE=new gGraph(GraphView,schema::channel[CPAP_IE].label(), schema::channel[CPAP_IE].fullname()+"\n"+schema::channel[CPAP_IE].description()+"\n("+schema::channel[CPAP_IE].units()+")",default_height);
STAGE=new gGraph(GraphView,STR_TR_SleepStage,schema::channel[ZEO_SleepStage].description()+"\n("+schema::channel[ZEO_SleepStage].units()+")",default_height); STAGE=new gGraph(GraphView,STR_TR_SleepStage, schema::channel[ZEO_SleepStage].fullname()+"\n"+schema::channel[ZEO_SleepStage].description()+"\n("+schema::channel[ZEO_SleepStage].units()+")",default_height);
int oxigrp=PROFILE.ExistsAndTrue("SyncOximetry") ? 0 : 1; int oxigrp=PROFILE.ExistsAndTrue("SyncOximetry") ? 0 : 1;
PULSE=new gGraph(GraphView,STR_TR_PulseRate,schema::channel[OXI_Pulse].description()+"\n("+schema::channel[OXI_Pulse].units()+")",default_height,oxigrp); PULSE=new gGraph(GraphView,STR_TR_PulseRate, schema::channel[OXI_Pulse].fullname()+"\n"+schema::channel[OXI_Pulse].description()+"\n("+schema::channel[OXI_Pulse].units()+")",default_height,oxigrp);
SPO2=new gGraph(GraphView,STR_TR_SpO2,schema::channel[OXI_SPO2].description()+"\n("+schema::channel[OXI_SPO2].units()+")",default_height,oxigrp); SPO2=new gGraph(GraphView,STR_TR_SpO2, schema::channel[OXI_SPO2].fullname()+"\n"+schema::channel[OXI_SPO2].description()+"\n("+schema::channel[OXI_SPO2].units()+")",default_height,oxigrp);
INTPULSE=new gGraph(GraphView,tr("Int. Pulse"),schema::channel[OXI_Pulse].description()+"\n("+schema::channel[OXI_Pulse].units()+")",default_height,oxigrp); INTPULSE=new gGraph(GraphView,tr("Int. Pulse"), schema::channel[OXI_Pulse].fullname()+"\n"+schema::channel[OXI_Pulse].description()+"\n("+schema::channel[OXI_Pulse].units()+")",default_height,oxigrp);
INTSPO2=new gGraph(GraphView,tr("Int. SpO2"),schema::channel[OXI_SPO2].description()+"\n("+schema::channel[OXI_SPO2].units()+")",default_height,oxigrp); INTSPO2=new gGraph(GraphView,tr("Int. SpO2"), schema::channel[OXI_SPO2].fullname()+"\n"+schema::channel[OXI_SPO2].description()+"\n("+schema::channel[OXI_SPO2].units()+")",default_height,oxigrp);
PLETHY=new gGraph(GraphView,STR_TR_Plethy,schema::channel[OXI_Plethy].description()+"\n("+schema::channel[OXI_Plethy].units()+")",default_height,oxigrp); PLETHY=new gGraph(GraphView,STR_TR_Plethy, schema::channel[OXI_Plethy].fullname()+"\n"+schema::channel[OXI_Plethy].description()+"\n("+schema::channel[OXI_Plethy].units()+")",default_height,oxigrp);
// Event Pie Chart (for snapshot purposes) // Event Pie Chart (for snapshot purposes)
// TODO: Convert snapGV to generic for snapshotting multiple graphs (like reports does) // TODO: Convert snapGV to generic for snapshotting multiple graphs (like reports does)
@ -452,7 +452,7 @@ void Daily::Link_clicked(const QUrl &url)
} }
return; return;
} else if (code=="event") { } else if (code=="event") {
QList<QTreeWidgetItem *> list=ui->treeWidget->findItems(schema::channel[sid].description(),Qt::MatchContains); QList<QTreeWidgetItem *> list=ui->treeWidget->findItems(schema::channel[sid].fullname(),Qt::MatchContains);
if (list.size()>0) { if (list.size()>0) {
ui->treeWidget->collapseAll(); ui->treeWidget->collapseAll();
ui->treeWidget->expandItem(list.at(0)); ui->treeWidget->expandItem(list.at(0));
@ -460,7 +460,7 @@ void Daily::Link_clicked(const QUrl &url)
ui->treeWidget->setCurrentItem(wi); ui->treeWidget->setCurrentItem(wi);
ui->tabWidget->setCurrentIndex(1); ui->tabWidget->setCurrentIndex(1);
} else { } else {
mainwin->Notify(tr("No %1 events are recorded this day").arg(schema::channel[sid].description()),"",1500); mainwin->Notify(tr("No %1 events are recorded this day").arg(schema::channel[sid].fullname()),"",1500);
} }
} else if (code=="graph") { } else if (code=="graph") {
qDebug() << "Select graph " << data; qDebug() << "Select graph " << data;
@ -551,7 +551,7 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day)
int cnt=day->count(code); int cnt=day->count(code);
if (!cnt) continue; // If no events than don't bother showing.. if (!cnt) continue; // If no events than don't bother showing..
total_events+=cnt; total_events+=cnt;
QString st=schema::channel[code].description(); QString st=schema::channel[code].fullname();
if (st.isEmpty()) { if (st.isEmpty()) {
st=QString("Fixme %1").arg(code); st=QString("Fixme %1").arg(code);
} }
@ -1199,25 +1199,24 @@ void Daily::Load(QDate date)
struct ChannelInfo { struct ChannelInfo {
ChannelID id; ChannelID id;
QString name;
QColor color; QColor color;
QColor color2; QColor color2;
EventDataType value; EventDataType value;
}; };
ChannelInfo chans[]={ ChannelInfo chans[]={
{ CPAP_Hypopnea, tr("Hypopnea"), COLOR_Hypopnea, Qt::white, hi=(cpap->count(CPAP_ExP)+cpap->count(CPAP_Hypopnea))/hours }, { CPAP_Hypopnea, COLOR_Hypopnea, Qt::white, hi=(cpap->count(CPAP_ExP)+cpap->count(CPAP_Hypopnea))/hours },
{ CPAP_Obstructive, tr("Obstructive Apnea"), COLOR_Obstructive, Qt::black, oai=cpap->count(CPAP_Obstructive)/hours }, { CPAP_Obstructive, COLOR_Obstructive, Qt::black, oai=cpap->count(CPAP_Obstructive)/hours },
{ CPAP_Apnea, tr("Unclassified Apnea"), COLOR_Apnea, Qt::black, uai=cpap->count(CPAP_Apnea)/hours }, { CPAP_Apnea, COLOR_Apnea, Qt::black, uai=cpap->count(CPAP_Apnea)/hours },
{ CPAP_ClearAirway, tr("Clear Airway Apnea"), COLOR_ClearAirway, Qt::black, cai=cpap->count(CPAP_ClearAirway)/hours }, { CPAP_ClearAirway, COLOR_ClearAirway, Qt::black, cai=cpap->count(CPAP_ClearAirway)/hours },
{ CPAP_NRI, tr("Non Responding Event"), COLOR_NRI, Qt::black, nri=cpap->count(CPAP_NRI)/hours }, { CPAP_NRI, COLOR_NRI, Qt::black, nri=cpap->count(CPAP_NRI)/hours },
{ CPAP_FlowLimit, tr("Flow Limitation"), COLOR_FlowLimit, Qt::white, fli=cpap->count(CPAP_FlowLimit)/hours }, { CPAP_FlowLimit, COLOR_FlowLimit, Qt::white, fli=cpap->count(CPAP_FlowLimit)/hours },
{ CPAP_ExP, tr("Expiratory Puff"), COLOR_ExP, Qt::black, exp=cpap->count(CPAP_ExP)/hours }, { CPAP_ExP, COLOR_ExP, Qt::black, exp=cpap->count(CPAP_ExP)/hours },
{ CPAP_RERA, tr("Respiratory Effort Related Arousal"), COLOR_RERA, Qt::black, rei=cpap->count(CPAP_RERA)/hours }, { CPAP_RERA, COLOR_RERA, Qt::black, rei=cpap->count(CPAP_RERA)/hours },
{ CPAP_VSnore, tr("Vibratory Snore"), COLOR_VibratorySnore, Qt::black, vs=cpap->count(CPAP_VSnore)/cpap->hours() }, { CPAP_VSnore, COLOR_VibratorySnore, Qt::black, vs=cpap->count(CPAP_VSnore)/cpap->hours() },
{ CPAP_VSnore2, tr("Vibratory Snore"), COLOR_VibratorySnore, Qt::black, vs2=cpap->count(CPAP_VSnore2)/cpap->hours() }, { CPAP_VSnore2, COLOR_VibratorySnore, Qt::black, vs2=cpap->count(CPAP_VSnore2)/cpap->hours() },
{ CPAP_LeakFlag, tr("Large Leak"), COLOR_LeakFlag, Qt::black, lki=cpap->count(CPAP_LeakFlag)/hours }, { CPAP_LeakFlag, COLOR_LeakFlag, Qt::black, lki=cpap->count(CPAP_LeakFlag)/hours },
{ PRS1_10, tr("Large Leak"), COLOR_LeakFlag, Qt::black, lk2=cpap->count(PRS1_10)/hours }, { PRS1_10, COLOR_LeakFlag, Qt::black, lk2=cpap->count(PRS1_10)/hours },
{ CPAP_CSR, tr("Periodic Breathing / CSR %"), COLOR_CSR, Qt::black, csr=(100.0/cpap->hours())*(cpap->sum(CPAP_CSR)/3600.0) } { CPAP_CSR, COLOR_CSR, Qt::black, csr=(100.0/cpap->hours())*(cpap->sum(CPAP_CSR)/3600.0) }
}; };
int numchans=sizeof(chans)/sizeof(ChannelInfo); int numchans=sizeof(chans)/sizeof(ChannelInfo);
@ -1228,7 +1227,7 @@ void Daily::Load(QDate date)
if ((cpap->machine->GetClass()==STR_MACH_PRS1) && (chans[i].id==CPAP_VSnore)) if ((cpap->machine->GetClass()==STR_MACH_PRS1) && (chans[i].id==CPAP_VSnore))
continue; continue;
html+=QString("<tr><td align='left' bgcolor='%1'><b><font color='%2'><a href='event=%5'>%3</a></font></b></td><td width=20% bgcolor='%1'><b><font color='%2'>%4</font></b></td></tr>\n") html+=QString("<tr><td align='left' bgcolor='%1'><b><font color='%2'><a href='event=%5'>%3</a></font></b></td><td width=20% bgcolor='%1'><b><font color='%2'>%4</font></b></td></tr>\n")
.arg(chans[i].color.name()).arg(chans[i].color2.name()).arg(chans[i].name).arg(chans[i].value,0,'f',2).arg(chans[i].id); .arg(chans[i].color.name()).arg(chans[i].color2.name()).arg(schema::channel[chans[i].id].fullname()).arg(chans[i].value,0,'f',2).arg(chans[i].id);
// keep in case tooltips are needed // keep in case tooltips are needed
//html+=QString("<tr><td align='left' bgcolor='%1'><b><font color='%2'><a class=info href='event=%6'>%3<span>%4</span></a></font></b></td><td width=20% bgcolor='%1'><b><font color='%2'>%5</font></b></td></tr>\n") //html+=QString("<tr><td align='left' bgcolor='%1'><b><font color='%2'><a class=info href='event=%6'>%3<span>%4</span></a></font></b></td><td width=20% bgcolor='%1'><b><font color='%2'>%5</font></b></td></tr>\n")

61
sleepyhead/docs/channels.xml
View File

@ -8,59 +8,9 @@ Important: One id code per item, DO NOT CHANGE ID NUMBERS!!!
<channels language="en" version="1.0"> <channels language="en" version="1.0">
<group name="CPAP"> <group name="CPAP">
<!-- Channel List --> <!-- Channel List -->
<channel id="0x1000" class="data" name="CSR" details="Periodic Breathing" label="PB" unit="% of night" color="light green"/>
<channel id="0x1001" class="data" name="ClearAirway" details="Clear Airway Apnea" label="CA" unit="events/hour" color="purple"/>
<channel id="0x1002" class="data" name="Obstructive" details="Obstructive Apnea" label="OA" unit="events/hour" color="#40c0ff"/>
<channel id="0x1003" class="data" name="Hypopnea" details="Hypopnea" label="H" unit="events/hour" color="blue"/>
<channel id="0x1004" class="data" name="Apnea" details="Unspecified Apnea" label="UA" unit="events/hour" color="dark green"/>
<channel id="0x1005" class="data" name="FlowLimit" details="Flow Limitation" label="FL" unit="events/hour" color="#404040"/>
<channel id="0x1006" class="data" name="RERA" details="Resp. Effort Related Arousal" unit="events/hour" label="RERA" color="gold"/>
<channel id="0x1007" class="data" name="VSnore" details="Vibratory Snore" label="VS" unit="events/hour" color="red"/>
<channel id="0x1008" class="data" name="VSnore2" details="Vibratory Snore #2" label="VS2" unit="events/hour" color="orange"/>
<channel id="0x1009" class="data" name="PressurePulse" details="Pressure Pulse" label="PP" unit="events/hour" color="dark red"/>
<channel id="0x100a" class="data" name="LeakFlag" details="Leak Event" label="L" unit="events/hour" color="dark blue"/>
<channel id="0x100b" class="data" name="NRI" details="Non-Responding Event" label="NRI" unit="events/hour" color="orange"/>
<channel id="0x100c" class="data" name="ExP" details="Exhale Puff" label="EP" unit="events/hour" color="dark magenta"/>
<channel id="0x101e" class="data" name="UserFlag1" details="User Flag #1" label="UF1" unit="events/hour" color="dark cyan"/>
<channel id="0x101f" class="data" name="UserFlag2" details="User Flag #2" label="UF2" unit="events/hour" color="dark blue"/>
<channel id="0x1020" class="data" name="PressureMin" details="Min Therapy Pressure" label="Pressure" color="black"/>
<channel id="0x1021" class="data" name="PressureMax" details="Max Therapy Pressure" label="Pressure" color="black"/>
<channel id="0x1022" class="data" name="RampTime" details="Ramp Time" label="Ramp Time" color="black"/>
<channel id="0x1023" class="data" name="RampPressure" details="Ramp Starting Pressure" label="Ramp Pr." color="black"/>
<channel id="0x1024" class="data" name="UserFlag3" details="User Flag #3" label="UF3" unit="events/hour" color="dark grey"/>
<channel id="0x1100" class="data" name="FlowRate" details="Flow Rate" label="Flow Rate" unit="L/min" color="black"/>
<channel id="0x1101" class="data" name="MaskPressure" details="Mask Pressure" label="Mask Pressure" unit="cmH20" color="blue"/>
<channel id="0x1102" class="data" name="MaskPressureHi" details="Mask Pressure" label="Mask Pressure (Hi-Res)" unit="cmH20" color="blue" link="0x1101"/>
<channel id="0x1103" class="data" name="TidalVolume" details="Tidal Volume" label="Tidal Volume" unit="ml" color="magenta"/>
<channel id="0x1104" class="data" name="Snore" details="Snore" label="Snore" unit="unknown" color="grey"/>
<channel id="0x1105" class="data" name="MinuteVent" details="Minute Ventilation" label="Minute Vent." unit="L/min" color="dark cyan"/>
<channel id="0x1106" class="data" name="RespRate" details="Respiratory Rate" label="Resp. Rate" unit="breaths/min" color="dark magenta"/>
<channel id="0x1107" class="data" name="PTB" details="Patient Triggered Breaths" label="Pat. Trig. Breaths" unit="%" color="dark grey"/>
<channel id="0x1108" class="data" name="Leak" details="Leak Rate" label="Leaks" unit="L/min" color="dark green"/>
<channel id="0x1109" class="data" name="IE" details="Inspiratory:Expiratory" label="I:E" unit="ratio" color="dark red"/>
<channel id="0x110a" class="data" name="Te" details="Expiratory Time" label="Exp Time" unit="seconds" color="dark green"/>
<channel id="0x110b" class="data" name="Ti" details="Inspiratory Time" label="Insp Time" unit="seconds" color="dark blue"/>
<channel id="0x110c" class="data" name="Pressure" details="Pressure" label="Pressure" unit="cmH20" color="dark green"/>
<channel id="0x110d" class="data" name="IPAP" details="Inspiratory Pressure" label="IPAP" unit="cmH20" color="orange"/>
<channel id="0x110e" class="data" name="EPAP" details="Expiratory Pressure" label="EPAP" unit="cmH20" color="light blue"/>
<channel id="0x110f" class="data" name="PS" details="Pressure Support" label="PS" unit="cmH20" color="dark blue"/>
<channel id="0x1110" class="data" name="IPAPLo" details="Inspiratory Pressure Lo" label="IPAP Lo" unit="cmH20" color="grey"/>
<channel id="0x1111" class="data" name="IPAPHi" details="Inspiratory Pressure Hi" label="IPAP Hi" unit="cmH20" color="grey"/>
<channel id="0x1112" class="data" name="RespEvent" details="Respiratory Events" label="Resp Events" unit="" color="black"/>
<channel id="0x1113" class="data" name="FLG" details="Flow Limit Graph" label="Flow Limit" unit="0-1" color="dark grey"/>
<channel id="0x1114" class="data" name="TgMV" details="Target Minute Ventilation" label="Target Vent." unit="" color="dark cyan"/>
<channel id="0x1115" class="data" name="MaxLeak" details="Maximum Leak" label="MaxLeaks" unit="L/min" color="dark red"/>
<channel id="0x1116" class="data" name="AHI" details="Apnea / Hypopnea Index" label="AHI/Hr" unit="events/hr" color="dark red"/>
<channel id="0x1117" class="data" name="LeakTotal" details="Total Leak Rate" label="Total Leaks" unit="L/min" color="dark green"/>
<channel id="0x1118" class="data" name="LeakMedian" details="Median Leak Rate" label="Median Leaks" unit="L/min" color="dark green"/>
<channel id="0x1119" class="data" name="RDI" details="Respiratory Disturbance Index" label="RDI" unit="events/hr" color="dark red"/>
<channel id="0x111a" class="setting" name="PSMin" details="Pressure Support Min" label="PS Min" unit="cmH20" color="dark cyan"/>
<channel id="0x111b" class="setting" name="PSMax" details="Pressure Support Max" label="PS Max" unit="cmH20" color="dark magenta"/>
<channel id="0x111c" class="data" name="TestChan1" details="Respiratory Rate" label="Mark's Resp. Rate" unit="breaths/min" color="black"/> <channel id="0x111c" class="data" name="TestChan1" details="Respiratory Rate" label="Mark's Resp. Rate" unit="breaths/min" color="black"/>
<channel id="0x111d" class="data" name="TestChan2" details="Tidal Volume" label="Tidal Volume" unit="L/min" color="blue"/> <channel id="0x111d" class="data" name="TestChan2" details="Tidal Volume" label="Tidal Volume" unit="L/min" color="blue"/>
@ -111,12 +61,7 @@ Important: One id code per item, DO NOT CHANGE ID NUMBERS!!!
</group> </group>
<group name="OXI"> <group name="OXI">
<channel id="0x1800" class="data" name="Pulse" details="Pulse Rate" label="Pulse Rate" unit="bpm" color="red"/> </group>
<channel id="0x1801" class="data" name="SPO2" details="Oxygen Saturation" label="SpO2" unit="%" color="blue"/>
<channel id="0x1802" class="data" name="Plethy" details="Plethysomogram" label="Plethy" color="black"/>
<channel id="0x1803" class="data" name="PulseChange" details="Pulse Change" label="Pulse Change" color="light gray"/>
<channel id="0x1804" class="data" name="SPO2Drop" details="SPO2Drop" label="SPO2 Drop" color="light blue"/>
</group>
<group name="SLEEP"> <group name="SLEEP">
<channel id="0x2000" class="data" name="SleepStage" details="Sleep Stage" label="Sleep Stage" unit="1=Awake 2=REM 3=Light Sleep 4=Deep Sleep" color="dark grey"/> <channel id="0x2000" class="data" name="SleepStage" details="Sleep Stage" label="Sleep Stage" unit="1=Awake 2=REM 3=Light Sleep 4=Deep Sleep" color="dark grey"/>
<channel id="0x2001" class="data" name="ZeoBW" details="Zeo Brainwave" label="ZeoWave" color="black"/> <channel id="0x2001" class="data" name="ZeoBW" details="Zeo Brainwave" label="ZeoWave" color="black"/>

5
sleepyhead/docs/release_notes.html
View File

@ -16,6 +16,11 @@ Please remember, for achieving the best sync, always start your oximeter at the
<b>New features & bugs fixes in this Update:</b><br/> <b>New features & bugs fixes in this Update:</b><br/>
<list> <list>
<li>Introduced yAxis Scaling modes</li>
<li>Cleaned up mouse handling underneath</li>
<li>Better ResMed SD card backups</li>
<li>New Profile selection screen</li>
<li>Fixed inconsistency with graph legend markers</li>
<li>Improved CMS50 Oximetry serial importing, including support for CMS50E & F models</li> <li>Improved CMS50 Oximetry serial importing, including support for CMS50E & F models</li>
<li>The foundations of loadable translations for non-English speakers</li> <li>The foundations of loadable translations for non-English speakers</li>
<li>Better Fisher & Paykel ICON support</li> <li>Better Fisher & Paykel ICON support</li>

9
sleepyhead/docs/update_notes.html
View File

@ -6,10 +6,11 @@
</div> </div>
<b>Changes in this version</b><br/> <b>Changes in this version</b><br/>
<list> <list>
<li>Fisher & Paykel ICON improvements</li> <li>Introduced yAxis Scaling modes</li>
<li>ResMed S9 Importer fixes</li> <li>Cleaned up mouse handling underneath</li>
<li>Lots of crashes resolved</li> <li>Better ResMed SD card backups</li>
<li>Heaps more bug fixes</li> <li>New Profile selection screen</li>
<li>Fixed inconsistency with graph legend markers</li>
</list> </list>
<p>Have fun!</p> <p>Have fun!</p>

2
sleepyhead/exportcsv.cpp
View File

@ -277,7 +277,7 @@ void ExportCSV::on_exportButton_clicked()
for (quint32 q=0;q<ev->count();q++) { for (quint32 q=0;q<ev->count();q++) {
data=QDateTime::fromTime_t(ev->time(q)/1000L).toString(Qt::ISODate); data=QDateTime::fromTime_t(ev->time(q)/1000L).toString(Qt::ISODate);
data+=sep+QString::number(sess->session()); data+=sep+QString::number(sess->session());
data+=sep+schema::channel[key].name(); data+=sep+schema::channel[key].code();
data+=sep+QString::number(ev->data(q),'f',2); data+=sep+QString::number(ev->data(q),'f',2);
data+=newline; data+=newline;
file.write(data.toLatin1()); file.write(data.toLatin1());

2
sleepyhead/overview.cpp
View File

@ -133,7 +133,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
WEIGHT=createGraph(STR_TR_Weight,STR_TR_Weight,YT_Weight); WEIGHT=createGraph(STR_TR_Weight,STR_TR_Weight,YT_Weight);
BMI=createGraph(STR_TR_BMI,tr("Body\nMass\nIndex")); BMI=createGraph(STR_TR_BMI,tr("Body\nMass\nIndex"));
ZOMBIE=createGraph(STR_TR_Zombie,tr("How you felt\n(0-10)")); ZOMBIE=createGraph(STR_TR_Zombie,tr("How you felt\n(0-10)")); // Rename this Energy?
ahihr=new SummaryChart(tr("Events/Hr"),GT_LINE); ahihr=new SummaryChart(tr("Events/Hr"),GT_LINE);
ahihr->addSlice(ahicode,COLOR_Blue,ST_MAX); ahihr->addSlice(ahicode,COLOR_Blue,ST_MAX);

2
sleepyhead/preferencesdialog.cpp
View File

@ -467,7 +467,7 @@ bool PreferencesDialog::Save()
for (QHash<int,QColor>::iterator i=m_new_colors.begin();i!=m_new_colors.end();i++) { for (QHash<int,QColor>::iterator i=m_new_colors.begin();i!=m_new_colors.end();i++) {
schema::Channel &chan=schema::channel[i.key()]; schema::Channel &chan=schema::channel[i.key()];
if (!chan.isNull()) { if (!chan.isNull()) {
qDebug() << "TODO: Change" << chan.name() << "color to" << i.value(); qDebug() << "TODO: Change" << chan.code() << "color to" << i.value();
chan.setDefaultColor(i.value()); chan.setDefaultColor(i.value());
} }
} }

4
sleepyhead/sleepyhead.pro
View File

@ -251,8 +251,8 @@ use_bundled_libs: {
greaterThan(QT_MAJOR_VERSION,4) { greaterThan(QT_MAJOR_VERSION,4) {
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lQt5ExtSerialPort1 win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lQt5ExtSerialPort1
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lQt5ExtSerialPortd1 else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lQt5ExtSerialPortd1
else:unix:CONFIG(release, debug|release): LIBS += -lQt5ExtSerialPort1 else:unix:CONFIG(release, debug|release): LIBS += -lQtExtSerialPort
else:unix:CONFIG(debug, debug|release): LIBS += -lQt5ExtSerialPortd1 else:unix:CONFIG(debug, debug|release): LIBS += -lQtExtSerialPortd
} else { } else {
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lqextserialport win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lqextserialport
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lqextserialport else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lqextserialport

2
sleepyhead/version.h
View File

@ -6,7 +6,7 @@
const int major_version=0; const int major_version=0;
const int minor_version=9; const int minor_version=9;
const int revision_number=4; const int revision_number=4;
const int release_number=0; const int release_number=1;
#ifdef UNSTABLE_BUILD #ifdef UNSTABLE_BUILD