mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Thermal Fracture: improve import and display of timestamps
This commit is contained in:
@@ -97,8 +97,15 @@ std::pair<std::shared_ptr<RigThermalFractureDefinition>, QString>
|
|||||||
|
|
||||||
// Second is the timestamp
|
// Second is the timestamp
|
||||||
QString dateString = values[1];
|
QString dateString = values[1];
|
||||||
QString dateFormat = "DD.MMMM.yy hh:mm:ss";
|
QString dateFormat = "dd.MM.yyyy hh:mm:ss";
|
||||||
QDateTime dateTime = QDateTime::fromString( dateString, dateFormat );
|
QDateTime dateTime = QDateTime::fromString( dateString, dateFormat );
|
||||||
|
// Sometimes the datetime field is missing time
|
||||||
|
if ( !dateTime.isValid() )
|
||||||
|
{
|
||||||
|
QString dateFormat = "dd.MM.yyyy";
|
||||||
|
dateTime = QDateTime::fromString( dateString, dateFormat );
|
||||||
|
}
|
||||||
|
|
||||||
def->addTimeStep( dateTime.toSecsSinceEpoch() );
|
def->addTimeStep( dateTime.toSecsSinceEpoch() );
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -204,11 +204,11 @@ QList<caf::PdmOptionItemInfo> RimMeshFractureTemplate::calculateValueOptions( co
|
|||||||
}
|
}
|
||||||
else if ( fieldNeedingOptions == &m_activeTimeStepIndex )
|
else if ( fieldNeedingOptions == &m_activeTimeStepIndex )
|
||||||
{
|
{
|
||||||
std::vector<double> timeValues = timeSteps();
|
std::vector<QString> timeValues = timeStepsStrings();
|
||||||
int index = 0;
|
int index = 0;
|
||||||
for ( double value : timeValues )
|
for ( QString value : timeValues )
|
||||||
{
|
{
|
||||||
options.push_back( caf::PdmOptionItemInfo( QString::number( value ), index ) );
|
options.push_back( caf::PdmOptionItemInfo( value, index ) );
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,8 +53,9 @@ public:
|
|||||||
QString wellPathDepthAtFractureUiName() const override;
|
QString wellPathDepthAtFractureUiName() const override;
|
||||||
|
|
||||||
// Result Access
|
// Result Access
|
||||||
virtual std::vector<double> timeSteps() = 0;
|
virtual std::vector<double> timeSteps() = 0;
|
||||||
virtual QStringList conductivityResultNames() const = 0;
|
virtual std::vector<QString> timeStepsStrings() = 0;
|
||||||
|
virtual QStringList conductivityResultNames() const = 0;
|
||||||
virtual std::vector<std::vector<double>>
|
virtual std::vector<std::vector<double>>
|
||||||
resultValues( const QString& uiResultName, const QString& unitName, size_t timeStepIndex ) const = 0;
|
resultValues( const QString& uiResultName, const QString& unitName, size_t timeStepIndex ) const = 0;
|
||||||
virtual std::vector<double>
|
virtual std::vector<double>
|
||||||
|
|||||||
@@ -518,6 +518,21 @@ std::vector<double> RimStimPlanFractureTemplate::timeSteps()
|
|||||||
return std::vector<double>();
|
return std::vector<double>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
std::vector<QString> RimStimPlanFractureTemplate::timeStepsStrings()
|
||||||
|
{
|
||||||
|
std::vector<QString> steps;
|
||||||
|
std::vector<double> timeStepsAsDouble = timeSteps();
|
||||||
|
for ( auto d : timeStepsAsDouble )
|
||||||
|
{
|
||||||
|
steps.push_back( QString::number( d ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
return steps;
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ public:
|
|||||||
double wellPathDepthAtFracture ) const override;
|
double wellPathDepthAtFracture ) const override;
|
||||||
|
|
||||||
// Result Access
|
// Result Access
|
||||||
|
std::vector<QString> timeStepsStrings() override;
|
||||||
std::vector<double> timeSteps() override;
|
std::vector<double> timeSteps() override;
|
||||||
std::vector<std::pair<QString, QString>> uiResultNamesWithUnit() const override;
|
std::vector<std::pair<QString, QString>> uiResultNamesWithUnit() const override;
|
||||||
std::vector<std::vector<double>>
|
std::vector<std::vector<double>>
|
||||||
|
|||||||
@@ -47,6 +47,7 @@
|
|||||||
#include "cvfMath.h"
|
#include "cvfMath.h"
|
||||||
#include "cvfVector3.h"
|
#include "cvfVector3.h"
|
||||||
|
|
||||||
|
#include <QDateTime>
|
||||||
#include <QFileInfo>
|
#include <QFileInfo>
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
@@ -499,6 +500,23 @@ std::vector<double> RimThermalFractureTemplate::timeSteps()
|
|||||||
return std::vector<double>();
|
return std::vector<double>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
std::vector<QString> RimThermalFractureTemplate::timeStepsStrings()
|
||||||
|
{
|
||||||
|
std::vector<QString> steps;
|
||||||
|
std::vector<double> timeStepsAsDouble = timeSteps();
|
||||||
|
for ( auto d : timeStepsAsDouble )
|
||||||
|
{
|
||||||
|
QDateTime dateTime;
|
||||||
|
dateTime.setSecsSinceEpoch( d );
|
||||||
|
steps.push_back( dateTime.toString() );
|
||||||
|
}
|
||||||
|
|
||||||
|
return steps;
|
||||||
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ public:
|
|||||||
double wellPathDepthAtFracture ) const override;
|
double wellPathDepthAtFracture ) const override;
|
||||||
|
|
||||||
// Result Access
|
// Result Access
|
||||||
|
std::vector<QString> timeStepsStrings() override;
|
||||||
std::vector<double> timeSteps() override;
|
std::vector<double> timeSteps() override;
|
||||||
std::vector<std::pair<QString, QString>> uiResultNamesWithUnit() const override;
|
std::vector<std::pair<QString, QString>> uiResultNamesWithUnit() const override;
|
||||||
std::vector<std::vector<double>>
|
std::vector<std::vector<double>>
|
||||||
|
|||||||
Reference in New Issue
Block a user