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

Name combobox as Charts in lower right corner of Overview page

Browse Source
This commit is contained in:
Guy Scharf 2021-12-05 11:51:20 -07:00
parent 994f44f007
commit 03b0dc5441
3 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Htmldocs/release_notes.html
View File

@ -23,7 +23,7 @@
</li>
<li>[new] Add support for new settings codes in recently manufactured 700X110 DreamStations.</li>
<li>[new] Add 95% flow limitation to Therapy Efficacy section on Statistics page.</li>
<li>[new] Improve appearance and operation of event types and graphs comboboxes on Daily page.<li>
<li>[new] Improve appearance and operation of event types and graphs comboboxes on Daily and Overview pages.<li>
<li>[fix] Correct SleepStyle machines sometimes identified as Icon machines.</li>
<li>[fix] Improve event flag position in flow graph for DV6 machines.<li>
<li>[fix] --datadir option now allows fully qualified paths on Mac and Linux.</li>

54
oscar/overview.cpp
View File

@ -131,6 +131,8 @@ Overview::Overview(QWidget *parent, gGraphView *shared) :
icon_on = new QIcon(":/icons/session-on.png");
icon_off = new QIcon(":/icons/session-off.png");
icon_up_down = new QIcon(":/icons/up-down.png");
icon_warning = new QIcon(":/icons/warning.png");
GraphView->resetLayout();
GraphView->SaveDefaultSettings();
@ -328,11 +330,33 @@ void Overview::ReloadGraphs()
on_rangeCombo_activated(ui->rangeCombo->currentIndex());
}
void Overview::setGraphText () {
int numOff = 0;
int numTotal = 0;
gGraph *g;
for (int i=0;i<GraphView->size();i++) {
g=(*GraphView)[i];
if (!g->isEmpty()) {
numTotal++;
if (!g->visible()) {
numOff++;
}
}
}
ui->graphCombo->setItemIcon(0, numOff ? *icon_warning : *icon_up_down);
QString graphText;
if (numOff == 0) graphText = QObject::tr("%1 Charts").arg(numTotal);
else graphText = QObject::tr("%1 of %2 Charts").arg(numTotal-numOff).arg(numTotal);
ui->graphCombo->setItemText(0, graphText);
}
void Overview::updateGraphCombo()
{
ui->graphCombo->clear();
gGraph *g;
ui->graphCombo->addItem(*icon_up_down, tr("10 of 10 Charts"), true); // Translation only to define space required
for (int i = 0; i < GraphView->size(); i++) {
g = (*GraphView)[i];
@ -346,6 +370,7 @@ void Overview::updateGraphCombo()
}
ui->graphCombo->setCurrentIndex(0);
setGraphText();
updateCube();
}
@ -591,22 +616,25 @@ void Overview::on_graphCombo_activated(int index)
return;
}
gGraph *g;
QString s;
s = ui->graphCombo->currentText();
bool b = !ui->graphCombo->itemData(index, Qt::UserRole).toBool();
ui->graphCombo->setItemData(index, b, Qt::UserRole);
if (index > 0 ) {
gGraph *g;
QString s;
s = ui->graphCombo->currentText();
bool b = !ui->graphCombo->itemData(index, Qt::UserRole).toBool();
ui->graphCombo->setItemData(index, b, Qt::UserRole);
if (b) {
ui->graphCombo->setItemIcon(index, *icon_on);
} else {
ui->graphCombo->setItemIcon(index, *icon_off);
}
g = GraphView->findGraphTitle(s);
g->setVisible(b);
if (b) {
ui->graphCombo->setItemIcon(index, *icon_on);
} else {
ui->graphCombo->setItemIcon(index, *icon_off);
}
g = GraphView->findGraphTitle(s);
g->setVisible(b);
}
ui->graphCombo->setCurrentIndex(0);
updateCube();
setGraphText();
GraphView->updateScale();
GraphView->redraw();
}

4
oscar/overview.h
View File

@ -116,7 +116,7 @@ class Overview : public QWidget
void on_LineCursorUpdate(double time);
void on_RangeUpdate(double minx, double maxx);
void setGraphText ();
private:
void CreateAllGraphs();
@ -128,6 +128,8 @@ class Overview : public QWidget
gGraphView *m_shared;
QIcon *icon_on;
QIcon *icon_off;
QIcon *icon_up_down;
QIcon *icon_warning;
MyLabel *dateLabel;
bool customMode=false;