#1495 Add WellPathCompletions

This commit is contained in:
Magne Sjaastad 2017-05-19 14:04:01 +02:00
parent fd254565e6
commit 1853f97bbc
5 changed files with 83 additions and 5 deletions

View File

@ -35,8 +35,8 @@ ${CEE_CURRENT_LIST_DIR}RimEclipseWell.h
${CEE_CURRENT_LIST_DIR}RimEclipseWellCollection.h
${CEE_CURRENT_LIST_DIR}RimWellPath.h
${CEE_CURRENT_LIST_DIR}RimWellPathCollection.h
${CEE_CURRENT_LIST_DIR}RimWellPathCompletion.h
${CEE_CURRENT_LIST_DIR}RimWellPathCompletionCollection.h
${CEE_CURRENT_LIST_DIR}RimFishboneWellPath.h
${CEE_CURRENT_LIST_DIR}RimFishboneWellPathCollection.h
${CEE_CURRENT_LIST_DIR}RimScriptCollection.h
${CEE_CURRENT_LIST_DIR}RimEclipseStatisticsCase.h
${CEE_CURRENT_LIST_DIR}RimEclipseStatisticsCaseCollection.h
@ -96,6 +96,7 @@ ${CEE_CURRENT_LIST_DIR}RimCheckableNamedObject.h
${CEE_CURRENT_LIST_DIR}RimGridTimeHistoryCurve.h
${CEE_CURRENT_LIST_DIR}RimGeometrySelectionItem.h
${CEE_CURRENT_LIST_DIR}RimEclipseGeometrySelectionItem.h
${CEE_CURRENT_LIST_DIR}RimWellPathCompletions.h
)
set (SOURCE_GROUP_SOURCE_FILES
@ -129,8 +130,8 @@ ${CEE_CURRENT_LIST_DIR}RimEclipseWell.cpp
${CEE_CURRENT_LIST_DIR}RimEclipseWellCollection.cpp
${CEE_CURRENT_LIST_DIR}RimWellPath.cpp
${CEE_CURRENT_LIST_DIR}RimWellPathCollection.cpp
${CEE_CURRENT_LIST_DIR}RimWellPathCompletion.cpp
${CEE_CURRENT_LIST_DIR}RimWellPathCompletionCollection.cpp
${CEE_CURRENT_LIST_DIR}RimFishboneWellPath.cpp
${CEE_CURRENT_LIST_DIR}RimFishboneWellPathCollection.cpp
${CEE_CURRENT_LIST_DIR}RimScriptCollection.cpp
${CEE_CURRENT_LIST_DIR}RimEclipseStatisticsCase.cpp
${CEE_CURRENT_LIST_DIR}RimEclipseStatisticsCaseCollection.cpp
@ -190,6 +191,7 @@ ${CEE_CURRENT_LIST_DIR}RimCheckableNamedObject.cpp
${CEE_CURRENT_LIST_DIR}RimGridTimeHistoryCurve.cpp
${CEE_CURRENT_LIST_DIR}RimGeometrySelectionItem.cpp
${CEE_CURRENT_LIST_DIR}RimEclipseGeometrySelectionItem.cpp
${CEE_CURRENT_LIST_DIR}RimWellPathCompletions.cpp
)
list(APPEND CODE_HEADER_FILES
@ -200,4 +202,5 @@ list(APPEND CODE_SOURCE_FILES
${SOURCE_GROUP_SOURCE_FILES}
)
source_group( "ProjectDataModel" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )

View File

@ -34,6 +34,7 @@
#include "RimPerforationCollection.h"
#include "RimFishbonesMultipleSubs.h"
#include "RimWellPathCompletions.h"
#include "RiuMainWindow.h"
@ -104,7 +105,7 @@ RimWellPath::RimWellPath()
CAF_PDM_InitField(&wellPathRadiusScaleFactor, "WellPathRadiusScale", 1.0, "Well path radius scale", "", "", "");
CAF_PDM_InitField(&wellPathColor, "WellPathColor", cvf::Color3f(0.999f, 0.333f, 0.999f), "Well path color", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_completionCollection, "Completions", "Completions", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_completionCollection, "Completions_to_be_moved", "Completions", "", "", "");
m_completionCollection = new RimFishboneWellPathCollection;
m_completionCollection.uiCapability()->setUiHidden(true);
@ -112,6 +113,10 @@ RimWellPath::RimWellPath()
m_perforationCollection = new RimPerforationCollection;
m_perforationCollection.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_completions, "Completions", "Completions", "", "", "");
m_completions = new RimWellPathCompletions;
m_completions.uiCapability()->setUiTreeHidden(true);
CAF_PDM_InitFieldNoDefault(&m_wellLogFile, "WellLogFile", "Well Log File", "", "", "");
m_wellLogFile.uiCapability()->setUiHidden(true);
@ -290,6 +295,8 @@ void RimWellPath::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, Q
{
uiTreeOrdering.skipRemainingChildren(true);
uiTreeOrdering.add(&m_wellLogFile);
uiTreeOrdering.add(&m_completions);
if (!m_completionCollection->m_completions.empty())
{
uiTreeOrdering.add(&m_completionCollection);

View File

@ -41,6 +41,7 @@ class RivWellPathPartMgr;
class RimFishbonesMultipleSubs;
class RimPerforationCollection;
class RimWellPathCompletions;
//==================================================================================================
///
@ -75,6 +76,7 @@ public:
caf::PdmChildField<RimWellLogFile*> m_wellLogFile;
caf::PdmChildField<RimFishboneWellPathCollection*> m_completionCollection;
caf::PdmChildField<RimPerforationCollection*> m_perforationCollection;
caf::PdmChildField<RimWellPathCompletions*> m_completions;
RigWellPath* wellPathGeometry();
caf::PdmChildArrayField<RimFishbonesMultipleSubs*> fishbonesSubs;

View File

@ -0,0 +1,32 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2017 Statoil ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimWellPathCompletions.h"
CAF_PDM_SOURCE_INIT(RimWellPathCompletions, "WellPathCompletions");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimWellPathCompletions::RimWellPathCompletions()
{
CAF_PDM_InitObject("WellPathCompletions", ":/WellCollection.png", "", "");
}

View File

@ -0,0 +1,34 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2017 Statoil ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "cafPdmObject.h"
//==================================================================================================
///
///
//==================================================================================================
class RimWellPathCompletions : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimWellPathCompletions();
};