Merge branch 'master' into preferences

Building/Windows/BuildInstall.iss

@@ -3,6 +3,10 @@
 ;
 ; See DEPLOY.BAT for documentation on how this is used to build OSCAR installer 
 
+#define MyGitRevision "unreleased"
+#define MyReleaseStatus ""
+#define MyVersionNumbers "0.0.0.0"
+
 #include "buildinfo.iss"
 
 #define MyAppPublisher "The OSCAR Team"

oscar/SleepLib/loader_plugins/dreem_loader.cpp

@@ -54,7 +54,11 @@ int DreemLoader::OpenFile(const QString & filename)
         mach->AddSession(sess);
         count++;
     }
-    mach->Save();
+    if (count > 0) {
+        mach->Save();
+        mach->SaveSummaryCache();
+        p_profile->StoreMachines();
+    }
     closeCSV();
     return count;
 }

oscar/SleepLib/loader_plugins/resmed_loader.cpp

@@ -368,6 +368,7 @@ int ResmedLoader::Open(const QString & dirpath)
     Machine *mach = p_profile->lookupMachine(info.serial, info.loadername);
     if ( mach ) {       // we have seen this machine
         qDebug() << "We have seen this machime";
+        mach->setInfo( info );                      // update info
 //      QDate lastDate = p_profile->LastDay(MT_CPAP);
 //      firstImportDay = lastDate.addDays(-1);
     } else {            // Starting from new beginnings - new or purged
@@ -483,7 +484,10 @@ int ResmedLoader::Open(const QString & dirpath)
     // Build a Date map of all records in STR.edf files, populating ResDayList
     ///////////////////////////////////////////////////////////////////////////////////
 
-    ProcessSTRfiles(mach, STRmap, firstImportDay);
+    if ( ! ProcessSTRfiles(mach, STRmap, firstImportDay) ) {
+        qCritical() << "ProcessSTR failed, abandoning this import";
+        return -1;
+    }
 
     // We are done with the Parsed STR EDF objects, so delete them
     for (auto it=STRmap.begin(), end=STRmap.end(); it != end; ++it) {
@@ -915,7 +919,7 @@ QString ResmedLoader::Backup(const QString & fullname, const QString & backup_pa
 
 
 // This function parses a list of STR files and creates a date ordered map of individual records
-void ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap, QDate firstImport)
+bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap, QDate firstImport)
 {
     Q_UNUSED(mach)
 
@@ -971,6 +975,10 @@ void ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
         if (!maskeventcount) {
              maskeventcount = str.lookupLabel("MaskEvents");
         }
+        if ( !maskon || !maskoff || !maskeventcount ) {
+            qCritical() << "Corrupt or untranslated STR.edf file";
+            return false;
+        }
 
         EDFSignal *sig = nullptr;
 
@@ -1415,6 +1423,7 @@ void ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
 #ifdef STR_DEBUG
     qDebug() << "Finished ProcessSTR";
 #endif
+    return true;
 }
 
     ///////////////////////////////////////////////////////////////////////////////////

oscar/SleepLib/loader_plugins/resmed_loader.h

@@ -138,7 +138,7 @@ class ResmedLoader : public CPAPLoader
 
 protected:
 //! \brief The STR.edf file is a unique edf file with many signals
-    void ProcessSTRfiles(Machine *, QMap<QDate, STRFile> &, QDate);
+    bool ProcessSTRfiles(Machine *, QMap<QDate, STRFile> &, QDate);
 
     //! \brief Scan for new files to import, group into sessions and add to task que
     int ScanFiles(Machine * mach, const QString & datalog_path, QDate firstImport);

oscar/SleepLib/loader_plugins/zeo_loader.cpp

@@ -95,7 +95,11 @@ int ZEOLoader::OpenFile(const QString & filename)
         mach->AddSession(sess);
         count++;
     }
-    mach->Save();
+    if (count > 0) {
+        mach->Save();
+        mach->SaveSummaryCache();
+        p_profile->StoreMachines();
+    }
     closeCSV();
     return count;
 }

