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

#3268 MSW Fracture Export: Add allFractures and allFishbones

Browse Source
This commit is contained in:
Magne Sjaastad
2018-09-07 13:32:53 +02:00
parent 7cd6c29c9c
commit 3e10e59445
14 changed files with 32 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.cpp
View File

@@ -190,7 +190,7 @@ std::vector<RimFishbonesMultipleSubs*> RimFishbonesCollection::activeFishbonesSu
if (isChecked())
{
for (const auto& f : fishbonesSubs())
for (const auto& f : allFishbonesSubs())
{
if (f->isActive())
{
@@ -205,7 +205,7 @@ std::vector<RimFishbonesMultipleSubs*> RimFishbonesCollection::activeFishbonesSu
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimFishbonesMultipleSubs*> RimFishbonesCollection::fishbonesSubs() const
std::vector<RimFishbonesMultipleSubs*> RimFishbonesCollection::allFishbonesSubs() const
{
return m_fishbonesSubs.childObjects();
}

2
ApplicationCode/ProjectDataModel/Completions/RimFishbonesCollection.h
View File

@@ -49,7 +49,7 @@ public:
const RimMswCompletionParameters* mswParameters() const;
std::vector<RimFishbonesMultipleSubs*> activeFishbonesSubs() const;
std::vector<RimFishbonesMultipleSubs*> fishbonesSubs() const;
std::vector<RimFishbonesMultipleSubs*> allFishbonesSubs() const;
void recalculateStartMD();
double startMD() const;

8
ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp
View File

@@ -170,12 +170,12 @@ RimWellPathFractureCollection* RimWellPathCompletions::fractureCollection() cons
//--------------------------------------------------------------------------------------------------
bool RimWellPathCompletions::hasCompletions() const
{
if (!fractureCollection()->fractures().empty())
if (!fractureCollection()->allFractures().empty())
{
return true;
}
return !fishbonesCollection()->fishbonesSubs().empty() ||
return !fishbonesCollection()->allFishbonesSubs().empty() ||
!fishbonesCollection()->wellPathCollection()->wellPaths().empty() ||
!perforationCollection()->perforations().empty();
}
@@ -201,13 +201,13 @@ void RimWellPathCompletions::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTree
uiTreeOrdering.add(&m_perforationCollection);
}
if (!fishbonesCollection()->fishbonesSubs().empty() ||
if (!fishbonesCollection()->allFishbonesSubs().empty() ||
!fishbonesCollection()->wellPathCollection()->wellPaths().empty())
{
uiTreeOrdering.add(&m_fishbonesCollection);
}
if (!fractureCollection()->fractures().empty())
if (!fractureCollection()->allFractures().empty())
{
uiTreeOrdering.add(&m_fractureCollection);
}

4
ApplicationCode/ProjectDataModel/Completions/RimWellPathFractureCollection.cpp
View File

@@ -120,7 +120,7 @@ double RimWellPathFractureCollection::manualReferenceMD() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimWellPathFracture*> RimWellPathFractureCollection::fractures() const
std::vector<RimWellPathFracture*> RimWellPathFractureCollection::allFractures() const
{
return m_fractures.childObjects();
}
@@ -134,7 +134,7 @@ std::vector<RimWellPathFracture*> RimWellPathFractureCollection::activeFractures
if (isChecked())
{
for (const auto& f : fractures())
for (const auto& f : allFractures())
{
if (f->isChecked())
{

9
ApplicationCode/ProjectDataModel/Completions/RimWellPathFractureCollection.h
View File

@@ -56,15 +56,14 @@ public:
ReferenceMDType referenceMDType() const;
double manualReferenceMD() const;
std::vector<RimWellPathFracture*> fractures() const;
std::vector<RimWellPathFracture*> allFractures() const;
std::vector<RimWellPathFracture*> activeFractures() const;
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
private:
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
private:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
caf::PdmChildArrayField<RimWellPathFracture*> m_fractures;
caf::PdmField<ReferenceMDEnum> m_refMDType;
caf::PdmField<double> m_refMD;