chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve purging UI for oximeters.

Browse Source 
The imported data doesn't list a brand, so the UI needs to fall back
on the loader name. Also, the purge menu wasn't getting updated
after an oximetry import.
This commit is contained in:
sawinglogz 2020-01-31 15:35:36 -05:00
parent ea66563521
commit e0b50a5680
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
oscar/mainwindow.cpp
View File

@ -397,9 +397,11 @@ void MainWindow::PopulatePurgeMenu()
void MainWindow::addMachineToMenu(Machine* mach, QMenu* menu)
{
QString name = mach->brand() + " "+
mach->model() + " "+
mach->serial();
QString name = mach->brand();
if (name.isEmpty()) {
name = mach->loaderName();
}
name += " " + mach->model() + " " + mach->serial();
QAction * action = new QAction(name.replace("&","&&"), menu);
action->setIconVisibleInMenu(true);
@ -1424,6 +1426,7 @@ void MainWindow::on_oximetryButton_clicked()
if (p_profile) {
OximeterImport oxiimp(this);
oxiimp.exec();
PopulatePurgeMenu();
if (overview) overview->ReloadGraphs();
if (welcome) welcome->refreshPage();
}
@ -2018,7 +2021,11 @@ void MainWindow::on_actionPurgeMachine(QAction *action)
}
if (!mach) return;
QString machname = mach->brand() + " " + mach->model() + " " + mach->modelnumber();
QString machname = mach->brand();
if (machname.isEmpty()) {
machname = mach->loaderName();
}
machname += " " + mach->model() + " " + mach->modelnumber();
if (!mach->serial().isEmpty()) {
machname += QString(" (%1)").arg(mach->serial());
}