OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move defines to RiaDateTimeDefines

Browse Source
This commit is contained in:
Magne Sjaastad
2022-03-14 09:18:48 +01:00
committed by GitHub
parent e435e28e7d
commit 0ca70249ae
49 changed files with 495 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/Application/CMakeLists_files.cmake
View File

@@ -26,6 +26,7 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaResultNames.h ${CMAKE_CURRENT_LIST_DIR}/RiaResultNames.h
${CMAKE_CURRENT_LIST_DIR}/RiaNumberFormat.h ${CMAKE_CURRENT_LIST_DIR}/RiaNumberFormat.h
${CMAKE_CURRENT_LIST_DIR}/RiaRftDefines.h ${CMAKE_CURRENT_LIST_DIR}/RiaRftDefines.h
${CMAKE_CURRENT_LIST_DIR}/RiaDateTimeDefines.h
) )
set(SOURCE_GROUP_SOURCE_FILES set(SOURCE_GROUP_SOURCE_FILES
@@ -56,6 +57,7 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaResultNames.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaResultNames.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaNumberFormat.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaNumberFormat.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaRftDefines.cpp ${CMAKE_CURRENT_LIST_DIR}/RiaRftDefines.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaDateTimeDefines.cpp
) )
list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES}) list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})

60
ApplicationLibCode/Application/RiaDateTimeDefines.cpp Normal file
View File

@@ -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 <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RiaDateTimeDefines.h"
#include "cafAppEnum.h"
namespace caf
{
template <>
void caf::AppEnum<RiaDefines::DateFormatComponents>::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<RiaDefines::TimeFormatComponents>::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<RiaDefines::DateTimePeriod>::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

59
ApplicationLibCode/Application/RiaDateTimeDefines.h Normal file
View File

@@ -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 <http://www.gnu.org/licenses/gpl.html>
// 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<RiaDefines::DateTimePeriod>;
}; // namespace RiaDefines

9
ApplicationLibCode/Application/RiaPreferences.cpp
View File

