From 8ed9945ccfb03ee2de76435b8a8ea81d067660e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A5l=20Hagen?= Date: Wed, 16 Sep 2015 15:43:14 +0200 Subject: [PATCH] (#436) Showing user name field. Default value is log channel name. --- .../ProjectDataModel/RimWellLogFileCurve.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp index 4c6821ff3f..23a531cad5 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp @@ -51,8 +51,6 @@ RimWellLogFileCurve::RimWellLogFileCurve() CAF_PDM_InitFieldNoDefault(&m_wellLogChannnelName, "CurveWellLogChannel", "Well Log Channel", "", "", ""); - m_userName.uiCapability()->setUiHidden(true); - m_wellPath = NULL; } @@ -79,13 +77,11 @@ void RimWellLogFileCurve::updatePlotData() { RigWellLogFile* wellLogFile = logFileInfo->wellLogFile(); m_plotCurve->setSamples(wellLogFile->values(m_wellLogChannnelName).data(), wellLogFile->depthValues().data(), (int) wellLogFile->depthValues().size()); - m_plotCurve->setTitle(m_wellLogChannnelName); } } else { 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) { + if (oldValue.toString() == m_userName) + { + m_userName = m_wellLogChannnelName; + } + this->updatePlotData(); RimWellLogPlot* wellLoglot; @@ -149,6 +150,7 @@ void RimWellLogFileCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedFie //-------------------------------------------------------------------------------------------------- void RimWellLogFileCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) { + uiOrdering.add(&m_userName); uiOrdering.add(&m_wellPath); uiOrdering.add(&m_wellLogChannnelName); } @@ -200,7 +202,6 @@ QList RimWellLogFileCurve::calculateValueOptions(const c { QString wellLogChannelName = (*fileLogs)[i]->name(); optionList.push_back(caf::PdmOptionItemInfo(wellLogChannelName, wellLogChannelName)); - } } }