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

Clean up gPressureChart constructor, with minor refactoring.

Browse Source
This commit is contained in:
sawinglogz 2020-04-27 14:46:49 -04:00
parent cfca378160
commit 0ebf4e70a3
4 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
oscar/Graphs/gPressureChart.cpp
View File

@ -14,21 +14,30 @@ gPressureChart::gPressureChart()
{ {
// Do not reorder these!!! :P // Do not reorder these!!! :P
addCalc(CPAP_Pressure, ST_SETMAX, schema::channel[CPAP_Pressure].defaultColor()); // 00 addCalc(CPAP_Pressure, ST_SETMAX); // 00
addCalc(CPAP_Pressure, ST_MID, schema::channel[CPAP_Pressure].defaultColor()); // 01 addCalc(CPAP_Pressure, ST_MID); // 01
addCalc(CPAP_Pressure, ST_90P, brighten(schema::channel[CPAP_Pressure].defaultColor(), 1.33f)); // 02 addCalc(CPAP_Pressure, ST_90P); // 02
addCalc(CPAP_PressureMin, ST_SETMIN, schema::channel[CPAP_PressureMin].defaultColor()); // 03 addCalc(CPAP_PressureMin, ST_SETMIN); // 03
addCalc(CPAP_PressureMax, ST_SETMAX, schema::channel[CPAP_PressureMax].defaultColor()); // 04 addCalc(CPAP_PressureMax, ST_SETMAX); // 04
addCalc(CPAP_EPAP, ST_SETMAX, schema::channel[CPAP_EPAP].defaultColor()); // 05 addCalc(CPAP_EPAP, ST_SETMAX); // 05
addCalc(CPAP_IPAP, ST_SETMAX, schema::channel[CPAP_IPAP].defaultColor()); // 06 addCalc(CPAP_IPAP, ST_SETMAX); // 06
addCalc(CPAP_EPAPLo, ST_SETMAX, schema::channel[CPAP_EPAPLo].defaultColor()); // 07 addCalc(CPAP_EPAPLo, ST_SETMAX); // 07
addCalc(CPAP_IPAPHi, ST_SETMAX, schema::channel[CPAP_IPAPHi].defaultColor()); // 08 addCalc(CPAP_IPAPHi, ST_SETMAX); // 08
addCalc(CPAP_EPAP, ST_MID, schema::channel[CPAP_EPAP].defaultColor()); // 09 addCalc(CPAP_EPAP, ST_MID); // 09
addCalc(CPAP_EPAP, ST_90P, brighten(schema::channel[CPAP_EPAP].defaultColor(),1.33f)); // 10 addCalc(CPAP_EPAP, ST_90P); // 10
addCalc(CPAP_IPAP, ST_MID, schema::channel[CPAP_IPAP].defaultColor()); // 11 addCalc(CPAP_IPAP, ST_MID); // 11
addCalc(CPAP_IPAP, ST_90P, brighten(schema::channel[CPAP_IPAP].defaultColor(),1.33f)); // 12 addCalc(CPAP_IPAP, ST_90P); // 12
}
int gPressureChart::addCalc(ChannelID code, SummaryType type) {
QColor color = schema::channel[code].defaultColor();
if (type == ST_90P) {
color = brighten(color, 1.33f);
}
int index = gSummaryChart::addCalc(code, type, color);
return index;
} }
void gPressureChart::afterDraw(QPainter &, gGraph &graph, QRectF rect) void gPressureChart::afterDraw(QPainter &, gGraph &graph, QRectF rect)

1
oscar/Graphs/gPressureChart.h
View File

@ -43,6 +43,7 @@ public:
return day->getCPAPModeStr() + "\n" + day->getPressureSettings() + gSummaryChart::tooltipData(day, idx); return day->getCPAPModeStr() + "\n" + day->getPressureSettings() + gSummaryChart::tooltipData(day, idx);
} }
virtual int addCalc(ChannelID code, SummaryType type);
}; };
#endif // GPRESSURECHART_H #endif // GPRESSURECHART_H

11
oscar/Graphs/gSessionTimesChart.cpp
View File

@ -102,6 +102,17 @@ void gSummaryChart::SetDay(Day *unused_day)
//QMap<QDate, int> gSummaryChart::dayindex; //QMap<QDate, int> gSummaryChart::dayindex;
//QList<Day *> gSummaryChart::daylist; //QList<Day *> gSummaryChart::daylist;
int gSummaryChart::addCalc(ChannelID code, SummaryType type, QColor color)
{
calcitems.append(SummaryCalcItem(code, type, color));
return calcitems.size() - 1; // return the index of the newly appended calc
}
int gSummaryChart::addCalc(ChannelID code, SummaryType type)
{
return addCalc(code, type, schema::channel[code].defaultColor());
}
bool gSummaryChart::keyPressEvent(QKeyEvent *event, gGraph *graph) bool gSummaryChart::keyPressEvent(QKeyEvent *event, gGraph *graph)
{ {

9
oscar/Graphs/gSessionTimesChart.h
View File

@ -189,13 +189,8 @@ public:
cache.clear(); cache.clear();
} }
virtual int addCalc(ChannelID code, SummaryType type, QColor color);
void addCalc(ChannelID code, SummaryType type, QColor color) { virtual int addCalc(ChannelID code, SummaryType type);
calcitems.append(SummaryCalcItem(code, type, color));
}
void addCalc(ChannelID code, SummaryType type) {
calcitems.append(SummaryCalcItem(code, type, schema::channel[code].defaultColor()));
}
virtual Layer * Clone() { virtual Layer * Clone() {
gSummaryChart * sc = new gSummaryChart(m_label, m_machtype); gSummaryChart * sc = new gSummaryChart(m_label, m_machtype);