@@ -26,6 +26,7 @@
#include "RiaPreferencesGeoMech.h" #include "RiaPreferencesGeoMech.h"
#include "RiaPreferencesSummary.h" #include "RiaPreferencesSummary.h"
#include "RiaPreferencesSystem.h" #include "RiaPreferencesSystem.h"
#include "RiaQDateTimeTools.h"
#include "RiaValidRegExpValidator.h" #include "RiaValidRegExpValidator.h"
#include "RifReaderSettings.h" #include "RifReaderSettings.h"
@@ -461,7 +462,8 @@ QList<caf::PdmOptionItemInfo> RiaPreferences::calculateValueOptions( const caf::
{ {
QDate exampleDate = QDate( 2019, 8, 16 ); QDate exampleDate = QDate( 2019, 8, 16 );
QString fullDateFormat = 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 ) ); QString uiText = QString( "%1 (%2)" ).arg( fullDateFormat ).arg( exampleDate.toString( fullDateFormat ) );
uiText.replace( "AP", "AM/PM" ); uiText.replace( "AP", "AM/PM" );
options.push_back( caf::PdmOptionItemInfo( uiText, QVariant::fromValue( dateFormat ) ) ); options.push_back( caf::PdmOptionItemInfo( uiText, QVariant::fromValue( dateFormat ) ) );
@@ -474,7 +476,7 @@ QList<caf::PdmOptionItemInfo> RiaPreferences::calculateValueOptions( const caf::
QTime exampleTime = QTime( 15, 48, 22 ); QTime exampleTime = QTime( 15, 48, 22 );
QString timeFormatString = QString timeFormatString =
RiaQDateTimeTools::timeFormatString( timeFormat, 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 ) ); QString uiText = QString( "%1 (%2)" ).arg( timeFormatString ).arg( exampleTime.toString( timeFormatString ) );
uiText.replace( "AP", "AM/PM" ); uiText.replace( "AP", "AM/PM" );
options.push_back( caf::PdmOptionItemInfo( uiText, QVariant::fromValue( timeFormat ) ) ); 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" ) return QString( "%1 %2" )
.arg( RiaQDateTimeTools::dateFormatString( m_dateFormat(), dateComponents ) ) .arg( RiaQDateTimeTools::dateFormatString( m_dateFormat(), dateComponents ) )

10
ApplicationLibCode/Application/RiaPreferences.h
View File

@@ -21,9 +21,9 @@
#pragma once #pragma once
#include "RiaDateTimeDefines.h"
#include "RiaDefines.h" #include "RiaDefines.h"
#include "RiaFontCache.h" #include "RiaFontCache.h"
#include "RiaQDateTimeTools.h"
#include "cafAppEnum.h" #include "cafAppEnum.h"
#include "cafPdmChildField.h" #include "cafPdmChildField.h"
@@ -52,9 +52,6 @@ class RiaPreferences : public caf::PdmObject
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
using DateFormatComponents = RiaQDateTimeTools::DateFormatComponents;
using TimeFormatComponents = RiaQDateTimeTools::TimeFormatComponents;
using FontSizeEnum = RiaFontCache::FontSizeEnum; using FontSizeEnum = RiaFontCache::FontSizeEnum;
using PageSizeEnum = caf::AppEnum<QPageSize::PageSizeId>; using PageSizeEnum = caf::AppEnum<QPageSize::PageSizeId>;
using PageOrientationEnum = caf::AppEnum<QPageLayout::Orientation>; using PageOrientationEnum = caf::AppEnum<QPageLayout::Orientation>;
@@ -75,8 +72,9 @@ public:
const QString& dateFormat() const; const QString& dateFormat() const;
const QString& timeFormat() const; const QString& timeFormat() const;
QString dateTimeFormat( DateFormatComponents dateComponents = DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY, QString dateTimeFormat(
TimeFormatComponents timeComponents = TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND ) const; RiaDefines::DateFormatComponents dateComponents = RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY,
RiaDefines::TimeFormatComponents timeComponents = RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND ) const;
bool searchPlotTemplateFoldersRecursively() const; bool searchPlotTemplateFoldersRecursively() const;
QStringList plotTemplateFolders() const; QStringList plotTemplateFolders() const;

104
ApplicationLibCode/Application/Tools/RiaQDateTimeTools.cpp
View File

@@ -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_YEAR = DateTimeSpan( 1, 0, 0 );
const DateTimeSpan RiaQDateTimeTools::TIMESPAN_DECADE = DateTimeSpan( 10, 0, 0 ); const DateTimeSpan RiaQDateTimeTools::TIMESPAN_DECADE = DateTimeSpan( 10, 0, 0 );
namespace caf
{
// clang-format off
template <>
void caf::AppEnum<RiaQDateTimeTools::DateFormatComponents>::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<RiaQDateTimeTools::TimeFormatComponents>::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<RiaQDateTimeTools::DateTimePeriod>::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 ) ); 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 ) ); 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 ) switch ( period )
{ {
case RiaQDateTimeTools::DateTimePeriod::DAY: case RiaDefines::DateTimePeriod::DAY:
return TIMESPAN_DAY; return TIMESPAN_DAY;
case RiaQDateTimeTools::DateTimePeriod::WEEK: case RiaDefines::DateTimePeriod::WEEK:
return TIMESPAN_WEEK; return TIMESPAN_WEEK;
case RiaQDateTimeTools::DateTimePeriod::MONTH: case RiaDefines::DateTimePeriod::MONTH:
return TIMESPAN_MONTH; return TIMESPAN_MONTH;
case RiaQDateTimeTools::DateTimePeriod::QUARTER: case RiaDefines::DateTimePeriod::QUARTER:
return TIMESPAN_QUARTER; return TIMESPAN_QUARTER;
case RiaQDateTimeTools::DateTimePeriod::HALFYEAR: case RiaDefines::DateTimePeriod::HALFYEAR:
return TIMESPAN_HALFYEAR; return TIMESPAN_HALFYEAR;
case RiaQDateTimeTools::DateTimePeriod::YEAR: case RiaDefines::DateTimePeriod::YEAR:
return TIMESPAN_YEAR; return TIMESPAN_YEAR;
case RiaQDateTimeTools::DateTimePeriod::DECADE: case RiaDefines::DateTimePeriod::DECADE:
return TIMESPAN_DECADE; return TIMESPAN_DECADE;
} }
CVF_ASSERT( false ); 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 y = dt.date().year();
int m = dt.date().month(); int m = dt.date().month();
@@ -322,19 +281,19 @@ QDateTime RiaQDateTimeTools::truncateTime( const QDateTime& dt, RiaQDateTimeTool
switch ( period ) switch ( period )
{ {
case RiaQDateTimeTools::DateTimePeriod::DAY: case RiaDefines::DateTimePeriod::DAY:
return createUtcDateTime( QDate( y, m, d ) ); return createUtcDateTime( QDate( y, m, d ) );
case RiaQDateTimeTools::DateTimePeriod::WEEK: case RiaDefines::DateTimePeriod::WEEK:
return createUtcDateTime( QDate( y, m, d ).addDays( -dow + 1 ) ); return createUtcDateTime( QDate( y, m, d ).addDays( -dow + 1 ) );
case RiaQDateTimeTools::DateTimePeriod::MONTH: case RiaDefines::DateTimePeriod::MONTH:
return createUtcDateTime( QDate( y, m, 1 ) ); return createUtcDateTime( QDate( y, m, 1 ) );
case RiaQDateTimeTools::DateTimePeriod::QUARTER: case RiaDefines::DateTimePeriod::QUARTER:
return createUtcDateTime( QDate( y, ( ( m - 1 ) / 3 ) * 3 + 1, 1 ) ); 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 ) ); return createUtcDateTime( QDate( y, ( ( m - 1 ) / 6 ) * 6 + 1, 1 ) );
case RiaQDateTimeTools::DateTimePeriod::YEAR: case RiaDefines::DateTimePeriod::YEAR:
return createUtcDateTime( QDate( y, 1, 1 ) ); return createUtcDateTime( QDate( y, 1, 1 ) );
case RiaQDateTimeTools::DateTimePeriod::DECADE: case RiaDefines::DateTimePeriod::DECADE:
return createUtcDateTime( QDate( ( y / 10 ) * 10, 1, 1 ) ); return createUtcDateTime( QDate( ( y / 10 ) * 10, 1, 1 ) );
} }
CVF_ASSERT( false ); CVF_ASSERT( false );
@@ -344,13 +303,13 @@ QDateTime RiaQDateTimeTools::truncateTime( const QDateTime& dt, RiaQDateTimeTool
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RiaQDateTimeTools::DateTimePeriod> RiaQDateTimeTools::dateTimePeriods() std::vector<RiaDefines::DateTimePeriod> RiaQDateTimeTools::dateTimePeriods()
{ {
std::vector<DateTimePeriod> allPeriods; std::vector<RiaDefines::DateTimePeriod> 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; return allPeriods;
@@ -359,9 +318,9 @@ std::vector<RiaQDateTimeTools::DateTimePeriod> 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<QString> 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<std::underlying_type<RiaDefines::DateFormatComponents>::type>( dateComponents );
if ( enumValue < 0 ) return "";
QStringList allVariants = fullDateFormat.split( ";" ); QStringList allVariants = fullDateFormat.split( ";" );
if ( static_cast<int>( dateComponents ) < allVariants.size() ) if ( enumValue < allVariants.size() )
{ {
return allVariants[dateComponents]; return allVariants[enumValue];
} }
CVF_ASSERT( false && "Date format string is malformed" ); CVF_ASSERT( false && "Date format string is malformed" );
return ""; 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( ";" ); QStringList allVariants = fullTimeFormat.split( ";" );
if ( static_cast<int>( timeComponents ) < allVariants.size() ) if ( static_cast<int>( timeComponents ) < allVariants.size() )

80
ApplicationLibCode/Application/Tools/RiaQDateTimeTools.h
View File

@@ -18,13 +18,15 @@
#pragma once #pragma once
#include "RiaDateTimeDefines.h"
#include "cafAppEnum.h"
#include <QString> #include <QString>
#include <string> #include <string>
#include <vector> #include <vector>
#include "cafAppEnum.h"
class QDateTime; class QDateTime;
class QDate; class QDate;
class QTime; class QTime;
@@ -40,49 +42,7 @@ class PdmOptionItemInfo;
//================================================================================================== //==================================================================================================
class RiaQDateTimeTools 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: 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<DateTimePeriod>;
static Qt::TimeSpec currentTimeSpec(); static Qt::TimeSpec currentTimeSpec();
static QDateTime fromString( const QString& dateString, const QString& format ); static QDateTime fromString( const QString& dateString, const QString& format );
@@ -94,8 +54,8 @@ public:
static QDateTime addYears( const QDateTime& dt, double years ); static QDateTime addYears( const QDateTime& dt, double years );
static QDateTime addSpan( const QDateTime& dt, DateTimeSpan span ); static QDateTime addSpan( const QDateTime& dt, DateTimeSpan span );
static QDateTime subtractSpan( const QDateTime& dt, DateTimeSpan span ); static QDateTime subtractSpan( const QDateTime& dt, DateTimeSpan span );
static QDateTime addPeriod( const QDateTime& dt, RiaQDateTimeTools::DateTimePeriod period ); static QDateTime addPeriod( const QDateTime& dt, RiaDefines::DateTimePeriod period );
static QDateTime subtractPeriod( const QDateTime& dt, RiaQDateTimeTools::DateTimePeriod period ); static QDateTime subtractPeriod( const QDateTime& dt, RiaDefines::DateTimePeriod period );
static QDateTime createDateTime( const QDate& date ); static QDateTime createDateTime( const QDate& date );
@@ -108,11 +68,11 @@ public:
static bool lessThan( const QDateTime& dt1, const QDateTime& dt2 ); static bool lessThan( const QDateTime& dt1, const QDateTime& dt2 );
static const DateTimeSpan timeSpan( RiaQDateTimeTools::DateTimePeriod period ); static const DateTimeSpan timeSpan( RiaDefines::DateTimePeriod period );
static QDateTime truncateTime( const QDateTime& dt, RiaQDateTimeTools::DateTimePeriod period ); static QDateTime truncateTime( const QDateTime& dt, RiaDefines::DateTimePeriod period );
static std::vector<RiaQDateTimeTools::DateTimePeriod> dateTimePeriods(); static std::vector<RiaDefines::DateTimePeriod> dateTimePeriods();
static QString dateTimePeriodName( RiaQDateTimeTools::DateTimePeriod period ); 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 // 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. // settings on local machine. Required for stable regression testing.
@@ -124,16 +84,24 @@ public:
static std::vector<QString> supportedDateFormats(); static std::vector<QString> supportedDateFormats();
static std::vector<QString> supportedTimeFormats(); static std::vector<QString> supportedTimeFormats();
static QString static QString dateFormatString(
dateFormatString( const QString& fullDateFormat, const QString& fullDateFormat,
DateFormatComponents dateComponents = DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY ); RiaDefines::DateFormatComponents dateComponents = RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY );
static QString static QString timeFormatString( const QString& fullTimeFormat,
timeFormatString( const QString& fullTimeFormat, RiaDefines::TimeFormatComponents timeComponents =
TimeFormatComponents timeComponents = TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND ); RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND );
static QList<caf::PdmOptionItemInfo> createOptionItems( const std::vector<time_t>& timeSteps ); static QList<caf::PdmOptionItemInfo> createOptionItems( const std::vector<time_t>& timeSteps );
private: 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 secondsInDay();
static quint64 secondsInYear(); static quint64 secondsInYear();
}; };

2
ApplicationLibCode/Application/Tools/RiaSummaryTools.cpp
View File

@@ -224,7 +224,7 @@ std::pair<std::vector<time_t>, std::vector<double>>
RiaSummaryTools::resampledValuesForPeriod( const RifEclipseSummaryAddress& address, RiaSummaryTools::resampledValuesForPeriod( const RifEclipseSummaryAddress& address,
const std::vector<time_t>& timeSteps, const std::vector<time_t>& timeSteps,
std::vector<double>& values, std::vector<double>& values,
RiaQDateTimeTools::DateTimePeriod period ) RiaDefines::DateTimePeriod period )
{ {
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( values, timeSteps ); resampler.setCurveData( values, timeSteps );

4
ApplicationLibCode/Application/Tools/RiaSummaryTools.h
View File

@@ -18,7 +18,7 @@
#pragma once #pragma once
#include "RiaQDateTimeTools.h" #include "RiaDateTimeDefines.h"
#include <QString> #include <QString>
@@ -69,7 +69,7 @@ public:
resampledValuesForPeriod( const RifEclipseSummaryAddress& address, resampledValuesForPeriod( const RifEclipseSummaryAddress& address,
const std::vector<time_t>& timeSteps, const std::vector<time_t>& timeSteps,
std::vector<double>& values, std::vector<double>& values,
RiaQDateTimeTools::DateTimePeriod period ); RiaDefines::DateTimePeriod period );
static RimSummaryCase* summaryCaseById( int caseId ); static RimSummaryCase* summaryCaseById( int caseId );
static RimSummaryCaseCollection* ensembleById( int ensembleId ); static RimSummaryCaseCollection* ensembleById( int ensembleId );

44
ApplicationLibCode/Application/Tools/RiaTimeHistoryCurveResampler.cpp
View File

@@ -19,6 +19,7 @@
#include <cvfAssert.h> #include <cvfAssert.h>
#include <cvfConfigCore.h> #include <cvfConfigCore.h>
#include "RiaQDateTimeTools.h"
#include "RiaTimeHistoryCurveResampler.h" #include "RiaTimeHistoryCurveResampler.h"
#include <limits> #include <limits>
@@ -67,7 +68,7 @@ void RiaTimeHistoryCurveResampler::setCurveData( const std::vector<double>& valu
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiaTimeHistoryCurveResampler::resampleAndComputePeriodEndValues( RiaQDateTimeTools::DateTimePeriod period ) void RiaTimeHistoryCurveResampler::resampleAndComputePeriodEndValues( RiaDefines::DateTimePeriod period )
{ {
computePeriodEndValues( 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 ); computeWeightedMeanValues( period );
} }
@@ -99,22 +100,22 @@ const std::vector<double>& RiaTimeHistoryCurveResampler::resampledValues() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<time_t> RiaTimeHistoryCurveResampler::timeStepsFromTimeRange( RiaQDateTimeTools::DateTimePeriod period, std::vector<time_t> RiaTimeHistoryCurveResampler::timeStepsFromTimeRange( RiaDefines::DateTimePeriod period,
time_t minTime, time_t minTime,
time_t maxTime ) time_t maxTime )
{ {
if ( minTime > maxTime ) return std::vector<time_t>(); if ( minTime > maxTime ) return std::vector<time_t>();
auto firstOriginalTimeStep = QDT::fromTime_t( minTime ); auto firstOriginalTimeStep = RiaQDateTimeTools::fromTime_t( minTime );
auto lastOriginalTimeStep = QDT::fromTime_t( maxTime ); auto lastOriginalTimeStep = RiaQDateTimeTools::fromTime_t( maxTime );
auto currTimeStep = firstResampledTimeStep( firstOriginalTimeStep, period ); auto currTimeStep = firstResampledTimeStep( firstOriginalTimeStep, period );
std::vector<time_t> timeSteps; std::vector<time_t> timeSteps;
while ( QDT::lessThan( currTimeStep, lastOriginalTimeStep ) ) while ( RiaQDateTimeTools::lessThan( currTimeStep, lastOriginalTimeStep ) )
{ {
timeSteps.push_back( currTimeStep.toSecsSinceEpoch() ); timeSteps.push_back( currTimeStep.toSecsSinceEpoch() );
currTimeStep = QDT::addPeriod( currTimeStep, period ); currTimeStep = RiaQDateTimeTools::addPeriod( currTimeStep, period );
} }
timeSteps.push_back( currTimeStep.toSecsSinceEpoch() ); timeSteps.push_back( currTimeStep.toSecsSinceEpoch() );
@@ -124,7 +125,7 @@ std::vector<time_t> RiaTimeHistoryCurveResampler::timeStepsFromTimeRange( RiaQDa
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiaTimeHistoryCurveResampler::computeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod period ) void RiaTimeHistoryCurveResampler::computeWeightedMeanValues( RiaDefines::DateTimePeriod period )
{ {
size_t origDataSize = m_originalValues.second.size(); size_t origDataSize = m_originalValues.second.size();
size_t oi = 0; size_t oi = 0;
@@ -142,8 +143,10 @@ void RiaTimeHistoryCurveResampler::computeWeightedMeanValues( RiaQDateTimeTools:
for ( size_t i = 0; i < m_timeSteps.size(); i++ ) for ( size_t i = 0; i < m_timeSteps.size(); i++ )
{ {
double wMean = 0.0; double wMean = 0.0;
time_t periodStart = i > 0 ? m_timeSteps[i - 1] time_t periodStart =
: QDT::subtractPeriod( QDT::fromTime_t( m_timeSteps[0] ), period ).toSecsSinceEpoch(); i > 0 ? m_timeSteps[i - 1]
: RiaQDateTimeTools::subtractPeriod( RiaQDateTimeTools::fromTime_t( m_timeSteps[0] ), period )
.toSecsSinceEpoch();
time_t periodEnd = m_timeSteps[i]; time_t periodEnd = m_timeSteps[i];
time_t periodLength = periodEnd - periodStart; 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 origDataSize = m_originalValues.second.size();
size_t oi = 0; 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 firstOriginalTimeStep = RiaQDateTimeTools::fromTime_t( m_originalValues.second.front() );
auto lastOriginalTimeStep = QDT::fromTime_t( m_originalValues.second.back() ); auto lastOriginalTimeStep = RiaQDateTimeTools::fromTime_t( m_originalValues.second.back() );
clearData(); clearData();
auto currTimeStep = firstResampledTimeStep( firstOriginalTimeStep, period ); auto currTimeStep = firstResampledTimeStep( firstOriginalTimeStep, period );
while ( QDT::lessThan( currTimeStep, lastOriginalTimeStep ) ) while ( RiaQDateTimeTools::lessThan( currTimeStep, lastOriginalTimeStep ) )
{ {
m_timeSteps.push_back( currTimeStep.toSecsSinceEpoch() ); m_timeSteps.push_back( currTimeStep.toSecsSinceEpoch() );
currTimeStep = QDT::addPeriod( currTimeStep, period ); currTimeStep = RiaQDateTimeTools::addPeriod( currTimeStep, period );
} }
// Add last time step // Add last time step
@@ -270,11 +273,12 @@ void RiaTimeHistoryCurveResampler::computeResampledTimeSteps( RiaQDateTimeTools:
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QDateTime RiaTimeHistoryCurveResampler::firstResampledTimeStep( const QDateTime& firstTimeStep, QDateTime RiaTimeHistoryCurveResampler::firstResampledTimeStep( const QDateTime& firstTimeStep,
RiaQDateTimeTools::DateTimePeriod period ) 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; return truncatedTime;
} }

19
ApplicationLibCode/Application/Tools/RiaTimeHistoryCurveResampler.h
View File

@@ -19,12 +19,10 @@
#pragma once #pragma once
#include "RiaCurveDataTools.h" #include "RiaCurveDataTools.h"
#include "RiaQDateTimeTools.h" #include "RiaDateTimeDefines.h"
#include <QDateTime> #include <QDateTime>
using QDT = RiaQDateTimeTools;
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
@@ -35,22 +33,21 @@ public:
void setCurveData( const std::vector<double>& values, const std::vector<time_t>& timeSteps ); void setCurveData( const std::vector<double>& values, const std::vector<time_t>& timeSteps );
void resampleAndComputePeriodEndValues( RiaQDateTimeTools::DateTimePeriod period ); void resampleAndComputePeriodEndValues( RiaDefines::DateTimePeriod period );
void resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod period ); void resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod period );
const std::vector<time_t>& resampledTimeSteps() const; const std::vector<time_t>& resampledTimeSteps() const;
const std::vector<double>& resampledValues() const; const std::vector<double>& resampledValues() const;
static std::vector<time_t> static std::vector<time_t> timeStepsFromTimeRange( RiaDefines::DateTimePeriod period, time_t minTime, time_t maxTime );
timeStepsFromTimeRange( RiaQDateTimeTools::DateTimePeriod period, time_t minTime, time_t maxTime );
private: private:
void computeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod period ); void computeWeightedMeanValues( RiaDefines::DateTimePeriod period );
void computePeriodEndValues( RiaQDateTimeTools::DateTimePeriod period ); void computePeriodEndValues( RiaDefines::DateTimePeriod period );
void clearData(); void clearData();
void computeResampledTimeSteps( RiaQDateTimeTools::DateTimePeriod period ); void computeResampledTimeSteps( RiaDefines::DateTimePeriod period );
static QDateTime firstResampledTimeStep( const QDateTime& firstTimestep, RiaQDateTimeTools::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 ); inline double interpolatedValue( time_t t, time_t t1, double v1, time_t t2, double v2 );
private: private:

21
ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp
View File

@@ -21,6 +21,7 @@
#include "RiaFeatureCommandContext.h" #include "RiaFeatureCommandContext.h"
#include "RiaGuiApplication.h" #include "RiaGuiApplication.h"
#include "RiaPreferencesSummary.h" #include "RiaPreferencesSummary.h"
#include "RiaQDateTimeTools.h"
#include "RimGridCrossPlot.h" #include "RimGridCrossPlot.h"
#include "RimGridCrossPlotCurve.h" #include "RimGridCrossPlotCurve.h"
@@ -64,8 +65,8 @@ public:
{ {
auto allTabs = tabs(); auto allTabs = tabs();
CVF_ASSERT( tabIndex < (int)allTabs.size() ); CVF_ASSERT( tabIndex < (int)allTabs.size() );
RiaQDateTimeTools::DateTimePeriod timePeriod = allTabs[tabIndex]; RiaDefines::DateTimePeriod timePeriod = allTabs[tabIndex];
if ( timePeriod == RiaQDateTimeTools::DateTimePeriod::NONE ) if ( timePeriod == RiaDefines::DateTimePeriod::NONE )
{ {
return "No Resampling"; return "No Resampling";
} }
@@ -79,7 +80,7 @@ public:
{ {
CVF_ASSERT( m_summaryPlot.notNull() && "Need to check that provider is valid" ); 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() ) if ( m_summaryPlot->containsResamplableCurves() )
{ {
@@ -89,27 +90,25 @@ public:
} }
else 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(); } int tabCount() const override { return (int)tabs().size(); }
private: private:
static RiaQDateTimeTools::DateTimePeriod indexToPeriod( int tabIndex ) static RiaDefines::DateTimePeriod indexToPeriod( int tabIndex )
{ {
auto allTabs = tabs(); auto allTabs = tabs();
CVF_ASSERT( tabIndex < (int)allTabs.size() ); CVF_ASSERT( tabIndex < (int)allTabs.size() );
RiaQDateTimeTools::DateTimePeriod timePeriod = allTabs[tabIndex]; RiaDefines::DateTimePeriod timePeriod = allTabs[tabIndex];
return timePeriod; return timePeriod;
} }
static std::vector<RiaQDateTimeTools::DateTimePeriod> tabs() static std::vector<RiaDefines::DateTimePeriod> tabs()
{ {
std::vector<RiaQDateTimeTools::DateTimePeriod> dateTimePeriods = RiaQDateTimeTools::dateTimePeriods(); std::vector<RiaDefines::DateTimePeriod> dateTimePeriods = RiaQDateTimeTools::dateTimePeriods();
dateTimePeriods.erase( std::remove( dateTimePeriods.begin(), dateTimePeriods.erase( std::remove( dateTimePeriods.begin(), dateTimePeriods.end(), RiaDefines::DateTimePeriod::DECADE ),
dateTimePeriods.end(),
RiaQDateTimeTools::DateTimePeriod::DECADE ),
dateTimePeriods.end() ); dateTimePeriods.end() );
return dateTimePeriods; return dateTimePeriods;
} }

2
ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.h
View File

@@ -18,8 +18,6 @@
#pragma once #pragma once
#include "RiaQDateTimeTools.h"
#include "cafCmdFeature.h" #include "cafCmdFeature.h"
#include <functional> #include <functional>

10
ApplicationLibCode/Commands/RicResampleDialog.cpp
View File

@@ -18,6 +18,8 @@
#include "RicResampleDialog.h" #include "RicResampleDialog.h"
#include "RiaQDateTimeTools.h"
#include "RiuTools.h" #include "RiuTools.h"
#include <QAbstractItemView> #include <QAbstractItemView>
@@ -97,12 +99,12 @@ RicResampleDialogResult RicResampleDialog::openDialog( QWidget* parent /*= 0*/,
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicResampleDialog::setPeriodOptions( const std::vector<RiaQDateTimeTools::DateTimePeriod>& dateTimePeriods ) void RicResampleDialog::setPeriodOptions( const std::vector<RiaDefines::DateTimePeriod>& dateTimePeriods )
{ {
QStringList s; QStringList s;
for ( auto& period : dateTimePeriods ) for ( auto& period : dateTimePeriods )
{ {
QString text = period != RiaQDateTimeTools::DateTimePeriod::NONE ? RiaQDateTimeTools::dateTimePeriodName( period ) QString text = period != RiaDefines::DateTimePeriod::NONE ? RiaQDateTimeTools::dateTimePeriodName( period )
: "No Resampling"; : "No Resampling";
m_timePeriodCombo->addItem( text, QVariant( (int)period ) ); m_timePeriodCombo->addItem( text, QVariant( (int)period ) );
} }
@@ -111,10 +113,10 @@ void RicResampleDialog::setPeriodOptions( const std::vector<RiaQDateTimeTools::D
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiaQDateTimeTools::DateTimePeriod RicResampleDialog::selectedDateTimePeriod() const RiaDefines::DateTimePeriod RicResampleDialog::selectedDateTimePeriod() const
{ {
int currIndex = m_timePeriodCombo->currentIndex(); int currIndex = m_timePeriodCombo->currentIndex();
return (RiaQDateTimeTools::DateTimePeriod)m_timePeriodCombo->itemData( currIndex ).toInt(); return (RiaDefines::DateTimePeriod)m_timePeriodCombo->itemData( currIndex ).toInt();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

10
ApplicationLibCode/Commands/RicResampleDialog.h
View File

@@ -18,7 +18,7 @@
#pragma once #pragma once
#include "RiaQDateTimeTools.h" #include "RiaDateTimeDefines.h"
#include "cafPdmPointer.h" #include "cafPdmPointer.h"
@@ -49,8 +49,8 @@ public:
static RicResampleDialogResult openDialog( QWidget* parent = nullptr, const QString& caption = QString() ); static RicResampleDialogResult openDialog( QWidget* parent = nullptr, const QString& caption = QString() );
private: private:
void setPeriodOptions( const std::vector<RiaQDateTimeTools::DateTimePeriod>& dateTimePeriods ); void setPeriodOptions( const std::vector<RiaDefines::DateTimePeriod>& dateTimePeriods );
RiaQDateTimeTools::DateTimePeriod selectedDateTimePeriod() const; RiaDefines::DateTimePeriod selectedDateTimePeriod() const;
private slots: private slots:
void slotDialogOkClicked(); void slotDialogOkClicked();
@@ -69,12 +69,12 @@ private:
class RicResampleDialogResult class RicResampleDialogResult
{ {
public: public:
RicResampleDialogResult( bool ok, RiaQDateTimeTools::DateTimePeriod period ) RicResampleDialogResult( bool ok, RiaDefines::DateTimePeriod period )
: ok( ok ) : ok( ok )
, period( period ) , period( period )
{ {
} }
bool ok; bool ok;
RiaQDateTimeTools::DateTimePeriod period; RiaDefines::DateTimePeriod period;
}; };

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp
View File

@@ -172,7 +172,7 @@ bool RicAsciiExportSummaryPlotFeature::exportTextToFile( const QString& fileName
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicAsciiExportSummaryPlotFeature::exportAsciiForSummaryPlot( const QString& fileName, bool RicAsciiExportSummaryPlotFeature::exportAsciiForSummaryPlot( const QString& fileName,
const RimSummaryPlot* summaryPlot, const RimSummaryPlot* summaryPlot,
RiaQDateTimeTools::DateTimePeriod resamplingPeriod, RiaDefines::DateTimePeriod resamplingPeriod,
bool showTimeAsLongString ) bool showTimeAsLongString )
{ {
QString text = summaryPlot->description(); QString text = summaryPlot->description();

5
ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.h
View File

@@ -18,8 +18,7 @@
#pragma once #pragma once
#include "RiaQDateTimeTools.h" #include "RiaDateTimeDefines.h"
#include "cafCmdFeature.h" #include "cafCmdFeature.h"
class RimSummaryPlot; class RimSummaryPlot;
@@ -44,6 +43,6 @@ protected:
private: private:
static bool exportAsciiForSummaryPlot( const QString& fileName, static bool exportAsciiForSummaryPlot( const QString& fileName,
const RimSummaryPlot* selectedSummaryPlots, const RimSummaryPlot* selectedSummaryPlots,
RiaQDateTimeTools::DateTimePeriod resamplingPeriod, RiaDefines::DateTimePeriod resamplingPeriod,
bool showTimeAsLongString ); bool showTimeAsLongString );
}; };

12
ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
View File

@@ -21,6 +21,7 @@
#include "RiaDefines.h" #include "RiaDefines.h"
#include "RiaPlotDefines.h" #include "RiaPlotDefines.h"
#include "RiaPreferences.h" #include "RiaPreferences.h"
#include "RiaQDateTimeTools.h"
#include "RiaSummaryCurveDefinition.h" #include "RiaSummaryCurveDefinition.h"
#include "RiaTextStringTools.h" #include "RiaTextStringTools.h"
@@ -611,11 +612,12 @@ QList<caf::PdmOptionItemInfo> RimAnalysisPlot::calculateValueOptions( const caf:
filteredTimeStepIndices.erase( std::unique( filteredTimeStepIndices.begin(), filteredTimeStepIndices.end() ), filteredTimeStepIndices.erase( std::unique( filteredTimeStepIndices.begin(), filteredTimeStepIndices.end() ),
filteredTimeStepIndices.end() ); filteredTimeStepIndices.end() );
QString dateFormatString = RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(), QString dateFormatString =
RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(),
RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY );
QString timeFormatString = QString timeFormatString =
RiaQDateTimeTools::timeFormatString( RiaPreferences::current()->timeFormat(), 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 ); QString dateTimeFormatString = QString( "%1 %2" ).arg( dateFormatString ).arg( timeFormatString );
bool showTime = m_timeStepFilter() == RimTimeStepFilter::TS_ALL || bool showTime = m_timeStepFilter() == RimTimeStepFilter::TS_ALL ||
@@ -1645,8 +1647,8 @@ void RimAnalysisPlot::updatePlotTitle()
if ( !autoTitle.isEmpty() ) autoTitle += " @ "; if ( !autoTitle.isEmpty() ) autoTitle += " @ ";
QString formatString = QString formatString =
RiaPreferences::current()->dateTimeFormat( RiaQDateTimeTools::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY, RiaPreferences::current()->dateTimeFormat( RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY,
RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_NONE ); RiaDefines::TimeFormatComponents::TIME_FORMAT_NONE );
autoTitle += m_selectedTimeSteps()[0].toString( formatString ); autoTitle += m_selectedTimeSteps()[0].toString( formatString );
} }

14
ApplicationLibCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp
View File

@@ -275,11 +275,12 @@ QList<caf::PdmOptionItemInfo>
std::vector<int> filteredTimeStepIndices = std::vector<int> filteredTimeStepIndices =
RimTimeStepFilter::filteredTimeStepIndices( allDateTimes, 0, (int)allDateTimes.size() - 1, m_timeStepFilter(), 1 ); RimTimeStepFilter::filteredTimeStepIndices( allDateTimes, 0, (int)allDateTimes.size() - 1, m_timeStepFilter(), 1 );
QString dateFormatString = RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(), QString dateFormatString =
RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(),
RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY );
QString timeFormatString = QString timeFormatString =
RiaQDateTimeTools::timeFormatString( RiaPreferences::current()->timeFormat(), 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 ); QString dateTimeFormatString = QString( "%1 %2" ).arg( dateFormatString ).arg( timeFormatString );
bool showTime = m_timeStepFilter == RimTimeStepFilter::TS_ALL || RimTimeStepFilter::TS_INTERVAL_DAYS; bool showTime = m_timeStepFilter == RimTimeStepFilter::TS_ALL || RimTimeStepFilter::TS_INTERVAL_DAYS;
@@ -607,11 +608,12 @@ QDateTime RimAbstractCorrelationPlot::timeStep() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimAbstractCorrelationPlot::timeStepString() const QString RimAbstractCorrelationPlot::timeStepString() const
{ {
QString dateFormatString = RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(), QString dateFormatString =
RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(),
RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY );
QString timeFormatString = QString timeFormatString =
RiaQDateTimeTools::timeFormatString( RiaPreferences::current()->timeFormat(), RiaQDateTimeTools::timeFormatString( RiaPreferences::current()->timeFormat(),
RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE ); RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE );
return timeStep().toString( dateFormatString ) + " " + timeStep().toString( timeFormatString ); return timeStep().toString( dateFormatString ) + " " + timeStep().toString( timeFormatString );
} }

2
ApplicationLibCode/ProjectDataModel/RimSimWellInViewTools.cpp
View File

@@ -168,7 +168,7 @@ double RimSimWellInViewTools::extractValueForTimeStep( RifSummaryReaderInterface
} }
auto [resampledTimeSteps, resampledValues] = 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(); time_t currentTime_t = currentDate.toSecsSinceEpoch();

14
ApplicationLibCode/ProjectDataModel/RimTimeAxisAnnotation.cpp
View File

@@ -57,12 +57,13 @@ void RimTimeAxisAnnotation::setTime( time_t time )
{ {
m_value = RiaTimeTTools::toDouble( time ); m_value = RiaTimeTTools::toDouble( time );
QString dateFormatString = RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(), QString dateFormatString =
RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(),
RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY );
QString timeFormatString = QString timeFormatString =
RiaQDateTimeTools::timeFormatString( RiaPreferences::current()->timeFormat(), 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 ); 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_rangeStart = RiaTimeTTools::toDouble( startTime );
m_rangeEnd = RiaTimeTTools::toDouble( endTime ); m_rangeEnd = RiaTimeTTools::toDouble( endTime );
QString dateFormatString = RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(), QString dateFormatString =
RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(),
RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY );
QString timeFormatString = QString timeFormatString =
RiaQDateTimeTools::timeFormatString( RiaPreferences::current()->timeFormat(), 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 ); QString dateTimeFormatString = QString( "%1 %2" ).arg( dateFormatString ).arg( timeFormatString );

1
ApplicationLibCode/ProjectDataModel/Summary/RimDerivedSummaryCase.cpp
View File

@@ -20,6 +20,7 @@
#include "RiaCurveMerger.h" #include "RiaCurveMerger.h"
#include "RiaLogging.h" #include "RiaLogging.h"
#include "RiaQDateTimeTools.h"
#include "RifDerivedEnsembleReader.h" #include "RifDerivedEnsembleReader.h"

8
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@@ -21,6 +21,7 @@
#include "RiaColorTools.h" #include "RiaColorTools.h"
#include "RiaGuiApplication.h" #include "RiaGuiApplication.h"
#include "RiaPreferences.h" #include "RiaPreferences.h"
#include "RiaQDateTimeTools.h"
#include "RiaResultNames.h" #include "RiaResultNames.h"
#include "RiaSummaryAddressAnalyzer.h" #include "RiaSummaryAddressAnalyzer.h"
#include "RiaSummaryCurveDefinition.h" #include "RiaSummaryCurveDefinition.h"
@@ -1175,11 +1176,12 @@ QList<caf::PdmOptionItemInfo> RimEnsembleCurveSet::calculateValueOptions( const
filteredTimeStepIndices.erase( std::unique( filteredTimeStepIndices.begin(), filteredTimeStepIndices.end() ), filteredTimeStepIndices.erase( std::unique( filteredTimeStepIndices.begin(), filteredTimeStepIndices.end() ),
filteredTimeStepIndices.end() ); filteredTimeStepIndices.end() );
QString dateFormatString = RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(), QString dateFormatString =
RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(),
RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY );
QString timeFormatString = QString timeFormatString =
RiaQDateTimeTools::timeFormatString( RiaPreferences::current()->timeFormat(), 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 ); QString dateTimeFormatString = QString( "%1 %2" ).arg( dateFormatString ).arg( timeFormatString );
bool showTime = m_timeStepFilter() == RimTimeStepFilter::TS_ALL || bool showTime = m_timeStepFilter() == RimTimeStepFilter::TS_ALL ||

4
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
View File

@@ -22,8 +22,8 @@
#include "RifEclipseSummaryAddressQMetaType.h" #include "RifEclipseSummaryAddressQMetaType.h"
#include "RifSummaryReaderInterface.h" #include "RifSummaryReaderInterface.h"
#include "RiaDateTimeDefines.h"
#include "RiaPlotDefines.h" #include "RiaPlotDefines.h"
#include "RiaQDateTimeTools.h"
#include "RimEnsembleCurveSetColorManager.h" #include "RimEnsembleCurveSetColorManager.h"
#include "RimEnsembleCurveSetInterface.h" #include "RimEnsembleCurveSetInterface.h"
@@ -220,7 +220,7 @@ private:
caf::PdmChildField<RimSummaryAddress*> m_yValuesSummaryAddress; caf::PdmChildField<RimSummaryAddress*> m_yValuesSummaryAddress;
caf::PdmField<RifEclipseSummaryAddress> m_yValuesSummaryAddressUiField; caf::PdmField<RifEclipseSummaryAddress> m_yValuesSummaryAddressUiField;
caf::PdmField<bool> m_yPushButtonSelectSummaryAddress; caf::PdmField<bool> m_yPushButtonSelectSummaryAddress;
caf::PdmField<RiaQDateTimeTools::DateTimePeriodEnum> m_resampling; caf::PdmField<RiaDefines::DateTimePeriodEnum> m_resampling;
caf::PdmField<ColorModeEnum> m_colorMode; caf::PdmField<ColorModeEnum> m_colorMode;
caf::PdmField<cvf::Color3f> m_color; caf::PdmField<cvf::Color3f> m_color;

5
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp
View File

@@ -161,10 +161,7 @@ void RimEnsembleStatisticsCase::calculate( const std::vector<RimSummaryCase*> su
if ( !includeIncompleteCurves && timeSteps.size() != values.size() ) continue; if ( !includeIncompleteCurves && timeSteps.size() != values.size() ) continue;
auto [resampledTimeSteps, resampledValues] = auto [resampledTimeSteps, resampledValues] =
RiaSummaryTools::resampledValuesForPeriod( inputAddress, RiaSummaryTools::resampledValuesForPeriod( inputAddress, timeSteps, values, RiaDefines::DateTimePeriod::DAY );
timeSteps,
values,
RiaQDateTimeTools::DateTimePeriod::DAY );
if ( allTimeSteps.empty() ) allTimeSteps = resampledTimeSteps; if ( allTimeSteps.empty() ) allTimeSteps = resampledTimeSteps;
caseAndTimeStepValues.push_back( resampledValues ); caseAndTimeStepValues.push_back( resampledValues );

5
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@@ -24,6 +24,7 @@
#include "RiaLogging.h" #include "RiaLogging.h"
#include "RiaPlotDefines.h" #include "RiaPlotDefines.h"
#include "RiaPreferencesSummary.h" #include "RiaPreferencesSummary.h"
#include "RiaQDateTimeTools.h"
#include "RiaResultNames.h" #include "RiaResultNames.h"
#include "RiaSummaryCurveDefinition.h" #include "RiaSummaryCurveDefinition.h"
#include "RiaSummaryTools.h" #include "RiaSummaryTools.h"
@@ -664,7 +665,7 @@ void RimSummaryCurve::onLoadDataAndUpdate( bool updateParentPlot )
} }
else else
{ {
if ( m_resampling() != RiaQDateTimeTools::DateTimePeriod::NONE ) if ( m_resampling() != RiaDefines::DateTimePeriod::NONE )
{ {
auto [resampledTimeSteps, resampledValues] = auto [resampledTimeSteps, resampledValues] =
RiaSummaryTools::resampledValuesForPeriod( m_yValuesSummaryAddress->address(), RiaSummaryTools::resampledValuesForPeriod( m_yValuesSummaryAddress->address(),
@@ -884,7 +885,7 @@ void RimSummaryCurve::appendOptionItemsForSummaryAddresses( QList<caf::PdmOption
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryCurve::setResampling( RiaQDateTimeTools::DateTimePeriodEnum resampling ) void RimSummaryCurve::setResampling( RiaDefines::DateTimePeriodEnum resampling )
{ {
m_resampling = resampling; m_resampling = resampling;
} }

6
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.h
View File

@@ -24,8 +24,8 @@
#include "cafPdmPointer.h" #include "cafPdmPointer.h"
#include "cafPdmPtrField.h" #include "cafPdmPtrField.h"
#include "RiaDateTimeDefines.h"
#include "RiaDefines.h" #include "RiaDefines.h"
#include "RiaQDateTimeTools.h"
#include "RifEclipseSummaryAddressQMetaType.h" #include "RifEclipseSummaryAddressQMetaType.h"
#include "RimStackablePlotCurve.h" #include "RimStackablePlotCurve.h"
@@ -63,7 +63,7 @@ public:
void setSummaryCaseY( RimSummaryCase* sumCase ); void setSummaryCaseY( RimSummaryCase* sumCase );
void setSummaryAddressYAndApplyInterpolation( const RifEclipseSummaryAddress& address ); void setSummaryAddressYAndApplyInterpolation( const RifEclipseSummaryAddress& address );
void setSummaryAddressY( const RifEclipseSummaryAddress& address ); void setSummaryAddressY( const RifEclipseSummaryAddress& address );
void setResampling( RiaQDateTimeTools::DateTimePeriodEnum resampling ); void setResampling( RiaDefines::DateTimePeriodEnum resampling );
RifEclipseSummaryAddress errorSummaryAddressY() const; RifEclipseSummaryAddress errorSummaryAddressY() const;
std::vector<double> errorValuesY() const; std::vector<double> errorValuesY() const;
@@ -134,7 +134,7 @@ private:
caf::PdmField<RifEclipseSummaryAddress> m_yValuesSummaryAddressUiField; caf::PdmField<RifEclipseSummaryAddress> m_yValuesSummaryAddressUiField;
caf::PdmField<bool> m_yPushButtonSelectSummaryAddress; caf::PdmField<bool> m_yPushButtonSelectSummaryAddress;
caf::PdmField<RiaQDateTimeTools::DateTimePeriodEnum> m_resampling; caf::PdmField<RiaDefines::DateTimePeriodEnum> m_resampling;
// X values // X values
caf::PdmPtrField<RimSummaryCase*> m_xValuesSummaryCase; caf::PdmPtrField<RimSummaryCase*> m_xValuesSummaryCase;

28
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurvesData.cpp
View File

@@ -77,7 +77,7 @@ void RimSummaryCurvesData::populateAsciiDataCurvesData( std::vector<RimAsciiData
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryCurvesData::RimSummaryCurvesData() RimSummaryCurvesData::RimSummaryCurvesData()
: resamplePeriod( RiaQDateTimeTools::DateTimePeriod::NONE ) : resamplePeriod( RiaDefines::DateTimePeriod::NONE )
{ {
} }
@@ -137,7 +137,7 @@ void RimSummaryCurvesData::addCurveDataNoSearch( const QString& c
QString RimSummaryCurvesData::createTextForExport( const std::vector<RimSummaryCurve*>& curves, QString RimSummaryCurvesData::createTextForExport( const std::vector<RimSummaryCurve*>& curves,
const std::vector<RimAsciiDataCurve*>& asciiCurves, const std::vector<RimAsciiDataCurve*>& asciiCurves,
const std::vector<RimGridTimeHistoryCurve*>& gridCurves, const std::vector<RimGridTimeHistoryCurve*>& gridCurves,
RiaQDateTimeTools::DateTimePeriod resamplingPeriod, RiaDefines::DateTimePeriod resamplingPeriod,
bool showTimeAsLongString ) bool showTimeAsLongString )
{ {
QString out; QString out;
@@ -242,7 +242,7 @@ void RimSummaryCurvesData::populateSummaryCurvesData( std::vector<RimSummaryCurv
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryCurvesData::prepareCaseCurvesForExport( RiaQDateTimeTools::DateTimePeriod period, void RimSummaryCurvesData::prepareCaseCurvesForExport( RiaDefines::DateTimePeriod period,
ResampleAlgorithm algorithm, ResampleAlgorithm algorithm,
const RimSummaryCurvesData& inputCurvesData, const RimSummaryCurvesData& inputCurvesData,
RimSummaryCurvesData* resultCurvesData ) RimSummaryCurvesData* resultCurvesData )
@@ -251,7 +251,7 @@ void RimSummaryCurvesData::prepareCaseCurvesForExport( RiaQDateTimeTools::DateTi
resultCurvesData->clear(); resultCurvesData->clear();
if ( period != RiaQDateTimeTools::DateTimePeriod::NONE ) if ( period != RiaDefines::DateTimePeriod::NONE )
{ {
// Prepare result data // Prepare result data
resultCurvesData->resamplePeriod = period; resultCurvesData->resamplePeriod = period;
@@ -333,7 +333,7 @@ void RimSummaryCurvesData::appendToExportData( QString&
{ {
RimSummaryCurvesData data = RimSummaryCurvesData::concatCurvesData( curvesData ); RimSummaryCurvesData data = RimSummaryCurvesData::concatCurvesData( curvesData );
if ( data.resamplePeriod != RiaQDateTimeTools::DateTimePeriod::NONE ) if ( data.resamplePeriod != RiaDefines::DateTimePeriod::NONE )
{ {
time_t minTimeStep = std::numeric_limits<time_t>::max(); time_t minTimeStep = std::numeric_limits<time_t>::max();
time_t maxTimeStep = 0; time_t maxTimeStep = 0;
@@ -385,40 +385,40 @@ void RimSummaryCurvesData::appendToExportData( QString&
{ {
default: default:
// Fall through to NONE // Fall through to NONE
case RiaQDateTimeTools::DateTimePeriod::NONE: case RiaDefines::DateTimePeriod::NONE:
timeText = timseStepUtc.toString( "yyyy-MM-dd hh:mm:ss " ); timeText = timseStepUtc.toString( "yyyy-MM-dd hh:mm:ss " );
break; break;
case RiaQDateTimeTools::DateTimePeriod::DAY: case RiaDefines::DateTimePeriod::DAY:
timeText = oneDayEarlier.toString( "yyyy-MM-dd " ); timeText = oneDayEarlier.toString( "yyyy-MM-dd " );
break; break;
case RiaQDateTimeTools::DateTimePeriod::WEEK: case RiaDefines::DateTimePeriod::WEEK:
{ {
timeText = oneDayEarlier.toString( "yyyy" ); timeText = oneDayEarlier.toString( "yyyy" );
int weekNumber = oneDayEarlier.date().weekNumber(); int weekNumber = oneDayEarlier.date().weekNumber();
timeText += QString( "-W%1" ).arg( weekNumber, 2, 10, zeroChar ); timeText += QString( "-W%1" ).arg( weekNumber, 2, 10, zeroChar );
break; break;
} }
case RiaQDateTimeTools::DateTimePeriod::MONTH: case RiaDefines::DateTimePeriod::MONTH:
timeText = oneDayEarlier.toString( "yyyy-MM" ); timeText = oneDayEarlier.toString( "yyyy-MM" );
break; break;
case RiaQDateTimeTools::DateTimePeriod::QUARTER: case RiaDefines::DateTimePeriod::QUARTER:
{ {
int quarterNumber = oneDayEarlier.date().month() / 3; int quarterNumber = oneDayEarlier.date().month() / 3;
timeText = oneDayEarlier.toString( "yyyy" ); timeText = oneDayEarlier.toString( "yyyy" );
timeText += QString( "-Q%1" ).arg( quarterNumber ); timeText += QString( "-Q%1" ).arg( quarterNumber );
break; break;
} }
case RiaQDateTimeTools::DateTimePeriod::HALFYEAR: case RiaDefines::DateTimePeriod::HALFYEAR:
{ {
int halfYearNumber = oneDayEarlier.date().month() / 6; int halfYearNumber = oneDayEarlier.date().month() / 6;
timeText = oneDayEarlier.toString( "yyyy" ); timeText = oneDayEarlier.toString( "yyyy" );
timeText += QString( "-H%1" ).arg( halfYearNumber ); timeText += QString( "-H%1" ).arg( halfYearNumber );
break; break;
} }
case RiaQDateTimeTools::DateTimePeriod::YEAR: case RiaDefines::DateTimePeriod::YEAR:
timeText = oneDayEarlier.toString( "yyyy" ); timeText = oneDayEarlier.toString( "yyyy" );
break; break;
case RiaQDateTimeTools::DateTimePeriod::DECADE: case RiaDefines::DateTimePeriod::DECADE:
timeText = oneDayEarlier.toString( "yyyy" ); timeText = oneDayEarlier.toString( "yyyy" );
break; break;
} }
@@ -473,7 +473,7 @@ RimSummaryCurvesData RimSummaryCurvesData::concatCurvesData( const std::vector<R
{ {
CVF_ASSERT( !curvesData.empty() ); CVF_ASSERT( !curvesData.empty() );
RiaQDateTimeTools::DateTimePeriod period = curvesData.front().resamplePeriod; RiaDefines::DateTimePeriod period = curvesData.front().resamplePeriod;
RimSummaryCurvesData resultCurvesData; RimSummaryCurvesData resultCurvesData;
resultCurvesData.resamplePeriod = period; resultCurvesData.resamplePeriod = period;

8
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurvesData.h
View File

@@ -18,7 +18,7 @@
#pragma once #pragma once
#include "RiaQDateTimeTools.h" #include "RiaDateTimeDefines.h"
#include "RifEclipseSummaryAddress.h" #include "RifEclipseSummaryAddress.h"
#include <QString> #include <QString>
@@ -66,7 +66,7 @@ public:
static QString createTextForExport( const std::vector<RimSummaryCurve*>& curves, static QString createTextForExport( const std::vector<RimSummaryCurve*>& curves,
const std::vector<RimAsciiDataCurve*>& asciiCurves, const std::vector<RimAsciiDataCurve*>& asciiCurves,
const std::vector<RimGridTimeHistoryCurve*>& gridCurves, const std::vector<RimGridTimeHistoryCurve*>& gridCurves,
RiaQDateTimeTools::DateTimePeriod resamplingPeriod, RiaDefines::DateTimePeriod resamplingPeriod,
bool showTimeAsLongString ); bool showTimeAsLongString );
private: private:
@@ -77,7 +77,7 @@ private:
RimSummaryCurvesData* curvesData ); RimSummaryCurvesData* curvesData );
static void populateAsciiDataCurvesData( std::vector<RimAsciiDataCurve*> curves, RimSummaryCurvesData* curvesData ); static void populateAsciiDataCurvesData( std::vector<RimAsciiDataCurve*> curves, RimSummaryCurvesData* curvesData );
static void prepareCaseCurvesForExport( RiaQDateTimeTools::DateTimePeriod period, static void prepareCaseCurvesForExport( RiaDefines::DateTimePeriod period,
ResampleAlgorithm algorithm, ResampleAlgorithm algorithm,
const RimSummaryCurvesData& inputCurvesData, const RimSummaryCurvesData& inputCurvesData,
RimSummaryCurvesData* resultCurvesData ); RimSummaryCurvesData* resultCurvesData );
@@ -95,7 +95,7 @@ private:
QString createCaseId( const QString& caseName, const QString& ensembleName ); QString createCaseId( const QString& caseName, const QString& ensembleName );
public: public:
RiaQDateTimeTools::DateTimePeriod resamplePeriod; RiaDefines::DateTimePeriod resamplePeriod;
std::vector<QString> caseIds; std::vector<QString> caseIds;
std::vector<std::vector<time_t>> timeSteps; std::vector<std::vector<time_t>> timeSteps;
std::vector<std::vector<CurveData>> allCurveData; std::vector<std::vector<CurveData>> allCurveData;

8
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -300,13 +300,13 @@ RiuPlotWidget* RimSummaryPlot::plotWidget()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimSummaryPlot::asciiDataForPlotExport() const QString RimSummaryPlot::asciiDataForPlotExport() const
{ {
return asciiDataForSummaryPlotExport( RiaQDateTimeTools::DateTimePeriod::YEAR, false ); return asciiDataForSummaryPlotExport( RiaDefines::DateTimePeriod::YEAR, false );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RimSummaryPlot::asciiDataForSummaryPlotExport( RiaQDateTimeTools::DateTimePeriod resamplingPeriod, QString RimSummaryPlot::asciiDataForSummaryPlotExport( RiaDefines::DateTimePeriod resamplingPeriod,
bool showTimeAsLongString ) const bool showTimeAsLongString ) const
{ {
std::vector<RimSummaryCurve*> curves; std::vector<RimSummaryCurve*> curves;
@@ -1044,8 +1044,8 @@ void RimSummaryPlot::updateTimeAxis( RimSummaryTimeAxisProperties* timeAxisPrope
if ( timeAxisProperties->timeMode() == RimSummaryTimeAxisProperties::DATE ) if ( timeAxisProperties->timeMode() == RimSummaryTimeAxisProperties::DATE )
{ {
RiaQDateTimeTools::DateFormatComponents dateComponents = timeAxisProperties->dateComponents(); RiaDefines::DateFormatComponents dateComponents = timeAxisProperties->dateComponents();
RiaQDateTimeTools::TimeFormatComponents timeComponents = timeAxisProperties->timeComponents(); RiaDefines::TimeFormatComponents timeComponents = timeAxisProperties->timeComponents();
const QString& dateFormat = timeAxisProperties->dateFormat(); const QString& dateFormat = timeAxisProperties->dateFormat();
const QString& timeFormat = timeAxisProperties->timeFormat(); const QString& timeFormat = timeAxisProperties->timeFormat();

5
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h
View File

@@ -18,8 +18,8 @@
#pragma once #pragma once
#include "RiaDateTimeDefines.h"
#include "RiaPlotDefines.h" #include "RiaPlotDefines.h"
#include "RiaQDateTimeTools.h"
#include "RifEclipseSummaryAddress.h" #include "RifEclipseSummaryAddress.h"
@@ -127,8 +127,7 @@ public:
QWidget* viewWidget() override; QWidget* viewWidget() override;
QString asciiDataForPlotExport() const override; QString asciiDataForPlotExport() const override;
QString asciiDataForSummaryPlotExport( RiaQDateTimeTools::DateTimePeriod resamplingPeriod, QString asciiDataForSummaryPlotExport( RiaDefines::DateTimePeriod resamplingPeriod, bool showTimeAsLongString ) const;
bool showTimeAsLongString ) const;
std::vector<RimSummaryCurve*> summaryAndEnsembleCurves() const; std::vector<RimSummaryCurve*> summaryAndEnsembleCurves() const;
std::set<RiaSummaryCurveDefinition> summaryAndEnsembleCurveDefinitions() const; std::set<RiaSummaryCurveDefinition> summaryAndEnsembleCurveDefinitions() const;

25
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp
View File

@@ -21,6 +21,7 @@
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaFontCache.h" #include "RiaFontCache.h"
#include "RiaPreferences.h" #include "RiaPreferences.h"
#include "RiaQDateTimeTools.h"
#include "RimSummaryPlot.h" #include "RimSummaryPlot.h"
@@ -364,7 +365,8 @@ QList<caf::PdmOptionItemInfo>
QDate exampleDate = QDate( 2019, 8, 16 ); QDate exampleDate = QDate( 2019, 8, 16 );
QString fullDateFormat = QString fullDateFormat =
RiaQDateTimeTools::dateFormatString( dateFormat, 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 ) ); QString uiText = QString( "%1 (%2)" ).arg( fullDateFormat ).arg( exampleDate.toString( fullDateFormat ) );
uiText.replace( "AP", "AM/PM" ); uiText.replace( "AP", "AM/PM" );
options.push_back( caf::PdmOptionItemInfo( uiText, QVariant::fromValue( dateFormat ) ) ); options.push_back( caf::PdmOptionItemInfo( uiText, QVariant::fromValue( dateFormat ) ) );
@@ -378,7 +380,7 @@ QList<caf::PdmOptionItemInfo>
QString timeFormatString = QString timeFormatString =
RiaQDateTimeTools::timeFormatString( timeFormat, RiaQDateTimeTools::timeFormatString( timeFormat,
timeComponents( 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 ) ); QString uiText = QString( "%1 (%2)" ).arg( timeFormatString ).arg( exampleTime.toString( timeFormatString ) );
uiText.replace( "AP", "AM/PM" ); uiText.replace( "AP", "AM/PM" );
options.push_back( caf::PdmOptionItemInfo( uiText, QVariant::fromValue( timeFormat ) ) ); options.push_back( caf::PdmOptionItemInfo( uiText, QVariant::fromValue( timeFormat ) ) );
@@ -474,12 +476,11 @@ double RimSummaryTimeAxisProperties::fromDaysToDisplayUnitScale()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiaQDateTimeTools::DateFormatComponents RiaDefines::DateFormatComponents RimSummaryTimeAxisProperties::dateComponents( RiaDefines::DateFormatComponents fallback ) const
RimSummaryTimeAxisProperties::dateComponents( RiaQDateTimeTools::DateFormatComponents fallback ) const
{ {
if ( m_automaticDateComponents() ) return fallback; if ( m_automaticDateComponents() ) return fallback;
RiaQDateTimeTools::DateFormatComponents components = m_dateComponents(); RiaDefines::DateFormatComponents components = m_dateComponents();
return components; return components;
} }
@@ -487,12 +488,11 @@ RiaQDateTimeTools::DateFormatComponents
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiaQDateTimeTools::TimeFormatComponents RiaDefines::TimeFormatComponents RimSummaryTimeAxisProperties::timeComponents( RiaDefines::TimeFormatComponents fallback ) const
RimSummaryTimeAxisProperties::timeComponents( RiaQDateTimeTools::TimeFormatComponents fallback ) const
{ {
if ( m_automaticDateComponents() ) return fallback; if ( m_automaticDateComponents() ) return fallback;
RiaQDateTimeTools::TimeFormatComponents components = m_timeComponents(); RiaDefines::TimeFormatComponents components = m_timeComponents();
return components; return components;
} }
@@ -578,11 +578,11 @@ void RimSummaryTimeAxisProperties::defineUiOrdering( QString uiConfigName, caf::
{ {
caf::PdmUiGroup* advancedGroup = timeGroup->addNewGroup( "Date/Time Label Format" ); caf::PdmUiGroup* advancedGroup = timeGroup->addNewGroup( "Date/Time Label Format" );
advancedGroup->setCollapsedByDefault( true ); 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 ); 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 ); advancedGroup->add( &m_timeFormat );
} }
@@ -684,7 +684,8 @@ void RimSummaryTimeAxisProperties::defineEditorAttribute( const caf::PdmFieldHan
if ( dateAttrib ) if ( dateAttrib )
{ {
dateAttrib->dateFormat = 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 ) else if ( field == &m_visibleTimeRangeMin || field == &m_visibleTimeRangeMax )
@@ -694,7 +695,7 @@ void RimSummaryTimeAxisProperties::defineEditorAttribute( const caf::PdmFieldHan
{ {
timeAttrib->timeFormat = timeAttrib->timeFormat =
RiaQDateTimeTools::timeFormatString( m_timeFormat(), RiaQDateTimeTools::timeFormatString( m_timeFormat(),
RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND ); RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND );
} }
} }
} }

15
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.h
View File

@@ -18,7 +18,7 @@
#pragma once #pragma once
#include "RiaQDateTimeTools.h" #include "RiaDateTimeDefines.h"
#include "RimPlotAxisPropertiesInterface.h" #include "RimPlotAxisPropertiesInterface.h"
#include "RimTimeAxisAnnotation.h" #include "RimTimeAxisAnnotation.h"
@@ -57,8 +57,8 @@ public:
YEARS YEARS
}; };
typedef caf::AppEnum<RiaQDateTimeTools::DateFormatComponents> DateFormatEnum; typedef caf::AppEnum<RiaDefines::DateFormatComponents> DateFormatEnum;
typedef caf::AppEnum<RiaQDateTimeTools::TimeFormatComponents> TimeFormatEnum; typedef caf::AppEnum<RiaDefines::TimeFormatComponents> TimeFormatEnum;
public: public:
RimSummaryTimeAxisProperties(); RimSummaryTimeAxisProperties();
@@ -75,11 +75,10 @@ public:
double fromTimeTToDisplayUnitScale(); double fromTimeTToDisplayUnitScale();
double fromDaysToDisplayUnitScale(); double fromDaysToDisplayUnitScale();
RiaQDateTimeTools::DateFormatComponents RiaDefines::DateFormatComponents dateComponents(
dateComponents( RiaQDateTimeTools::DateFormatComponents fallback = RiaQDateTimeTools::DATE_FORMAT_UNSPECIFIED ) const; RiaDefines::DateFormatComponents fallback = RiaDefines::DateFormatComponents::DATE_FORMAT_UNSPECIFIED ) const;
RiaQDateTimeTools::TimeFormatComponents RiaDefines::TimeFormatComponents timeComponents(
timeComponents( RiaQDateTimeTools::TimeFormatComponents fallback = RiaDefines::TimeFormatComponents fallback = RiaDefines::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) const;
RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) const;
std::vector<RimPlotAxisAnnotation*> annotations() const override; std::vector<RimPlotAxisAnnotation*> annotations() const override;
void appendAnnotation( RimPlotAxisAnnotation* annotation ) override; void appendAnnotation( RimPlotAxisAnnotation* annotation ) override;

4
ApplicationLibCode/ProjectDataModelCommands/RimcSummaryCase.cpp
View File

@@ -221,9 +221,9 @@ caf::PdmObjectHandle* RimSummaryCase_resampleValues::execute()
const auto& timeValues = sumReader->timeSteps( adr ); const auto& timeValues = sumReader->timeSteps( adr );
QString periodString = m_resamplingPeriod().trimmed(); QString periodString = m_resamplingPeriod().trimmed();
RiaQDateTimeTools::DateTimePeriod period = RiaQDateTimeTools::DateTimePeriodEnum::fromText( periodString ); RiaDefines::DateTimePeriod period = RiaDefines::DateTimePeriodEnum::fromText( periodString );
if ( period != RiaQDateTimeTools::DateTimePeriod::NONE ) if ( period != RiaDefines::DateTimePeriod::NONE )
{ {
auto [resampledTimeSteps, resampledValues] = auto [resampledTimeSteps, resampledValues] =
RiaSummaryTools::resampledValuesForPeriod( adr, timeValues, values, period ); RiaSummaryTools::resampledValuesForPeriod( adr, timeValues, values, period );

40
ApplicationLibCode/UnitTests/RiaTimeHistoryCurveTools-Test.cpp
View File

@@ -35,7 +35,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_NoPeriod )
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::MONTH );
EXPECT_EQ( 1, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 1, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toSecsSinceEpoch( "2018-03-01" ), resampler.resampledTimeSteps()[0] ); EXPECT_EQ( toSecsSinceEpoch( "2018-03-01" ), resampler.resampledTimeSteps()[0] );
@@ -52,7 +52,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_Decade )
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::DECADE ); resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::DECADE );
EXPECT_EQ( 4, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 4, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toSecsSinceEpoch( "1990-01-01" ), resampler.resampledTimeSteps()[0] ); EXPECT_EQ( toSecsSinceEpoch( "1990-01-01" ), resampler.resampledTimeSteps()[0] );
@@ -72,7 +72,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_Year )
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::YEAR ); resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::YEAR );
EXPECT_EQ( 5, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 5, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toSecsSinceEpoch( "2015-01-01" ), resampler.resampledTimeSteps()[0] ); EXPECT_EQ( toSecsSinceEpoch( "2015-01-01" ), resampler.resampledTimeSteps()[0] );
@@ -93,7 +93,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_HalfYear )
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::HALFYEAR ); resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::HALFYEAR );
EXPECT_EQ( 5, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 5, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toSecsSinceEpoch( "2016-07-01" ), resampler.resampledTimeSteps()[0] ); EXPECT_EQ( toSecsSinceEpoch( "2016-07-01" ), resampler.resampledTimeSteps()[0] );
@@ -114,7 +114,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_Quarter )
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::QUARTER ); resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::QUARTER );
EXPECT_EQ( 7, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 7, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toSecsSinceEpoch( "2016-10-01" ), resampler.resampledTimeSteps()[0] ); EXPECT_EQ( toSecsSinceEpoch( "2016-10-01" ), resampler.resampledTimeSteps()[0] );
@@ -137,7 +137,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_Month )
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::MONTH );
EXPECT_EQ( 6, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 6, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toSecsSinceEpoch( "2017-10-01" ), resampler.resampledTimeSteps()[0] ); EXPECT_EQ( toSecsSinceEpoch( "2017-10-01" ), resampler.resampledTimeSteps()[0] );
@@ -159,7 +159,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_Week )
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::WEEK ); resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::WEEK );
EXPECT_EQ( 10, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 10, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toSecsSinceEpoch( "2017-11-06" ), resampler.resampledTimeSteps()[0] ); EXPECT_EQ( toSecsSinceEpoch( "2017-11-06" ), resampler.resampledTimeSteps()[0] );
@@ -185,7 +185,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_Resampling_NoSampleCrossingPeriodBounda
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::YEAR ); resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::YEAR );
EXPECT_EQ( 1, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 1, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toSecsSinceEpoch( "2018-01-01" ), resampler.resampledTimeSteps()[0] ); EXPECT_EQ( toSecsSinceEpoch( "2018-01-01" ), resampler.resampledTimeSteps()[0] );
@@ -202,7 +202,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_SingleSample )
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::MONTH );
EXPECT_EQ( 1, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 1, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toSecsSinceEpoch( "2018-03-01" ), resampler.resampledTimeSteps()[0] ); EXPECT_EQ( toSecsSinceEpoch( "2018-03-01" ), resampler.resampledTimeSteps()[0] );
@@ -222,7 +222,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_Days )
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::DAY ); resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::DAY );
EXPECT_EQ( 5, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 5, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toSecsSinceEpoch( "2018-02-03" ), resampler.resampledTimeSteps()[0] ); EXPECT_EQ( toSecsSinceEpoch( "2018-02-03" ), resampler.resampledTimeSteps()[0] );
@@ -256,7 +256,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_Decade )
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::DECADE ); resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::DECADE );
EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] ); EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] );
@@ -287,7 +287,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_SamplesStartBeforePeriod )
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::MONTH );
EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] ); EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] );
@@ -320,7 +320,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_SamplesStartBeforePeriod_T
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::MONTH );
EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] ); EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] );
@@ -349,7 +349,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_SamplesStartAndEndMatchPer
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::MONTH );
EXPECT_EQ( 2, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 2, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toSecsSinceEpoch( "2018-02-01" ), resampler.resampledTimeSteps().front() ); EXPECT_EQ( toSecsSinceEpoch( "2018-02-01" ), resampler.resampledTimeSteps().front() );
@@ -379,7 +379,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_SamplesStartMatchPeriodSta
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::MONTH );
EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] ); EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] );
@@ -409,7 +409,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_WeightedMean_MultipleSamplesInLastPerio
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputeWeightedMeanValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); resampler.resampleAndComputeWeightedMeanValues( RiaDefines::DateTimePeriod::MONTH );
EXPECT_EQ( 2, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 2, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] ); EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] );
@@ -433,7 +433,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_PeriodEndValues_SingleSample )
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputePeriodEndValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); resampler.resampleAndComputePeriodEndValues( RiaDefines::DateTimePeriod::MONTH );
EXPECT_EQ( 1, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 1, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toSecsSinceEpoch( "2018-03-01" ), resampler.resampledTimeSteps()[0] ); EXPECT_EQ( toSecsSinceEpoch( "2018-03-01" ), resampler.resampledTimeSteps()[0] );
@@ -459,7 +459,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_PeriodEndValues_SamplesStartBeforePerio
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputePeriodEndValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); resampler.resampleAndComputePeriodEndValues( RiaDefines::DateTimePeriod::MONTH );
EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] ); EXPECT_EQ( tp0, resampler.resampledTimeSteps()[0] );
@@ -486,7 +486,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_PeriodEndValues_SamplesStartMatchPeriod
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputePeriodEndValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); resampler.resampleAndComputePeriodEndValues( RiaDefines::DateTimePeriod::MONTH );
EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 3, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toSecsSinceEpoch( "2018-02-01" ), resampler.resampledTimeSteps()[0] ); EXPECT_EQ( toSecsSinceEpoch( "2018-02-01" ), resampler.resampledTimeSteps()[0] );
@@ -509,7 +509,7 @@ TEST( RiaTimeHistoryCurveResampler, Test_PeriodEndValues_SamplesStartAndEndMatch
RiaTimeHistoryCurveResampler resampler; RiaTimeHistoryCurveResampler resampler;
resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) ); resampler.setCurveData( dataValues, toSecsSinceEpochVector( timeStrings ) );
resampler.resampleAndComputePeriodEndValues( RiaQDateTimeTools::DateTimePeriod::MONTH ); resampler.resampleAndComputePeriodEndValues( RiaDefines::DateTimePeriod::MONTH );
EXPECT_EQ( 2, (int)resampler.resampledTimeSteps().size() ); EXPECT_EQ( 2, (int)resampler.resampledTimeSteps().size() );
EXPECT_EQ( toSecsSinceEpoch( "2018-02-01" ), resampler.resampledTimeSteps().front() ); EXPECT_EQ( toSecsSinceEpoch( "2018-02-01" ), resampler.resampledTimeSteps().front() );

