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

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

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

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

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

2
ApplicationLibCode/ProjectDataModel/RimSimWellInViewTools.cpp
View File

@@ -168,7 +168,7 @@ double RimSimWellInViewTools::extractValueForTimeStep( RifSummaryReaderInterface
}
auto [resampledTimeSteps, resampledValues] =
RiaSummaryTools::resampledValuesForPeriod( addr, timeSteps, values, RiaQDateTimeTools::DateTimePeriod::DAY );
RiaSummaryTools::resampledValuesForPeriod( addr, timeSteps, values, RiaDefines::DateTimePeriod::DAY );
time_t currentTime_t = currentDate.toSecsSinceEpoch();

14
ApplicationLibCode/ProjectDataModel/RimTimeAxisAnnotation.cpp
View File

@@ -57,12 +57,13 @@ void RimTimeAxisAnnotation::setTime( time_t time )
{
m_value = RiaTimeTTools::toDouble( time );
QString dateFormatString = RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(),
RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY );
QString dateFormatString =
RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(),
RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY );
QString timeFormatString =
RiaQDateTimeTools::timeFormatString( RiaPreferences::current()->timeFormat(),
RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE );
RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE );
QString dateTimeFormatString = QString( "%1 %2" ).arg( dateFormatString ).arg( timeFormatString );
@@ -80,12 +81,13 @@ void RimTimeAxisAnnotation::setTimeRange( time_t startTime, time_t endTime )
m_rangeStart = RiaTimeTTools::toDouble( startTime );
m_rangeEnd = RiaTimeTTools::toDouble( endTime );
QString dateFormatString = RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(),
RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY );
QString dateFormatString =
RiaQDateTimeTools::dateFormatString( RiaPreferences::current()->dateFormat(),
RiaDefines::DateFormatComponents::DATE_FORMAT_YEAR_MONTH_DAY );
QString timeFormatString =
RiaQDateTimeTools::timeFormatString( RiaPreferences::current()->timeFormat(),
RiaQDateTimeTools::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE );
RiaDefines::TimeFormatComponents::TIME_FORMAT_HOUR_MINUTE );
QString dateTimeFormatString = QString( "%1 %2" ).arg( dateFormatString ).arg( timeFormatString );

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

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

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

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

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

@@ -22,8 +22,8 @@
#include "RifEclipseSummaryAddressQMetaType.h"
#include "RifSummaryReaderInterface.h"
#include "RiaDateTimeDefines.h"
#include "RiaPlotDefines.h"
#include "RiaQDateTimeTools.h"
#include "RimEnsembleCurveSetColorManager.h"
#include "RimEnsembleCurveSetInterface.h"
@@ -216,11 +216,11 @@ private:
caf::PdmPointer<RimSummaryCurve> m_currentSummaryCurve;
caf::PdmPtrField<RimSummaryCaseCollection*> m_yValuesSummaryCaseCollection;
caf::PdmChildField<RimSummaryAddress*> m_yValuesSummaryAddress;
caf::PdmField<RifEclipseSummaryAddress> m_yValuesSummaryAddressUiField;
caf::PdmField<bool> m_yPushButtonSelectSummaryAddress;
caf::PdmField<RiaQDateTimeTools::DateTimePeriodEnum> m_resampling;
caf::PdmPtrField<RimSummaryCaseCollection*> m_yValuesSummaryCaseCollection;
caf::PdmChildField<RimSummaryAddress*> m_yValuesSummaryAddress;
caf::PdmField<RifEclipseSummaryAddress> m_yValuesSummaryAddressUiField;
caf::PdmField<bool> m_yPushButtonSelectSummaryAddress;
caf::PdmField<RiaDefines::DateTimePeriodEnum> m_resampling;
caf::PdmField<ColorModeEnum> m_colorMode;
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;
auto [resampledTimeSteps, resampledValues] =
RiaSummaryTools::resampledValuesForPeriod( inputAddress,
timeSteps,
values,
RiaQDateTimeTools::DateTimePeriod::DAY );
RiaSummaryTools::resampledValuesForPeriod( inputAddress, timeSteps, values, RiaDefines::DateTimePeriod::DAY );
if ( allTimeSteps.empty() ) allTimeSteps = resampledTimeSteps;
caseAndTimeStepValues.push_back( resampledValues );

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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