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

Merged patch to dev. #2429, #2430

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-01-31 15:53:02 +01:00
commit 4d98ac04e8
6 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/Rim3dView.cpp
View File

@ -381,7 +381,7 @@ void Rim3dView::endAnimation()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellPathCollection* Rim3dView::wellPathCollection()
RimWellPathCollection* Rim3dView::wellPathCollection() const
{
RimProject* proj = nullptr;
this->firstAncestorOrThisOfTypeAsserted(proj);

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -1527,6 +1527,8 @@ bool RimEclipseView::isTimeStepDependentDataVisible() const
if (this->faultResultSettings->customFaultResult()->isTernarySaturationSelected()) return true;
}
if (this->wellPathCollection()->anyWellsContainingPerforationIntervals()) return true;
return false;
}

7
ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.cpp
View File

@ -320,6 +320,13 @@ void RimSimWellInViewCollection::fieldChangedByUi(const caf::PdmFieldHandle* cha
if (&isActive == changedField)
{
this->updateUiIconFromToggleField();
RimView* view;
firstAncestorOrThisOfType(view);
if (view)
{
view->hasUserRequestedAnimation = true;
}
}
if (&m_showWellLabel == changedField)

13
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
View File

@ -37,6 +37,7 @@
#include "RimProject.h"
#include "RimWellLogFile.h"
#include "RimWellPath.h"
#include "RimPerforationCollection.h"
#include "RiuMainWindow.h"
@ -478,6 +479,18 @@ void RimWellPathCollection::updateFilePathsFromProjectPath(const QString& newPro
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimWellPathCollection::anyWellsContainingPerforationIntervals() const
{
for (const auto& wellPath : wellPaths)
{
if (!wellPath->perforationIntervalCollection()->perforations().empty()) return true;
}
return false;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimWellPathCollection.h
View File

@ -122,6 +122,8 @@ public:
const cvf::BoundingBox& wellPathClipBoundingBox,
const caf::DisplayCoordTransform* displayCoordTransform);
void updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath);
bool anyWellsContainingPerforationIntervals() const;
protected:
virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;

2
ResInsightVersion.cmake
View File

@ -10,7 +10,7 @@ set(RESINSIGHT_VERSION_TEXT "-dev")
# Must be unique and increasing within one combination of major/minor/patch version
# The uniqueness of this text is independent of RESINSIGHT_VERSION_TEXT
# Format of text must be ".xx"
set(RESINSIGHT_DEV_VERSION ".103")
set(RESINSIGHT_DEV_VERSION ".04")
# https://github.com/CRAVA/crava/tree/master/libs/nrlib
set(NRLIB_GITHUB_SHA "ba35d4359882f1c6f5e9dc30eb95fe52af50fd6f")