26
ApplicationLibCode/UserInterface/RiuQtChartsPlotTools.cpp
View File

@@ -15,13 +15,15 @@
// for more details. // for more details.
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RiuQtChartsPlotTools.h" #include "RiuQtChartsPlotTools.h"
#include "RiaPlotDefines.h"
#include "RiuGuiTheme.h"
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaPlotDefines.h"
#include "RiaPreferences.h" #include "RiaPreferences.h"
#include "RiaQDateTimeTools.h"
#include "RiuGuiTheme.h"
#include "RiuQtChartsPlotWidget.h" #include "RiuQtChartsPlotWidget.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -75,8 +77,8 @@ void RiuQtChartsPlotTools::setDefaultAxes( RiuQtChartsPlotWidget* plot )
void RiuQtChartsPlotTools::enableDateBasedBottomXAxis( RiuQtChartsPlotWidget* plot, void RiuQtChartsPlotTools::enableDateBasedBottomXAxis( RiuQtChartsPlotWidget* plot,
const QString& dateFormat, const QString& dateFormat,
const QString& timeFormat, const QString& timeFormat,
RiaQDateTimeTools::DateFormatComponents dateComponents, RiaDefines::DateFormatComponents dateComponents,
RiaQDateTimeTools::TimeFormatComponents timeComponents ) RiaDefines::TimeFormatComponents timeComponents )
{ {
QString format = dateTimeFormatForInterval( dateFormat, timeFormat, dateComponents, timeComponents ); QString format = dateTimeFormatForInterval( dateFormat, timeFormat, dateComponents, timeComponents );
plot->setAxisFormat( RiuPlotAxis::defaultBottom(), format ); plot->setAxisFormat( RiuPlotAxis::defaultBottom(), format );
@@ -87,19 +89,17 @@ void RiuQtChartsPlotTools::enableDateBasedBottomXAxis( RiuQtChartsPlotWidget*
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RiuQtChartsPlotTools::dateTimeFormatForInterval( const QString& dateFormat, QString RiuQtChartsPlotTools::dateTimeFormatForInterval( const QString& dateFormat,
const QString& timeFormat, const QString& timeFormat,
RiaQDateTimeTools::DateFormatComponents dateComponents, RiaDefines::DateFormatComponents dateComponents,
RiaQDateTimeTools::TimeFormatComponents timeComponents ) RiaDefines::TimeFormatComponents timeComponents )
{ {
if ( dateComponents != RiaQDateTimeTools::DATE_FORMAT_UNSPECIFIED && if ( dateComponents != RiaDefines::DateFormatComponents::DATE_FORMAT_UNSPECIFIED &&
timeComponents != RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) timeComponents != RiaDefines::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED )
{ {
return RiaQDateTimeTools::timeFormatString( timeFormat, timeComponents ) + "\n" + return RiaQDateTimeTools::timeFormatString( timeFormat, timeComponents ) + "\n" +
RiaQDateTimeTools::dateFormatString( dateFormat, dateComponents ); RiaQDateTimeTools::dateFormatString( dateFormat, dateComponents );
} }
// Default: // Default:
return RiaQDateTimeTools::timeFormatString( timeFormat, RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_NONE ) + return RiaQDateTimeTools::timeFormatString( timeFormat, RiaDefines::TimeFormatComponents::TIME_FORMAT_NONE ) + "\n" +
"\n" + RiaQDateTimeTools::dateFormatString( dateFormat, RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY );
RiaQDateTimeTools::dateFormatString( dateFormat,
RiaQDateTimeTools::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY );
} }

10
ApplicationLibCode/UserInterface/RiuQtChartsPlotTools.h
View File

@@ -17,7 +17,7 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#pragma once #pragma once
#include "RiaQDateTimeTools.h" #include "RiaDateTimeDefines.h"
class RiuQtChartsPlotWidget; class RiuQtChartsPlotWidget;
@@ -30,11 +30,11 @@ public:
RiuQtChartsPlotWidget* plot, RiuQtChartsPlotWidget* plot,
const QString& dateFormat, const QString& dateFormat,
const QString& timeFormat, const QString& timeFormat,
RiaQDateTimeTools::DateFormatComponents dateComponents = RiaQDateTimeTools::DATE_FORMAT_UNSPECIFIED, RiaDefines::DateFormatComponents dateComponents = RiaDefines::DateFormatComponents::DATE_FORMAT_UNSPECIFIED,
RiaQDateTimeTools::TimeFormatComponents timeComponents = RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ); RiaDefines::TimeFormatComponents timeComponents = RiaDefines::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED );
static QString dateTimeFormatForInterval( const QString& dateFormat, static QString dateTimeFormatForInterval( const QString& dateFormat,
const QString& timeFormat, const QString& timeFormat,
RiaQDateTimeTools::DateFormatComponents dateComponents, RiaDefines::DateFormatComponents dateComponents,
RiaQDateTimeTools::TimeFormatComponents timeComponents ); RiaDefines::TimeFormatComponents timeComponents );
}; };

