From 2b62343e6173bd642a55f17b9cade2fec1ba1627 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Mon, 28 Apr 2014 13:27:33 +1000 Subject: [PATCH] Removed ImportLocations and implemented datacard Autoscanner --- .../SleepLib/loader_plugins/prs1_loader.cpp | 48 +++++- sleepyhead/daily.cpp | 4 +- sleepyhead/mainwindow.cpp | 143 ++++++++-------- sleepyhead/mainwindow.h | 7 +- sleepyhead/preferencesdialog.cpp | 62 ------- sleepyhead/preferencesdialog.h | 4 - sleepyhead/preferencesdialog.ui | 152 +++++------------- 7 files changed, 169 insertions(+), 251 deletions(-) diff --git a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp index 7a028230..2dc0d3af 100644 --- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp @@ -180,6 +180,48 @@ bool isdigit(QChar c) const QString PR_STR_PSeries = "P-Series"; + +// Tests path to see if it has (what looks like) a valid PRS1 folder structure +bool PRS1Loader::Detect(const QString & path) +{ + QString newpath = path; + + newpath.replace("\\", "/"); + + if (!newpath.endsWith("/" + PR_STR_PSeries)) { + newpath = path + "/" + PR_STR_PSeries; + } + + QDir dir(newpath); + + if ((!dir.exists() || !dir.isReadable())) { + return false; + } + qDebug() << "PRS1Loader::Detect path=" << newpath; + + QFile lastfile(newpath+"/last.txt"); + if (!lastfile.exists()) { + return false; + } + + if (!lastfile.open(QIODevice::ReadOnly)) { + qDebug() << "PRS1Loader: last.txt exists but I couldn't open it!"; + return false; + } + + QString last = lastfile.readLine(64); + last = last.trimmed(); + lastfile.close(); + + QFile f(newpath+"/"+last); + if (!f.exists()) { + qDebug() << "in PRS1Loader::Detect():" << last << "does not exist, despite last.txt saying it does"; + return false; + } + // newpath is a valid path + return true; +} + int PRS1Loader::Open(QString &path, Profile *profile) { QString newpath; @@ -1795,12 +1837,6 @@ bool PRS1Loader::OpenWaveforms(SessionID sid, QString filename) return true; } - -bool PRS1Loader::Detect(const QString & path) -{ - return false; -} - void InitModelMap() { ModelMap[0x34] = "RemStar Pro with C-Flex+"; diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index 35de0531..8c07a2f7 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -1210,7 +1210,9 @@ void Daily::Load(QDate date) UpdatePOSGraphs(posit); UpdateEventsTree(ui->treeWidget,cpap); - mainwin->refreshStatistics(); + // FIXME: + // Generating entire statistics because bookmarks may have changed.. (This updates the side panel too) + mainwin->GenerateStatistics(); snapGV->setDay(cpap); diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index 298a9fa0..935b23a2 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -314,58 +314,87 @@ void MainWindow::on_action_Import_Data_triggered() if (m_inRecalculation) { Notify(tr("Access to Import has been blocked while recalculations are in progress.")); return; - } - QStringList importLocations; - { - QString filename = PROFILE.Get("{DataFolder}/ImportLocations.txt"); - QFile file(filename); - file.open(QFile::ReadOnly); - QTextStream textStream(&file); + QList AutoScannerPaths = +#ifdef Q_OS_MAC + { "/Volumes" }; +#elif Q_OS_WIN + { "dummy" }; + // scan all available drive letters after C: +#else + { "/Media", "/mnt" }; +#endif - while (1) { - QString line = textStream.readLine(); + QHash datacard; - if (line.isNull()) { - break; - } else if (line.isEmpty()) { - continue; - } else { - importLocations.append(line); + QString datacard_path = QString(); + MachineLoader * datacard_loader = nullptr; + + QListloaders = GetLoaders(); + + Q_FOREACH(const QString & path, AutoScannerPaths) { + qDebug() << "Scanning" << path; + +#ifdef Q_OS_WIN + QFileInfoList list = QDir::drives(); +#else + QDir dir(path); + dir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot); + QFileInfoList list = dir.entryInfoList(); +#endif + + for (int i = 0; i < list.size(); ++i) { + QFileInfo fileInfo = list.at(i); + QString p=fileInfo.fileName(); + + Q_FOREACH(MachineLoader * loader, loaders) { + QString scanpath=path+"/"+p; + if (loader->Detect(scanpath)) { + datacard[loader->ClassName()]=scanpath; + + qDebug() << "Found" << loader->ClassName() << "datacard at" << scanpath; + if (datacard_path.isEmpty()) { + datacard_loader=loader; + datacard_path=scanpath; + } + } } - } - - file.close(); - } - - //bool addnew=false; - QString newdir; - - bool asknew = false; - - if (importLocations.size() == 0) { - asknew = true; - } else { - int res = QMessageBox::question(this, tr("Import from where?"), - tr("Do you just want to Import from the usual (remembered) locations?\n"), tr("The Usual"), - tr("New Location"), tr("Cancel"), 0, 2); - - if (res == 1) { - asknew = true; - } - - if (res == 2) { return; } - } - - if (asknew) { - //mainwin->Notify("Please remember to point the importer at the root folder or drive letter of your data-card, and not a subfolder.","Import Reminder",8000); + } } QStringList importFrom; + bool asknew = false; + + if (datacard.size() > 0) { + if (datacard.size() > 1) { + qWarning() << "User has more than detected datacard folder structure in scan path, only using the first one found."; + } + + int res = QMessageBox::question(this, tr("Datacard Located"), + QString(tr("A %1 datacard structure was detected at\n%2\n\nWould you like to import from this location?")).arg(datacard_loader->ClassName()).arg(datacard_path), tr("Yes"), + tr("Select another folder"), tr("Cancel"), 0, 2); + if (res == 1) { + asknew = true; + } else { + importFrom.push_back(datacard_path); + } + + if (res == 2) { return; } + + } if (asknew) { + mainwin->Notify("Please remember to point the importer at the root folder or drive letter of your data-card, and not a subfolder.","Import Reminder",8000); + QFileDialog w; +#if QT_VERSION < QT_VERSION_CHECK(5,0,0) + const QString documentsFolder = QDesktopServices::storageLocation( + QDesktopServices::DocumentsLocation); +#else + const QString documentsFolder = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation); +#endif + w.setDirectory(documentsFolder); w.setFileMode(QFileDialog::Directory); w.setOption(QFileDialog::ShowDirsOnly, true); @@ -401,7 +430,7 @@ void MainWindow::on_action_Import_Data_triggered() //addnew=true; } } - } else { importFrom = importLocations; } + } int successful = false; @@ -418,9 +447,7 @@ void MainWindow::on_action_Import_Data_triggered() qDebug() << "Finished Importing data" << c; if (c) { - if (!importLocations.contains(dir)) { - goodlocations.push_back(dir); - } + goodlocations.push_back(dir); successful = true; } @@ -433,32 +460,16 @@ void MainWindow::on_action_Import_Data_triggered() if (successful) { PROFILE.Save(); - if (overview) { overview->ReloadGraphs(); } - GenerateStatistics(); + if (overview) { overview->ReloadGraphs(); } if (daily) { daily->ReloadGraphs(); } - if ((goodlocations.size() > 0) - && (QMessageBox::question(this, tr("Remember this Location?"), - tr("Would you like to remember this import location for next time?") + "\n" + newdir, - QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes)) { - for (int i = 0; i < goodlocations.size(); i++) { - importLocations.push_back(goodlocations[i]); - } - - QString filename = PROFILE.Get("{DataFolder}/ImportLocations.txt"); - QFile file(filename); - file.open(QFile::WriteOnly); - QTextStream ts(&file); - - for (int i = 0; i < importLocations.size(); i++) { - ts << importLocations[i] << endl; - //file.write(importLocations[i].toUtf8()); - } - - file.close(); + QString str=tr("Data successfully imported from the following locations\n\n"); + for (int i=0; iNotify(str); } else { mainwin->Notify(tr("Import Problem\n\nCouldn't find any new Machine Data at the locations given")); } diff --git a/sleepyhead/mainwindow.h b/sleepyhead/mainwindow.h index 192780f8..af3d128e 100644 --- a/sleepyhead/mainwindow.h +++ b/sleepyhead/mainwindow.h @@ -84,15 +84,15 @@ class MainWindow : public QMainWindow //! \brief Update the list of Favourites (Bookmarks) in the right sidebar. void updateFavourites(); + //! \brief Update statistics report + void GenerateStatistics(); + //! \brief Create a new menu object in the main menubar. QMenu *CreateMenu(QString title); //! \brief Start the automatic update checker process void CheckForUpdates(); - //! \brief Refresh the statistics page - void refreshStatistics() { on_statisticsButton_clicked(); } - /*! \fn Notify(QString s,int ms=5000, QString title="SleepyHead v"+VersionString()); \brief Pops up a message box near the system tray \param QString string @@ -308,7 +308,6 @@ class MainWindow : public QMainWindow private: QString getWelcomeHTML(); void FreeSessions(); - void GenerateStatistics(); Ui::MainWindow *ui; Daily *daily; diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp index fe444b99..e9c961e8 100644 --- a/sleepyhead/preferencesdialog.cpp +++ b/sleepyhead/preferencesdialog.cpp @@ -92,30 +92,6 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) : //ui->leakProfile->setColumnWidth(1,ui->leakProfile->width()/2); - { - QString filename = PROFILE.Get("{DataFolder}/ImportLocations.txt"); - QFile file(filename); - file.open(QFile::ReadOnly); - QTextStream textStream(&file); - - while (1) { - QString line = textStream.readLine(); - - if (line.isNull()) { - break; - } else if (line.isEmpty()) { - continue; - } else { - importLocations.append(line); - } - }; - - file.close(); - } - importModel = new QStringListModel(importLocations, this); - ui->importListWidget->setModel(importModel); - //ui->tabWidget->removeTab(3); - Q_ASSERT(profile != nullptr); ui->tabWidget->setCurrentIndex(0); @@ -537,21 +513,6 @@ bool PreferencesDialog::Save() //qDebug() << "TODO: Save channels.xml to update channel data"; - { - QString filename = PROFILE.Get("{DataFolder}/ImportLocations.txt"); - QFile file(filename); - file.open(QFile::WriteOnly); - QTextStream ts(&file); - - for (int i = 0; i < importLocations.size(); i++) { - ts << importLocations[i] << endl; - //file.write(importLocations[i].toUtf8()); - } - - file.close(); - } - - //PROFILE.Save(); PREF.Save(); if (recalc_events) { @@ -593,29 +554,6 @@ void PreferencesDialog::on_checkForUpdatesButton_clicked() mainwin->CheckForUpdates(); } -void PreferencesDialog::on_addImportLocation_clicked() -{ - QString dir = QFileDialog::getExistingDirectory(this, tr("Add this Location to the Import List"), - "", QFileDialog::ShowDirsOnly); - - if (!dir.isEmpty()) { - if (!importLocations.contains(dir)) { - importLocations.append(dir); - importModel->setStringList(importLocations); - } - } -} - -void PreferencesDialog::on_removeImportLocation_clicked() -{ - if (ui->importListWidget->currentIndex().isValid()) { - QString dir = ui->importListWidget->currentIndex().data().toString(); - importModel->removeRow(ui->importListWidget->currentIndex().row()); - importLocations.removeAll(dir); - } -} - - void PreferencesDialog::on_graphView_activated(const QModelIndex &index) { QString a = index.data().toString(); diff --git a/sleepyhead/preferencesdialog.h b/sleepyhead/preferencesdialog.h index a9aa5c35..217f3f2d 100644 --- a/sleepyhead/preferencesdialog.h +++ b/sleepyhead/preferencesdialog.h @@ -76,10 +76,6 @@ class PreferencesDialog : public QDialog void on_checkForUpdatesButton_clicked(); - void on_addImportLocation_clicked(); - - void on_removeImportLocation_clicked(); - void on_graphView_activated(const QModelIndex &index); void on_graphFilter_textChanged(const QString &arg1); diff --git a/sleepyhead/preferencesdialog.ui b/sleepyhead/preferencesdialog.ui index b7478b24..12576249 100644 --- a/sleepyhead/preferencesdialog.ui +++ b/sleepyhead/preferencesdialog.ui @@ -10,7 +10,7 @@ 0 0 721 - 545 + 572 @@ -51,7 +51,7 @@ - 6 + 5 @@ -1419,61 +1419,6 @@ p, li { white-space: pre-wrap; } 4 - - - - General Settings - - - - 4 - - - 4 - - - 4 - - - 4 - - - 4 - - - - - Daily view navigation buttons will skip over days without data records - - - Skip over Empty Days - - - - - - - Allow use of multiple CPU cores where available to improve performance. -Mainly affects the importer. - - - Enable Multithreading - - - - - - - Bypass the login screen and load the most recent User Profile - - - Skip Login Screen - - - - - - @@ -1603,76 +1548,67 @@ as this is the only value available on summary-only days. - - - Qt::Vertical - - - - - + - Import Locations + General Settings - - - 0 - + - 0 + 4 4 - 0 + 4 - 0 + 4 - - - - QAbstractItemView::NoEditTriggers + + 4 + + + + + Daily view navigation buttons will skip over days without data records + + + Skip over Empty Days - - - - - - - Add - - - - - - - Remove - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - + + + + Allow use of multiple CPU cores where available to improve performance. +Mainly affects the importer. + + + Enable Multithreading + + + + + + + Bypass the login screen and load the most recent User Profile + + + Skip Login Screen + + + + + Qt::Vertical + + +