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

(#436) Showing user name field. Default value is log channel name.

Browse Source
This commit is contained in:
Pål Hagen 2015-09-16 15:43:14 +02:00
parent c88bdfd823
commit 8ed9945ccf
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp
View File

@ -51,8 +51,6 @@ RimWellLogFileCurve::RimWellLogFileCurve()
CAF_PDM_InitFieldNoDefault(&m_wellLogChannnelName, "CurveWellLogChannel", "Well Log Channel", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_wellLogChannnelName, "CurveWellLogChannel", "Well Log Channel", "", "", "");
m_userName.uiCapability()->setUiHidden(true);
m_wellPath = NULL; m_wellPath = NULL;
} }
@ -79,13 +77,11 @@ void RimWellLogFileCurve::updatePlotData()
{ {
RigWellLogFile* wellLogFile = logFileInfo->wellLogFile(); RigWellLogFile* wellLogFile = logFileInfo->wellLogFile();
m_plotCurve->setSamples(wellLogFile->values(m_wellLogChannnelName).data(), wellLogFile->depthValues().data(), (int) wellLogFile->depthValues().size()); m_plotCurve->setSamples(wellLogFile->values(m_wellLogChannnelName).data(), wellLogFile->depthValues().data(), (int) wellLogFile->depthValues().size());
m_plotCurve->setTitle(m_wellLogChannnelName);
} }
} }
else else
{ {
m_plotCurve->setSamples(NULL, NULL, 0); m_plotCurve->setSamples(NULL, NULL, 0);
m_plotCurve->setTitle("None");
} }
} }
} }
@ -127,6 +123,11 @@ void RimWellLogFileCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
} }
else if (changedField == &m_wellLogChannnelName) else if (changedField == &m_wellLogChannnelName)
{ {
if (oldValue.toString() == m_userName)
{
m_userName = m_wellLogChannnelName;
}
this->updatePlotData(); this->updatePlotData();
RimWellLogPlot* wellLoglot; RimWellLogPlot* wellLoglot;
@ -149,6 +150,7 @@ void RimWellLogFileCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellLogFileCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RimWellLogFileCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{ {
uiOrdering.add(&m_userName);
uiOrdering.add(&m_wellPath); uiOrdering.add(&m_wellPath);
uiOrdering.add(&m_wellLogChannnelName); uiOrdering.add(&m_wellLogChannnelName);
} }
@ -200,7 +202,6 @@ QList<caf::PdmOptionItemInfo> RimWellLogFileCurve::calculateValueOptions(const c
{ {
QString wellLogChannelName = (*fileLogs)[i]->name(); QString wellLogChannelName = (*fileLogs)[i]->name();
optionList.push_back(caf::PdmOptionItemInfo(wellLogChannelName, wellLogChannelName)); optionList.push_back(caf::PdmOptionItemInfo(wellLogChannelName, wellLogChannelName));
} }
} }
} }