OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-11-11 00:35:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

WIP resolved conflicts

Browse Source
This commit is contained in:
Magne Sjaastad committed 2015-09-18 13:46:18 +02:00
1 parent 6be5be4746
commit 842363eebd
9 files changed
+145 -81
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp
+15 -9
View File
@@ -65,9 +65,9 @@ RimWellLogFileCurve::~RimWellLogFileCurve()
//--------------------------------------------------------------------------------------------------
void RimWellLogFileCurve::updatePlotData()
{
RimWellLogPlotCurve::updatePlotData();
RimWellLogPlotCurve::updatePlotConfiguration();
if (m_showCurve)
if (isCurveVisibile())
{
if (m_wellPath)
{
@@ -81,7 +81,7 @@ void RimWellLogFileCurve::updatePlotData()
if (values.size() > 0 && depthValues.size() > 0)
{
m_plotCurve->setSamples(values.data(), depthValues.data(), (int) depthValues.size());
m_plotCurve->setSamples(values.data(), depthValues.data(), (int)depthValues.size());
}
else
{
@@ -127,6 +127,7 @@ void RimWellLogFileCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
if (changedField == &m_wellPath)
{
this->updatePlotTitle();
this->updatePlotData();
if (wellLoglot)
@@ -142,11 +143,7 @@ void RimWellLogFileCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
}
else if (changedField == &m_wellLogChannnelName)
{
if (oldValue.toString() == m_userName)
{
m_userName = m_wellLogChannnelName;
}
this->updatePlotTitle();
this->updatePlotData();
if (wellLoglot)
@@ -172,7 +169,8 @@ void RimWellLogFileCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
//--------------------------------------------------------------------------------------------------
void RimWellLogFileCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
uiOrdering.add(&m_userName);
RimWellLogPlotCurve::defineUiOrdering(uiConfigName, uiOrdering);
uiOrdering.add(&m_wellPath);
uiOrdering.add(&m_wellLogChannnelName);
}
@@ -237,3 +235,11 @@ QList<caf::PdmOptionItemInfo> RimWellLogFileCurve::calculateValueOptions(const c
return optionList;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimWellLogFileCurve::createCurveName()
{
return "The method or operation is not implemented.";
}