- Changes and fixes in OSCAR v1.3.0 Beta 1
+ Changes and fixes in OSCAR v1.3.0 xxx.x
+
Portions of OSCAR are © 2019-2021 by
+ The OSCAR Team
+ Changes and fixes in OSCAR v1.3.0 Beta 3
+
Portions of OSCAR are © 2019-2021 by
+ The OSCAR Team
+ Changes and fixes in OSCAR v1.3.0 Beta 2/b>
Portions of OSCAR are © 2019-2021 by
The OSCAR Team
" + QObject::tr("You are running OSCAR %1").arg(getVersion()) + "
"; + } } else { msg = QObject::tr("A more recent version of OSCAR is available"); - msg += "" + QObject::tr("You are running version %1").arg(getVersion()) + "
"; + msg += "" + QObject::tr("You are running OSCAR %1").arg(getVersion()) + "
"; if (releaseVersion.version.length() > 0) { msg += "" + QObject::tr("OSCAR %1 is available here.").arg(releaseVersion.version).arg(releaseVersion.urlInstaller) + "
"; } - if (testVersion.version.length() > 0) { + if (showTestVersion && (testVersion.version.length() > 0)) { msg += "" + QObject::tr("Information about more recent test version %1 is available at %2").arg(testVersion.version).arg(testVersion.urlInstaller) + "
"; } } if (msg.length() > 0) { // Add elapsed time in test versions only - if (elapsedTime > 0 && !getVersion().IsReleaseVersion()) - msg += "" + QString(QObject::tr("(Reading %1 took %2 seconds)")).arg("versions.xml").arg(elapsedTime) + "
"; +// if (elapsedTime > 0 && !getVersion().IsReleaseVersion()) +// msg += "" + QString(QObject::tr("(Reading %1 took %2 seconds)")).arg("versions.xml").arg(elapsedTime) + "
"; msgIsReady = true; } @@ -212,9 +217,12 @@ void CheckUpdates::showMessage() void CheckUpdates::checkForUpdates(bool showWhenCurrent) { showIfCurrent = showWhenCurrent; + showTestVersion = false; // If running a test version of OSCAR, try reading versions.xml from OSCAR_Data directory + // and force display of any new test version if (!getVersion().IsReleaseVersion()) { + showTestVersion = true; versionXML = readLocalVersions(); if (versionXML.length() > 0) { compareVersions(); @@ -223,6 +231,8 @@ void CheckUpdates::checkForUpdates(bool showWhenCurrent) showMessage(); return; } + } else { + showTestVersion = AppSetting->allowEarlyUpdates(); } readTimer.start(); diff --git a/oscar/checkupdates.h b/oscar/checkupdates.h index 2a980cd8..ec4e1918 100644 --- a/oscar/checkupdates.h +++ b/oscar/checkupdates.h @@ -50,6 +50,7 @@ class CheckUpdates : public QMainWindow QString msg; // Message to show to user bool msgIsReady = false; // Message is ready to be displayed bool showIfCurrent = false; // show a message if running current release + bool showTestVersion = false; // Show message if test version is available QProgressDialog * checkingBox;// Looking for updates message QNetworkReply *reply; diff --git a/oscar/daily.cpp b/oscar/daily.cpp index 2531adac..e1c5ab2d 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -2474,6 +2474,7 @@ void Daily::on_ZombieMeter_valueChanged(int action) } journal->settings[Journal_ZombieMeter]=ui->ZombieMeter->value(); journal->SetChanged(true); + mainwin->updateOverview(); } void Daily::on_bookmarkTable_itemChanged(QTableWidgetItem *item) @@ -2552,6 +2553,7 @@ void Daily::on_weightSpinBox_editingFinished() if (g) g->setDay(nullptr); } journal->SetChanged(true); + mainwin->updateOverview(); } void Daily::on_ouncesSpinBox_valueChanged(int arg1) diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index b0e08b24..f461b4f3 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -746,6 +746,11 @@ int MainWindow::importCPAP(ImportPath import, const QString &message) return c; } +void MainWindow::updateOverview() +{ + if (overview) + overview->ReloadGraphs(); +} void MainWindow::finishCPAPImport() { if (daily) @@ -2712,8 +2717,28 @@ void MainWindow::on_actionCreate_Card_zip_triggered() bool ok = z.Open(filename); if (ok) { ProgressDialog * prog = new ProgressDialog(this); + + // Very full cards can sometimes take nearly a minute to scan, + // so display the progress dialog immediately. + prog->setMessage(tr("Calculating size...")); + prog->setWindowModality(Qt::ApplicationModal); + prog->open(); + + // Build the list of files. + FileQueue files; + bool ok = files.AddDirectory(cardPath, prefix); + + // If there were any unexpected errors scanning the media, add the debug log to the zip. + if (!ok) { + qWarning() << "Unexpected errors when scanning SD card, adding debug log to zip."; + QString debugLog = logger->logFileName(); + files.AddFile(debugLog, prefix + "-debug.txt"); + } + prog->setMessage(tr("Creating zip...")); - ok = z.AddDirectory(cardPath, prefix, prog); + + // Create the zip. + ok = z.AddFiles(files, prog); z.Close(); } else { qWarning() << "Unable to open" << filename; diff --git a/oscar/mainwindow.h b/oscar/mainwindow.h index e50d21c1..33d3ab5b 100644 --- a/oscar/mainwindow.h +++ b/oscar/mainwindow.h @@ -137,6 +137,8 @@ class MainWindow : public QMainWindow //! \brief Returns the Overview Tab object Overview *getOverview() { return overview; } + void updateOverview(); + /*! \fn void RestartApplication(bool force_login=false); \brief Closes down OSCAR and restarts it \param bool force_login diff --git a/oscar/newprofile.cpp b/oscar/newprofile.cpp index da306902..a8333b8a 100644 --- a/oscar/newprofile.cpp +++ b/oscar/newprofile.cpp @@ -363,6 +363,8 @@ void NewProfile::edit(const QString name) ui->untreatedAHIEdit->setValue(profile->cpap->untreatedAHI()); ui->cpapModeCombo->setCurrentIndex((int)profile->cpap->mode()); + on_cpapModeCombo_activated(profile->cpap->mode()); + ui->doctorNameEdit->setText(profile->doctor->name()); ui->doctorPracticeEdit->setText(profile->doctor->practiceName()); ui->doctorPhoneEdit->setText(profile->doctor->phone()); diff --git a/oscar/preferencesdialog.ui b/oscar/preferencesdialog.ui index 53c9403b..112f4646 100644 --- a/oscar/preferencesdialog.ui +++ b/oscar/preferencesdialog.ui @@ -10,7 +10,7 @@