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

Handle ugly 'restarts' in preferences by gracefully reloading profile instead

Browse Source
This commit is contained in:
Mark Watkins 2018-05-05 20:07:40 +10:00
parent cf72406ee6
commit b9e1af63da
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@
// Disable this to cut excess debug messages // Disable this to cut excess debug messages
#define DEBUG_IMPORTER //#define DEBUG_IMPORTER
//const int PRS1_MAGIC_NUMBER = 2; //const int PRS1_MAGIC_NUMBER = 2;
//const int PRS1_SUMMARY_FILE=1; //const int PRS1_SUMMARY_FILE=1;

8
sleepyhead/mainwindow.cpp
View File

@ -1814,6 +1814,14 @@ void MainWindow::on_action_Rebuild_Oximetry_Index_triggered()
daily->LoadDate(getDaily()->getDate()); daily->LoadDate(getDaily()->getDate());
overview->ReloadGraphs(); overview->ReloadGraphs();
} }
void MainWindow::reloadProfile()
{
QString username = p_profile->user->userName();
int tabidx = ui->tabWidget->currentIndex();
CloseProfile();
OpenProfile(username);
ui->tabWidget->setCurrentIndex(tabidx);
}
void MainWindow::RestartApplication(bool force_login, QString cmdline) void MainWindow::RestartApplication(bool force_login, QString cmdline)
{ {

2
sleepyhead/mainwindow.h
View File

@ -339,6 +339,8 @@ class MainWindow : public QMainWindow
void on_profilesButton_clicked(); void on_profilesButton_clicked();
void reloadProfile();
private: private:
void importCPAPBackups(); void importCPAPBackups();
void finishCPAPImport(); void finishCPAPImport();

9
sleepyhead/preferencesdialog.cpp
View File

@ -740,13 +740,13 @@ bool PreferencesDialog::Save()
return false; return false;
} }
} else { recalc_events = false; } } else { recalc_events = false; }
} else if (needs_restart) { } /*else if (needs_restart) {
if (QMessageBox::question(this, tr("Restart Required"), if (QMessageBox::question(this, tr("Restart Required"),
tr("One or more of the changes you have made will require this application to be restarted,\nin order for these changes to come into effect.\n\nWould you like do this now?"), tr("One or more of the changes you have made will require this application to be restarted,\nin order for these changes to come into effect.\n\nWould you like do this now?"),
QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) { QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) {
return false; return false;
} }
} }*/
schema::channel[OXI_SPO2].setLowerThreshold(ui->oxiDesaturationThreshold->value()); schema::channel[OXI_SPO2].setLowerThreshold(ui->oxiDesaturationThreshold->value());
schema::channel[OXI_Pulse].setLowerThreshold(ui->flagPulseBelow->value()); schema::channel[OXI_Pulse].setLowerThreshold(ui->flagPulseBelow->value());
@ -911,8 +911,9 @@ bool PreferencesDialog::Save()
// send a signal instead? // send a signal instead?
mainwin->reprocessEvents(needs_restart); mainwin->reprocessEvents(needs_restart);
} else if (needs_restart) { } else if (needs_restart) {
profile->removeLock(); QTimer::singleShot(0, mainwin, SLOT(reloadProfile()));
mainwin->RestartApplication(); // profile->removeLock();
// mainwin->RestartApplication();
} else { } else {
mainwin->getDaily()->LoadDate(mainwin->getDaily()->getDate()); mainwin->getDaily()->LoadDate(mainwin->getDaily()->getDate());
// Save early.. just in case.. // Save early.. just in case..