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 export. Improved FishbonesCollection interface

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-09-05 12:40:21 +02:00 committed by Magne Sjaastad
parent ff976cff38
commit a3035d4f47
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/CompletionExportCommands/RicExportFishbonesWellSegmentsFeature.cpp
View File

@ -90,7 +90,7 @@ void RicExportFishbonesWellSegmentsFeature::onActionTriggered(bool isChecked)
RiaApplication::instance()->setLastUsedDialogDirectory("COMPLETIONS", QFileInfo(exportSettings.folder).absolutePath());
std::vector<RimFishbonesMultipleSubs*> fishbonesSubs;
for (RimFishbonesMultipleSubs* subs : fishbonesCollection->fishbonesSubs)
for (RimFishbonesMultipleSubs* subs : fishbonesCollection->fishbonesSubs())
{
fishbonesSubs.push_back(subs);
}

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

@ -44,9 +44,9 @@ RimFishbonesCollection::RimFishbonesCollection()
nameField()->uiCapability()->setUiHidden(true);
this->setName("Fishbones");
CAF_PDM_InitFieldNoDefault(&fishbonesSubs, "FishbonesSubs", "fishbonesSubs", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_fishbonesSubs, "FishbonesSubs", "fishbonesSubs", "", "", "");
fishbonesSubs.uiCapability()->setUiHidden(true);
m_fishbonesSubs.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_wellPathCollection, "WellPathCollection", "Imported Laterals", "", "", "");
m_wellPathCollection = new RimFishboneWellPathCollection;
@ -166,7 +166,7 @@ void RimFishbonesCollection::initAfterRead()
void RimFishbonesCollection::appendFishbonesSubs(RimFishbonesMultipleSubs* subs)
{
subs->fishbonesColor = nextFishbonesColor();
fishbonesSubs.push_back(subs);
m_fishbonesSubs.push_back(subs);
subs->setUnitSystemSpecificDefaults();
subs->recomputeLateralLocations();
@ -180,6 +180,14 @@ const RimMswCompletionParameters* RimFishbonesCollection::mswParameters() const
return m_mswParameters;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimFishbonesMultipleSubs*> RimFishbonesCollection::fishbonesSubs() const
{
return m_fishbonesSubs.childObjects();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -199,7 +207,7 @@ cvf::Color3f RimFishbonesCollection::nextFishbonesColor() const
QColor qFishbonesColor;
int newIndex = static_cast<int>(fishbonesSubs.size());
int newIndex = static_cast<int>(m_fishbonesSubs.size());
if (qWellPathColor.lightnessF() < 0.5)
{
@ -220,7 +228,7 @@ void RimFishbonesCollection::recalculateStartMD()
{
double minStartMD = HUGE_VAL;
for (const RimFishbonesMultipleSubs* sub : fishbonesSubs())
for (const RimFishbonesMultipleSubs* sub : m_fishbonesSubs())
{
for (auto& index : sub->installedLateralIndices())
{

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

@ -49,8 +49,8 @@ public:
RimFishboneWellPathCollection* wellPathCollection() const;
void appendFishbonesSubs(RimFishbonesMultipleSubs* subs);
const RimMswCompletionParameters* mswParameters() const;
caf::PdmChildArrayField<RimFishbonesMultipleSubs*> fishbonesSubs;
std::vector<RimFishbonesMultipleSubs*> fishbonesSubs() const;
void recalculateStartMD();
double startMD() const;
double mainBoreSkinFactor() const { return m_skinFactor; }
@ -66,6 +66,7 @@ private:
cvf::Color3f nextFishbonesColor() const;
private:
caf::PdmChildArrayField<RimFishbonesMultipleSubs*> m_fishbonesSubs;
caf::PdmChildField<RimFishboneWellPathCollection*> m_wellPathCollection;
caf::PdmField<double> m_startMD;