oscar/SleepLib/machine.cpp

@@ -387,7 +387,7 @@ bool Machine::AddSession(Session *s)
     if (session_length < ignore_sessions) {
         // keep the session to save importing it again, but don't add it to the day record this time
         qDebug() << s->session() << "Ignoring short session <" << ignore_sessions
-            << "["+QDateTime::fromTime_t(s->session()).toString("MMM dd, yyyy hh:mm:ss")+"]";
+            << "["+QDateTime::fromMSecsSinceEpoch(s->first()).toString("MMM dd, yyyy hh:mm:ss")+"]";
         return true;
     }
 

oscar/SleepLib/profiles.cpp

@@ -565,7 +565,12 @@ void Profile::DataFormatError(Machine *m)
         }
         // Note: I deliberately haven't added a Profile help for this
         if (backups) {
-            mainwin->importCPAP(ImportPath(m->getBackupPath(), lookupLoader(m)), QObject::tr("Rebuilding from %1 Backup").arg(m->brand()));
+            MachineLoader * loader = lookupLoader(m);
+            /* int c = */  
+            mainwin->importCPAP(ImportPath(m->getBackupPath(), loader),
+                                QObject::tr("Rebuilding from %1 Backup").arg(m->brand()));
+//          if ( c > 0 )
+//              m->info.version = loader->Version();
         } else {
             if (!p_profile->session->backupCardData()) {
                 // Automatic backups not available for Intellipap users yet, so don't taunt them..

oscar/main.cpp

@@ -264,16 +264,37 @@ int main(int argc, char *argv[]) {
 
     QSettings settings;
 
-    QApplication a(argc, argv);
-    QStringList args = a.arguments();
-
     // If shift key was held down when OSCAR was launched, force Software graphics Engine (aka LegacyGFX)
-    Qt::KeyboardModifiers keymodifier = QApplication::queryKeyboardModifiers();
+    Qt::KeyboardModifiers keymodifier = QApplication::keyboardModifiers();
     QString forcedEngine = "";
     if (keymodifier == Qt::ShiftModifier){
         settings.setValue(GFXEngineSetting, (unsigned int)GFX_Software);
         forcedEngine = "Software Engine forced by shift key at launch";
     }
+    // This argument needs to be processed before creating the QApplication,
+    // based on sample code at https://doc.qt.io/qt-5/qapplication.html#details
+    for (int i = 1; i < argc; ++i) {
+        if (!qstrcmp(argv[i], "--legacy")) {
+            settings.setValue(GFXEngineSetting, (unsigned int)GFX_Software);
+            forcedEngine = "Software Engine forced by --legacy command line switch";
+        }
+    }
+    GFXEngine gfxEngine = (GFXEngine)qMin((unsigned int)settings.value(GFXEngineSetting, (unsigned int)GFX_OpenGL).toUInt(), (unsigned int)MaxGFXEngine);
+    switch (gfxEngine) {
+    case 0:  // GFX_OpenGL
+        QCoreApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
+        break;
+    case 1:  // GFX_ANGLE
+        QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
+        break;
+    case 2:  // GFX_Software
+    default:
+        QCoreApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
+    }
+
+    QApplication a(argc, argv);
+    QStringList args = a.arguments();
+
 
     QString lastlanguage = settings.value(LangSetting, "").toString();
     if (lastlanguage.compare("is", Qt::CaseInsensitive))    // Convert code for Hebrew from 'is' to 'he'
@@ -296,10 +317,7 @@ int main(int argc, char *argv[]) {
             changing_language = true; // reset to force language dialog
             settings.setValue(LangSetting,"");
         }
-        else if (args[i] == "--legacy") {
+        // "--legacy" is handle above, as it needs to be processed before creating QApplication.
-            settings.setValue(GFXEngineSetting, (unsigned int)GFX_Software);
-            forcedEngine = "Software Engine forced by --legacy command line switch";
-        }
         else if (args[i] == "-p")
             QThread::msleep(1000);
         else if (args[i] == "--profile") {
@@ -324,22 +342,13 @@ int main(int argc, char *argv[]) {
         }
     }   // end of for args loop
 
-
-    GFXEngine gfxEngine = (GFXEngine)qMin((unsigned int)settings.value(GFXEngineSetting, (unsigned int)GFX_OpenGL).toUInt(), (unsigned int)MaxGFXEngine);
-
-    switch (gfxEngine) {
-    case 0:
-        QCoreApplication::setAttribute(Qt::AA_UseDesktopOpenGL);
-        break;
-    case 1:
-        QCoreApplication::setAttribute(Qt::AA_UseOpenGLES);
-        break;
-    case 2:
-    default:
-        QCoreApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
-    }
-
     initializeLogger();
+    // After initializing the logger, any qDebug() messages will be queued but not written to console
+    // until MainWindow is constructed below. In spite of that, we initialize the logger here so that
+    // the intervening messages to show up in the debug pane.
+    //
+    // The only time this is really noticeable is when initTranslations() presents its language
+    // selection QDialog, which waits indefinitely for user input before MainWindow is constructed.
 
     qDebug().noquote() << "OSCAR starting" << QDateTime::currentDateTime().toString();
 

oscar/mainwindow.cpp

@@ -1064,35 +1064,17 @@ void MainWindow::importCPAPDataCards(const QList<ImportPath> & datacards)
 {
     bool newdata = false;
 
-//    QStringList goodlocations;
-
-    ProgressDialog * prog = new ProgressDialog(this);
-    prog->setMessage(tr("Processing import list..."));
-    prog->addAbortButton();
-    prog->setWindowModality(Qt::ApplicationModal);
-
-    prog->open();
-
     int c = -1;
     for (int i = 0; i < datacards.size(); i++) {
         QString dir = datacards[i].path;
         MachineLoader * loader = datacards[i].loader;
         if (!loader) continue;
-        connect(loader, SIGNAL(updateMessage(QString)), prog, SLOT(setMessage(QString)));
-        connect(loader, SIGNAL(setProgressMax(int)), prog, SLOT(setProgressMax(int)));
-        connect(loader, SIGNAL(setProgressValue(int)), prog, SLOT(setProgressValue(int)));
-        connect(prog, SIGNAL(abortClicked()), loader, SLOT(abortImport()));
-
-        QPixmap image = loader->getPixmap(loader->PeekInfo(dir).series);
-        image = image.scaled(64,64);
-        prog->setPixmap(image);
 
         if (!dir.isEmpty()) {
             c = importCPAP(datacards[i], tr("Importing Data"));
             qDebug() << "Finished Importing data" << c;
 
             if (c >= 0) {
-            //    goodlocations.push_back(dir);
                 QDir d(dir.section("/",0,-1));
                 (*p_profile)[STR_PREF_LastCPAPPath] = d.absolutePath();
             }
@@ -1101,19 +1083,12 @@ void MainWindow::importCPAPDataCards(const QList<ImportPath> & datacards)
                 newdata = true;
             }
         }
-        disconnect(prog, SIGNAL(abortClicked()), loader, SLOT(abortImport()));
-        disconnect(loader, SIGNAL(setProgressMax(int)), prog, SLOT(setProgressMax(int)));
-        disconnect(loader, SIGNAL(setProgressValue(int)), prog, SLOT(setProgressValue(int)));
-        disconnect(loader, SIGNAL(updateMessage(QString)), prog, SLOT(setMessage(QString)));
     }
 
     if (newdata)  {
         finishCPAPImport();
         PopulatePurgeMenu();
     }
-
-    prog->close();
-    prog->deleteLater();
 }
 
 
@@ -1352,12 +1327,14 @@ void MainWindow::on_action_Reset_Graph_Layout_triggered()
     if (overview && (ui->tabWidget->currentWidget() == overview)) { overview->ResetGraphLayout(); }
 }
 
+/*
 void MainWindow::on_action_Reset_Graph_Order_triggered()
 {
     if (daily && (ui->tabWidget->currentWidget() == daily)) { daily->ResetGraphOrder(0); }
 
     if (overview && (ui->tabWidget->currentWidget() == overview)) { overview->ResetGraphOrder(0); }
 }
+*/
 
 void MainWindow::on_action_Standard_Graph_Order_triggered()
 {
@@ -1442,14 +1419,14 @@ void MainWindow::CheckForUpdates()
 #endif
 }
 
+#ifndef NO_UPDATER
 void MainWindow::on_actionCheck_for_Updates_triggered()
 {
     qDebug() << "procedure <on_actionCheck_for_Updates_triggered> called";
-#ifndef NO_UPDATER
     UpdaterWindow *w = new UpdaterWindow(this);
     w->checkForUpdates();
-#endif
 }
+#endif
 
 bool toolbox_visible = false;
 void MainWindow::on_action_Screenshot_triggered()
@@ -2424,11 +2401,13 @@ void MainWindow::on_actionSleep_Disorder_Terms_Glossary_triggered()
         QDesktopServices::openUrl(QUrl("https://www.apneaboard.com/wiki/index.php?title=Definitions"));
 }
 
