From 4d41fcf997946cd4d7772f224635c78076f9816a Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Mon, 21 Nov 2011 09:39:55 +1000 Subject: [PATCH] New Feature: Added Import locations preference tab and related import logic --- SleepLib/loader_plugins/intellipap_loader.cpp | 10 ++ main.cpp | 4 + mainwindow.cpp | 104 +++++++++++++----- preferencesdialog.cpp | 54 +++++++++ preferencesdialog.h | 8 ++ preferencesdialog.ui | 80 ++++++++++++++ 6 files changed, 231 insertions(+), 29 deletions(-) diff --git a/SleepLib/loader_plugins/intellipap_loader.cpp b/SleepLib/loader_plugins/intellipap_loader.cpp index cc93c35a..a2da7d94 100644 --- a/SleepLib/loader_plugins/intellipap_loader.cpp +++ b/SleepLib/loader_plugins/intellipap_loader.cpp @@ -4,6 +4,10 @@ SleepLib (DeVilbiss) Intellipap Loader Implementation Author: Mark Watkins License: GPL + +Notes: Intellipap requires the SmartLink attachment to access this data. +It does not seem to record multiple days, graph data is overwritten each time.. + */ #include "intellipap_loader.h" @@ -22,14 +26,20 @@ Intellipap::~Intellipap() IntellipapLoader::IntellipapLoader() { + m_buffer=NULL; } IntellipapLoader::~IntellipapLoader() { + for (QHash::iterator i=MachList.begin(); i!=MachList.end(); i++) { + delete i.value(); + } } int IntellipapLoader::Open(QString & path,Profile *profile) { + // Check for DV5MFirm.bin + return 0; } diff --git a/main.cpp b/main.cpp index 2f4aaaa4..3fd4558a 100644 --- a/main.cpp +++ b/main.cpp @@ -18,10 +18,13 @@ #include "SleepLib/profiles.h" #include "profileselect.h" #include "newprofile.h" + +// Gah! I must add the real darn plugin system one day. #include "SleepLib/loader_plugins/prs1_loader.h" #include "SleepLib/loader_plugins/cms50_loader.h" #include "SleepLib/loader_plugins/zeo_loader.h" #include "SleepLib/loader_plugins/resmed_loader.h" +#include "SleepLib/loader_plugins/intellipap_loader.h" #ifdef Q_WS_X11 #include @@ -94,6 +97,7 @@ int main(int argc, char *argv[]) CMS50Loader::Register(); ZEOLoader::Register(); ResmedLoader::Register(); + IntellipapLoader::Register(); Profiles::Scan(); PREF["AppName"]="SleepyHead"; bool skip_login=(PREF.ExistsAndTrue("SkipLoginScreen")); diff --git a/mainwindow.cpp b/mainwindow.cpp index 574bfb06..79040f8c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -212,40 +212,86 @@ void MainWindow::Startup() void MainWindow::on_action_Import_Data_triggered() { - //QStringList dirNames; + QStringList importLocations; + { + 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(); + } - //QFileDialog qfd(this); - //qfd.setFileMode(QFileDialog::Directory); - //qfd.setOption(QFileDialog::ShowDirsOnly,true); - QString dir=QFileDialog::getExistingDirectory(this,"Select a folder to import","",QFileDialog::ShowDirsOnly); + bool addnew=false; + QString newdir; - if (!dir.isEmpty()) { - //if (qfd.exec()) { - qprogress->setValue(0); - qprogress->show(); - qstatus->setText(tr("Importing Data")); - int c=PROFILE.Import(dir); - if (!c) { - QMessageBox::warning(this,"Import Problem","Couldn't Find any Machine Data at this location:\n"+dir,QMessageBox::Ok); + bool asknew=false; + if (importLocations.size()==0) { + asknew=true; + } else { + int res=QMessageBox::question(this,"Import from where?","Do you just want to Import from the usual (remembered) locations?\n","The Usual","New Location","Cancel",0,2); + if (res==1) { + asknew=true; } - /*dirNames=qfd.selectedFiles(); - int c=0,d; - for (int i=0;iImport(dirNames[i]); - if (!d) { - QMessageBox::warning(this,"Import Problem","Couldn't Find any Machine Data at this location:\n"+dirNames[i],QMessageBox::Ok); + if (res==2) return; + } + + if (asknew) { + newdir=QFileDialog::getExistingDirectory(this,"Select a folder to import","",QFileDialog::ShowDirsOnly); + if (newdir.isEmpty()) { + // inform the user or just abort? + return; + } + if (!importLocations.contains(newdir)) { + importLocations.append(newdir); + addnew=true; + } + } + + int successful=false; + for (int i=0;isetValue(0); + qprogress->show(); + qstatus->setText(tr("Importing Data")); + int c=PROFILE.Import(dir); + if (!c) { + QMessageBox::warning(this,"Import Problem","Couldn't Find any Machine Data at this location:\n"+dir,QMessageBox::Ok); + if (newdir==dir) addnew=false; // Don't bother asking to add it. } - c+=d; - }*/ - qDebug() << "Finished Importing data" << c; - if (c) { - PROFILE.Save(); - if (daily) daily->ReloadGraphs(); - if (overview) overview->ReloadGraphs(); + qDebug() << "Finished Importing data" << c; + if (c) { + successful=true; + } + qstatus->setText(""); + qprogress->hide(); + } + } + if (successful) { + PROFILE.Save(); + if (daily) daily->ReloadGraphs(); + if (overview) overview->ReloadGraphs(); + if (addnew && (QMessageBox::question(this,"Remember this Location?","Would you like to remember this import location for next time?\n"+newdir,QMessageBox::Yes,QMessageBox::No)==QMessageBox::Yes)) { + QString filename=PROFILE.Get("{DataFolder}/ImportLocations.txt"); + QFile file(filename); + file.open(QFile::WriteOnly); + QTextStream ts(&file); + for (int i=0;isetText(""); - qprogress->hide(); - } } QMenu * MainWindow::CreateMenu(QString title) diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp index 2db64e7a..ef006ec7 100644 --- a/preferencesdialog.cpp +++ b/preferencesdialog.cpp @@ -4,6 +4,8 @@ #include #include #include +#include +#include #include "preferencesdialog.h" #include "ui_preferencesdialog.h" #include "SleepLib/machine_common.h" @@ -19,6 +21,25 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) : { ui->setupUi(this); + { + 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!=NULL); @@ -281,6 +302,18 @@ void 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;iSave(); PREF.Save(); @@ -354,3 +387,24 @@ void PreferencesDialog::on_checkForUpdatesButton_clicked() ui->updateLastChecked->setText("Checking for Updates"); mainwin->CheckForUpdates(); } + +void PreferencesDialog::on_addImportLocation_clicked() +{ + QString dir=QFileDialog::getExistingDirectory(this,"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); + } +} diff --git a/preferencesdialog.h b/preferencesdialog.h index d40ecf49..16aa9f29 100644 --- a/preferencesdialog.h +++ b/preferencesdialog.h @@ -9,6 +9,7 @@ #include #include +#include #include "SleepLib/profiles.h" namespace Ui { @@ -34,10 +35,17 @@ private slots: void on_checkForUpdatesButton_clicked(); + void on_addImportLocation_clicked(); + + void on_removeImportLocation_clicked(); + private: Ui::PreferencesDialog *ui; Profile * profile; QHash m_new_colors; + QStringList importLocations; + QStringListModel *importModel; + }; #endif // PREFERENCESDIALOG_H diff --git a/preferencesdialog.ui b/preferencesdialog.ui index 9233bdf2..7a2088e6 100644 --- a/preferencesdialog.ui +++ b/preferencesdialog.ui @@ -1226,6 +1226,86 @@ It has no effect on single cpu machines. + + + Import + + + + 4 + + + 4 + + + + + Automatically scan these locations during import. + + + + 0 + + + 0 + + + 4 + + + 0 + + + 0 + + + + + QAbstractItemView::NoEditTriggers + + + + + + + + + + Add + + + + + + + Remove + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + removeImportLocation + addImportLocation + verticalSpacer_5 + + + + + + +