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

#1532 Move export settings classes to commands folder

Browse Source
This commit is contained in:
Bjørnar Grip Fjær 2017-05-30 14:37:51 +02:00
parent bd74a942fd
commit c55d381cbf
12 changed files with 57 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/CompletionCommands/CMakeLists_files.cmake
View File

@ -5,8 +5,11 @@ if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
endif() endif()
set (SOURCE_GROUP_HEADER_FILES set (SOURCE_GROUP_HEADER_FILES
${CEE_CURRENT_LIST_DIR}RicCaseAndFileExportSettingsUi.h
${CEE_CURRENT_LIST_DIR}RicExportCompletionDataSettingsUi.h
${CEE_CURRENT_LIST_DIR}RicExportFishbonesLateralsFeature.h ${CEE_CURRENT_LIST_DIR}RicExportFishbonesLateralsFeature.h
${CEE_CURRENT_LIST_DIR}RicExportFishbonesWellSegmentsFeature.h ${CEE_CURRENT_LIST_DIR}RicExportFishbonesWellSegmentsFeature.h
${CEE_CURRENT_LIST_DIR}RicExportWellSegmentsSettingsUi.h
${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsAtMeasuredDepthFeature.h ${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsAtMeasuredDepthFeature.h
${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsFeature.h ${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsFeature.h
${CEE_CURRENT_LIST_DIR}RicWellPathExportCompletionDataFeature.h ${CEE_CURRENT_LIST_DIR}RicWellPathExportCompletionDataFeature.h
@ -15,8 +18,11 @@ ${CEE_CURRENT_LIST_DIR}RicWellPathImportPerforationIntervalsFeature.h
) )
set (SOURCE_GROUP_SOURCE_FILES set (SOURCE_GROUP_SOURCE_FILES
${CEE_CURRENT_LIST_DIR}RicCaseAndFileExportSettingsUi.cpp
${CEE_CURRENT_LIST_DIR}RicExportCompletionDataSettingsUi.cpp
${CEE_CURRENT_LIST_DIR}RicExportFishbonesLateralsFeature.cpp ${CEE_CURRENT_LIST_DIR}RicExportFishbonesLateralsFeature.cpp
${CEE_CURRENT_LIST_DIR}RicExportFishbonesWellSegmentsFeature.cpp ${CEE_CURRENT_LIST_DIR}RicExportFishbonesWellSegmentsFeature.cpp
${CEE_CURRENT_LIST_DIR}RicExportWellSegmentsSettingsUi.cpp
${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsAtMeasuredDepthFeature.cpp ${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsAtMeasuredDepthFeature.cpp
${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsFeature.cpp ${CEE_CURRENT_LIST_DIR}RicNewFishbonesSubsFeature.cpp
${CEE_CURRENT_LIST_DIR}RicWellPathExportCompletionDataFeature.cpp ${CEE_CURRENT_LIST_DIR}RicWellPathExportCompletionDataFeature.cpp

10
ApplicationCode/ProjectDataModel/RimCaseAndFileExportSettings.cpp → ApplicationCode/Commands/CompletionCommands/RicCaseAndFileExportSettingsUi.cpp
View File

@ -16,18 +16,18 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RimCaseAndFileExportSettings.h" #include "RicCaseAndFileExportSettingsUi.h"
#include "RimTools.h" #include "RimTools.h"
#include "cafPdmUiFilePathEditor.h" #include "cafPdmUiFilePathEditor.h"
CAF_PDM_SOURCE_INIT(RimCaseAndFileExportSettings, "RimCaseAndFileExportSettings"); CAF_PDM_SOURCE_INIT(RicCaseAndFileExportSettingsUi, "RicCaseAndFileExportSettingsUi");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimCaseAndFileExportSettings::RimCaseAndFileExportSettings() RicCaseAndFileExportSettingsUi::RicCaseAndFileExportSettingsUi()
{ {
CAF_PDM_InitObject("RimCaseAndFileExportSettings", "", "", ""); CAF_PDM_InitObject("RimCaseAndFileExportSettings", "", "", "");
@ -40,7 +40,7 @@ RimCaseAndFileExportSettings::RimCaseAndFileExportSettings()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimCaseAndFileExportSettings::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) QList<caf::PdmOptionItemInfo> RicCaseAndFileExportSettingsUi::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
{ {
QList<caf::PdmOptionItemInfo> options; QList<caf::PdmOptionItemInfo> options;
@ -55,7 +55,7 @@ QList<caf::PdmOptionItemInfo> RimCaseAndFileExportSettings::calculateValueOption
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCaseAndFileExportSettings::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) void RicCaseAndFileExportSettingsUi::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
{ {
if (field == &fileName) if (field == &fileName)
{ {

5
ApplicationCode/ProjectDataModel/RimCaseAndFileExportSettings.h → ApplicationCode/Commands/CompletionCommands/RicCaseAndFileExportSettingsUi.h
View File

@ -1,7 +1,6 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2017- Statoil ASA // Copyright (C) 2017- Statoil ASA
// Copyright (C) 2017- Ceetron Solutions AS
// //
// ResInsight is free software: you can redistribute it and/or modify // ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
@ -29,12 +28,12 @@
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RimCaseAndFileExportSettings : public caf::PdmObject class RicCaseAndFileExportSettingsUi : public caf::PdmObject
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
RimCaseAndFileExportSettings(); RicCaseAndFileExportSettingsUi();
caf::PdmField<QString> fileName; caf::PdmField<QString> fileName;
caf::PdmPtrField<RimEclipseCase*> caseToApply; caf::PdmPtrField<RimEclipseCase*> caseToApply;

6
ApplicationCode/ProjectDataModel/RimExportCompletionDataSettings.cpp → ApplicationCode/Commands/CompletionCommands/RicExportCompletionDataSettingsUi.cpp
View File

@ -16,14 +16,14 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RimExportCompletionDataSettings.h" #include "RicExportCompletionDataSettingsUi.h"
CAF_PDM_SOURCE_INIT(RimExportCompletionDataSettings, "RimExportCompletionDataSettings"); CAF_PDM_SOURCE_INIT(RicExportCompletionDataSettingsUi, "RicExportCompletionDataSettingsUi");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimExportCompletionDataSettings::RimExportCompletionDataSettings() RicExportCompletionDataSettingsUi::RicExportCompletionDataSettingsUi()
{ {
CAF_PDM_InitObject("RimExportCompletionDataSettings", "", "", ""); CAF_PDM_InitObject("RimExportCompletionDataSettings", "", "", "");

6
ApplicationCode/ProjectDataModel/RimExportCompletionDataSettings.h → ApplicationCode/Commands/CompletionCommands/RicExportCompletionDataSettingsUi.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "RimCaseAndFileExportSettings.h" #include "RicCaseAndFileExportSettingsUi.h"
#include "cafPdmField.h" #include "cafPdmField.h"
@ -26,11 +26,11 @@
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RimExportCompletionDataSettings : public RimCaseAndFileExportSettings class RicExportCompletionDataSettingsUi : public RicCaseAndFileExportSettingsUi
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
RimExportCompletionDataSettings(); RicExportCompletionDataSettingsUi();
caf::PdmField<bool> includePerforations; caf::PdmField<bool> includePerforations;

12
ApplicationCode/Commands/CompletionCommands/RicExportFishbonesWellSegmentsFeature.cpp
View File

@ -58,7 +58,7 @@ void RicExportFishbonesWellSegmentsFeature::onActionTriggered(bool isChecked)
QString projectFolder = app->currentProjectPath(); QString projectFolder = app->currentProjectPath();
QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallback("COMPLETIONS", projectFolder); QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallback("COMPLETIONS", projectFolder);
RimExportWellSegmentsSettings exportSettings; RicExportWellSegmentsSettingsUi exportSettings;
std::vector<RimCase*> cases; std::vector<RimCase*> cases;
app->project()->allCases(cases); app->project()->allCases(cases);
for (auto c : cases) for (auto c : cases)
@ -148,7 +148,7 @@ bool RicExportFishbonesWellSegmentsFeature::isCommandEnabled()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicExportFishbonesWellSegmentsFeature::exportWellSegments(const RimWellPath* wellPath, const std::vector<RimFishbonesMultipleSubs*>& fishbonesSubs, const RimExportWellSegmentsSettings& settings) void RicExportFishbonesWellSegmentsFeature::exportWellSegments(const RimWellPath* wellPath, const std::vector<RimFishbonesMultipleSubs*>& fishbonesSubs, const RicExportWellSegmentsSettingsUi& settings)
{ {
QFile exportFile(settings.fileName()); QFile exportFile(settings.fileName());
@ -175,7 +175,7 @@ void RicExportFishbonesWellSegmentsFeature::exportWellSegments(const RimWellPath
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicExportFishbonesWellSegmentsFeature::generateWelsegsTable(RifEclipseOutputTableFormatter& formatter, const RimWellPath* wellPath, const RimExportWellSegmentsSettings& settings, const std::vector<WellSegmentLocation>& locations) void RicExportFishbonesWellSegmentsFeature::generateWelsegsTable(RifEclipseOutputTableFormatter& formatter, const RimWellPath* wellPath, const RicExportWellSegmentsSettingsUi& settings, const std::vector<WellSegmentLocation>& locations)
{ {
formatter.keyword("WELSEGS"); formatter.keyword("WELSEGS");
@ -227,7 +227,7 @@ void RicExportFishbonesWellSegmentsFeature::generateWelsegsTable(RifEclipseOutpu
{ {
const WellSegmentLocation& location = locations[i]; const WellSegmentLocation& location = locations[i];
if (settings.lengthAndDepth() == RimExportWellSegmentsSettings::INC) if (settings.lengthAndDepth() == RicExportWellSegmentsSettingsUi::INC)
{ {
depth = location.trueVerticalDepth - previousLocation.trueVerticalDepth; depth = location.trueVerticalDepth - previousLocation.trueVerticalDepth;
length = location.fishbonesSubs->locationOfSubs()[location.subIndex] - previousLocation.fishbonesSubs->locationOfSubs()[previousLocation.subIndex]; length = location.fishbonesSubs->locationOfSubs()[location.subIndex] - previousLocation.fishbonesSubs->locationOfSubs()[previousLocation.subIndex];
@ -267,7 +267,7 @@ void RicExportFishbonesWellSegmentsFeature::generateWelsegsTable(RifEclipseOutpu
for (const WellSegmentLateralIntersection& intersection : lateral.intersections) for (const WellSegmentLateralIntersection& intersection : lateral.intersections)
{ {
if (settings.lengthAndDepth() == RimExportWellSegmentsSettings::INC) if (settings.lengthAndDepth() == RicExportWellSegmentsSettingsUi::INC)
{ {
depth = intersection.depth; depth = intersection.depth;
length = intersection.length; length = intersection.length;
@ -297,7 +297,7 @@ void RicExportFishbonesWellSegmentsFeature::generateWelsegsTable(RifEclipseOutpu
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicExportFishbonesWellSegmentsFeature::generateCompsegsTable(RifEclipseOutputTableFormatter& formatter, const RimWellPath* wellPath, const RimExportWellSegmentsSettings& settings, const std::vector<WellSegmentLocation>& locations) void RicExportFishbonesWellSegmentsFeature::generateCompsegsTable(RifEclipseOutputTableFormatter& formatter, const RimWellPath* wellPath, const RicExportWellSegmentsSettingsUi& settings, const std::vector<WellSegmentLocation>& locations)
{ {
RigMainGrid* grid = settings.caseToApply->eclipseCaseData()->mainGrid(); RigMainGrid* grid = settings.caseToApply->eclipseCaseData()->mainGrid();
formatter.keyword("COMPSEGS"); formatter.keyword("COMPSEGS");

8
ApplicationCode/Commands/CompletionCommands/RicExportFishbonesWellSegmentsFeature.h
View File

@ -20,7 +20,7 @@
#include "RifEclipseOutputTableFormatter.h" #include "RifEclipseOutputTableFormatter.h"
#include "RimExportWellSegmentsSettings.h" #include "RicExportWellSegmentsSettingsUi.h"
#include "RicWellPathExportCompletionDataFeature.h" #include "RicWellPathExportCompletionDataFeature.h"
@ -46,7 +46,7 @@ private:
static RimFishbonesCollection* selectedFishbonesCollection(); static RimFishbonesCollection* selectedFishbonesCollection();
static RimWellPath* selectedWellPath(); static RimWellPath* selectedWellPath();
static void exportWellSegments(const RimWellPath* wellPath, const std::vector<RimFishbonesMultipleSubs*>& fishbonesSubs, const RimExportWellSegmentsSettings& settings); static void exportWellSegments(const RimWellPath* wellPath, const std::vector<RimFishbonesMultipleSubs*>& fishbonesSubs, const RicExportWellSegmentsSettingsUi& settings);
static void generateWelsegsTable(RifEclipseOutputTableFormatter& formatter, const RimWellPath* wellPath, const RimExportWellSegmentsSettings& settings, const std::vector<WellSegmentLocation>& locations); static void generateWelsegsTable(RifEclipseOutputTableFormatter& formatter, const RimWellPath* wellPath, const RicExportWellSegmentsSettingsUi& settings, const std::vector<WellSegmentLocation>& locations);
static void generateCompsegsTable(RifEclipseOutputTableFormatter& formatter, const RimWellPath* wellPath, const RimExportWellSegmentsSettings& settings, const std::vector<WellSegmentLocation>& locations); static void generateCompsegsTable(RifEclipseOutputTableFormatter& formatter, const RimWellPath* wellPath, const RicExportWellSegmentsSettingsUi& settings, const std::vector<WellSegmentLocation>& locations);
}; };

24
ApplicationCode/ProjectDataModel/RimExportWellSegmentsSettings.cpp → ApplicationCode/Commands/CompletionCommands/RicExportWellSegmentsSettingsUi.cpp
View File

@ -16,33 +16,33 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RimExportWellSegmentsSettings.h" #include "RicExportWellSegmentsSettingsUi.h"
namespace caf { namespace caf {
template<> template<>
void RimExportWellSegmentsSettings::PressureDropEnum::setUp() void RicExportWellSegmentsSettingsUi::PressureDropEnum::setUp()
{ {
addItem(RimExportWellSegmentsSettings::HYDROSTATIC, "H--", "Hydrostatic"); addItem(RicExportWellSegmentsSettingsUi::HYDROSTATIC, "H--", "Hydrostatic");
addItem(RimExportWellSegmentsSettings::HYDROSTATIC_FRICTION, "HF-", "Hydrostatic + Friction"); addItem(RicExportWellSegmentsSettingsUi::HYDROSTATIC_FRICTION, "HF-", "Hydrostatic + Friction");
addItem(RimExportWellSegmentsSettings::HYDROSTATIC_FRICTION_ACCELERATION, "HFA", "Hydrostatic + Friction + Acceleration"); addItem(RicExportWellSegmentsSettingsUi::HYDROSTATIC_FRICTION_ACCELERATION, "HFA", "Hydrostatic + Friction + Acceleration");
setDefault(RimExportWellSegmentsSettings::HYDROSTATIC); setDefault(RicExportWellSegmentsSettingsUi::HYDROSTATIC);
} }
template<> template<>
void RimExportWellSegmentsSettings::LengthAndDepthEnum::setUp() void RicExportWellSegmentsSettingsUi::LengthAndDepthEnum::setUp()
{ {
addItem(RimExportWellSegmentsSettings::INC, "INC", "Incremental"); addItem(RicExportWellSegmentsSettingsUi::INC, "INC", "Incremental");
addItem(RimExportWellSegmentsSettings::ABS, "ABS", "Absolute"); addItem(RicExportWellSegmentsSettingsUi::ABS, "ABS", "Absolute");
setDefault(RimExportWellSegmentsSettings::INC); setDefault(RicExportWellSegmentsSettingsUi::INC);
} }
} }
CAF_PDM_SOURCE_INIT(RimExportWellSegmentsSettings, "RimExportWellSegmentsSettings"); CAF_PDM_SOURCE_INIT(RicExportWellSegmentsSettingsUi, "RicExportWellSegmentsSettingsUi");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimExportWellSegmentsSettings::RimExportWellSegmentsSettings() RicExportWellSegmentsSettingsUi::RicExportWellSegmentsSettingsUi()
{ {
CAF_PDM_InitObject("RimExportWellSegmentsSettings", "", "", ""); CAF_PDM_InitObject("RimExportWellSegmentsSettings", "", "", "");

10
ApplicationCode/ProjectDataModel/RimExportWellSegmentsSettings.h → ApplicationCode/Commands/CompletionCommands/RicExportWellSegmentsSettingsUi.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "RimCaseAndFileExportSettings.h" #include "RicCaseAndFileExportSettingsUi.h"
#include "cafPdmField.h" #include "cafPdmField.h"
@ -26,7 +26,7 @@
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RimExportWellSegmentsSettings : public RimCaseAndFileExportSettings class RicExportWellSegmentsSettingsUi : public RicCaseAndFileExportSettingsUi
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
@ -37,16 +37,16 @@ public:
HYDROSTATIC_FRICTION_ACCELERATION HYDROSTATIC_FRICTION_ACCELERATION
}; };
typedef caf::AppEnum<RimExportWellSegmentsSettings::PressureDropType> PressureDropEnum; typedef caf::AppEnum<RicExportWellSegmentsSettingsUi::PressureDropType> PressureDropEnum;
enum LengthAndDepthType { enum LengthAndDepthType {
ABS, ABS,
INC INC
}; };
typedef caf::AppEnum<RimExportWellSegmentsSettings::LengthAndDepthType> LengthAndDepthEnum; typedef caf::AppEnum<RicExportWellSegmentsSettingsUi::LengthAndDepthType> LengthAndDepthEnum;
RimExportWellSegmentsSettings(); RicExportWellSegmentsSettingsUi();
caf::PdmField<PressureDropEnum> pressureDrop; caf::PdmField<PressureDropEnum> pressureDrop;
caf::PdmField<LengthAndDepthEnum> lengthAndDepth; caf::PdmField<LengthAndDepthEnum> lengthAndDepth;

12
ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp
View File

@ -30,7 +30,7 @@
#include "RimFishboneWellPathCollection.h" #include "RimFishboneWellPathCollection.h"
#include "RimPerforationInterval.h" #include "RimPerforationInterval.h"
#include "RimPerforationCollection.h" #include "RimPerforationCollection.h"
#include "RimExportCompletionDataSettings.h" #include "RicExportCompletionDataSettingsUi.h"
#include "RiuMainWindow.h" #include "RiuMainWindow.h"
@ -73,7 +73,7 @@ void RicWellPathExportCompletionDataFeature::onActionTriggered(bool isChecked)
QString projectFolder = app->currentProjectPath(); QString projectFolder = app->currentProjectPath();
QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallback("COMPLETIONS", projectFolder); QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallback("COMPLETIONS", projectFolder);
RimExportCompletionDataSettings exportSettings; RicExportCompletionDataSettingsUi exportSettings;
std::vector<RimCase*> cases; std::vector<RimCase*> cases;
app->project()->allCases(cases); app->project()->allCases(cases);
for (auto c : cases) for (auto c : cases)
@ -132,7 +132,7 @@ std::vector<RimWellPath*> RicWellPathExportCompletionDataFeature::selectedWellPa
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicWellPathExportCompletionDataFeature::exportCompletions(const std::vector<RimWellPath*>& wellPaths, const RimExportCompletionDataSettings& exportSettings) void RicWellPathExportCompletionDataFeature::exportCompletions(const std::vector<RimWellPath*>& wellPaths, const RicExportCompletionDataSettingsUi& exportSettings)
{ {
QFile exportFile(exportSettings.fileName()); QFile exportFile(exportSettings.fileName());
@ -297,7 +297,7 @@ void RicWellPathExportCompletionDataFeature::generateWpimultTable(RifEclipseOutp
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RigCompletionData> RicWellPathExportCompletionDataFeature::generateFishbonesCompdatValues(const RimWellPath* wellPath, const RimExportCompletionDataSettings& settings) std::vector<RigCompletionData> RicWellPathExportCompletionDataFeature::generateFishbonesCompdatValues(const RimWellPath* wellPath, const RicExportCompletionDataSettingsUi& settings)
{ {
// Generate data // Generate data
const RigEclipseCaseData* caseData = settings.caseToApply()->eclipseCaseData(); const RigEclipseCaseData* caseData = settings.caseToApply()->eclipseCaseData();
@ -340,7 +340,7 @@ std::vector<RigCompletionData> RicWellPathExportCompletionDataFeature::generateF
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RigCompletionData> RicWellPathExportCompletionDataFeature::generateFishbonesWellPathCompdatValues(const RimWellPath* wellPath, const RimExportCompletionDataSettings & settings) std::vector<RigCompletionData> RicWellPathExportCompletionDataFeature::generateFishbonesWellPathCompdatValues(const RimWellPath* wellPath, const RicExportCompletionDataSettingsUi & settings)
{ {
std::vector<RigCompletionData> completionData; std::vector<RigCompletionData> completionData;
@ -366,7 +366,7 @@ std::vector<RigCompletionData> RicWellPathExportCompletionDataFeature::generateF
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RigCompletionData> RicWellPathExportCompletionDataFeature::generatePerforationsCompdatValues(const RimWellPath* wellPath, const RimExportCompletionDataSettings& settings) std::vector<RigCompletionData> RicWellPathExportCompletionDataFeature::generatePerforationsCompdatValues(const RimWellPath* wellPath, const RicExportCompletionDataSettingsUi& settings)
{ {
std::vector<RigCompletionData> completionData; std::vector<RigCompletionData> completionData;

10
ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.h
View File

@ -24,7 +24,7 @@
#include "RigWellPathIntersectionTools.h" #include "RigWellPathIntersectionTools.h"
#include "RigCompletionData.h" #include "RigCompletionData.h"
#include "RimExportCompletionDataSettings.h" #include "RicExportCompletionDataSettingsUi.h"
#include "cafCmdFeature.h" #include "cafCmdFeature.h"
@ -128,14 +128,14 @@ public:
static std::vector<WellSegmentLocation> findWellSegmentLocations(const RimEclipseCase* caseToApply, const RimWellPath* wellPath, const std::vector<RimFishbonesMultipleSubs*>& fishbonesSubs); static std::vector<WellSegmentLocation> findWellSegmentLocations(const RimEclipseCase* caseToApply, const RimWellPath* wellPath, const std::vector<RimFishbonesMultipleSubs*>& fishbonesSubs);
private: private:
static void exportCompletions(const std::vector<RimWellPath*>& wellPaths, const RimExportCompletionDataSettings& exportSettings); static void exportCompletions(const std::vector<RimWellPath*>& wellPaths, const RicExportCompletionDataSettingsUi& exportSettings);
static void generateCompdatTable(RifEclipseOutputTableFormatter& formatter, const std::vector<RigCompletionData>& completionData); static void generateCompdatTable(RifEclipseOutputTableFormatter& formatter, const std::vector<RigCompletionData>& completionData);
static void generateWpimultTable(RifEclipseOutputTableFormatter& formatter, const std::vector<RigCompletionData>& completionData); static void generateWpimultTable(RifEclipseOutputTableFormatter& formatter, const std::vector<RigCompletionData>& completionData);
static std::vector<RigCompletionData> generateFishbonesCompdatValues(const RimWellPath* wellPath, const RimExportCompletionDataSettings& settings); static std::vector<RigCompletionData> generateFishbonesCompdatValues(const RimWellPath* wellPath, const RicExportCompletionDataSettingsUi& settings);
static std::vector<RigCompletionData> generateFishbonesWellPathCompdatValues(const RimWellPath* wellPath, const RimExportCompletionDataSettings& settings); static std::vector<RigCompletionData> generateFishbonesWellPathCompdatValues(const RimWellPath* wellPath, const RicExportCompletionDataSettingsUi& settings);
static std::vector<RigCompletionData> generatePerforationsCompdatValues(const RimWellPath* wellPath, const RimExportCompletionDataSettings& settings); static std::vector<RigCompletionData> generatePerforationsCompdatValues(const RimWellPath* wellPath, const RicExportCompletionDataSettingsUi& settings);
static std::map<size_t, double> computeLateralsPerCell(const std::vector<WellSegmentLocation>& segmentLocations, bool removeMainBoreCells); static std::map<size_t, double> computeLateralsPerCell(const std::vector<WellSegmentLocation>& segmentLocations, bool removeMainBoreCells);
static std::vector<size_t> findIntersectingCells(const RigEclipseCaseData* grid, const std::vector<cvf::Vec3d>& coords); static std::vector<size_t> findIntersectingCells(const RigEclipseCaseData* grid, const std::vector<cvf::Vec3d>& coords);

6
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@ -7,9 +7,6 @@ endif()
set (SOURCE_GROUP_HEADER_FILES set (SOURCE_GROUP_HEADER_FILES
${CEE_CURRENT_LIST_DIR}RimEclipseCaseCollection.h ${CEE_CURRENT_LIST_DIR}RimEclipseCaseCollection.h
${CEE_CURRENT_LIST_DIR}RimCaseCollection.h ${CEE_CURRENT_LIST_DIR}RimCaseCollection.h
${CEE_CURRENT_LIST_DIR}RimCaseAndFileExportSettings.h
${CEE_CURRENT_LIST_DIR}RimExportCompletionDataSettings.h
${CEE_CURRENT_LIST_DIR}RimExportWellSegmentsSettings.h
${CEE_CURRENT_LIST_DIR}RimCellFilter.h ${CEE_CURRENT_LIST_DIR}RimCellFilter.h
${CEE_CURRENT_LIST_DIR}RimEclipsePropertyFilter.h ${CEE_CURRENT_LIST_DIR}RimEclipsePropertyFilter.h
${CEE_CURRENT_LIST_DIR}RimPropertyFilterCollection.h ${CEE_CURRENT_LIST_DIR}RimPropertyFilterCollection.h
@ -103,9 +100,6 @@ ${CEE_CURRENT_LIST_DIR}RimWellPathCompletions.h
set (SOURCE_GROUP_SOURCE_FILES set (SOURCE_GROUP_SOURCE_FILES
${CEE_CURRENT_LIST_DIR}RimEclipseCaseCollection.cpp ${CEE_CURRENT_LIST_DIR}RimEclipseCaseCollection.cpp
${CEE_CURRENT_LIST_DIR}RimCaseCollection.cpp ${CEE_CURRENT_LIST_DIR}RimCaseCollection.cpp
${CEE_CURRENT_LIST_DIR}RimCaseAndFileExportSettings.cpp
${CEE_CURRENT_LIST_DIR}RimExportCompletionDataSettings.cpp
${CEE_CURRENT_LIST_DIR}RimExportWellSegmentsSettings.cpp
${CEE_CURRENT_LIST_DIR}RimCellFilter.cpp ${CEE_CURRENT_LIST_DIR}RimCellFilter.cpp
${CEE_CURRENT_LIST_DIR}RimEclipsePropertyFilter.cpp ${CEE_CURRENT_LIST_DIR}RimEclipsePropertyFilter.cpp
${CEE_CURRENT_LIST_DIR}RimPropertyFilterCollection.cpp ${CEE_CURRENT_LIST_DIR}RimPropertyFilterCollection.cpp