+/*
 void MainWindow::on_actionHelp_Support_OSCAR_Development_triggered()
 {
 //    QDesktopServices().openUrl(QUrl("https://sleepyhead.jedimark.net/donate.php"));
     QMessageBox::information(nullptr, STR_MessageBox_Information, tr("Donations are not implemented"));
 }
+*/
 
 void MainWindow::on_actionChange_Language_triggered()
 {
@@ -2485,6 +2464,10 @@ void MainWindow::on_actionImport_Viatom_Data_triggered()
     w.setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
     w.setOption(QFileDialog::ShowDirsOnly, false);
     w.setNameFilters(viatom.getNameFilter());
+#if defined(Q_OS_WIN)
+    // Windows can't handle this name filter.
+    w.setOption(QFileDialog::DontUseNativeDialog, true);
+#endif
 
     if (w.exec() == QFileDialog::Accepted) {
         QString filename = w.selectedFiles()[0];

oscar/mainwindow.h

@@ -214,7 +214,7 @@ class MainWindow : public QMainWindow
     void on_action_Reset_Graph_Layout_triggered();
 
     //! \brief passes the ResetGraphOrder menu click to the Daily & Overview views
-    void on_action_Reset_Graph_Order_triggered();
+    //void on_action_Reset_Graph_Order_triggered();
 
     //! \brief passes the ResetGraphOrder menu click to the Daily & Overview views
     void on_action_Standard_Graph_Order_triggered();
@@ -229,7 +229,9 @@ class MainWindow : public QMainWindow
     void on_oximetryButton_clicked();
 
     //! \brief Creates the UpdaterWindow object that actually does the real check for updates
+#ifndef NO_UPDATER
     void on_actionCheck_for_Updates_triggered();
+#endif
 
     //! \brief Attempts to do a screenshot of the application window
     void on_action_Screenshot_triggered();
@@ -287,7 +289,7 @@ class MainWindow : public QMainWindow
 
     void on_actionSleep_Disorder_Terms_Glossary_triggered();
 
-    void on_actionHelp_Support_OSCAR_Development_triggered();
+    //void on_actionHelp_Support_OSCAR_Development_triggered();
 
     void aboutBoxLinkClicked(const QUrl &url);
 

oscar/update_gitinfo.bat

@@ -25,7 +25,6 @@ if errorlevel 1 goto GitFail
     goto GitDone
     
 :GitFail
-  set GIT_REVISION="private"
 :GitDone
 
 @echo Update_gtinfo.bat: GIT_BRANCH=%GIT_BRANCH%, GIT_REVISION=%GIT_REVISION%, GIT_TAG=%GIT_TAG%
@@ -50,4 +49,4 @@ echo Updating %DIR%git_info.h
 move /y %DIR%git_info.new %DIR%git_info.h
 
 :AllDone
-endlocal
+endlocal