Implement function getTimeString()

BenJuan26 · May 27, 2018 · 9ef94ba · 9ef94ba
1 parent 910d48a
commit 9ef94ba
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 3 deletions.
diff --git a/libstacker/include/libstacker/util.h b/libstacker/include/libstacker/util.h
@@ -72,6 +72,7 @@ LIBSTACKER_EXPORT cv::Mat stackDarks(QStringList filenames, cv::Mat bias);
 LIBSTACKER_EXPORT cv::Mat stackDarkFlats(QStringList filenames, cv::Mat bias);
 LIBSTACKER_EXPORT cv::Mat stackFlats(QStringList filenames, cv::Mat darkFlat, cv::Mat bias);
 LIBSTACKER_EXPORT cv::Mat stackBias(QStringList filenames);
+LIBSTACKER_EXPORT QString getTimeString(int seconds);
 LIBSTACKER_EXPORT StackingResult processConcurrent(StackingParams params, int *numCompleted);
 }
 

diff --git a/libstacker/src/imagestacker.cpp b/libstacker/src/imagestacker.cpp
@@ -334,7 +334,10 @@ void ImageStackerPrivate::process(int tolerance, int threads) {
     time_t doneStacking;
     time(&doneStacking);
 
-    emit q->finished(workingImage, QObject::tr("Stacking completed in %1 seconds.").arg(difftime(doneStacking, now)));
+    QString completeString = QObject::tr("Stacking completed in ");
+    QString timeString = getTimeString(difftime(doneStacking, now));
+
+    emit q->finished(workingImage, completeString + timeString + ".");
 }
 
 void ImageStackerPrivate::readQImage(QString filename)

diff --git a/libstacker/src/imagestacker_p.h b/libstacker/src/imagestacker_p.h
@@ -73,8 +73,7 @@ class ImageStackerPrivate
 
 private:
     int getTotalOperations();
-
-    int validateImageSizes();
+    int validateImageSizes(); 
 
     mutable QMutex mutex;
 

diff --git a/libstacker/src/util.cpp b/libstacker/src/util.cpp
@@ -26,6 +26,42 @@ cv::Mat openskystacker::getBayerMatrix(QString filename) {
     return bayer.clone();
 }
 
+QString openskystacker::getTimeString(int seconds) {
+    QString value;
+    if (seconds < 60) {
+        value = QObject::tr(seconds == 1 ? "%1 second" : "%1 seconds").arg(seconds);
+    } else if (seconds < 3600) {
+        int min = seconds / 60;
+        int sec = seconds % 60;
+        QString minString = QObject::tr(min == 1 ? "%1 minute" : "%1 minutes").arg(min);
+        QString secString = QObject::tr(sec == 1 ? " and %1 second" : " and %1 seconds").arg(sec);
+        value = minString + secString;
+    } else if (seconds < 86400) {
+        int hrs = seconds / 3600;
+        int hrsRemainder = seconds % 3600;
+        int min = hrsRemainder / 60;
+        int sec = hrsRemainder % 60;
+        QString hrsString = QObject::tr(hrs == 1 ? "%1 hour" : "%1 hours").arg(hrs);
+        QString minString = QObject::tr(min == 1 ? ", %1 minute" : ", %1 minutes").arg(min);
+        QString secString = QObject::tr(sec == 1 ? ", and %1 second" : ", and %1 seconds").arg(sec);
+        value = hrsString + minString + secString;
+    } else {
+        int days = seconds / 86400;
+        int daysRemainder = seconds % 86400;
+        int hrs = daysRemainder / 3600;
+        int hrsRemainder = daysRemainder % 3600;
+        int min = hrsRemainder / 60;
+        int sec = hrsRemainder % 60;
+        QString daysString = QObject::tr(days == 1 ? "%1 day" : "%1 days").arg(days);
+        QString hrsString = QObject::tr(hrs == 1 ? ", %1 hour" : ", %1 hours").arg(hrs);
+        QString minString = QObject::tr(min == 1 ? ", %1 minute" : ", %1 minutes").arg(min);
+        QString secString = QObject::tr(sec == 1 ? ", and %1 second" : ", and %1 seconds").arg(sec);
+        value = daysString + hrsString + minString + secString;
+    }
+
+    return value;
+}
+
 ImageRecord *openskystacker::getImageRecord(QString filename)
 {
     ImageRecord *record = new ImageRecord();