OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-16 02:12:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

#1842 RFT Plot. Show plot when new RFT plot command is triggered

Browse Source
This commit is contained in:
Bjørn Erik Jensen committed 2017-10-05 16:26:39 +02:00
1 parent 19e5e61cb7
commit 2add09ea33
9 files changed
+136 -57
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
+46 -8
View File
@@ -101,7 +101,8 @@ RimWellRftPlot::RimWellRftPlot()
m_selectedTimeSteps.xmlCapability()->setIOReadable(false);
m_selectedTimeSteps.xmlCapability()->setIOWritable(false);
m_selectedTimeSteps.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
//this->setAsPlotMdiWindow();
this->setAsPlotMdiWindow();
}
//--------------------------------------------------------------------------------------------------
@@ -206,13 +207,16 @@ QList<caf::PdmOptionItemInfo> RimWellRftPlot::calculateValueOptions(const caf::P
}
else if (fieldNeedingOptions == &m_selectedSources)
{
calculateValueOptionsForObservedData(options);
options.push_back(caf::PdmOptionItemInfo::createHeader("RFT Cases", true));
options.push_back(caf::PdmOptionItemInfo::createHeader("Grid Cases", true));
options.push_back(caf::PdmOptionItemInfo::createHeader("Observed Data", true));
calculateValueOptionsForObservedData(options, 1);
}
else if (fieldNeedingOptions == &m_selectedTimeSteps)
{
options.push_back(caf::PdmOptionItemInfo("TimeStep 1", "TimeStep 1"));
options.push_back(caf::PdmOptionItemInfo("TimeStep 2", "TimeStep 2"));
calculateValueOptionsForTimeSteps(options);
}
return options;
@@ -223,7 +227,7 @@ QList<caf::PdmOptionItemInfo> RimWellRftPlot::calculateValueOptions(const caf::P
//--------------------------------------------------------------------------------------------------
void RimWellRftPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
//RimViewWindow::fieldChangedByUi(changedField, oldValue, newValue);
RimViewWindow::fieldChangedByUi(changedField, oldValue, newValue);
//if (changedField == &m_userName ||
// changedField == &m_showPlotTitle)
@@ -317,7 +321,7 @@ void RimWellRftPlot::calculateValueOptionsForWells(QList<caf::PdmOptionItemInfo>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellRftPlot::calculateValueOptionsForObservedData(QList<caf::PdmOptionItemInfo>& options)
void RimWellRftPlot::calculateValueOptionsForObservedData(QList<caf::PdmOptionItemInfo>& options, int level)
{
auto project = RiaApplication::instance()->project();
@@ -333,9 +337,43 @@ void RimWellRftPlot::calculateValueOptionsForObservedData(QList<caf::PdmOptionIt
{
auto name = channel->name();
if (QString::compare(name, "GR") == 0) // Test code
if (QString::compare(name, "PRESSURE") == 0) // Todo: Move constant to config/defines
{
options.push_back(caf::PdmOptionItemInfo(name, name));
auto item = caf::PdmOptionItemInfo(name, name);
if (level > 0)
{
item.setLevel(level);
}
options.push_back(item);
}
}
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellRftPlot::calculateValueOptionsForTimeSteps(QList<caf::PdmOptionItemInfo>& options)
{
auto project = RiaApplication::instance()->project();
for (RimOilField* oilField : project->oilFields)
{
auto wellPathColl = oilField->wellPathCollection();
for (const auto& wellPath : wellPathColl->wellPaths)
{
const auto& wellLogFile = wellPath->wellLogFile();
const auto& channels = wellLogFile->wellLogChannelNames();
for (const auto& channel : *channels)
{
auto name = channel->name();
if (QString::compare(name, "PRESSURE") == 0) // Todo: Move constant to config/defines
{
auto item = caf::PdmOptionItemInfo(wellLogFile->date(), name);
options.push_back(item);
}
}
}
ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h
+3 -1
View File
@@ -89,7 +89,9 @@ protected:
private:
void calculateValueOptionsForWells(QList<caf::PdmOptionItemInfo>& options);
void calculateValueOptionsForObservedData(QList<caf::PdmOptionItemInfo>& options);
void calculateValueOptionsForObservedData(QList<caf::PdmOptionItemInfo>& options, int level);
void calculateValueOptionsForTimeSteps(QList<caf::PdmOptionItemInfo>& options);
void updateFromWell();
void updateWidgetTitleWindowTitle();
ApplicationCode/ProjectDataModel/RimWellLogFile.cpp
+14
View File
@@ -45,6 +45,11 @@ RimWellLogFile::RimWellLogFile()
m_wellName.uiCapability()->setUiHidden(true);
m_wellName.xmlCapability()->setIOWritable(false);
CAF_PDM_InitFieldNoDefault(&m_date, "Date", "", "", "", "");
m_date.uiCapability()->setUiReadOnly(true);
m_date.uiCapability()->setUiHidden(true);
m_date.xmlCapability()->setIOWritable(false);
CAF_PDM_InitFieldNoDefault(&m_fileName, "FileName", "Filename", "", "", "");
m_fileName.uiCapability()->setUiReadOnly(true);
@@ -131,6 +136,7 @@ bool RimWellLogFile::readFile(QString* errorMessage)
}
m_wellName = m_wellLogDataFile->wellName();
m_date = m_wellLogDataFile->date();
m_wellLogChannelNames.deleteAllChildObjects();
@@ -162,3 +168,11 @@ QString RimWellLogFile::wellName() const
{
return m_wellName;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimWellLogFile::date() const
{
return m_date;
}
ApplicationCode/ProjectDataModel/RimWellLogFile.h
+2
View File
@@ -52,6 +52,7 @@ public:
bool readFile(QString* errorMessage);
QString wellName() const;
QString date() const;
virtual caf::PdmFieldHandle* userDescriptionField() { return &m_name; }
RigWellLogFile* wellLogFile() { return m_wellLogDataFile.p(); }
@@ -66,4 +67,5 @@ private:
caf::PdmField<QString> m_wellName;
caf::PdmField<QString> m_fileName;
caf::PdmField<QString> m_name;
caf::PdmField<QString> m_date;
};