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

added progress bar during import

Browse Source
This commit is contained in:
LoudSnorer 2023-10-30 19:20:20 -04:00
parent 46c7d0f5e9
commit 7fe7672aa6
3 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
oscar/SleepLib/loader_plugins/resvent_loader.cpp
View File

@ -67,6 +67,33 @@ constexpr int kDescriptionCountOffset = 0x12;
constexpr int kDescriptionSamplesByChunk = 0x1e;
constexpr double kDefaultGain = 0.01;
int countDaysWithRecordData(QDir& dir) {
int count = 0;
QDirIterator it(dir);
while (it.hasNext()) {
QFileInfo fi = it.next();
QString filename = fi.fileName();
if (filename == "." || filename == "..") continue;
bool isDir = dir.cd(filename);
if (isDir) {
// It is a directory.
// check if name is between 1 and 31. for day in month
int dayInMonth = filename.toInt();
if ( dayInMonth>0 && dayInMonth<=31) {
count++;
} else {
count += countDaysWithRecordData(dir);
}
//Change back to parent.
dir.cdUp();
//} else {
// It is a file.
//count++;
}
}
return count;
}
bool ResventLoader::Detect(const QString & givenpath)
{
QDir dir(givenpath);
@ -84,10 +111,16 @@ bool ResventLoader::Detect(const QString & givenpath)
return false;
}
if (!dir.exists(kResventRecordFolder)) {
if (!dir.cd(kResventRecordFolder)) {
return false;
}
int count = countDaysWithRecordData(dir);
progress = 0;
emit setProgressMax(count+1);
emit setProgressValue(progress);
QCoreApplication::processEvents();
return true;
}
@ -572,7 +605,7 @@ QVector<UsageData> GetDifferentUsage(const QString& session_folder_path) {
return usage_data;
}
int LoadSession(const QString& dirpath, const QDate& session_date, Machine* machine) {
int ResventLoader::LoadSession(const QString& dirpath, const QDate& session_date, Machine* machine) {
const auto session_folder_path = GetSessionFolder(dirpath, session_date);
const auto different_usage = GetDifferentUsage(session_folder_path);
@ -594,6 +627,7 @@ int LoadSession(const QString& dirpath, const QDate& session_date, Machine* mach
session->UpdateSummaries();
session->Store(machine->getDataPath());
machine->AddSession(session);
emit setProgressValue(++progress);
QCoreApplication::processEvents();
return base + 1;
});

4
oscar/SleepLib/loader_plugins/resvent_loader.h
View File

@ -71,6 +71,10 @@ public:
virtual ChannelID CPAPModeChannel();
////////////////////////////////////////////////////////////////////////////////////////////////////////////
private:
int progress = 0;
int LoadSession(const QString& dirpath, const QDate& session_date, Machine* machine);
};
#endif // RESVENT_LOADER_H

1
oscar/SleepLib/progressdialog.cpp
View File

@ -45,6 +45,7 @@ void ProgressDialog::setProgressMax(int max)
void ProgressDialog::setProgressValue(int val)
{
progress->setValue(val);
progress->raise();
}