diff --git a/oscar/Graphs/gdailysummary.cpp b/oscar/Graphs/gdailysummary.cpp index 6da12b55..6d10eeb1 100644 --- a/oscar/Graphs/gdailysummary.cpp +++ b/oscar/Graphs/gdailysummary.cpp @@ -1,5 +1,6 @@ /* gDailySummary Graph Implementation * + * Copyright (c) 2019 The OSCAR Team * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public @@ -108,7 +109,7 @@ void gDailySummary::SetDay(Day *day) info_background.append(QColor("orange")); - settings.append(cpap->brand()+ " " + cpap->series()); + settings.append(cpap->brand()); settings.append(cpap->model()+ " " + cpap->modelnumber()); settings.append(schema::channel[CPAP_Mode].option(mode)); diff --git a/oscar/SleepLib/machine.cpp b/oscar/SleepLib/machine.cpp index 0dc6a265..6ccfa632 100644 --- a/oscar/SleepLib/machine.cpp +++ b/oscar/SleepLib/machine.cpp @@ -1013,7 +1013,7 @@ bool Machine::LoadSummary(ProgressDialog * progress) progress->setProgressValue(sess_order.size()); QApplication::processEvents(); - qDebug() << "Loaded" << info.series.toLocal8Bit().data() << info.model.toLocal8Bit().data() << "data in" << time.elapsed() << "ms"; + qDebug() << "Loaded" << info.model.toLocal8Bit().data() << "data in" << time.elapsed() << "ms"; return true; } diff --git a/oscar/daily.cpp b/oscar/daily.cpp index fe58d54f..0d40b74a 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -1,5 +1,6 @@ /* Daily Panel * + * Copyright (c) 2019 The OSCAR Team * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public @@ -1153,7 +1154,7 @@ QString Daily::getCPAPInformation(Day * day) QString tooltip=tr("Model %1 - %2").arg(info.modelnumber).arg(info.serial); tooltip=tooltip.replace(" "," "); - html+="

"+info.brand + " "+ info.series+"
"+info.model+"

\n"; + html+="

"+info.brand+"
"+info.model+"

\n"; html+=""; html+=tr("PAP Mode: %1").arg(day->getCPAPMode())+"
"; diff --git a/oscar/profileselector.cpp b/oscar/profileselector.cpp index 39c08994..c23ec2c4 100644 --- a/oscar/profileselector.cpp +++ b/oscar/profileselector.cpp @@ -1,5 +1,6 @@ /* Profile Selector Implementation * + * Copyright (c) 2019 The OSCAR Team * Copyright (c) 2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public @@ -139,7 +140,7 @@ void ProfileSelector::updateProfileList() model->setData(model->index(row, 5, QModelIndex()), usersname); if (mach) { model->setData(model->index(row, 1, QModelIndex()), mach->brand()); - model->setData(model->index(row, 2, QModelIndex()), mach->series()+" "+mach->model()); + model->setData(model->index(row, 2, QModelIndex()), mach->model()); model->setData(model->index(row, 4, QModelIndex()), mach->lastImported().toString(Qt::SystemLocaleShortDate)); } QBrush bg = QColor(Qt::black); diff --git a/oscar/reports.cpp b/oscar/reports.cpp index 424ab983..5d7b4d9e 100644 --- a/oscar/reports.cpp +++ b/oscar/reports.cpp @@ -1,5 +1,6 @@ -/* Reports/Printing Module +/* Reports/Printing Module * + * Copyright (c) 2019 The OSCAR Team * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public @@ -189,11 +190,10 @@ void Report::PrintReport(gGraphView *gv, QString name, QDate date) cpapinfo += STR_TR_MaskTime + QObject::tr(": %1 hours, %2 minutes, %3 seconds\n").arg(h).arg(m).arg(s); cpapinfo += STR_TR_BedTime + ": " + QDateTime::fromTime_t(f).time().toString("HH:mm:ss") + " "; cpapinfo += STR_TR_WakeUp + ": " + QDateTime::fromTime_t(l).time().toString("HH:mm:ss") + "\n\n"; - QString submodel; cpapinfo += STR_TR_Machine + ": "; - cpapinfo += cpap->brand() + " " + cpap->series() + " " + cpap->model() + submodel + "\n"; + cpapinfo += cpap->brand() + " " + cpap->model() + "\n"; cpapinfo += STR_TR_Mode + ": " + day->getCPAPMode() + "\n"; cpapinfo += day->getPressureSettings() + "\n"; diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp index 4c0a7836..a412b3ce 100644 --- a/oscar/statistics.cpp +++ b/oscar/statistics.cpp @@ -1,5 +1,6 @@ /* Statistics Report Generator Implementation * + * Copyright (c) 2019 The OSCAR Team * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public @@ -872,9 +873,8 @@ QString Statistics::GenerateMachineList() html += ""; html += "" + tr("Machine Information") + ""; - html += QString("%1%2%3%4%5%6") + html += QString("%1%2%3%4%5") .arg(STR_TR_Brand) - .arg(STR_TR_Series) .arg(STR_TR_Model) .arg(STR_TR_Serial) .arg(tr("First Use")) @@ -892,9 +892,8 @@ QString Statistics::GenerateMachineList() QDate d1 = m->FirstDay(); QDate d2 = m->LastDay(); QString mn = m->modelnumber(); - html += QString("%1%2%3%4%5%6") + html += QString("%1%2%3%4%5") .arg(m->brand()) - .arg(m->series()) .arg(m->model() + (mn.isEmpty() ? "" : QString(" (") + mn + QString(")"))) .arg(m->serial()) diff --git a/oscar/welcome.cpp b/oscar/welcome.cpp index b70df2d2..2864687c 100644 --- a/oscar/welcome.cpp +++ b/oscar/welcome.cpp @@ -1,5 +1,6 @@ -/* Welcome page Implementation +/* Welcome page Implementation * + * Copyright (c) 2019 The OSCAR Team * Copyright (c) 2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public @@ -173,7 +174,7 @@ QString Welcome::GenerateCPAPHTML() ui->cpapIcon->setPixmap(QPixmap(cpapimage)); - html+= ""+tr("The last time you used your %1...").arg(cpap->brand()+" "+cpap->series()+" "+cpap->model())+"
"; + html+= ""+tr("The last time you used your %1...").arg(cpap->brand()+" "+cpap->model())+"
"; int daysto = date.daysTo(QDate::currentDate()); QString daystring;