#9773 Add option for resampling to minute intervals.

OPM · Apr 19, 2023 · 7d5e6ba · 7d5e6ba
1 parent 4aa3f7b
commit 7d5e6ba
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 9 deletions.
diff --git a/ApplicationLibCode/Application/RiaDateTimeDefines.h b/ApplicationLibCode/Application/RiaDateTimeDefines.h
@@ -45,6 +45,7 @@ enum class TimeFormatComponents
 enum class DateTimePeriod
 {
     NONE = -1,
+    MINUTE,
     HOUR,
     DAY,
     WEEK,

diff --git a/ApplicationLibCode/Application/Tools/RiaQDateTimeTools.cpp b/ApplicationLibCode/Application/Tools/RiaQDateTimeTools.cpp
@@ -33,6 +33,7 @@
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
+const DateTimeSpan RiaQDateTimeTools::TIMESPAN_MINUTE   = DateTimeSpan( 0, 0, 0, 0, 1 );
 const DateTimeSpan RiaQDateTimeTools::TIMESPAN_HOUR     = DateTimeSpan( 0, 0, 0, 1 );
 const DateTimeSpan RiaQDateTimeTools::TIMESPAN_DAY      = DateTimeSpan( 0, 0, 1 );
 const DateTimeSpan RiaQDateTimeTools::TIMESPAN_WEEK     = DateTimeSpan( 0, 0, 7 );
@@ -50,6 +51,14 @@ Qt::TimeSpec RiaQDateTimeTools::currentTimeSpec()
     return Qt::UTC;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+quint64 RiaQDateTimeTools::secondsInMinute()
+{
+    return 60;
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -156,7 +165,8 @@ QDateTime RiaQDateTimeTools::addSpan( const QDateTime& dt, DateTimeSpan span )
         .addYears( span.years() )
         .addMonths( span.months() )
         .addDays( span.days() )
-        .addSecs( span.hours() * RiaQDateTimeTools::secondsInHour() );
+        .addSecs( span.hours() * RiaQDateTimeTools::secondsInHour() )
+        .addSecs( span.minutes() * RiaQDateTimeTools::secondsInMinute() );
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -168,7 +178,8 @@ QDateTime RiaQDateTimeTools::subtractSpan( const QDateTime& dt, DateTimeSpan spa
         .addYears( -span.years() )
         .addMonths( -span.months() )
         .addDays( -span.days() )
-        .addSecs( -span.hours() * RiaQDateTimeTools::secondsInHour() );
+        .addSecs( -span.hours() * RiaQDateTimeTools::secondsInHour() )
+        .addSecs( -span.minutes() * RiaQDateTimeTools::secondsInMinute() );
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -268,6 +279,8 @@ const DateTimeSpan RiaQDateTimeTools::timeSpan( RiaDefines::DateTimePeriod perio
 {
     switch ( period )
     {
+        case RiaDefines::DateTimePeriod::MINUTE:
+            return TIMESPAN_MINUTE;
         case RiaDefines::DateTimePeriod::HOUR:
             return TIMESPAN_HOUR;
         case RiaDefines::DateTimePeriod::DAY:
@@ -294,14 +307,17 @@ const DateTimeSpan RiaQDateTimeTools::timeSpan( RiaDefines::DateTimePeriod perio
 //--------------------------------------------------------------------------------------------------
 QDateTime RiaQDateTimeTools::truncateTime( const QDateTime& dt, RiaDefines::DateTimePeriod period )
 {
-    int y   = dt.date().year();
-    int m   = dt.date().month();
-    int d   = dt.date().day();
-    int dow = dt.date().dayOfWeek();
-    int h   = dt.time().hour();
+    int y      = dt.date().year();
+    int m      = dt.date().month();
+    int d      = dt.date().day();
+    int dow    = dt.date().dayOfWeek();
+    int h      = dt.time().hour();
+    int minute = dt.time().minute();
 
     switch ( period )
     {
+        case RiaDefines::DateTimePeriod::MINUTE:
+            return createUtcDateTime( QDate( y, m, d ), QTime( h, minute, 0 ) );
         case RiaDefines::DateTimePeriod::HOUR:
             return createUtcDateTime( QDate( y, m, d ), QTime( h, 0, 0 ) );
         case RiaDefines::DateTimePeriod::DAY:

diff --git a/ApplicationLibCode/Application/Tools/RiaQDateTimeTools.h b/ApplicationLibCode/Application/Tools/RiaQDateTimeTools.h
@@ -99,6 +99,7 @@ class RiaQDateTimeTools
         getTimeStepsWithinSelectedRange( const std::vector<QDateTime>& timeSteps, const QDateTime& fromTimeStep, const QDateTime& toTimeStep );
 
 private:
+    static const DateTimeSpan TIMESPAN_MINUTE;
     static const DateTimeSpan TIMESPAN_HOUR;
     static const DateTimeSpan TIMESPAN_DAY;
     static const DateTimeSpan TIMESPAN_WEEK;
@@ -111,6 +112,7 @@ class RiaQDateTimeTools
     static quint64 secondsInDay();
     static quint64 secondsInYear();
     static quint64 secondsInHour();
+    static quint64 secondsInMinute();
 };
 
 //==================================================================================================
@@ -124,26 +126,30 @@ class DateTimeSpan
         , m_months( 0 )
         , m_days( 0 )
         , m_hours( 0 )
+        , m_minutes( 0 )
     {
     }
-    DateTimeSpan( int years, int months, int days, int hours = 0 )
+    DateTimeSpan( int years, int months, int days, int hours = 0, int minutes = 0 )
         : m_years( years )
         , m_months( months )
         , m_days( days )
         , m_hours( hours )
+        , m_minutes( minutes )
     {
     }
 
     int years() const { return m_years; }
     int months() const { return m_months; }
     int days() const { return m_days; }
     int hours() const { return m_hours; }
+    int minutes() const { return m_minutes; }
 
-    bool isEmpty() { return m_years == 0 && m_months == 0 && m_days == 0 && m_hours == 0; }
+    bool isEmpty() { return m_years == 0 && m_months == 0 && m_days == 0 && m_hours == 0 && m_minutes == 0; }
 
 private:
     int m_years;
     int m_months;
     int m_days;
     int m_hours;
+    int m_minutes;
 };