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

#2684 Well CF Visualization: Option to turn off CF visualization on closed connections

Browse Source
This commit is contained in:
Magne Sjaastad
2018-04-19 22:28:22 +02:00
parent e6781e2de4
commit 9e40ba39c8
5 changed files with 49 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -1108,7 +1108,7 @@ void RimEclipseView::updateLegends()
}
}
if (m_virtualPerforationResult->isActive() && m_virtualPerforationResult->legendConfig()->showLegend())
if (m_virtualPerforationResult->showConnectionFactors() && m_virtualPerforationResult->legendConfig()->showLegend())
{
updateVirtualConnectionLegendRanges();
@@ -1433,7 +1433,7 @@ bool RimEclipseView::isVirtualConnectionFactorGeometryVisible() const
{
if (!m_showWindow()) return false;
if (!m_virtualPerforationResult->isActive()) return false;
if (!m_virtualPerforationResult->showConnectionFactors()) return false;
// TODO: Consider check if no well paths are visible

26
ApplicationCode/ProjectDataModel/RimVirtualPerforationResults.cpp
View File

@@ -36,7 +36,8 @@ RimVirtualPerforationResults::RimVirtualPerforationResults()
CAF_PDM_InitObject(connectionFactorUiName, ":/CellResult.png", "", "");
CAF_PDM_InitField(&m_isActive, "ShowConnectionFactors", false, "", "", "", "");
CAF_PDM_InitField(&m_geometryScaleFactor, "GeometryScaleFactor", 1.0, "Geometry Scale Factor", "", "", "");
CAF_PDM_InitField(&m_showClosedConnections, "ShowClosedConnections", true, "Show On Closed Connections", "", "", "");
CAF_PDM_InitField(&m_geometryScaleFactor, "GeometryScaleFactor", 2.0, "Geometry Scale Factor", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_legendConfig, "LegendDefinition", "Legend Definition", "", "", "");
m_legendConfig.uiCapability()->setUiHidden(true);
@@ -55,11 +56,19 @@ RimVirtualPerforationResults::~RimVirtualPerforationResults() {}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimVirtualPerforationResults::isActive() const
bool RimVirtualPerforationResults::showConnectionFactors() const
{
return m_isActive();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimVirtualPerforationResults::showConnectionFactorsOnClosedConnections() const
{
return m_showClosedConnections();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -117,24 +126,13 @@ caf::PdmFieldHandle* RimVirtualPerforationResults::objectToggleField()
return &m_isActive;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimVirtualPerforationResults::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly)
{
QList<caf::PdmOptionItemInfo> options;
*useOptionsOnly = true;
return options;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimVirtualPerforationResults::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
uiOrdering.add(&m_geometryScaleFactor);
uiOrdering.add(&m_showClosedConnections);
uiOrdering.skipRemainingFields(true);
}

7
ApplicationCode/ProjectDataModel/RimVirtualPerforationResults.h
View File

@@ -22,7 +22,6 @@
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include <vector>
class RimRegularLegendConfig;
@@ -39,21 +38,21 @@ public:
RimVirtualPerforationResults();
virtual ~RimVirtualPerforationResults();
bool isActive() const;
bool showConnectionFactors() const;
bool showConnectionFactorsOnClosedConnections() const;
double geometryScaleFactor() const;
RimRegularLegendConfig* legendConfig() const;
void loadData();
private:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual caf::PdmFieldHandle* objectToggleField() override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual void initAfterRead() override;
private:
caf::PdmField<bool> m_isActive;
caf::PdmField<bool> m_showClosedConnections;
caf::PdmField<double> m_geometryScaleFactor;
caf::PdmChildField<RimRegularLegendConfig*> m_legendConfig;