4
ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp
View File

@@ -662,8 +662,8 @@ void RiuQtChartsPlotWidget::updateZoomDependentCurveProperties()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuQtChartsPlotWidget::setFormatStrings( const QString& dateFormat, void RiuQtChartsPlotWidget::setFormatStrings( const QString& dateFormat,
const QString& timeFormat, const QString& timeFormat,
RiaQDateTimeTools::DateFormatComponents dateComponents, RiaDefines::DateFormatComponents dateComponents,
RiaQDateTimeTools::TimeFormatComponents timeComponents ) RiaDefines::TimeFormatComponents timeComponents )
{ {
m_dateScaleWrapper->setFormatStrings( dateFormat, timeFormat, dateComponents, timeComponents ); m_dateScaleWrapper->setFormatStrings( dateFormat, timeFormat, dateComponents, timeComponents );
} }

6
ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.h
View File

@@ -19,9 +19,9 @@
#pragma once #pragma once
#include "RiaDateTimeDefines.h"
#include "RiaDefines.h" #include "RiaDefines.h"
#include "RiaPlotDefines.h" #include "RiaPlotDefines.h"
#include "RiaQDateTimeTools.h"
#include "RiuPlotWidget.h" #include "RiuPlotWidget.h"
@@ -185,8 +185,8 @@ public:
void setFormatStrings( const QString& dateFormat, void setFormatStrings( const QString& dateFormat,
const QString& timeFormat, const QString& timeFormat,
RiaQDateTimeTools::DateFormatComponents dateComponents, RiaDefines::DateFormatComponents dateComponents,
RiaQDateTimeTools::TimeFormatComponents timeComponents ); RiaDefines::TimeFormatComponents timeComponents );
protected: protected:
void attachSeriesToAxis( RiuPlotAxis axis, QtCharts::QAbstractSeries* series, RiuQtChartsPlotCurve* plotCurve ); void attachSeriesToAxis( RiuPlotAxis axis, QtCharts::QAbstractSeries* series, RiuQtChartsPlotCurve* plotCurve );

