chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed ImportLocations and implemented datacard Autoscanner

Browse Source
This commit is contained in:
Mark Watkins 2014-04-28 13:27:33 +10:00
parent 38d7aeb3fb
commit 2b62343e61
7 changed files with 169 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -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+";

4
sleepyhead/daily.cpp
View File

@ -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);

143
sleepyhead/mainwindow.cpp
View File

@ -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<QString> 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<QString,QString> datacard;
if (line.isNull()) {
break;
} else if (line.isEmpty()) {
continue;
} else {
importLocations.append(line);
QString datacard_path = QString();
MachineLoader * datacard_loader = nullptr;
QList<MachineLoader *>loaders = 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; i<goodlocations.size(); i++) {
str += goodlocations.at(i) + "\n";
}
mainwin->Notify(str);
} else {
mainwin->Notify(tr("Import Problem\n\nCouldn't find any new Machine Data at the locations given"));
}

7
sleepyhead/mainwindow.h
View File

@ -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;

62
sleepyhead/preferencesdialog.cpp
View File

@ -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();

4
sleepyhead/preferencesdialog.h
View File

@ -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);

152
sleepyhead/preferencesdialog.ui
View File

@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>721</width>
<height>545</height>
<height>572</height>
</rect>
</property>
<property name="sizePolicy">
@ -51,7 +51,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>6</number>
<number>5</number>
</property>
<widget class="QWidget" name="importTab">
<attribute name="title">
@ -1419,61 +1419,6 @@ p, li { white-space: pre-wrap; }
<property name="bottomMargin">
<number>4</number>
</property>
<item>
<widget class="QGroupBox" name="GeneralSettings">
<property name="title">
<string>General Settings</string>
</property>
<layout class="QGridLayout" name="gridLayout_10">
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>4</number>
</property>
<property name="rightMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>4</number>
</property>
<property name="spacing">
<number>4</number>
</property>
<item row="5" column="0">
<widget class="QCheckBox" name="skipEmptyDays">
<property name="toolTip">
<string>Daily view navigation buttons will skip over days without data records</string>
</property>
<property name="text">
<string>Skip over Empty Days</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="enableMultithreading">
<property name="toolTip">
<string>Allow use of multiple CPU cores where available to improve performance.
Mainly affects the importer.</string>
</property>
<property name="text">
<string>Enable Multithreading</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="skipLoginScreen">
<property name="toolTip">
<string>Bypass the login screen and load the most recent User Profile</string>
</property>
<property name="text">
<string>Skip Login Screen</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="Line" name="line_7">
<property name="orientation">
@ -1603,76 +1548,67 @@ as this is the only value available on summary-only days.</string>
</widget>
</item>
<item>
<widget class="Line" name="line_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="ImportLocations">
<widget class="QGroupBox" name="GeneralSettings">
<property name="title">
<string>Import Locations</string>
<string>General Settings</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_10">
<property name="spacing">
<number>0</number>
</property>
<layout class="QGridLayout" name="gridLayout_10">
<property name="leftMargin">
<number>0</number>
<number>4</number>
</property>
<property name="topMargin">
<number>4</number>
</property>
<property name="rightMargin">
<number>0</number>
<number>4</number>
</property>
<property name="bottomMargin">
<number>0</number>
<number>4</number>
</property>
<item>
<widget class="QListView" name="importListWidget">
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
<property name="spacing">
<number>4</number>
</property>
<item row="5" column="0">
<widget class="QCheckBox" name="skipEmptyDays">
<property name="toolTip">
<string>Daily view navigation buttons will skip over days without data records</string>
</property>
<property name="text">
<string>Skip over Empty Days</string>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="widget" native="true">
<layout class="QVBoxLayout" name="verticalLayout_9">
<item>
<widget class="QPushButton" name="addImportLocation">
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="removeImportLocation">
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
<item row="1" column="1">
<widget class="QCheckBox" name="enableMultithreading">
<property name="toolTip">
<string>Allow use of multiple CPU cores where available to improve performance.
Mainly affects the importer.</string>
</property>
<property name="text">
<string>Enable Multithreading</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="skipLoginScreen">
<property name="toolTip">
<string>Bypass the login screen and load the most recent User Profile</string>
</property>
<property name="text">
<string>Skip Login Screen</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="Line" name="line_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
</layout>
</item>
<item>