From 0ca70249aeb5381c46daee07fdc07a15cb307484 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 14 Mar 2022 09:18:48 +0100 Subject: [PATCH] Move defines to RiaDateTimeDefines --- .../Application/CMakeLists_files.cmake | 2 + .../Application/RiaDateTimeDefines.cpp | 60 ++++++++++ .../Application/RiaDateTimeDefines.h | 59 ++++++++++ .../Application/RiaPreferences.cpp | 9 +- .../Application/RiaPreferences.h | 10 +- .../Application/Tools/RiaQDateTimeTools.cpp | 104 ++++++------------ .../Application/Tools/RiaQDateTimeTools.h | 80 ++++---------- .../Application/Tools/RiaSummaryTools.cpp | 8 +- .../Application/Tools/RiaSummaryTools.h | 10 +- .../Tools/RiaTimeHistoryCurveResampler.cpp | 52 +++++---- .../Tools/RiaTimeHistoryCurveResampler.h | 19 ++-- .../RicShowPlotDataFeature.cpp | 21 ++-- .../RicShowPlotDataFeature.h | 2 - .../Commands/RicResampleDialog.cpp | 12 +- .../Commands/RicResampleDialog.h | 12 +- .../RicAsciiExportSummaryPlotFeature.cpp | 8 +- .../RicAsciiExportSummaryPlotFeature.h | 11 +- .../AnalysisPlots/RimAnalysisPlot.cpp | 12 +- .../RimAbstractCorrelationPlot.cpp | 14 ++- .../RimSimWellInViewTools.cpp | 2 +- .../RimTimeAxisAnnotation.cpp | 14 ++- .../Summary/RimDerivedSummaryCase.cpp | 1 + .../Summary/RimEnsembleCurveSet.cpp | 8 +- .../Summary/RimEnsembleCurveSet.h | 12 +- .../Summary/RimEnsembleStatisticsCase.cpp | 5 +- .../Summary/RimSummaryCurve.cpp | 5 +- .../Summary/RimSummaryCurve.h | 6 +- .../Summary/RimSummaryCurvesData.cpp | 36 +++--- .../Summary/RimSummaryCurvesData.h | 14 +-- .../Summary/RimSummaryPlot.cpp | 10 +- .../ProjectDataModel/Summary/RimSummaryPlot.h | 5 +- .../Summary/RimSummaryTimeAxisProperties.cpp | 25 +++-- .../Summary/RimSummaryTimeAxisProperties.h | 15 ++- .../RimcSummaryCase.cpp | 6 +- .../RiaTimeHistoryCurveTools-Test.cpp | 40 +++---- .../UserInterface/RiuQtChartsPlotTools.cpp | 36 +++--- .../UserInterface/RiuQtChartsPlotTools.h | 20 ++-- .../UserInterface/RiuQtChartsPlotWidget.cpp | 8 +- .../UserInterface/RiuQtChartsPlotWidget.h | 10 +- .../UserInterface/RiuQwtDateScaleWrapper.cpp | 8 +- .../UserInterface/RiuQwtDateScaleWrapper.h | 8 +- .../UserInterface/RiuQwtPlotTools.cpp | 54 +++++---- .../UserInterface/RiuQwtPlotTools.h | 23 ++-- .../UserInterface/RiuSummaryPlot.h | 11 +- .../UserInterface/RiuSummaryQtChartsPlot.cpp | 8 +- .../UserInterface/RiuSummaryQtChartsPlot.h | 12 +- .../UserInterface/RiuSummaryQwtPlot.cpp | 8 +- .../UserInterface/RiuSummaryQwtPlot.h | 12 +- .../UserInterface/RiuTextDialog.h | 2 - 49 files changed, 495 insertions(+), 434 deletions(-) create mode 100644 ApplicationLibCode/Application/RiaDateTimeDefines.cpp create mode 100644 ApplicationLibCode/Application/RiaDateTimeDefines.h diff --git a/ApplicationLibCode/Application/CMakeLists_files.cmake b/ApplicationLibCode/Application/CMakeLists_files.cmake index cb87a9bae2..1a4af7591e 100644 --- a/ApplicationLibCode/Application/CMakeLists_files.cmake +++ b/ApplicationLibCode/Application/CMakeLists_files.cmake @@ -26,6 +26,7 @@ set(SOURCE_GROUP_HEADER_FILES ${CMAKE_CURRENT_LIST_DIR}/RiaResultNames.h ${CMAKE_CURRENT_LIST_DIR}/RiaNumberFormat.h ${CMAKE_CURRENT_LIST_DIR}/RiaRftDefines.h + ${CMAKE_CURRENT_LIST_DIR}/RiaDateTimeDefines.h ) set(SOURCE_GROUP_SOURCE_FILES @@ -56,6 +57,7 @@ set(SOURCE_GROUP_SOURCE_FILES ${CMAKE_CURRENT_LIST_DIR}/RiaResultNames.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaNumberFormat.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaRftDefines.cpp + ${CMAKE_CURRENT_LIST_DIR}/RiaDateTimeDefines.cpp ) list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES}) diff --git a/ApplicationLibCode/Application/RiaDateTimeDefines.cpp b/ApplicationLibCode/Application/RiaDateTimeDefines.cpp new file mode 100644 index 0000000000..bbac4778a0 --- /dev/null +++ b/ApplicationLibCode/Application/RiaDateTimeDefines.cpp @@ -0,0 +1,60 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2022- Equinor ASA +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#include "RiaDateTimeDefines.h" + +#include "cafAppEnum.h" + +namespace caf +{ +template <> +void caf::AppEnum::setUp() +{ + addItem( RiaDefines::DateFormatComponents::DATE_FORMAT_NONE, "NO_DATE", "No Date" ); + addItem( RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR, "YEAR", "Year Only" ); + addItem( RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH, "YEAR_MONTH", "Year and Month" ); + addItem( RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY, "YEAR_MONTH_DAY", "Year, Month and Day" ); + setDefault( RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ); +} + +template <> +void caf::AppEnum::setUp() +{ + addItem( RiaDefines::TimeFormatComponents::TIME_FORMAT_NONE, "NO_TIME", "No Time of Day" ); + addItem( RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR, "HOUR", "Hour Only" ); + addItem( RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE, "HOUR_MINUTE", "Hour and Minute" ); + addItem( RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND, + "HOUR_MINUTE_SECONDS", + "Hour, Minutes and Seconds" ); + setDefault( RiaDefines::TimeFormatComponents::TIME_FORMAT_NONE ); +} + +template <> +void caf::AppEnum::setUp() +{ + addItem( RiaDefines::DateTimePeriod::NONE, "NONE", "None" ); + addItem( RiaDefines::DateTimePeriod::DAY, "DAY", "Day" ); + addItem( RiaDefines::DateTimePeriod::WEEK, "WEEK", "Week" ); + addItem( RiaDefines::DateTimePeriod::MONTH, "MONTH", "Month" ); + addItem( RiaDefines::DateTimePeriod::QUARTER, "QUARTER", "Quarter" ); + addItem( RiaDefines::DateTimePeriod::HALFYEAR, "HALFYEAR", "Half Year" ); + addItem( RiaDefines::DateTimePeriod::YEAR, "YEAR", "Year" ); + addItem( RiaDefines::DateTimePeriod::DECADE, "DECADE", "Decade" ); + setDefault( RiaDefines::DateTimePeriod::NONE ); +} +} // namespace caf diff --git a/ApplicationLibCode/Application/RiaDateTimeDefines.h b/ApplicationLibCode/Application/RiaDateTimeDefines.h new file mode 100644 index 0000000000..dcd235464d --- /dev/null +++ b/ApplicationLibCode/Application/RiaDateTimeDefines.h @@ -0,0 +1,59 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2022- Equinor ASA +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafAppEnum.h" + +namespace RiaDefines +{ +enum class DateFormatComponents +{ + DATE_FORMAT_UNSPECIFIED = -2, + DATE_FORMAT_NONE = -1, + DATE_FORMAT_YEAR = 0, + DATE_FORMAT_YEAR_MONTH, + DATE_FORMAT_YEAR_MONTH_DAY, +}; + +enum class TimeFormatComponents +{ + TIME_FORMAT_UNSPECIFIED = -2, + TIME_FORMAT_NONE = -1, + TIME_FORMAT_HOUR, + TIME_FORMAT_HOUR_MINUTE, + TIME_FORMAT_HOUR_MINUTE_SECOND, + TIME_FORMAT_HOUR_MINUTE_SECOND_MILLISECOND, + TIME_FORMAT_SIZE +}; + +enum class DateTimePeriod +{ + NONE = -1, + DAY, + WEEK, + MONTH, + QUARTER, + HALFYEAR, + YEAR, + DECADE +}; + +using DateTimePeriodEnum = caf::AppEnum; + +}; // namespace RiaDefines diff --git a/ApplicationLibCode/Application/RiaPreferences.cpp b/ApplicationLibCode/Application/RiaPreferences.cpp index c846d52c19..07f57ac13c 100644 --- a/ApplicationLibCode/Application/RiaPreferences.cpp +++ b/ApplicationLibCode/Application/RiaPreferences.cpp @@ -26,6 +26,7 @@ #include "RiaPreferencesGeoMech.h" #include "RiaPreferencesSummary.h" #include "RiaPreferencesSystem.h" +#include "RiaQDateTimeTools.h" #include "RiaValidRegExpValidator.h" #include "RifReaderSettings.h" @@ -461,7 +462,8 @@ QList RiaPreferences::calculateValueOptions( const caf:: { QDate exampleDate = QDate( 2019, 8, 16 ); QString fullDateFormat = - RiaQDateTimeTools::dateFormatString( dateFormat, RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); + RiaQDateTimeTools::dateFormatString( dateFormat, + RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ); QString uiText = QString( "%1 (%2)" ).arg( fullDateFormat ).arg( exampleDate.toString( fullDateFormat ) ); uiText.replace( "AP", "AM/PM" ); options.push_back( caf::PdmOptionItemInfo( uiText, QVariant::fromValue( dateFormat ) ) ); @@ -474,7 +476,7 @@ QList RiaPreferences::calculateValueOptions( const caf:: QTime exampleTime = QTime( 15, 48, 22 ); QString timeFormatString = RiaQDateTimeTools::timeFormatString( timeFormat, - RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND ); + RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND ); QString uiText = QString( "%1 (%2)" ).arg( timeFormatString ).arg( exampleTime.toString( timeFormatString ) ); uiText.replace( "AP", "AM/PM" ); options.push_back( caf::PdmOptionItemInfo( uiText, QVariant::fromValue( timeFormat ) ) ); @@ -660,7 +662,8 @@ const QString& RiaPreferences::timeFormat() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RiaPreferences::dateTimeFormat( DateFormatComponents dateComponents, TimeFormatComponents timeComponents ) const +QString RiaPreferences::dateTimeFormat( RiaDefines::DateFormatComponents dateComponents, + RiaDefines::TimeFormatComponents timeComponents ) const { return QString( "%1 %2" ) .arg( RiaQDateTimeTools::dateFormatString( m_dateFormat(), dateComponents ) ) diff --git a/ApplicationLibCode/Application/RiaPreferences.h b/ApplicationLibCode/Application/RiaPreferences.h index 272148b53b..9f112e8eba 100644 --- a/ApplicationLibCode/Application/RiaPreferences.h +++ b/ApplicationLibCode/Application/RiaPreferences.h @@ -21,9 +21,9 @@ #pragma once +#include "RiaDateTimeDefines.h" #include "RiaDefines.h" #include "RiaFontCache.h" -#include "RiaQDateTimeTools.h" #include "cafAppEnum.h" #include "cafPdmChildField.h" @@ -52,9 +52,6 @@ class RiaPreferences : public caf::PdmObject CAF_PDM_HEADER_INIT; public: - using DateFormatComponents = RiaQDateTimeTools::DateFormatComponents; - using TimeFormatComponents = RiaQDateTimeTools::TimeFormatComponents; - using FontSizeEnum = RiaFontCache::FontSizeEnum; using PageSizeEnum = caf::AppEnum; using PageOrientationEnum = caf::AppEnum; @@ -75,8 +72,9 @@ public: const QString& dateFormat() const; const QString& timeFormat() const; - QString dateTimeFormat( DateFormatComponents dateComponents = DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY, - TimeFormatComponents timeComponents = TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND ) const; + QString dateTimeFormat( + RiaDefines::DateFormatComponents dateComponents = RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY, + RiaDefines::TimeFormatComponents timeComponents = RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND ) const; bool searchPlotTemplateFoldersRecursively() const; QStringList plotTemplateFolders() const; diff --git a/ApplicationLibCode/Application/Tools/RiaQDateTimeTools.cpp b/ApplicationLibCode/Application/Tools/RiaQDateTimeTools.cpp index 387fdc9b3b..a3ed7e6d32 100644 --- a/ApplicationLibCode/Application/Tools/RiaQDateTimeTools.cpp +++ b/ApplicationLibCode/Application/Tools/RiaQDateTimeTools.cpp @@ -40,47 +40,6 @@ const DateTimeSpan RiaQDateTimeTools::TIMESPAN_HALFYEAR = DateTimeSpan( 0, 6, 0 const DateTimeSpan RiaQDateTimeTools::TIMESPAN_YEAR = DateTimeSpan( 1, 0, 0 ); const DateTimeSpan RiaQDateTimeTools::TIMESPAN_DECADE = DateTimeSpan( 10, 0, 0 ); -namespace caf -{ -// clang-format off - -template <> -void caf::AppEnum::setUp() -{ - addItem( RiaQDateTimeTools::DATE_FORMAT_NONE, "NO_DATE", "No Date" ); - addItem( RiaQDateTimeTools::DATE_FORMAT_YEAR, "YEAR", "Year Only" ); - addItem( RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH, "YEAR_MONTH", "Year and Month" ); - addItem( RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY, "YEAR_MONTH_DAY", "Year, Month and Day" ); - setDefault( RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); -} - -template <> -void caf::AppEnum::setUp() -{ - addItem( RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_NONE, "NO_TIME", "No Time of Day" ); - addItem( RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR, "HOUR", "Hour Only" ); - addItem( RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE, "HOUR_MINUTE", "Hour and Minute" ); - addItem( RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND, "HOUR_MINUTE_SECONDS", "Hour, Minutes and Seconds" ); - setDefault( RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_NONE ); -} - -template <> -void caf::AppEnum::setUp() -{ - addItem( RiaQDateTimeTools::DateTimePeriod::NONE, "NONE", "None" ); - addItem( RiaQDateTimeTools::DateTimePeriod::DAY, "DAY", "Day" ); - addItem( RiaQDateTimeTools::DateTimePeriod::WEEK, "WEEK", "Week" ); - addItem( RiaQDateTimeTools::DateTimePeriod::MONTH, "MONTH", "Month" ); - addItem( RiaQDateTimeTools::DateTimePeriod::QUARTER, "QUARTER", "Quarter" ); - addItem( RiaQDateTimeTools::DateTimePeriod::HALFYEAR, "HALFYEAR", "Half Year" ); - addItem( RiaQDateTimeTools::DateTimePeriod::YEAR, "YEAR", "Year" ); - addItem( RiaQDateTimeTools::DateTimePeriod::DECADE, "DECADE", "Decade" ); - setDefault( RiaQDateTimeTools::DateTimePeriod::NONE ); -} - -// clang-format on -} // namespace caf - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -197,7 +156,7 @@ QDateTime RiaQDateTimeTools::subtractSpan( const QDateTime& dt, DateTimeSpan spa //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QDateTime RiaQDateTimeTools::addPeriod( const QDateTime& dt, RiaQDateTimeTools::DateTimePeriod period ) +QDateTime RiaQDateTimeTools::addPeriod( const QDateTime& dt, RiaDefines::DateTimePeriod period ) { return addSpan( dt, timeSpan( period ) ); } @@ -205,7 +164,7 @@ QDateTime RiaQDateTimeTools::addPeriod( const QDateTime& dt, RiaQDateTimeTools:: //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QDateTime RiaQDateTimeTools::subtractPeriod( const QDateTime& dt, RiaQDateTimeTools::DateTimePeriod period ) +QDateTime RiaQDateTimeTools::subtractPeriod( const QDateTime& dt, RiaDefines::DateTimePeriod period ) { return subtractSpan( dt, timeSpan( period ) ); } @@ -287,23 +246,23 @@ bool RiaQDateTimeTools::lessThan( const QDateTime& dt1, const QDateTime& dt2 ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -const DateTimeSpan RiaQDateTimeTools::timeSpan( RiaQDateTimeTools::DateTimePeriod period ) +const DateTimeSpan RiaQDateTimeTools::timeSpan( RiaDefines::DateTimePeriod period ) { switch ( period ) { - case RiaQDateTimeTools::DateTimePeriod::DAY: + case RiaDefines::DateTimePeriod::DAY: return TIMESPAN_DAY; - case RiaQDateTimeTools::DateTimePeriod::WEEK: + case RiaDefines::DateTimePeriod::WEEK: return TIMESPAN_WEEK; - case RiaQDateTimeTools::DateTimePeriod::MONTH: + case RiaDefines::DateTimePeriod::MONTH: return TIMESPAN_MONTH; - case RiaQDateTimeTools::DateTimePeriod::QUARTER: + case RiaDefines::DateTimePeriod::QUARTER: return TIMESPAN_QUARTER; - case RiaQDateTimeTools::DateTimePeriod::HALFYEAR: + case RiaDefines::DateTimePeriod::HALFYEAR: return TIMESPAN_HALFYEAR; - case RiaQDateTimeTools::DateTimePeriod::YEAR: + case RiaDefines::DateTimePeriod::YEAR: return TIMESPAN_YEAR; - case RiaQDateTimeTools::DateTimePeriod::DECADE: + case RiaDefines::DateTimePeriod::DECADE: return TIMESPAN_DECADE; } CVF_ASSERT( false ); @@ -313,7 +272,7 @@ const DateTimeSpan RiaQDateTimeTools::timeSpan( RiaQDateTimeTools::DateTimePerio //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QDateTime RiaQDateTimeTools::truncateTime( const QDateTime& dt, RiaQDateTimeTools::DateTimePeriod period ) +QDateTime RiaQDateTimeTools::truncateTime( const QDateTime& dt, RiaDefines::DateTimePeriod period ) { int y = dt.date().year(); int m = dt.date().month(); @@ -322,19 +281,19 @@ QDateTime RiaQDateTimeTools::truncateTime( const QDateTime& dt, RiaQDateTimeTool switch ( period ) { - case RiaQDateTimeTools::DateTimePeriod::DAY: + case RiaDefines::DateTimePeriod::DAY: return createUtcDateTime( QDate( y, m, d ) ); - case RiaQDateTimeTools::DateTimePeriod::WEEK: + case RiaDefines::DateTimePeriod::WEEK: return createUtcDateTime( QDate( y, m, d ).addDays( -dow + 1 ) ); - case RiaQDateTimeTools::DateTimePeriod::MONTH: + case RiaDefines::DateTimePeriod::MONTH: return createUtcDateTime( QDate( y, m, 1 ) ); - case RiaQDateTimeTools::DateTimePeriod::QUARTER: + case RiaDefines::DateTimePeriod::QUARTER: return createUtcDateTime( QDate( y, ( ( m - 1 ) / 3 ) * 3 + 1, 1 ) ); - case RiaQDateTimeTools::DateTimePeriod::HALFYEAR: + case RiaDefines::DateTimePeriod::HALFYEAR: return createUtcDateTime( QDate( y, ( ( m - 1 ) / 6 ) * 6 + 1, 1 ) ); - case RiaQDateTimeTools::DateTimePeriod::YEAR: + case RiaDefines::DateTimePeriod::YEAR: return createUtcDateTime( QDate( y, 1, 1 ) ); - case RiaQDateTimeTools::DateTimePeriod::DECADE: + case RiaDefines::DateTimePeriod::DECADE: return createUtcDateTime( QDate( ( y / 10 ) * 10, 1, 1 ) ); } CVF_ASSERT( false ); @@ -344,13 +303,13 @@ QDateTime RiaQDateTimeTools::truncateTime( const QDateTime& dt, RiaQDateTimeTool //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RiaQDateTimeTools::dateTimePeriods() +std::vector RiaQDateTimeTools::dateTimePeriods() { - std::vector allPeriods; + std::vector allPeriods; - for ( size_t i = 0; i < DateTimePeriodEnum::size(); i++ ) + for ( size_t i = 0; i < RiaDefines::DateTimePeriodEnum::size(); i++ ) { - allPeriods.push_back( DateTimePeriodEnum::fromIndex( i ) ); + allPeriods.push_back( RiaDefines::DateTimePeriodEnum::fromIndex( i ) ); } return allPeriods; @@ -359,9 +318,9 @@ std::vector RiaQDateTimeTools::dateTimePeriod //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RiaQDateTimeTools::dateTimePeriodName( RiaQDateTimeTools::DateTimePeriod period ) +QString RiaQDateTimeTools::dateTimePeriodName( RiaDefines::DateTimePeriod period ) { - return DateTimePeriodEnum::uiText( period ); + return RiaDefines::DateTimePeriodEnum::uiText( period ); } //-------------------------------------------------------------------------------------------------- @@ -482,14 +441,17 @@ std::vector RiaQDateTimeTools::supportedTimeFormats() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RiaQDateTimeTools::dateFormatString( const QString& fullDateFormat, DateFormatComponents dateComponents ) +QString RiaQDateTimeTools::dateFormatString( const QString& fullDateFormat, RiaDefines::DateFormatComponents dateComponents ) { - if ( dateComponents == DATE_FORMAT_NONE ) return ""; + if ( dateComponents == RiaDefines::DateFormatComponents::DATE_FORMAT_NONE ) return ""; + + auto enumValue = static_cast::type>( dateComponents ); + if ( enumValue < 0 ) return ""; QStringList allVariants = fullDateFormat.split( ";" ); - if ( static_cast( dateComponents ) < allVariants.size() ) + if ( enumValue < allVariants.size() ) { - return allVariants[dateComponents]; + return allVariants[enumValue]; } CVF_ASSERT( false && "Date format string is malformed" ); return ""; @@ -498,9 +460,9 @@ QString RiaQDateTimeTools::dateFormatString( const QString& fullDateFormat, Date //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RiaQDateTimeTools::timeFormatString( const QString& fullTimeFormat, TimeFormatComponents timeComponents ) +QString RiaQDateTimeTools::timeFormatString( const QString& fullTimeFormat, RiaDefines::TimeFormatComponents timeComponents ) { - if ( timeComponents == TimeFormatComponents::TIME_FORMAT_NONE ) return ""; + if ( timeComponents == RiaDefines::TimeFormatComponents::TIME_FORMAT_NONE ) return ""; QStringList allVariants = fullTimeFormat.split( ";" ); if ( static_cast( timeComponents ) < allVariants.size() ) diff --git a/ApplicationLibCode/Application/Tools/RiaQDateTimeTools.h b/ApplicationLibCode/Application/Tools/RiaQDateTimeTools.h index 7a4861a16a..2da11175f4 100644 --- a/ApplicationLibCode/Application/Tools/RiaQDateTimeTools.h +++ b/ApplicationLibCode/Application/Tools/RiaQDateTimeTools.h @@ -18,13 +18,15 @@ #pragma once +#include "RiaDateTimeDefines.h" + +#include "cafAppEnum.h" + #include #include #include -#include "cafAppEnum.h" - class QDateTime; class QDate; class QTime; @@ -40,49 +42,7 @@ class PdmOptionItemInfo; //================================================================================================== class RiaQDateTimeTools { - static const DateTimeSpan TIMESPAN_DAY; - static const DateTimeSpan TIMESPAN_WEEK; - static const DateTimeSpan TIMESPAN_MONTH; - static const DateTimeSpan TIMESPAN_QUARTER; - static const DateTimeSpan TIMESPAN_HALFYEAR; - static const DateTimeSpan TIMESPAN_YEAR; - static const DateTimeSpan TIMESPAN_DECADE; - public: - enum DateFormatComponents - { - DATE_FORMAT_UNSPECIFIED = -2, - DATE_FORMAT_NONE = -1, - DATE_FORMAT_YEAR = 0, - DATE_FORMAT_YEAR_MONTH, - DATE_FORMAT_YEAR_MONTH_DAY, - DATE_FORMAT_SIZE - }; - - enum class TimeFormatComponents - { - TIME_FORMAT_UNSPECIFIED = -2, - TIME_FORMAT_NONE = -1, - TIME_FORMAT_HOUR, - TIME_FORMAT_HOUR_MINUTE, - TIME_FORMAT_HOUR_MINUTE_SECOND, - TIME_FORMAT_HOUR_MINUTE_SECOND_MILLISECOND, - TIME_FORMAT_SIZE - }; - - enum class DateTimePeriod - { - NONE = -1, - DAY, - WEEK, - MONTH, - QUARTER, - HALFYEAR, - YEAR, - DECADE - }; - using DateTimePeriodEnum = caf::AppEnum; - static Qt::TimeSpec currentTimeSpec(); static QDateTime fromString( const QString& dateString, const QString& format ); @@ -94,8 +54,8 @@ public: static QDateTime addYears( const QDateTime& dt, double years ); static QDateTime addSpan( const QDateTime& dt, DateTimeSpan span ); static QDateTime subtractSpan( const QDateTime& dt, DateTimeSpan span ); - static QDateTime addPeriod( const QDateTime& dt, RiaQDateTimeTools::DateTimePeriod period ); - static QDateTime subtractPeriod( const QDateTime& dt, RiaQDateTimeTools::DateTimePeriod period ); + static QDateTime addPeriod( const QDateTime& dt, RiaDefines::DateTimePeriod period ); + static QDateTime subtractPeriod( const QDateTime& dt, RiaDefines::DateTimePeriod period ); static QDateTime createDateTime( const QDate& date ); @@ -108,11 +68,11 @@ public: static bool lessThan( const QDateTime& dt1, const QDateTime& dt2 ); - static const DateTimeSpan timeSpan( RiaQDateTimeTools::DateTimePeriod period ); - static QDateTime truncateTime( const QDateTime& dt, RiaQDateTimeTools::DateTimePeriod period ); + static const DateTimeSpan timeSpan( RiaDefines::DateTimePeriod period ); + static QDateTime truncateTime( const QDateTime& dt, RiaDefines::DateTimePeriod period ); - static std::vector dateTimePeriods(); - static QString dateTimePeriodName( RiaQDateTimeTools::DateTimePeriod period ); + static std::vector dateTimePeriods(); + static QString dateTimePeriodName( RiaDefines::DateTimePeriod period ); // This function uses C locale to make sure the text representation of a date is stable, independent of the locale // settings on local machine. Required for stable regression testing. @@ -124,16 +84,24 @@ public: static std::vector supportedDateFormats(); static std::vector supportedTimeFormats(); - static QString - dateFormatString( const QString& fullDateFormat, - DateFormatComponents dateComponents = DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ); - static QString - timeFormatString( const QString& fullTimeFormat, - TimeFormatComponents timeComponents = TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND ); + static QString dateFormatString( + const QString& fullDateFormat, + RiaDefines::DateFormatComponents dateComponents = RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ); + static QString timeFormatString( const QString& fullTimeFormat, + RiaDefines::TimeFormatComponents timeComponents = + RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND ); static QList createOptionItems( const std::vector& timeSteps ); private: + static const DateTimeSpan TIMESPAN_DAY; + static const DateTimeSpan TIMESPAN_WEEK; + static const DateTimeSpan TIMESPAN_MONTH; + static const DateTimeSpan TIMESPAN_QUARTER; + static const DateTimeSpan TIMESPAN_HALFYEAR; + static const DateTimeSpan TIMESPAN_YEAR; + static const DateTimeSpan TIMESPAN_DECADE; + static quint64 secondsInDay(); static quint64 secondsInYear(); }; diff --git a/ApplicationLibCode/Application/Tools/RiaSummaryTools.cpp b/ApplicationLibCode/Application/Tools/RiaSummaryTools.cpp index 4566231e47..6614fce282 100644 --- a/ApplicationLibCode/Application/Tools/RiaSummaryTools.cpp +++ b/ApplicationLibCode/Application/Tools/RiaSummaryTools.cpp @@ -221,10 +221,10 @@ void RiaSummaryTools::getSummaryCasesAndAddressesForCalculation( int /// //-------------------------------------------------------------------------------------------------- std::pair, std::vector> - RiaSummaryTools::resampledValuesForPeriod( const RifEclipseSummaryAddress& address, - const std::vector& timeSteps, - std::vector& values, - RiaQDateTimeTools::DateTimePeriod period ) + RiaSummaryTools::resampledValuesForPeriod( const RifEclipseSummaryAddress& address, + const std::vector& timeSteps, + std::vector& values, + RiaDefines::DateTimePeriod period ) { RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( values, timeSteps ); diff --git a/ApplicationLibCode/Application/Tools/RiaSummaryTools.h b/ApplicationLibCode/Application/Tools/RiaSummaryTools.h index e38d8aa5ea..1b8fa4f175 100644 --- a/ApplicationLibCode/Application/Tools/RiaSummaryTools.h +++ b/ApplicationLibCode/Application/Tools/RiaSummaryTools.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaQDateTimeTools.h" +#include "RiaDateTimeDefines.h" #include @@ -66,10 +66,10 @@ public: std::vector& addresses ); static std::pair, std::vector> - resampledValuesForPeriod( const RifEclipseSummaryAddress& address, - const std::vector& timeSteps, - std::vector& values, - RiaQDateTimeTools::DateTimePeriod period ); + resampledValuesForPeriod( const RifEclipseSummaryAddress& address, + const std::vector& timeSteps, + std::vector& values, + RiaDefines::DateTimePeriod period ); static RimSummaryCase* summaryCaseById( int caseId ); static RimSummaryCaseCollection* ensembleById( int ensembleId ); diff --git a/ApplicationLibCode/Application/Tools/RiaTimeHistoryCurveResampler.cpp b/ApplicationLibCode/Application/Tools/RiaTimeHistoryCurveResampler.cpp index 88deb2a5ef..d88b9dffc6 100644 --- a/ApplicationLibCode/Application/Tools/RiaTimeHistoryCurveResampler.cpp +++ b/ApplicationLibCode/Application/Tools/RiaTimeHistoryCurveResampler.cpp @@ -19,6 +19,7 @@ #include #include +#include "RiaQDateTimeTools.h" #include "RiaTimeHistoryCurveResampler.h" #include @@ -67,7 +68,7 @@ void RiaTimeHistoryCurveResampler::setCurveData( const std::vector& valu //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiaTimeHistoryCurveResampler::resampleAndComputePeriodEndValues( RiaQDateTimeTools::DateTimePeriod period ) +void RiaTimeHistoryCurveResampler::resampleAndComputePeriodEndValues( RiaDefines::DateTimePeriod period ) { computePeriodEndValues( period ); } @@ -75,7 +76,7 @@ void RiaTimeHistoryCurveResampler::resampleAndComputePeriodEndValues( RiaQDateTi //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiaTimeHistoryCurveResampler::resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod period ) +void RiaTimeHistoryCurveResampler::resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod period ) { computeWeightedMeanValues( period ); } @@ -99,22 +100,22 @@ const std::vector& RiaTimeHistoryCurveResampler::resampledValues() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RiaTimeHistoryCurveResampler::timeStepsFromTimeRange( RiaQDateTimeTools::DateTimePeriod period, - time_t minTime, - time_t maxTime ) +std::vector RiaTimeHistoryCurveResampler::timeStepsFromTimeRange( RiaDefines::DateTimePeriod period, + time_t minTime, + time_t maxTime ) { if ( minTime > maxTime ) return std::vector(); - auto firstOriginalTimeStep = QDT::fromTime_t( minTime ); - auto lastOriginalTimeStep = QDT::fromTime_t( maxTime ); + auto firstOriginalTimeStep = RiaQDateTimeTools::fromTime_t( minTime ); + auto lastOriginalTimeStep = RiaQDateTimeTools::fromTime_t( maxTime ); auto currTimeStep = firstResampledTimeStep( firstOriginalTimeStep, period ); std::vector timeSteps; - while ( QDT::lessThan( currTimeStep, lastOriginalTimeStep ) ) + while ( RiaQDateTimeTools::lessThan( currTimeStep, lastOriginalTimeStep ) ) { timeSteps.push_back( currTimeStep.toSecsSinceEpoch() ); - currTimeStep = QDT::addPeriod( currTimeStep, period ); + currTimeStep = RiaQDateTimeTools::addPeriod( currTimeStep, period ); } timeSteps.push_back( currTimeStep.toSecsSinceEpoch() ); @@ -124,7 +125,7 @@ std::vector RiaTimeHistoryCurveResampler::timeStepsFromTimeRange( RiaQDa //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiaTimeHistoryCurveResampler::computeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod period ) +void RiaTimeHistoryCurveResampler::computeWeightedMeanValues( RiaDefines::DateTimePeriod period ) { size_t origDataSize = m_originalValues.second.size(); size_t oi = 0; @@ -141,9 +142,11 @@ void RiaTimeHistoryCurveResampler::computeWeightedMeanValues( RiaQDateTimeTools: m_values.reserve( m_timeSteps.size() ); for ( size_t i = 0; i < m_timeSteps.size(); i++ ) { - double wMean = 0.0; - time_t periodStart = i > 0 ? m_timeSteps[i - 1] - : QDT::subtractPeriod( QDT::fromTime_t( m_timeSteps[0] ), period ).toSecsSinceEpoch(); + double wMean = 0.0; + time_t periodStart = + i > 0 ? m_timeSteps[i - 1] + : RiaQDateTimeTools::subtractPeriod( RiaQDateTimeTools::fromTime_t( m_timeSteps[0] ), period ) + .toSecsSinceEpoch(); time_t periodEnd = m_timeSteps[i]; time_t periodLength = periodEnd - periodStart; @@ -197,7 +200,7 @@ void RiaTimeHistoryCurveResampler::computeWeightedMeanValues( RiaQDateTimeTools: //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiaTimeHistoryCurveResampler::computePeriodEndValues( RiaQDateTimeTools::DateTimePeriod period ) +void RiaTimeHistoryCurveResampler::computePeriodEndValues( RiaDefines::DateTimePeriod period ) { size_t origDataSize = m_originalValues.second.size(); size_t oi = 0; @@ -246,20 +249,20 @@ void RiaTimeHistoryCurveResampler::clearData() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiaTimeHistoryCurveResampler::computeResampledTimeSteps( RiaQDateTimeTools::DateTimePeriod period ) +void RiaTimeHistoryCurveResampler::computeResampledTimeSteps( RiaDefines::DateTimePeriod period ) { - CVF_ASSERT( period != RiaQDateTimeTools::DateTimePeriod::NONE && m_originalValues.second.size() > 0 ); + CVF_ASSERT( period != RiaDefines::DateTimePeriod::NONE && m_originalValues.second.size() > 0 ); - auto firstOriginalTimeStep = QDT::fromTime_t( m_originalValues.second.front() ); - auto lastOriginalTimeStep = QDT::fromTime_t( m_originalValues.second.back() ); + auto firstOriginalTimeStep = RiaQDateTimeTools::fromTime_t( m_originalValues.second.front() ); + auto lastOriginalTimeStep = RiaQDateTimeTools::fromTime_t( m_originalValues.second.back() ); clearData(); auto currTimeStep = firstResampledTimeStep( firstOriginalTimeStep, period ); - while ( QDT::lessThan( currTimeStep, lastOriginalTimeStep ) ) + while ( RiaQDateTimeTools::lessThan( currTimeStep, lastOriginalTimeStep ) ) { m_timeSteps.push_back( currTimeStep.toSecsSinceEpoch() ); - currTimeStep = QDT::addPeriod( currTimeStep, period ); + currTimeStep = RiaQDateTimeTools::addPeriod( currTimeStep, period ); } // Add last time step @@ -269,12 +272,13 @@ void RiaTimeHistoryCurveResampler::computeResampledTimeSteps( RiaQDateTimeTools: //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QDateTime RiaTimeHistoryCurveResampler::firstResampledTimeStep( const QDateTime& firstTimeStep, - RiaQDateTimeTools::DateTimePeriod period ) +QDateTime RiaTimeHistoryCurveResampler::firstResampledTimeStep( const QDateTime& firstTimeStep, + RiaDefines::DateTimePeriod period ) { - QDateTime truncatedTime = QDT::truncateTime( firstTimeStep, period ); + QDateTime truncatedTime = RiaQDateTimeTools::truncateTime( firstTimeStep, period ); - if ( QDT::lessThan( truncatedTime, firstTimeStep ) ) return QDT::addPeriod( truncatedTime, period ); + if ( RiaQDateTimeTools::lessThan( truncatedTime, firstTimeStep ) ) + return RiaQDateTimeTools::addPeriod( truncatedTime, period ); return truncatedTime; } diff --git a/ApplicationLibCode/Application/Tools/RiaTimeHistoryCurveResampler.h b/ApplicationLibCode/Application/Tools/RiaTimeHistoryCurveResampler.h index e917aadec7..d33ca73057 100644 --- a/ApplicationLibCode/Application/Tools/RiaTimeHistoryCurveResampler.h +++ b/ApplicationLibCode/Application/Tools/RiaTimeHistoryCurveResampler.h @@ -19,12 +19,10 @@ #pragma once #include "RiaCurveDataTools.h" -#include "RiaQDateTimeTools.h" +#include "RiaDateTimeDefines.h" #include -using QDT = RiaQDateTimeTools; - //================================================================================================== /// //================================================================================================== @@ -35,22 +33,21 @@ public: void setCurveData( const std::vector& values, const std::vector& timeSteps ); - void resampleAndComputePeriodEndValues( RiaQDateTimeTools::DateTimePeriod period ); - void resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod period ); + void resampleAndComputePeriodEndValues( RiaDefines::DateTimePeriod period ); + void resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod period ); const std::vector& resampledTimeSteps() const; const std::vector& resampledValues() const; - static std::vector - timeStepsFromTimeRange( RiaQDateTimeTools::DateTimePeriod period, time_t minTime, time_t maxTime ); + static std::vector timeStepsFromTimeRange( RiaDefines::DateTimePeriod period, time_t minTime, time_t maxTime ); private: - void computeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod period ); - void computePeriodEndValues( RiaQDateTimeTools::DateTimePeriod period ); + void computeWeightedMeanValues( RiaDefines::DateTimePeriod period ); + void computePeriodEndValues( RiaDefines::DateTimePeriod period ); void clearData(); - void computeResampledTimeSteps( RiaQDateTimeTools::DateTimePeriod period ); - static QDateTime firstResampledTimeStep( const QDateTime& firstTimestep, RiaQDateTimeTools::DateTimePeriod period ); + void computeResampledTimeSteps( RiaDefines::DateTimePeriod period ); + static QDateTime firstResampledTimeStep( const QDateTime& firstTimestep, RiaDefines::DateTimePeriod period ); inline double interpolatedValue( time_t t, time_t t1, double v1, time_t t2, double v2 ); private: diff --git a/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp b/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp index b026ff5352..7d3dc74ed2 100644 --- a/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp +++ b/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp @@ -21,6 +21,7 @@ #include "RiaFeatureCommandContext.h" #include "RiaGuiApplication.h" #include "RiaPreferencesSummary.h" +#include "RiaQDateTimeTools.h" #include "RimGridCrossPlot.h" #include "RimGridCrossPlotCurve.h" @@ -64,8 +65,8 @@ public: { auto allTabs = tabs(); CVF_ASSERT( tabIndex < (int)allTabs.size() ); - RiaQDateTimeTools::DateTimePeriod timePeriod = allTabs[tabIndex]; - if ( timePeriod == RiaQDateTimeTools::DateTimePeriod::NONE ) + RiaDefines::DateTimePeriod timePeriod = allTabs[tabIndex]; + if ( timePeriod == RiaDefines::DateTimePeriod::NONE ) { return "No Resampling"; } @@ -79,7 +80,7 @@ public: { CVF_ASSERT( m_summaryPlot.notNull() && "Need to check that provider is valid" ); - RiaQDateTimeTools::DateTimePeriod timePeriod = indexToPeriod( tabIndex ); + RiaDefines::DateTimePeriod timePeriod = indexToPeriod( tabIndex ); if ( m_summaryPlot->containsResamplableCurves() ) { @@ -89,27 +90,25 @@ public: } else { - return m_summaryPlot->asciiDataForSummaryPlotExport( RiaQDateTimeTools::DateTimePeriod::NONE, true ); + return m_summaryPlot->asciiDataForSummaryPlotExport( RiaDefines::DateTimePeriod::NONE, true ); } } int tabCount() const override { return (int)tabs().size(); } private: - static RiaQDateTimeTools::DateTimePeriod indexToPeriod( int tabIndex ) + static RiaDefines::DateTimePeriod indexToPeriod( int tabIndex ) { auto allTabs = tabs(); CVF_ASSERT( tabIndex < (int)allTabs.size() ); - RiaQDateTimeTools::DateTimePeriod timePeriod = allTabs[tabIndex]; + RiaDefines::DateTimePeriod timePeriod = allTabs[tabIndex]; return timePeriod; } - static std::vector tabs() + static std::vector tabs() { - std::vector dateTimePeriods = RiaQDateTimeTools::dateTimePeriods(); - dateTimePeriods.erase( std::remove( dateTimePeriods.begin(), - dateTimePeriods.end(), - RiaQDateTimeTools::DateTimePeriod::DECADE ), + std::vector dateTimePeriods = RiaQDateTimeTools::dateTimePeriods(); + dateTimePeriods.erase( std::remove( dateTimePeriods.begin(), dateTimePeriods.end(), RiaDefines::DateTimePeriod::DECADE ), dateTimePeriods.end() ); return dateTimePeriods; } diff --git a/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.h b/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.h index eea9017d87..3e3c4a36f8 100644 --- a/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.h +++ b/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.h @@ -18,8 +18,6 @@ #pragma once -#include "RiaQDateTimeTools.h" - #include "cafCmdFeature.h" #include diff --git a/ApplicationLibCode/Commands/RicResampleDialog.cpp b/ApplicationLibCode/Commands/RicResampleDialog.cpp index f3e4b1b16c..7d153ec128 100644 --- a/ApplicationLibCode/Commands/RicResampleDialog.cpp +++ b/ApplicationLibCode/Commands/RicResampleDialog.cpp @@ -18,6 +18,8 @@ #include "RicResampleDialog.h" +#include "RiaQDateTimeTools.h" + #include "RiuTools.h" #include @@ -97,13 +99,13 @@ RicResampleDialogResult RicResampleDialog::openDialog( QWidget* parent /*= 0*/, //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicResampleDialog::setPeriodOptions( const std::vector& dateTimePeriods ) +void RicResampleDialog::setPeriodOptions( const std::vector& dateTimePeriods ) { QStringList s; for ( auto& period : dateTimePeriods ) { - QString text = period != RiaQDateTimeTools::DateTimePeriod::NONE ? RiaQDateTimeTools::dateTimePeriodName( period ) - : "No Resampling"; + QString text = period != RiaDefines::DateTimePeriod::NONE ? RiaQDateTimeTools::dateTimePeriodName( period ) + : "No Resampling"; m_timePeriodCombo->addItem( text, QVariant( (int)period ) ); } } @@ -111,10 +113,10 @@ void RicResampleDialog::setPeriodOptions( const std::vectorcurrentIndex(); - return (RiaQDateTimeTools::DateTimePeriod)m_timePeriodCombo->itemData( currIndex ).toInt(); + return (RiaDefines::DateTimePeriod)m_timePeriodCombo->itemData( currIndex ).toInt(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Commands/RicResampleDialog.h b/ApplicationLibCode/Commands/RicResampleDialog.h index 8feb1068e7..ea68da6cb3 100644 --- a/ApplicationLibCode/Commands/RicResampleDialog.h +++ b/ApplicationLibCode/Commands/RicResampleDialog.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaQDateTimeTools.h" +#include "RiaDateTimeDefines.h" #include "cafPdmPointer.h" @@ -49,8 +49,8 @@ public: static RicResampleDialogResult openDialog( QWidget* parent = nullptr, const QString& caption = QString() ); private: - void setPeriodOptions( const std::vector& dateTimePeriods ); - RiaQDateTimeTools::DateTimePeriod selectedDateTimePeriod() const; + void setPeriodOptions( const std::vector& dateTimePeriods ); + RiaDefines::DateTimePeriod selectedDateTimePeriod() const; private slots: void slotDialogOkClicked(); @@ -69,12 +69,12 @@ private: class RicResampleDialogResult { public: - RicResampleDialogResult( bool ok, RiaQDateTimeTools::DateTimePeriod period ) + RicResampleDialogResult( bool ok, RiaDefines::DateTimePeriod period ) : ok( ok ) , period( period ) { } - bool ok; - RiaQDateTimeTools::DateTimePeriod period; + bool ok; + RiaDefines::DateTimePeriod period; }; diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp b/ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp index ca91b371f3..f92ee8c3c5 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp @@ -170,10 +170,10 @@ bool RicAsciiExportSummaryPlotFeature::exportTextToFile( const QString& fileName //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RicAsciiExportSummaryPlotFeature::exportAsciiForSummaryPlot( const QString& fileName, - const RimSummaryPlot* summaryPlot, - RiaQDateTimeTools::DateTimePeriod resamplingPeriod, - bool showTimeAsLongString ) +bool RicAsciiExportSummaryPlotFeature::exportAsciiForSummaryPlot( const QString& fileName, + const RimSummaryPlot* summaryPlot, + RiaDefines::DateTimePeriod resamplingPeriod, + bool showTimeAsLongString ) { QString text = summaryPlot->description(); text.append( summaryPlot->asciiDataForSummaryPlotExport( resamplingPeriod, showTimeAsLongString ) ); diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.h b/ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.h index 76a7078e62..77d021bb07 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.h +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.h @@ -18,8 +18,7 @@ #pragma once -#include "RiaQDateTimeTools.h" - +#include "RiaDateTimeDefines.h" #include "cafCmdFeature.h" class RimSummaryPlot; @@ -42,8 +41,8 @@ protected: void setupActionLook( QAction* actionToSetup ) override; private: - static bool exportAsciiForSummaryPlot( const QString& fileName, - const RimSummaryPlot* selectedSummaryPlots, - RiaQDateTimeTools::DateTimePeriod resamplingPeriod, - bool showTimeAsLongString ); + static bool exportAsciiForSummaryPlot( const QString& fileName, + const RimSummaryPlot* selectedSummaryPlots, + RiaDefines::DateTimePeriod resamplingPeriod, + bool showTimeAsLongString ); }; diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp index 5c26851b52..0177e0dedf 100644 --- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp @@ -21,6 +21,7 @@ #include "RiaDefines.h" #include "RiaPlotDefines.h" #include "RiaPreferences.h" +#include "RiaQDateTimeTools.h" #include "RiaSummaryCurveDefinition.h" #include "RiaTextStringTools.h" @@ -611,11 +612,12 @@ QList RimAnalysisPlot::calculateValueOptions( const caf: filteredTimeStepIndices.erase( std::unique( filteredTimeStepIndices.begin(), filteredTimeStepIndices.end() ), filteredTimeStepIndices.end() ); - QString dateFormatString = RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(), - RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); + QString dateFormatString = + RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(), + RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ); QString timeFormatString = RiaQDateTimeTools::timeFormatString( RiaPreferences::current()->timeFormat(), - RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE ); + RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE ); QString dateTimeFormatString = QString( "%1 %2" ).arg( dateFormatString ).arg( timeFormatString ); bool showTime = m_timeStepFilter() == RimTimeStepFilter::TS_ALL || @@ -1645,8 +1647,8 @@ void RimAnalysisPlot::updatePlotTitle() if ( !autoTitle.isEmpty() ) autoTitle += " @ "; QString formatString = - RiaPreferences::current()->dateTimeFormat( RiaQDateTimeTools::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY, - RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_NONE ); + RiaPreferences::current()->dateTimeFormat( RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY, + RiaDefines::TimeFormatComponents::TIME_FORMAT_NONE ); autoTitle += m_selectedTimeSteps()[0].toString( formatString ); } diff --git a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp index de7643318c..8aeeb188d8 100644 --- a/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp @@ -275,11 +275,12 @@ QList std::vector filteredTimeStepIndices = RimTimeStepFilter::filteredTimeStepIndices( allDateTimes, 0, (int)allDateTimes.size() - 1, m_timeStepFilter(), 1 ); - QString dateFormatString = RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(), - RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); + QString dateFormatString = + RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(), + RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ); QString timeFormatString = RiaQDateTimeTools::timeFormatString( RiaPreferences::current()->timeFormat(), - RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE ); + RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE ); QString dateTimeFormatString = QString( "%1 %2" ).arg( dateFormatString ).arg( timeFormatString ); bool showTime = m_timeStepFilter == RimTimeStepFilter::TS_ALL || RimTimeStepFilter::TS_INTERVAL_DAYS; @@ -607,11 +608,12 @@ QDateTime RimAbstractCorrelationPlot::timeStep() const //-------------------------------------------------------------------------------------------------- QString RimAbstractCorrelationPlot::timeStepString() const { - QString dateFormatString = RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(), - RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); + QString dateFormatString = + RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(), + RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ); QString timeFormatString = RiaQDateTimeTools::timeFormatString( RiaPreferences::current()->timeFormat(), - RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE ); + RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE ); return timeStep().toString( dateFormatString ) + " " + timeStep().toString( timeFormatString ); } diff --git a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewTools.cpp b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewTools.cpp index 6c69e11233..18a903ff73 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSimWellInViewTools.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSimWellInViewTools.cpp @@ -168,7 +168,7 @@ double RimSimWellInViewTools::extractValueForTimeStep( RifSummaryReaderInterface } auto [resampledTimeSteps, resampledValues] = - RiaSummaryTools::resampledValuesForPeriod( addr, timeSteps, values, RiaQDateTimeTools::DateTimePeriod::DAY ); + RiaSummaryTools::resampledValuesForPeriod( addr, timeSteps, values, RiaDefines::DateTimePeriod::DAY ); time_t currentTime_t = currentDate.toSecsSinceEpoch(); diff --git a/ApplicationLibCode/ProjectDataModel/RimTimeAxisAnnotation.cpp b/ApplicationLibCode/ProjectDataModel/RimTimeAxisAnnotation.cpp index 82d1dc5315..dd0fc474d4 100644 --- a/ApplicationLibCode/ProjectDataModel/RimTimeAxisAnnotation.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimTimeAxisAnnotation.cpp @@ -57,12 +57,13 @@ void RimTimeAxisAnnotation::setTime( time_t time ) { m_value = RiaTimeTTools::toDouble( time ); - QString dateFormatString = RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(), - RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); + QString dateFormatString = + RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(), + RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ); QString timeFormatString = RiaQDateTimeTools::timeFormatString( RiaPreferences::current()->timeFormat(), - RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE ); + RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE ); QString dateTimeFormatString = QString( "%1 %2" ).arg( dateFormatString ).arg( timeFormatString ); @@ -80,12 +81,13 @@ void RimTimeAxisAnnotation::setTimeRange( time_t startTime, time_t endTime ) m_rangeStart = RiaTimeTTools::toDouble( startTime ); m_rangeEnd = RiaTimeTTools::toDouble( endTime ); - QString dateFormatString = RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(), - RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); + QString dateFormatString = + RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(), + RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ); QString timeFormatString = RiaQDateTimeTools::timeFormatString( RiaPreferences::current()->timeFormat(), - RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE ); + RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE ); QString dateTimeFormatString = QString( "%1 %2" ).arg( dateFormatString ).arg( timeFormatString ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimDerivedSummaryCase.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimDerivedSummaryCase.cpp index 233c1e3080..b6874171ca 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimDerivedSummaryCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimDerivedSummaryCase.cpp @@ -20,6 +20,7 @@ #include "RiaCurveMerger.h" #include "RiaLogging.h" +#include "RiaQDateTimeTools.h" #include "RifDerivedEnsembleReader.h" diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp index d3056f3c0f..ba20062352 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp @@ -21,6 +21,7 @@ #include "RiaColorTools.h" #include "RiaGuiApplication.h" #include "RiaPreferences.h" +#include "RiaQDateTimeTools.h" #include "RiaResultNames.h" #include "RiaSummaryAddressAnalyzer.h" #include "RiaSummaryCurveDefinition.h" @@ -1175,11 +1176,12 @@ QList RimEnsembleCurveSet::calculateValueOptions( const filteredTimeStepIndices.erase( std::unique( filteredTimeStepIndices.begin(), filteredTimeStepIndices.end() ), filteredTimeStepIndices.end() ); - QString dateFormatString = RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(), - RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); + QString dateFormatString = + RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(), + RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ); QString timeFormatString = RiaQDateTimeTools::timeFormatString( RiaPreferences::current()->timeFormat(), - RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE ); + RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE ); QString dateTimeFormatString = QString( "%1 %2" ).arg( dateFormatString ).arg( timeFormatString ); bool showTime = m_timeStepFilter() == RimTimeStepFilter::TS_ALL || diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h index 4075be02dc..4694a23533 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h @@ -22,8 +22,8 @@ #include "RifEclipseSummaryAddressQMetaType.h" #include "RifSummaryReaderInterface.h" +#include "RiaDateTimeDefines.h" #include "RiaPlotDefines.h" -#include "RiaQDateTimeTools.h" #include "RimEnsembleCurveSetColorManager.h" #include "RimEnsembleCurveSetInterface.h" @@ -216,11 +216,11 @@ private: caf::PdmPointer m_currentSummaryCurve; - caf::PdmPtrField m_yValuesSummaryCaseCollection; - caf::PdmChildField m_yValuesSummaryAddress; - caf::PdmField m_yValuesSummaryAddressUiField; - caf::PdmField m_yPushButtonSelectSummaryAddress; - caf::PdmField m_resampling; + caf::PdmPtrField m_yValuesSummaryCaseCollection; + caf::PdmChildField m_yValuesSummaryAddress; + caf::PdmField m_yValuesSummaryAddressUiField; + caf::PdmField m_yPushButtonSelectSummaryAddress; + caf::PdmField m_resampling; caf::PdmField m_colorMode; caf::PdmField m_color; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp index 8fd7c45f0a..9b1614291b 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp @@ -161,10 +161,7 @@ void RimEnsembleStatisticsCase::calculate( const std::vector su if ( !includeIncompleteCurves && timeSteps.size() != values.size() ) continue; auto [resampledTimeSteps, resampledValues] = - RiaSummaryTools::resampledValuesForPeriod( inputAddress, - timeSteps, - values, - RiaQDateTimeTools::DateTimePeriod::DAY ); + RiaSummaryTools::resampledValuesForPeriod( inputAddress, timeSteps, values, RiaDefines::DateTimePeriod::DAY ); if ( allTimeSteps.empty() ) allTimeSteps = resampledTimeSteps; caseAndTimeStepValues.push_back( resampledValues ); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index 38e627f727..aecf7f74eb 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -24,6 +24,7 @@ #include "RiaLogging.h" #include "RiaPlotDefines.h" #include "RiaPreferencesSummary.h" +#include "RiaQDateTimeTools.h" #include "RiaResultNames.h" #include "RiaSummaryCurveDefinition.h" #include "RiaSummaryTools.h" @@ -664,7 +665,7 @@ void RimSummaryCurve::onLoadDataAndUpdate( bool updateParentPlot ) } else { - if ( m_resampling() != RiaQDateTimeTools::DateTimePeriod::NONE ) + if ( m_resampling() != RiaDefines::DateTimePeriod::NONE ) { auto [resampledTimeSteps, resampledValues] = RiaSummaryTools::resampledValuesForPeriod( m_yValuesSummaryAddress->address(), @@ -884,7 +885,7 @@ void RimSummaryCurve::appendOptionItemsForSummaryAddresses( QList errorValuesY() const; @@ -134,7 +134,7 @@ private: caf::PdmField m_yValuesSummaryAddressUiField; caf::PdmField m_yPushButtonSelectSummaryAddress; - caf::PdmField m_resampling; + caf::PdmField m_resampling; // X values caf::PdmPtrField m_xValuesSummaryCase; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurvesData.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurvesData.cpp index 1cbcba7995..daf51ac1a2 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurvesData.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurvesData.cpp @@ -77,7 +77,7 @@ void RimSummaryCurvesData::populateAsciiDataCurvesData( std::vector& curves, const std::vector& asciiCurves, const std::vector& gridCurves, - RiaQDateTimeTools::DateTimePeriod resamplingPeriod, + RiaDefines::DateTimePeriod resamplingPeriod, bool showTimeAsLongString ) { QString out; @@ -242,16 +242,16 @@ void RimSummaryCurvesData::populateSummaryCurvesData( std::vectorclear(); - if ( period != RiaQDateTimeTools::DateTimePeriod::NONE ) + if ( period != RiaDefines::DateTimePeriod::NONE ) { // Prepare result data resultCurvesData->resamplePeriod = period; @@ -333,7 +333,7 @@ void RimSummaryCurvesData::appendToExportData( QString& { RimSummaryCurvesData data = RimSummaryCurvesData::concatCurvesData( curvesData ); - if ( data.resamplePeriod != RiaQDateTimeTools::DateTimePeriod::NONE ) + if ( data.resamplePeriod != RiaDefines::DateTimePeriod::NONE ) { time_t minTimeStep = std::numeric_limits::max(); time_t maxTimeStep = 0; @@ -385,40 +385,40 @@ void RimSummaryCurvesData::appendToExportData( QString& { default: // Fall through to NONE - case RiaQDateTimeTools::DateTimePeriod::NONE: + case RiaDefines::DateTimePeriod::NONE: timeText = timseStepUtc.toString( "yyyy-MM-dd hh:mm:ss " ); break; - case RiaQDateTimeTools::DateTimePeriod::DAY: + case RiaDefines::DateTimePeriod::DAY: timeText = oneDayEarlier.toString( "yyyy-MM-dd " ); break; - case RiaQDateTimeTools::DateTimePeriod::WEEK: + case RiaDefines::DateTimePeriod::WEEK: { timeText = oneDayEarlier.toString( "yyyy" ); int weekNumber = oneDayEarlier.date().weekNumber(); timeText += QString( "-W%1" ).arg( weekNumber, 2, 10, zeroChar ); break; } - case RiaQDateTimeTools::DateTimePeriod::MONTH: + case RiaDefines::DateTimePeriod::MONTH: timeText = oneDayEarlier.toString( "yyyy-MM" ); break; - case RiaQDateTimeTools::DateTimePeriod::QUARTER: + case RiaDefines::DateTimePeriod::QUARTER: { int quarterNumber = oneDayEarlier.date().month() / 3; timeText = oneDayEarlier.toString( "yyyy" ); timeText += QString( "-Q%1" ).arg( quarterNumber ); break; } - case RiaQDateTimeTools::DateTimePeriod::HALFYEAR: + case RiaDefines::DateTimePeriod::HALFYEAR: { int halfYearNumber = oneDayEarlier.date().month() / 6; timeText = oneDayEarlier.toString( "yyyy" ); timeText += QString( "-H%1" ).arg( halfYearNumber ); break; } - case RiaQDateTimeTools::DateTimePeriod::YEAR: + case RiaDefines::DateTimePeriod::YEAR: timeText = oneDayEarlier.toString( "yyyy" ); break; - case RiaQDateTimeTools::DateTimePeriod::DECADE: + case RiaDefines::DateTimePeriod::DECADE: timeText = oneDayEarlier.toString( "yyyy" ); break; } @@ -473,8 +473,8 @@ RimSummaryCurvesData RimSummaryCurvesData::concatCurvesData( const std::vector @@ -66,7 +66,7 @@ public: static QString createTextForExport( const std::vector& curves, const std::vector& asciiCurves, const std::vector& gridCurves, - RiaQDateTimeTools::DateTimePeriod resamplingPeriod, + RiaDefines::DateTimePeriod resamplingPeriod, bool showTimeAsLongString ); private: @@ -77,10 +77,10 @@ private: RimSummaryCurvesData* curvesData ); static void populateAsciiDataCurvesData( std::vector curves, RimSummaryCurvesData* curvesData ); - static void prepareCaseCurvesForExport( RiaQDateTimeTools::DateTimePeriod period, - ResampleAlgorithm algorithm, - const RimSummaryCurvesData& inputCurvesData, - RimSummaryCurvesData* resultCurvesData ); + static void prepareCaseCurvesForExport( RiaDefines::DateTimePeriod period, + ResampleAlgorithm algorithm, + const RimSummaryCurvesData& inputCurvesData, + RimSummaryCurvesData* resultCurvesData ); static void appendToExportDataForCase( QString& out, const std::vector& timeSteps, @@ -95,7 +95,7 @@ private: QString createCaseId( const QString& caseName, const QString& ensembleName ); public: - RiaQDateTimeTools::DateTimePeriod resamplePeriod; + RiaDefines::DateTimePeriod resamplePeriod; std::vector caseIds; std::vector> timeSteps; std::vector> allCurveData; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index 1ea1c47b19..9fed24ab17 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -300,14 +300,14 @@ RiuPlotWidget* RimSummaryPlot::plotWidget() //-------------------------------------------------------------------------------------------------- QString RimSummaryPlot::asciiDataForPlotExport() const { - return asciiDataForSummaryPlotExport( RiaQDateTimeTools::DateTimePeriod::YEAR, false ); + return asciiDataForSummaryPlotExport( RiaDefines::DateTimePeriod::YEAR, false ); } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RimSummaryPlot::asciiDataForSummaryPlotExport( RiaQDateTimeTools::DateTimePeriod resamplingPeriod, - bool showTimeAsLongString ) const +QString RimSummaryPlot::asciiDataForSummaryPlotExport( RiaDefines::DateTimePeriod resamplingPeriod, + bool showTimeAsLongString ) const { std::vector curves; this->descendantsIncludingThisOfType( curves ); @@ -1044,8 +1044,8 @@ void RimSummaryPlot::updateTimeAxis( RimSummaryTimeAxisProperties* timeAxisPrope if ( timeAxisProperties->timeMode() == RimSummaryTimeAxisProperties::DATE ) { - RiaQDateTimeTools::DateFormatComponents dateComponents = timeAxisProperties->dateComponents(); - RiaQDateTimeTools::TimeFormatComponents timeComponents = timeAxisProperties->timeComponents(); + RiaDefines::DateFormatComponents dateComponents = timeAxisProperties->dateComponents(); + RiaDefines::TimeFormatComponents timeComponents = timeAxisProperties->timeComponents(); const QString& dateFormat = timeAxisProperties->dateFormat(); const QString& timeFormat = timeAxisProperties->timeFormat(); diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h index 3365161185..39217afb34 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h @@ -18,8 +18,8 @@ #pragma once +#include "RiaDateTimeDefines.h" #include "RiaPlotDefines.h" -#include "RiaQDateTimeTools.h" #include "RifEclipseSummaryAddress.h" @@ -127,8 +127,7 @@ public: QWidget* viewWidget() override; QString asciiDataForPlotExport() const override; - QString asciiDataForSummaryPlotExport( RiaQDateTimeTools::DateTimePeriod resamplingPeriod, - bool showTimeAsLongString ) const; + QString asciiDataForSummaryPlotExport( RiaDefines::DateTimePeriod resamplingPeriod, bool showTimeAsLongString ) const; std::vector summaryAndEnsembleCurves() const; std::set summaryAndEnsembleCurveDefinitions() const; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp index 557c640986..88c01c8ab0 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp @@ -21,6 +21,7 @@ #include "RiaApplication.h" #include "RiaFontCache.h" #include "RiaPreferences.h" +#include "RiaQDateTimeTools.h" #include "RimSummaryPlot.h" @@ -364,7 +365,8 @@ QList QDate exampleDate = QDate( 2019, 8, 16 ); QString fullDateFormat = RiaQDateTimeTools::dateFormatString( dateFormat, - dateComponents( RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ) ); + dateComponents( + RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ) ); QString uiText = QString( "%1 (%2)" ).arg( fullDateFormat ).arg( exampleDate.toString( fullDateFormat ) ); uiText.replace( "AP", "AM/PM" ); options.push_back( caf::PdmOptionItemInfo( uiText, QVariant::fromValue( dateFormat ) ) ); @@ -378,7 +380,7 @@ QList QString timeFormatString = RiaQDateTimeTools::timeFormatString( timeFormat, timeComponents( - RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND ) ); + RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND ) ); QString uiText = QString( "%1 (%2)" ).arg( timeFormatString ).arg( exampleTime.toString( timeFormatString ) ); uiText.replace( "AP", "AM/PM" ); options.push_back( caf::PdmOptionItemInfo( uiText, QVariant::fromValue( timeFormat ) ) ); @@ -474,12 +476,11 @@ double RimSummaryTimeAxisProperties::fromDaysToDisplayUnitScale() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaQDateTimeTools::DateFormatComponents - RimSummaryTimeAxisProperties::dateComponents( RiaQDateTimeTools::DateFormatComponents fallback ) const +RiaDefines::DateFormatComponents RimSummaryTimeAxisProperties::dateComponents( RiaDefines::DateFormatComponents fallback ) const { if ( m_automaticDateComponents() ) return fallback; - RiaQDateTimeTools::DateFormatComponents components = m_dateComponents(); + RiaDefines::DateFormatComponents components = m_dateComponents(); return components; } @@ -487,12 +488,11 @@ RiaQDateTimeTools::DateFormatComponents //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiaQDateTimeTools::TimeFormatComponents - RimSummaryTimeAxisProperties::timeComponents( RiaQDateTimeTools::TimeFormatComponents fallback ) const +RiaDefines::TimeFormatComponents RimSummaryTimeAxisProperties::timeComponents( RiaDefines::TimeFormatComponents fallback ) const { if ( m_automaticDateComponents() ) return fallback; - RiaQDateTimeTools::TimeFormatComponents components = m_timeComponents(); + RiaDefines::TimeFormatComponents components = m_timeComponents(); return components; } @@ -578,11 +578,11 @@ void RimSummaryTimeAxisProperties::defineUiOrdering( QString uiConfigName, caf:: { caf::PdmUiGroup* advancedGroup = timeGroup->addNewGroup( "Date/Time Label Format" ); advancedGroup->setCollapsedByDefault( true ); - if ( m_automaticDateComponents() || m_dateComponents() != RiaQDateTimeTools::DATE_FORMAT_NONE ) + if ( m_automaticDateComponents() || m_dateComponents() != RiaDefines::DateFormatComponents::DATE_FORMAT_NONE ) { advancedGroup->add( &m_dateFormat ); } - if ( m_automaticDateComponents() || m_timeComponents() != RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_NONE ) + if ( m_automaticDateComponents() || m_timeComponents() != RiaDefines::TimeFormatComponents::TIME_FORMAT_NONE ) { advancedGroup->add( &m_timeFormat ); } @@ -684,7 +684,8 @@ void RimSummaryTimeAxisProperties::defineEditorAttribute( const caf::PdmFieldHan if ( dateAttrib ) { dateAttrib->dateFormat = - RiaQDateTimeTools::dateFormatString( m_dateFormat(), RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); + RiaQDateTimeTools::dateFormatString( m_dateFormat(), + RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ); } } else if ( field == &m_visibleTimeRangeMin || field == &m_visibleTimeRangeMax ) @@ -694,7 +695,7 @@ void RimSummaryTimeAxisProperties::defineEditorAttribute( const caf::PdmFieldHan { timeAttrib->timeFormat = RiaQDateTimeTools::timeFormatString( m_timeFormat(), - RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND ); + RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND ); } } } diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.h index 02336e1d4f..699ef2f1c5 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaQDateTimeTools.h" +#include "RiaDateTimeDefines.h" #include "RimPlotAxisPropertiesInterface.h" #include "RimTimeAxisAnnotation.h" @@ -57,8 +57,8 @@ public: YEARS }; - typedef caf::AppEnum DateFormatEnum; - typedef caf::AppEnum TimeFormatEnum; + typedef caf::AppEnum DateFormatEnum; + typedef caf::AppEnum TimeFormatEnum; public: RimSummaryTimeAxisProperties(); @@ -75,11 +75,10 @@ public: double fromTimeTToDisplayUnitScale(); double fromDaysToDisplayUnitScale(); - RiaQDateTimeTools::DateFormatComponents - dateComponents( RiaQDateTimeTools::DateFormatComponents fallback = RiaQDateTimeTools::DATE_FORMAT_UNSPECIFIED ) const; - RiaQDateTimeTools::TimeFormatComponents - timeComponents( RiaQDateTimeTools::TimeFormatComponents fallback = - RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) const; + RiaDefines::DateFormatComponents dateComponents( + RiaDefines::DateFormatComponents fallback = RiaDefines::DateFormatComponents::DATE_FORMAT_UNSPECIFIED ) const; + RiaDefines::TimeFormatComponents timeComponents( + RiaDefines::TimeFormatComponents fallback = RiaDefines::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) const; std::vector annotations() const override; void appendAnnotation( RimPlotAxisAnnotation* annotation ) override; diff --git a/ApplicationLibCode/ProjectDataModelCommands/RimcSummaryCase.cpp b/ApplicationLibCode/ProjectDataModelCommands/RimcSummaryCase.cpp index d772a811c8..616dcdf3b5 100644 --- a/ApplicationLibCode/ProjectDataModelCommands/RimcSummaryCase.cpp +++ b/ApplicationLibCode/ProjectDataModelCommands/RimcSummaryCase.cpp @@ -220,10 +220,10 @@ caf::PdmObjectHandle* RimSummaryCase_resampleValues::execute() const auto& timeValues = sumReader->timeSteps( adr ); - QString periodString = m_resamplingPeriod().trimmed(); - RiaQDateTimeTools::DateTimePeriod period = RiaQDateTimeTools::DateTimePeriodEnum::fromText( periodString ); + QString periodString = m_resamplingPeriod().trimmed(); + RiaDefines::DateTimePeriod period = RiaDefines::DateTimePeriodEnum::fromText( periodString ); - if ( period != RiaQDateTimeTools::DateTimePeriod::NONE ) + if ( period != RiaDefines::DateTimePeriod::NONE ) { auto [resampledTimeSteps, resampledValues] = RiaSummaryTools::resampledValuesForPeriod( adr, timeValues, values, period ); diff --git a/ApplicationLibCode/UnitTests/RiaTimeHistoryCurveTools-Test.cpp b/ApplicationLibCode/UnitTests/RiaTimeHistoryCurveTools-Test.cpp index fcabcb6677..4826dfb52f 100644 --- a/ApplicationLibCode/UnitTests/RiaTimeHistoryCurveTools-Test.cpp +++ b/ApplicationLibCode/UnitTests/RiaTimeHistoryCurveTools-Test.cpp @@ -35,7 +35,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_NoPeriod ) RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); + resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::MONTH ); EXPECT_EQ( 1, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( toSecsSinceEpoch( "2018-03-01" ), resampler.resampledTimeSteps()[0] ); @@ -52,7 +52,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_Decade ) RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::DECADE ); + resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::DECADE ); EXPECT_EQ( 4, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( toSecsSinceEpoch( "1990-01-01" ), resampler.resampledTimeSteps()[0] ); @@ -72,7 +72,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_Year ) RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::YEAR ); + resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::YEAR ); EXPECT_EQ( 5, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( toSecsSinceEpoch( "2015-01-01" ), resampler.resampledTimeSteps()[0] ); @@ -93,7 +93,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_HalfYear ) RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::HALFYEAR ); + resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::HALFYEAR ); EXPECT_EQ( 5, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( toSecsSinceEpoch( "2016-07-01" ), resampler.resampledTimeSteps()[0] ); @@ -114,7 +114,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_Quarter ) RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::QUARTER ); + resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::QUARTER ); EXPECT_EQ( 7, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( toSecsSinceEpoch( "2016-10-01" ), resampler.resampledTimeSteps()[0] ); @@ -137,7 +137,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_Month ) RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); + resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::MONTH ); EXPECT_EQ( 6, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( toSecsSinceEpoch( "2017-10-01" ), resampler.resampledTimeSteps()[0] ); @@ -159,7 +159,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_Week ) RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::WEEK ); + resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::WEEK ); EXPECT_EQ( 10, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( toSecsSinceEpoch( "2017-11-06" ), resampler.resampledTimeSteps()[0] ); @@ -185,7 +185,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_NoSampleCrossingPeriodBounda RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::YEAR ); + resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::YEAR ); EXPECT_EQ( 1, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( toSecsSinceEpoch( "2018-01-01" ), resampler.resampledTimeSteps()[0] ); @@ -202,7 +202,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_SingleSample ) RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); + resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::MONTH ); EXPECT_EQ( 1, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( toSecsSinceEpoch( "2018-03-01" ), resampler.resampledTimeSteps()[0] ); @@ -222,7 +222,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_Days ) RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::DAY ); + resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::DAY ); EXPECT_EQ( 5, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( toSecsSinceEpoch( "2018-02-03" ), resampler.resampledTimeSteps()[0] ); @@ -256,7 +256,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_Decade ) RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::DECADE ); + resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::DECADE ); EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] ); @@ -287,7 +287,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_SamplesStartBeforePeriod ) RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); + resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::MONTH ); EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] ); @@ -320,7 +320,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_SamplesStartBeforePeriod_T RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); + resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::MONTH ); EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] ); @@ -349,7 +349,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_SamplesStartAndEndMatchPer RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); + resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::MONTH ); EXPECT_EQ( 2, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( toSecsSinceEpoch( "2018-02-01" ), resampler.resampledTimeSteps().front() ); @@ -379,7 +379,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_SamplesStartMatchPeriodSta RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); + resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::MONTH ); EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] ); @@ -409,7 +409,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_MultipleSamplesInLastPerio RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); + resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::MONTH ); EXPECT_EQ( 2, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] ); @@ -433,7 +433,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_PeriodEndValues_SingleSample ) RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputePeriodEndValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); + resampler.resampleAndComputePeriodEndValues( RiaDefines::DateTimePeriod::MONTH ); EXPECT_EQ( 1, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( toSecsSinceEpoch( "2018-03-01" ), resampler.resampledTimeSteps()[0] ); @@ -459,7 +459,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_PeriodEndValues_SamplesStartBeforePerio RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputePeriodEndValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); + resampler.resampleAndComputePeriodEndValues( RiaDefines::DateTimePeriod::MONTH ); EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] ); @@ -486,7 +486,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_PeriodEndValues_SamplesStartMatchPeriod RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputePeriodEndValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); + resampler.resampleAndComputePeriodEndValues( RiaDefines::DateTimePeriod::MONTH ); EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( toSecsSinceEpoch( "2018-02-01" ), resampler.resampledTimeSteps()[0] ); @@ -509,7 +509,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_PeriodEndValues_SamplesStartAndEndMatch RiaTimeHistoryCurveResampler resampler; resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); - resampler.resampleAndComputePeriodEndValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); + resampler.resampleAndComputePeriodEndValues( RiaDefines::DateTimePeriod::MONTH ); EXPECT_EQ( 2, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( toSecsSinceEpoch( "2018-02-01" ), resampler.resampledTimeSteps().front() ); diff --git a/ApplicationLibCode/UserInterface/RiuQtChartsPlotTools.cpp b/ApplicationLibCode/UserInterface/RiuQtChartsPlotTools.cpp index bb64a0e03b..a129a30b56 100644 --- a/ApplicationLibCode/UserInterface/RiuQtChartsPlotTools.cpp +++ b/ApplicationLibCode/UserInterface/RiuQtChartsPlotTools.cpp @@ -15,13 +15,15 @@ // for more details. // ///////////////////////////////////////////////////////////////////////////////// + #include "RiuQtChartsPlotTools.h" -#include "RiaPlotDefines.h" -#include "RiuGuiTheme.h" - #include "RiaApplication.h" +#include "RiaPlotDefines.h" #include "RiaPreferences.h" +#include "RiaQDateTimeTools.h" + +#include "RiuGuiTheme.h" #include "RiuQtChartsPlotWidget.h" //-------------------------------------------------------------------------------------------------- @@ -72,11 +74,11 @@ void RiuQtChartsPlotTools::setDefaultAxes( RiuQtChartsPlotWidget* plot ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuQtChartsPlotTools::enableDateBasedBottomXAxis( RiuQtChartsPlotWidget* plot, - const QString& dateFormat, - const QString& timeFormat, - RiaQDateTimeTools::DateFormatComponents dateComponents, - RiaQDateTimeTools::TimeFormatComponents timeComponents ) +void RiuQtChartsPlotTools::enableDateBasedBottomXAxis( RiuQtChartsPlotWidget* plot, + const QString& dateFormat, + const QString& timeFormat, + RiaDefines::DateFormatComponents dateComponents, + RiaDefines::TimeFormatComponents timeComponents ) { QString format = dateTimeFormatForInterval( dateFormat, timeFormat, dateComponents, timeComponents ); plot->setAxisFormat( RiuPlotAxis::defaultBottom(), format ); @@ -85,21 +87,19 @@ void RiuQtChartsPlotTools::enableDateBasedBottomXAxis( RiuQtChartsPlotWidget* //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RiuQtChartsPlotTools::dateTimeFormatForInterval( const QString& dateFormat, - const QString& timeFormat, - RiaQDateTimeTools::DateFormatComponents dateComponents, - RiaQDateTimeTools::TimeFormatComponents timeComponents ) +QString RiuQtChartsPlotTools::dateTimeFormatForInterval( const QString& dateFormat, + const QString& timeFormat, + RiaDefines::DateFormatComponents dateComponents, + RiaDefines::TimeFormatComponents timeComponents ) { - if ( dateComponents != RiaQDateTimeTools::DATE_FORMAT_UNSPECIFIED && - timeComponents != RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) + if ( dateComponents != RiaDefines::DateFormatComponents::DATE_FORMAT_UNSPECIFIED && + timeComponents != RiaDefines::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) { return RiaQDateTimeTools::timeFormatString( timeFormat, timeComponents ) + "\n" + RiaQDateTimeTools::dateFormatString( dateFormat, dateComponents ); } // Default: - return RiaQDateTimeTools::timeFormatString( timeFormat, RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_NONE ) + - "\n" + - RiaQDateTimeTools::dateFormatString( dateFormat, - RiaQDateTimeTools::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ); + return RiaQDateTimeTools::timeFormatString( timeFormat, RiaDefines::TimeFormatComponents::TIME_FORMAT_NONE ) + "\n" + + RiaQDateTimeTools::dateFormatString( dateFormat, RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ); } diff --git a/ApplicationLibCode/UserInterface/RiuQtChartsPlotTools.h b/ApplicationLibCode/UserInterface/RiuQtChartsPlotTools.h index e809ad2de4..58a7744c9b 100644 --- a/ApplicationLibCode/UserInterface/RiuQtChartsPlotTools.h +++ b/ApplicationLibCode/UserInterface/RiuQtChartsPlotTools.h @@ -17,7 +17,7 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "RiaQDateTimeTools.h" +#include "RiaDateTimeDefines.h" class RiuQtChartsPlotWidget; @@ -27,14 +27,14 @@ public: static void setCommonPlotBehaviour( RiuQtChartsPlotWidget* plot ); static void setDefaultAxes( RiuQtChartsPlotWidget* plot ); static void enableDateBasedBottomXAxis( - RiuQtChartsPlotWidget* plot, - const QString& dateFormat, - const QString& timeFormat, - RiaQDateTimeTools::DateFormatComponents dateComponents = RiaQDateTimeTools::DATE_FORMAT_UNSPECIFIED, - RiaQDateTimeTools::TimeFormatComponents timeComponents = RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ); + RiuQtChartsPlotWidget* plot, + const QString& dateFormat, + const QString& timeFormat, + RiaDefines::DateFormatComponents dateComponents = RiaDefines::DateFormatComponents::DATE_FORMAT_UNSPECIFIED, + RiaDefines::TimeFormatComponents timeComponents = RiaDefines::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ); - static QString dateTimeFormatForInterval( const QString& dateFormat, - const QString& timeFormat, - RiaQDateTimeTools::DateFormatComponents dateComponents, - RiaQDateTimeTools::TimeFormatComponents timeComponents ); + static QString dateTimeFormatForInterval( const QString& dateFormat, + const QString& timeFormat, + RiaDefines::DateFormatComponents dateComponents, + RiaDefines::TimeFormatComponents timeComponents ); }; diff --git a/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp b/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp index bccc6a72eb..bcc535f08f 100644 --- a/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp +++ b/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp @@ -660,10 +660,10 @@ void RiuQtChartsPlotWidget::updateZoomDependentCurveProperties() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuQtChartsPlotWidget::setFormatStrings( const QString& dateFormat, - const QString& timeFormat, - RiaQDateTimeTools::DateFormatComponents dateComponents, - RiaQDateTimeTools::TimeFormatComponents timeComponents ) +void RiuQtChartsPlotWidget::setFormatStrings( const QString& dateFormat, + const QString& timeFormat, + RiaDefines::DateFormatComponents dateComponents, + RiaDefines::TimeFormatComponents timeComponents ) { m_dateScaleWrapper->setFormatStrings( dateFormat, timeFormat, dateComponents, timeComponents ); } diff --git a/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.h b/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.h index 7c654f288c..c67ee6f70d 100644 --- a/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.h +++ b/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.h @@ -19,9 +19,9 @@ #pragma once +#include "RiaDateTimeDefines.h" #include "RiaDefines.h" #include "RiaPlotDefines.h" -#include "RiaQDateTimeTools.h" #include "RiuPlotWidget.h" @@ -183,10 +183,10 @@ public: void updateZoomDependentCurveProperties() override; - void setFormatStrings( const QString& dateFormat, - const QString& timeFormat, - RiaQDateTimeTools::DateFormatComponents dateComponents, - RiaQDateTimeTools::TimeFormatComponents timeComponents ); + void setFormatStrings( const QString& dateFormat, + const QString& timeFormat, + RiaDefines::DateFormatComponents dateComponents, + RiaDefines::TimeFormatComponents timeComponents ); protected: void attachSeriesToAxis( RiuPlotAxis axis, QtCharts::QAbstractSeries* series, RiuQtChartsPlotCurve* plotCurve ); diff --git a/ApplicationLibCode/UserInterface/RiuQwtDateScaleWrapper.cpp b/ApplicationLibCode/UserInterface/RiuQwtDateScaleWrapper.cpp index e9d12148d2..a1432d74db 100644 --- a/ApplicationLibCode/UserInterface/RiuQwtDateScaleWrapper.cpp +++ b/ApplicationLibCode/UserInterface/RiuQwtDateScaleWrapper.cpp @@ -33,10 +33,10 @@ RiuQwtDateScaleWrapper::RiuQwtDateScaleWrapper() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuQwtDateScaleWrapper::setFormatStrings( const QString& dateFormat, - const QString& timeFormat, - RiaQDateTimeTools::DateFormatComponents dateComponents, - RiaQDateTimeTools::TimeFormatComponents timeComponents ) +void RiuQwtDateScaleWrapper::setFormatStrings( const QString& dateFormat, + const QString& timeFormat, + RiaDefines::DateFormatComponents dateComponents, + RiaDefines::TimeFormatComponents timeComponents ) { std::set intervals = { QwtDate::Year, QwtDate::Month, diff --git a/ApplicationLibCode/UserInterface/RiuQwtDateScaleWrapper.h b/ApplicationLibCode/UserInterface/RiuQwtDateScaleWrapper.h index dbdf506ae5..ee37ecd6d1 100644 --- a/ApplicationLibCode/UserInterface/RiuQwtDateScaleWrapper.h +++ b/ApplicationLibCode/UserInterface/RiuQwtDateScaleWrapper.h @@ -27,10 +27,10 @@ class RiuQwtDateScaleWrapper public: RiuQwtDateScaleWrapper(); - void setFormatStrings( const QString& dateFormat, - const QString& timeFormat, - RiaQDateTimeTools::DateFormatComponents dateComponents, - RiaQDateTimeTools::TimeFormatComponents timeComponents ); + void setFormatStrings( const QString& dateFormat, + const QString& timeFormat, + RiaDefines::DateFormatComponents dateComponents, + RiaDefines::TimeFormatComponents timeComponents ); void setMaxMajorTicks( int tickCount ); QString formatStringForRange( const QDateTime& min, const QDateTime& max ); diff --git a/ApplicationLibCode/UserInterface/RiuQwtPlotTools.cpp b/ApplicationLibCode/UserInterface/RiuQwtPlotTools.cpp index d997d2838b..0a1e0489a9 100644 --- a/ApplicationLibCode/UserInterface/RiuQwtPlotTools.cpp +++ b/ApplicationLibCode/UserInterface/RiuQwtPlotTools.cpp @@ -21,6 +21,7 @@ #include "RiaApplication.h" #include "RiaPreferences.h" +#include "RiaQDateTimeTools.h" #include "qwt_date_scale_draw.h" #include "qwt_date_scale_engine.h" @@ -126,11 +127,11 @@ void RiuQwtPlotTools::setDefaultAxes( QwtPlot* plot ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuQwtPlotTools::enableDateBasedBottomXAxis( QwtPlot* plot, - const QString& dateFormat, - const QString& timeFormat, - RiaQDateTimeTools::DateFormatComponents dateComponents, - RiaQDateTimeTools::TimeFormatComponents timeComponents ) +void RiuQwtPlotTools::enableDateBasedBottomXAxis( QwtPlot* plot, + const QString& dateFormat, + const QString& timeFormat, + RiaDefines::DateFormatComponents dateComponents, + RiaDefines::TimeFormatComponents timeComponents ) { QwtDateScaleDraw* scaleDraw = new QwtDateScaleDraw( Qt::UTC ); @@ -157,14 +158,14 @@ void RiuQwtPlotTools::enableDateBasedBottomXAxis( QwtPlot* //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RiuQwtPlotTools::dateTimeFormatForInterval( QwtDate::IntervalType interval, - const QString& dateFormat, - const QString& timeFormat, - RiaQDateTimeTools::DateFormatComponents dateComponents, - RiaQDateTimeTools::TimeFormatComponents timeComponents ) +QString RiuQwtPlotTools::dateTimeFormatForInterval( QwtDate::IntervalType interval, + const QString& dateFormat, + const QString& timeFormat, + RiaDefines::DateFormatComponents dateComponents, + RiaDefines::TimeFormatComponents timeComponents ) { - if ( dateComponents != RiaQDateTimeTools::DATE_FORMAT_UNSPECIFIED && - timeComponents != RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) + if ( dateComponents != RiaDefines::DateFormatComponents::DATE_FORMAT_UNSPECIFIED && + timeComponents != RiaDefines::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) { return RiaQDateTimeTools::timeFormatString( timeFormat, timeComponents ) + "\n" + RiaQDateTimeTools::dateFormatString( dateFormat, dateComponents ); @@ -175,44 +176,49 @@ QString RiuQwtPlotTools::dateTimeFormatForInterval( QwtDate::IntervalType { case QwtDate::Millisecond: return RiaQDateTimeTools::timeFormatString( timeFormat, - RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND_MILLISECOND ); + RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND_MILLISECOND ); case QwtDate::Second: return RiaQDateTimeTools::timeFormatString( timeFormat, - RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND ); + RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND ); case QwtDate::Minute: { QString fullFormat = RiaQDateTimeTools::timeFormatString( timeFormat, - RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE ); + RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE ); fullFormat += "\n"; fullFormat += - RiaQDateTimeTools::dateFormatString( dateFormat, RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); + RiaQDateTimeTools::dateFormatString( dateFormat, + RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ); return fullFormat; } case QwtDate::Hour: { QString fullFormat = - RiaQDateTimeTools::timeFormatString( timeFormat, - RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR ); + RiaQDateTimeTools::timeFormatString( timeFormat, RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR ); if ( !fullFormat.endsWith( "AP" ) ) { fullFormat += ":00"; } fullFormat += "\n"; fullFormat += - RiaQDateTimeTools::dateFormatString( dateFormat, RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); + RiaQDateTimeTools::dateFormatString( dateFormat, + RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ); return fullFormat; } case QwtDate::Day: - return RiaQDateTimeTools::dateFormatString( dateFormat, RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); + return RiaQDateTimeTools::dateFormatString( dateFormat, + RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ); case QwtDate::Week: - return RiaQDateTimeTools::dateFormatString( dateFormat, RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH ); + return RiaQDateTimeTools::dateFormatString( dateFormat, + RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH ); case QwtDate::Month: - return RiaQDateTimeTools::dateFormatString( dateFormat, RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH ); + return RiaQDateTimeTools::dateFormatString( dateFormat, + RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH ); case QwtDate::Year: - return RiaQDateTimeTools::dateFormatString( dateFormat, RiaQDateTimeTools::DATE_FORMAT_YEAR ); + return RiaQDateTimeTools::dateFormatString( dateFormat, RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR ); default: - return RiaQDateTimeTools::dateFormatString( dateFormat, RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); + return RiaQDateTimeTools::dateFormatString( dateFormat, + RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ); } } } diff --git a/ApplicationLibCode/UserInterface/RiuQwtPlotTools.h b/ApplicationLibCode/UserInterface/RiuQwtPlotTools.h index 2d2cbed420..e567f9acae 100644 --- a/ApplicationLibCode/UserInterface/RiuQwtPlotTools.h +++ b/ApplicationLibCode/UserInterface/RiuQwtPlotTools.h @@ -17,8 +17,9 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once +#include "RiaDateTimeDefines.h" #include "RiaPlotDefines.h" -#include "RiaQDateTimeTools.h" + #include #include #include @@ -29,17 +30,17 @@ public: static void setCommonPlotBehaviour( QwtPlot* plot ); static void setDefaultAxes( QwtPlot* plot ); static void enableDateBasedBottomXAxis( - QwtPlot* plot, - const QString& dateFormat, - const QString& timeFormat, - RiaQDateTimeTools::DateFormatComponents dateComponents = RiaQDateTimeTools::DATE_FORMAT_UNSPECIFIED, - RiaQDateTimeTools::TimeFormatComponents timeComponents = RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ); + QwtPlot* plot, + const QString& dateFormat, + const QString& timeFormat, + RiaDefines::DateFormatComponents dateComponents = RiaDefines::DateFormatComponents::DATE_FORMAT_UNSPECIFIED, + RiaDefines::TimeFormatComponents timeComponents = RiaDefines::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ); - static QString dateTimeFormatForInterval( QwtDate::IntervalType interval, - const QString& dateFormat, - const QString& timeFormat, - RiaQDateTimeTools::DateFormatComponents dateComponents, - RiaQDateTimeTools::TimeFormatComponents timeComponents ); + static QString dateTimeFormatForInterval( QwtDate::IntervalType interval, + const QString& dateFormat, + const QString& timeFormat, + RiaDefines::DateFormatComponents dateComponents, + RiaDefines::TimeFormatComponents timeComponents ); static QwtPlotShapeItem* createBoxShape( const QString& label, double startX, diff --git a/ApplicationLibCode/UserInterface/RiuSummaryPlot.h b/ApplicationLibCode/UserInterface/RiuSummaryPlot.h index 791c07aa96..87fd5cca17 100644 --- a/ApplicationLibCode/UserInterface/RiuSummaryPlot.h +++ b/ApplicationLibCode/UserInterface/RiuSummaryPlot.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaQDateTimeTools.h" +#include "RiaDateTimeDefines.h" #include #include @@ -40,11 +40,10 @@ public: ~RiuSummaryPlot() override; virtual void useDateBasedTimeAxis( - const QString& dateFormat, - const QString& timeFormat, - RiaQDateTimeTools::DateFormatComponents dateComponents = RiaQDateTimeTools::DATE_FORMAT_UNSPECIFIED, - RiaQDateTimeTools::TimeFormatComponents timeComponents = - RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) = 0; + const QString& dateFormat, + const QString& timeFormat, + RiaDefines::DateFormatComponents dateComponents = RiaDefines::DateFormatComponents::DATE_FORMAT_UNSPECIFIED, + RiaDefines::TimeFormatComponents timeComponents = RiaDefines::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) = 0; virtual void useTimeBasedTimeAxis() = 0; diff --git a/ApplicationLibCode/UserInterface/RiuSummaryQtChartsPlot.cpp b/ApplicationLibCode/UserInterface/RiuSummaryQtChartsPlot.cpp index 3c49d08f2d..9fc1356f97 100644 --- a/ApplicationLibCode/UserInterface/RiuSummaryQtChartsPlot.cpp +++ b/ApplicationLibCode/UserInterface/RiuSummaryQtChartsPlot.cpp @@ -56,10 +56,10 @@ RiuSummaryQtChartsPlot::~RiuSummaryQtChartsPlot() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuSummaryQtChartsPlot::useDateBasedTimeAxis( const QString& dateFormat, - const QString& timeFormat, - RiaQDateTimeTools::DateFormatComponents dateComponents, - RiaQDateTimeTools::TimeFormatComponents timeComponents ) +void RiuSummaryQtChartsPlot::useDateBasedTimeAxis( const QString& dateFormat, + const QString& timeFormat, + RiaDefines::DateFormatComponents dateComponents, + RiaDefines::TimeFormatComponents timeComponents ) { m_plotWidget->setAxisScaleType( RiuPlotAxis::defaultBottom(), RiuPlotWidget::AxisScaleType::DATE ); m_plotWidget->setFormatStrings( dateFormat, timeFormat, dateComponents, timeComponents ); diff --git a/ApplicationLibCode/UserInterface/RiuSummaryQtChartsPlot.h b/ApplicationLibCode/UserInterface/RiuSummaryQtChartsPlot.h index 80dd2ea8fe..eda7e71429 100644 --- a/ApplicationLibCode/UserInterface/RiuSummaryQtChartsPlot.h +++ b/ApplicationLibCode/UserInterface/RiuSummaryQtChartsPlot.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaQDateTimeTools.h" +#include "RiaDateTimeDefines.h" #include "RiuQtChartsPlotWidget.h" #include "RiuSummaryPlot.h" @@ -41,11 +41,11 @@ public: RiuSummaryQtChartsPlot( RimSummaryPlot* plot ); ~RiuSummaryQtChartsPlot() override; - void useDateBasedTimeAxis( const QString& dateFormat, - const QString& timeFormat, - RiaQDateTimeTools::DateFormatComponents dateComponents = RiaQDateTimeTools::DATE_FORMAT_UNSPECIFIED, - RiaQDateTimeTools::TimeFormatComponents timeComponents = - RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) override; + void useDateBasedTimeAxis( + const QString& dateFormat, + const QString& timeFormat, + RiaDefines::DateFormatComponents dateComponents = RiaDefines::DateFormatComponents::DATE_FORMAT_UNSPECIFIED, + RiaDefines::TimeFormatComponents timeComponents = RiaDefines::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) override; void useTimeBasedTimeAxis() override; diff --git a/ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.cpp b/ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.cpp index d7d8c9e94b..1b8932f168 100644 --- a/ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.cpp +++ b/ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.cpp @@ -145,10 +145,10 @@ RiuSummaryQwtPlot::~RiuSummaryQwtPlot() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuSummaryQwtPlot::useDateBasedTimeAxis( const QString& dateFormat, - const QString& timeFormat, - RiaQDateTimeTools::DateFormatComponents dateComponents, - RiaQDateTimeTools::TimeFormatComponents timeComponents ) +void RiuSummaryQwtPlot::useDateBasedTimeAxis( const QString& dateFormat, + const QString& timeFormat, + RiaDefines::DateFormatComponents dateComponents, + RiaDefines::TimeFormatComponents timeComponents ) { RiuQwtPlotTools::enableDateBasedBottomXAxis( m_plotWidget->qwtPlot(), dateFormat, timeFormat, dateComponents, timeComponents ); } diff --git a/ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.h b/ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.h index 1e1a909005..a5ff1f4ad7 100644 --- a/ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.h +++ b/ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.h @@ -18,7 +18,7 @@ #pragma once -#include "RiaQDateTimeTools.h" +#include "RiaDateTimeDefines.h" #include "RiuInterfaceToViewWindow.h" #include "RiuQwtPlotWidget.h" @@ -47,11 +47,11 @@ public: RiuSummaryQwtPlot( RimSummaryPlot* plot, QWidget* parent = nullptr ); ~RiuSummaryQwtPlot() override; - void useDateBasedTimeAxis( const QString& dateFormat, - const QString& timeFormat, - RiaQDateTimeTools::DateFormatComponents dateComponents = RiaQDateTimeTools::DATE_FORMAT_UNSPECIFIED, - RiaQDateTimeTools::TimeFormatComponents timeComponents = - RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) override; + void useDateBasedTimeAxis( + const QString& dateFormat, + const QString& timeFormat, + RiaDefines::DateFormatComponents dateComponents = RiaDefines::DateFormatComponents::DATE_FORMAT_UNSPECIFIED, + RiaDefines::TimeFormatComponents timeComponents = RiaDefines::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) override; void useTimeBasedTimeAxis() override; diff --git a/ApplicationLibCode/UserInterface/RiuTextDialog.h b/ApplicationLibCode/UserInterface/RiuTextDialog.h index a57c39eb46..453990de54 100644 --- a/ApplicationLibCode/UserInterface/RiuTextDialog.h +++ b/ApplicationLibCode/UserInterface/RiuTextDialog.h @@ -18,8 +18,6 @@ #pragma once -#include "RiaQDateTimeTools.h" - #include #include #include