4
ApplicationLibCode/UserInterface/RiuQwtDateScaleWrapper.cpp
View File

@@ -35,8 +35,8 @@ RiuQwtDateScaleWrapper::RiuQwtDateScaleWrapper()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuQwtDateScaleWrapper::setFormatStrings( const QString& dateFormat, void RiuQwtDateScaleWrapper::setFormatStrings( const QString& dateFormat,
const QString& timeFormat, const QString& timeFormat,
RiaQDateTimeTools::DateFormatComponents dateComponents, RiaDefines::DateFormatComponents dateComponents,
RiaQDateTimeTools::TimeFormatComponents timeComponents ) RiaDefines::TimeFormatComponents timeComponents )
{ {
std::set<QwtDate::IntervalType> intervals = { QwtDate::Year, std::set<QwtDate::IntervalType> intervals = { QwtDate::Year,
QwtDate::Month, QwtDate::Month,

4
ApplicationLibCode/UserInterface/RiuQwtDateScaleWrapper.h
View File

@@ -29,8 +29,8 @@ public:
void setFormatStrings( const QString& dateFormat, void setFormatStrings( const QString& dateFormat,
const QString& timeFormat, const QString& timeFormat,
RiaQDateTimeTools::DateFormatComponents dateComponents, RiaDefines::DateFormatComponents dateComponents,
RiaQDateTimeTools::TimeFormatComponents timeComponents ); RiaDefines::TimeFormatComponents timeComponents );
void setMaxMajorTicks( int tickCount ); void setMaxMajorTicks( int tickCount );
QString formatStringForRange( const QDateTime& min, const QDateTime& max ); QString formatStringForRange( const QDateTime& min, const QDateTime& max );

42
ApplicationLibCode/UserInterface/RiuQwtPlotTools.cpp
View File

@@ -21,6 +21,7 @@
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaPreferences.h" #include "RiaPreferences.h"
#include "RiaQDateTimeTools.h"
#include "qwt_date_scale_draw.h" #include "qwt_date_scale_draw.h"
#include "qwt_date_scale_engine.h" #include "qwt_date_scale_engine.h"
@@ -129,8 +130,8 @@ void RiuQwtPlotTools::setDefaultAxes( QwtPlot* plot )
void RiuQwtPlotTools::enableDateBasedBottomXAxis( QwtPlot* plot, void RiuQwtPlotTools::enableDateBasedBottomXAxis( QwtPlot* plot,
const QString& dateFormat, const QString& dateFormat,
const QString& timeFormat, const QString& timeFormat,
RiaQDateTimeTools::DateFormatComponents dateComponents, RiaDefines::DateFormatComponents dateComponents,
RiaQDateTimeTools::TimeFormatComponents timeComponents ) RiaDefines::TimeFormatComponents timeComponents )
{ {
QwtDateScaleDraw* scaleDraw = new QwtDateScaleDraw( Qt::UTC ); QwtDateScaleDraw* scaleDraw = new QwtDateScaleDraw( Qt::UTC );
@@ -160,11 +161,11 @@ void RiuQwtPlotTools::enableDateBasedBottomXAxis( QwtPlot*
QString RiuQwtPlotTools::dateTimeFormatForInterval( QwtDate::IntervalType interval, QString RiuQwtPlotTools::dateTimeFormatForInterval( QwtDate::IntervalType interval,
const QString& dateFormat, const QString& dateFormat,
const QString& timeFormat, const QString& timeFormat,
RiaQDateTimeTools::DateFormatComponents dateComponents, RiaDefines::DateFormatComponents dateComponents,
RiaQDateTimeTools::TimeFormatComponents timeComponents ) RiaDefines::TimeFormatComponents timeComponents )
{ {
if ( dateComponents != RiaQDateTimeTools::DATE_FORMAT_UNSPECIFIED && if ( dateComponents != RiaDefines::DateFormatComponents::DATE_FORMAT_UNSPECIFIED &&
timeComponents != RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) timeComponents != RiaDefines::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED )
{ {
return RiaQDateTimeTools::timeFormatString( timeFormat, timeComponents ) + "\n" + return RiaQDateTimeTools::timeFormatString( timeFormat, timeComponents ) + "\n" +
RiaQDateTimeTools::dateFormatString( dateFormat, dateComponents ); RiaQDateTimeTools::dateFormatString( dateFormat, dateComponents );
@@ -175,44 +176,49 @@ QString RiuQwtPlotTools::dateTimeFormatForInterval( QwtDate::IntervalType
{ {
case QwtDate::Millisecond: case QwtDate::Millisecond:
return RiaQDateTimeTools::timeFormatString( timeFormat, return RiaQDateTimeTools::timeFormatString( timeFormat,
RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND_MILLISECOND ); RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND_MILLISECOND );
case QwtDate::Second: case QwtDate::Second:
return RiaQDateTimeTools::timeFormatString( timeFormat, return RiaQDateTimeTools::timeFormatString( timeFormat,
RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND ); RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE_SECOND );
case QwtDate::Minute: case QwtDate::Minute:
{ {
QString fullFormat = QString fullFormat =
RiaQDateTimeTools::timeFormatString( timeFormat, RiaQDateTimeTools::timeFormatString( timeFormat,
RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE ); RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE );
fullFormat += "\n"; fullFormat += "\n";
fullFormat += fullFormat +=
RiaQDateTimeTools::dateFormatString( dateFormat, RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); RiaQDateTimeTools::dateFormatString( dateFormat,
RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY );
return fullFormat; return fullFormat;
} }
case QwtDate::Hour: case QwtDate::Hour:
{ {
QString fullFormat = QString fullFormat =
RiaQDateTimeTools::timeFormatString( timeFormat, RiaQDateTimeTools::timeFormatString( timeFormat, RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR );
RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR );
if ( !fullFormat.endsWith( "AP" ) ) if ( !fullFormat.endsWith( "AP" ) )
{ {
fullFormat += ":00"; fullFormat += ":00";
} }
fullFormat += "\n"; fullFormat += "\n";
fullFormat += fullFormat +=
RiaQDateTimeTools::dateFormatString( dateFormat, RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); RiaQDateTimeTools::dateFormatString( dateFormat,
RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY );
return fullFormat; return fullFormat;
} }
case QwtDate::Day: 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: 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: 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: case QwtDate::Year:
return RiaQDateTimeTools::dateFormatString( dateFormat, RiaQDateTimeTools::DATE_FORMAT_YEAR ); return RiaQDateTimeTools::dateFormatString( dateFormat, RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR );
default: default:
return RiaQDateTimeTools::dateFormatString( dateFormat, RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY ); return RiaQDateTimeTools::dateFormatString( dateFormat,
RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY );
} }
} }
} }

11
ApplicationLibCode/UserInterface/RiuQwtPlotTools.h
View File

@@ -17,8 +17,9 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#pragma once #pragma once
#include "RiaDateTimeDefines.h"
#include "RiaPlotDefines.h" #include "RiaPlotDefines.h"
#include "RiaQDateTimeTools.h"
#include <qwt_date.h> #include <qwt_date.h>
#include <qwt_plot.h> #include <qwt_plot.h>
#include <qwt_plot_shapeitem.h> #include <qwt_plot_shapeitem.h>
@@ -32,14 +33,14 @@ public:
QwtPlot* plot, QwtPlot* plot,
const QString& dateFormat, const QString& dateFormat,
const QString& timeFormat, const QString& timeFormat,
RiaQDateTimeTools::DateFormatComponents dateComponents = RiaQDateTimeTools::DATE_FORMAT_UNSPECIFIED, RiaDefines::DateFormatComponents dateComponents = RiaDefines::DateFormatComponents::DATE_FORMAT_UNSPECIFIED,
RiaQDateTimeTools::TimeFormatComponents timeComponents = RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ); RiaDefines::TimeFormatComponents timeComponents = RiaDefines::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED );
static QString dateTimeFormatForInterval( QwtDate::IntervalType interval, static QString dateTimeFormatForInterval( QwtDate::IntervalType interval,
const QString& dateFormat, const QString& dateFormat,
const QString& timeFormat, const QString& timeFormat,
RiaQDateTimeTools::DateFormatComponents dateComponents, RiaDefines::DateFormatComponents dateComponents,
RiaQDateTimeTools::TimeFormatComponents timeComponents ); RiaDefines::TimeFormatComponents timeComponents );
static QwtPlotShapeItem* createBoxShape( const QString& label, static QwtPlotShapeItem* createBoxShape( const QString& label,
double startX, double startX,

7
ApplicationLibCode/UserInterface/RiuSummaryPlot.h
View File

@@ -18,7 +18,7 @@
#pragma once #pragma once
#include "RiaQDateTimeTools.h" #include "RiaDateTimeDefines.h"
#include <QObject> #include <QObject>
#include <QPoint> #include <QPoint>
@@ -42,9 +42,8 @@ public:
virtual void useDateBasedTimeAxis( virtual void useDateBasedTimeAxis(
const QString& dateFormat, const QString& dateFormat,
const QString& timeFormat, const QString& timeFormat,
RiaQDateTimeTools::DateFormatComponents dateComponents = RiaQDateTimeTools::DATE_FORMAT_UNSPECIFIED, RiaDefines::DateFormatComponents dateComponents = RiaDefines::DateFormatComponents::DATE_FORMAT_UNSPECIFIED,
RiaQDateTimeTools::TimeFormatComponents timeComponents = RiaDefines::TimeFormatComponents timeComponents = RiaDefines::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) = 0;
RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) = 0;
virtual void useTimeBasedTimeAxis() = 0; virtual void useTimeBasedTimeAxis() = 0;

4
ApplicationLibCode/UserInterface/RiuSummaryQtChartsPlot.cpp
View File

@@ -58,8 +58,8 @@ RiuSummaryQtChartsPlot::~RiuSummaryQtChartsPlot()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuSummaryQtChartsPlot::useDateBasedTimeAxis( const QString& dateFormat, void RiuSummaryQtChartsPlot::useDateBasedTimeAxis( const QString& dateFormat,
const QString& timeFormat, const QString& timeFormat,
RiaQDateTimeTools::DateFormatComponents dateComponents, RiaDefines::DateFormatComponents dateComponents,
RiaQDateTimeTools::TimeFormatComponents timeComponents ) RiaDefines::TimeFormatComponents timeComponents )
{ {
m_plotWidget->setAxisScaleType( RiuPlotAxis::defaultBottom(), RiuPlotWidget::AxisScaleType::DATE ); m_plotWidget->setAxisScaleType( RiuPlotAxis::defaultBottom(), RiuPlotWidget::AxisScaleType::DATE );
m_plotWidget->setFormatStrings( dateFormat, timeFormat, dateComponents, timeComponents ); m_plotWidget->setFormatStrings( dateFormat, timeFormat, dateComponents, timeComponents );

10
ApplicationLibCode/UserInterface/RiuSummaryQtChartsPlot.h
View File

@@ -18,7 +18,7 @@
#pragma once #pragma once
#include "RiaQDateTimeTools.h" #include "RiaDateTimeDefines.h"
#include "RiuQtChartsPlotWidget.h" #include "RiuQtChartsPlotWidget.h"
#include "RiuSummaryPlot.h" #include "RiuSummaryPlot.h"
@@ -41,11 +41,11 @@ public:
RiuSummaryQtChartsPlot( RimSummaryPlot* plot ); RiuSummaryQtChartsPlot( RimSummaryPlot* plot );
~RiuSummaryQtChartsPlot() override; ~RiuSummaryQtChartsPlot() override;
void useDateBasedTimeAxis( const QString& dateFormat, void useDateBasedTimeAxis(
const QString& dateFormat,
const QString& timeFormat, const QString& timeFormat,
RiaQDateTimeTools::DateFormatComponents dateComponents = RiaQDateTimeTools::DATE_FORMAT_UNSPECIFIED, RiaDefines::DateFormatComponents dateComponents = RiaDefines::DateFormatComponents::DATE_FORMAT_UNSPECIFIED,
RiaQDateTimeTools::TimeFormatComponents timeComponents = RiaDefines::TimeFormatComponents timeComponents = RiaDefines::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) override;
RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) override;
void useTimeBasedTimeAxis() override; void useTimeBasedTimeAxis() override;

4
ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.cpp
View File

@@ -147,8 +147,8 @@ RiuSummaryQwtPlot::~RiuSummaryQwtPlot()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuSummaryQwtPlot::useDateBasedTimeAxis( const QString& dateFormat, void RiuSummaryQwtPlot::useDateBasedTimeAxis( const QString& dateFormat,
const QString& timeFormat, const QString& timeFormat,
RiaQDateTimeTools::DateFormatComponents dateComponents, RiaDefines::DateFormatComponents dateComponents,
RiaQDateTimeTools::TimeFormatComponents timeComponents ) RiaDefines::TimeFormatComponents timeComponents )
{ {
RiuQwtPlotTools::enableDateBasedBottomXAxis( m_plotWidget->qwtPlot(), dateFormat, timeFormat, dateComponents, timeComponents ); RiuQwtPlotTools::enableDateBasedBottomXAxis( m_plotWidget->qwtPlot(), dateFormat, timeFormat, dateComponents, timeComponents );
} }

10
ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.h
View File

@@ -18,7 +18,7 @@
#pragma once #pragma once
#include "RiaQDateTimeTools.h" #include "RiaDateTimeDefines.h"
#include "RiuInterfaceToViewWindow.h" #include "RiuInterfaceToViewWindow.h"
#include "RiuQwtPlotWidget.h" #include "RiuQwtPlotWidget.h"
@@ -47,11 +47,11 @@ public:
RiuSummaryQwtPlot( RimSummaryPlot* plot, QWidget* parent = nullptr ); RiuSummaryQwtPlot( RimSummaryPlot* plot, QWidget* parent = nullptr );
~RiuSummaryQwtPlot() override; ~RiuSummaryQwtPlot() override;
void useDateBasedTimeAxis( const QString& dateFormat, void useDateBasedTimeAxis(
const QString& dateFormat,
const QString& timeFormat, const QString& timeFormat,
RiaQDateTimeTools::DateFormatComponents dateComponents = RiaQDateTimeTools::DATE_FORMAT_UNSPECIFIED, RiaDefines::DateFormatComponents dateComponents = RiaDefines::DateFormatComponents::DATE_FORMAT_UNSPECIFIED,
RiaQDateTimeTools::TimeFormatComponents timeComponents = RiaDefines::TimeFormatComponents timeComponents = RiaDefines::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) override;
RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_UNSPECIFIED ) override;
void useTimeBasedTimeAxis() override; void useTimeBasedTimeAxis() override;

2
ApplicationLibCode/UserInterface/RiuTextDialog.h
View File

@@ -18,8 +18,6 @@
#pragma once #pragma once
#include "RiaQDateTimeTools.h"
#include <QDialog> #include <QDialog>
#include <QPlainTextEdit> #include <QPlainTextEdit>
#include <QPointer> #include <QPointer>