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

#1947 RFT/PLT Plot: Add uiordering and change Address from std to qt variables

Browse Source
This commit is contained in:
Unknown
2017-10-05 13:49:49 +02:00
committed by Rebecca Cox
parent b8cef666e0
commit 9c3b199e7e
5 changed files with 92 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ApplicationCode/FileInterface/RifEclipseRftAddress.cpp
View File

@@ -18,6 +18,31 @@
#include "RifEclipseRftAddress.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifEclipseRftAddress::RifEclipseRftAddress(std::string wellName, time_t timeStep, std::string wellLogChannelName)
{
m_timeStep.setTimeSpec(Qt::TimeSpec::UTC);
m_timeStep.setTime_t(timeStep);
m_wellName = QString(wellName.c_str());
m_wellLogChannelName = QString(wellLogChannelName.c_str());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifEclipseRftAddress::RifEclipseRftAddress(QString wellName, QDateTime timeStep, QString wellLogChannelName) :
m_wellName(wellName), m_wellLogChannelName(wellLogChannelName)
{
timeStep.setTimeSpec(Qt::TimeSpec::UTC);
m_timeStep.setTimeSpec(Qt::TimeSpec::UTC);
m_timeStep = timeStep;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -41,3 +66,4 @@ bool operator<(const RifEclipseRftAddress& first, const RifEclipseRftAddress& se
return false;
}

17
ApplicationCode/FileInterface/RifEclipseRftAddress.h
View File

@@ -20,6 +20,7 @@
#pragma once
#include <string>
#include <QDateTime>
//==================================================================================================
///
@@ -28,17 +29,17 @@
class RifEclipseRftAddress
{
public:
RifEclipseRftAddress(std::string wellName, time_t timeStep, std::string wellLogChannelName) :
m_wellName(wellName), m_timeStep(timeStep), m_wellLogChannelName(wellLogChannelName) {}
RifEclipseRftAddress(QString wellName, QDateTime timeStep, QString wellLogChannelName);
RifEclipseRftAddress(std::string wellName, time_t timeStep, std::string wellLogChannelName);
const std::string& wellName() const { return m_wellName; }
time_t timeStep() const { return m_timeStep; }
const std::string& wellLogChannelName() const { return m_wellLogChannelName; }
const QString& wellName() const { return m_wellName; }
QDateTime timeStep() const { return m_timeStep; }
const QString& wellLogChannelName() const { return m_wellLogChannelName; }
private:
std::string m_wellName;
time_t m_timeStep;
std::string m_wellLogChannelName;
QString m_wellName;
QDateTime m_timeStep;
QString m_wellLogChannelName;
};
bool operator==(const RifEclipseRftAddress& first, const RifEclipseRftAddress& second);

4
ApplicationCode/FileInterface/RifReaderEclipseRft.cpp
View File

@@ -22,6 +22,8 @@
#include "ert/ecl/ecl_rft_file.h"
#include <QString>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -134,7 +136,7 @@ void RifReaderEclipseRft::values(const RifEclipseRftAddress& rftAddress, std::ve
ecl_rft_node_type* node = ecl_rft_file_iget_node(m_ecl_rft_file, index);
std::string wellLogChannelName = rftAddress.wellLogChannelName();
QString wellLogChannelName = rftAddress.wellLogChannelName();
if (wellLogChannelName == "DEPTH")
{