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

#2021 LAS file. Minor improvements

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-11-01 09:05:36 +01:00
parent 23536c1dec
commit 297dfa5b5f
2 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ApplicationCode/ProjectDataModel/RimWellLogFile.cpp
View File

@@ -59,9 +59,14 @@ RimWellLogFile::RimWellLogFile()
m_wellName.uiCapability()->setUiHidden(true);
m_wellName.xmlCapability()->setIOWritable(false);
CAF_PDM_InitFieldNoDefault(&m_uiDate, "ui_Date", "Date", "", "", "");
m_uiDate.registerGetMethod(this, &RimWellLogFile::formatDate);
m_uiDate.uiCapability()->setUiHidden(false);
m_uiDate.uiCapability()->setUiReadOnly(true);
CAF_PDM_InitFieldNoDefault(&m_date, "Date", "Date", "", "", "");
m_date.uiCapability()->setUiReadOnly(true);
//m_date.uiCapability()->setUiEditorTypeName(caf::PdmUiLineEditor::uiEditorTypeName());
m_date.uiCapability()->setUiHidden(true);
m_date.xmlCapability()->setIOWritable(false);
CAF_PDM_InitFieldNoDefault(&m_fileName, "FileName", "Filename", "", "", "");
@@ -76,7 +81,7 @@ RimWellLogFile::RimWellLogFile()
m_wellLogChannelNames.uiCapability()->setUiHidden(true);
m_wellLogChannelNames.xmlCapability()->setIOWritable(false);
CAF_PDM_InitFieldNoDefault(&m_wellFlowCondition, "WellFlowCondition", "", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_wellFlowCondition, "WellFlowCondition", "Well Flow Condition", "", "", "");
m_wellLogDataFile = NULL;
}
@@ -212,7 +217,7 @@ std::vector<RimWellLogFileChannel*> RimWellLogFile::wellLogChannels() const
void RimWellLogFile::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
uiOrdering.add(&m_fileName);
uiOrdering.add(&m_date);
uiOrdering.add(&m_uiDate);
if (RimWellPltPlot::hasFlowData(this))
{
@@ -225,24 +230,9 @@ void RimWellLogFile::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimWellLogFile::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
QString RimWellLogFile::formatDate() const
{
QList<caf::PdmOptionItemInfo> options;
if (fieldNeedingOptions == &m_date)
{
QString dateString = formatDate(date());
options.push_back(caf::PdmOptionItemInfo(!dateString.isEmpty() ? dateString : "Invalid or no date", date()));
}
return options;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimWellLogFile::formatDate(const QString dateString)
{
QDateTime timeStep = RiaDateStringParser::parseDateString(dateString);
QDateTime timeStep = RiaDateStringParser::parseDateString(m_date());
if (timeStep.isValid())
{
const QString dateFormatString = RimTools::createTimeFormatStringFromDates({ timeStep });