From 32e6a409b7b8fa2f4084efa54664d403f20384ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Thu, 6 Sep 2018 09:53:35 +0200 Subject: [PATCH] #3268 MSW export. Dialog adjustments --- .../RicExportCompletionDataSettingsUi.cpp | 24 ++++++------------- .../RicExportCompletionDataSettingsUi.h | 4 ++-- ...ellPathExportCompletionDataFeatureImpl.cpp | 3 ++- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp index 9b2a25ef9e..8b756a36e6 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp +++ b/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp @@ -35,7 +35,6 @@ namespace caf { addItem(RicExportCompletionDataSettingsUi::TRANSMISSIBILITIES, "TRANSMISSIBILITIES", "Calculated Transmissibilities"); addItem(RicExportCompletionDataSettingsUi::WPIMULT_AND_DEFAULT_CONNECTION_FACTORS, "WPIMULT_AND_DEFAULT_CONNECTION_FACTORS", "Default Connection Factors and WPIMULT (Fractures Not Supported)"); - addItem(RicExportCompletionDataSettingsUi::MULTI_SEGMENT_WELL, "MULTI_SEGMENT_WELL", "Multi Segment Well"); setDefault(RicExportCompletionDataSettingsUi::TRANSMISSIBILITIES); } @@ -64,6 +63,8 @@ RicExportCompletionDataSettingsUi::RicExportCompletionDataSettingsUi() CAF_PDM_InitField(&timeStep, "TimeStepIndex", 0, " Time Step", "", "", ""); + CAF_PDM_InitField(&includeMsw, "IncludeMSW", false, "Include MSW", "", "", ""); + CAF_PDM_InitField(&useLateralNTG, "UseLateralNTG", false, "Use NTG Horizontally", "", "", ""); CAF_PDM_InitField(&includePerforations, "IncludePerforations", true, "Perforations", "", "", ""); @@ -173,7 +174,7 @@ void RicExportCompletionDataSettingsUi::fieldChangedByUi(const caf::PdmFieldHand { includeFractures = false; } - else if (compdatExport == TRANSMISSIBILITIES || compdatExport == MULTI_SEGMENT_WELL) + else if (compdatExport == TRANSMISSIBILITIES || includeMsw) { includeFractures = true; } @@ -217,20 +218,16 @@ void RicExportCompletionDataSettingsUi::defineUiOrdering(QString uiConfigName, c caf::PdmUiGroup* group = uiOrdering.addNewGroup("Export Settings"); group->add(&compdatExport); + group->add(&includeMsw); group->add(&useLateralNTG); group->add(&caseToApply); group->add(&fileSplit); group->add(&m_reportCompletionTypesSeparately); group->add(&folder); - - // Set visibility - useLateralNTG.uiCapability()->setUiHidden(compdatExport == MULTI_SEGMENT_WELL); - fileSplit.uiCapability()->setUiHidden(compdatExport == MULTI_SEGMENT_WELL); - m_reportCompletionTypesSeparately.uiCapability()->setUiHidden(compdatExport == MULTI_SEGMENT_WELL); } { - caf::PdmUiGroup* group = uiOrdering.addNewGroup("Visible Completions"); + caf::PdmUiGroup* group = uiOrdering.addNewGroup("Completions Export Selection"); if (!m_displayForSimWell) { if (m_perforationsEnabled) @@ -242,10 +239,6 @@ void RicExportCompletionDataSettingsUi::defineUiOrdering(QString uiConfigName, c else timeStep.uiCapability()->setUiReadOnly(false); } - - // Set visibility - includePerforations.uiCapability()->setUiHidden(compdatExport == MULTI_SEGMENT_WELL); - timeStep.uiCapability()->setUiHidden(compdatExport == MULTI_SEGMENT_WELL); } if (m_fracturesEnabled) @@ -254,9 +247,8 @@ void RicExportCompletionDataSettingsUi::defineUiOrdering(QString uiConfigName, c group->add(&m_includeFracturesSummaryHeader); // Set visibility - includeFractures.uiCapability()->setUiHidden(compdatExport == WPIMULT_AND_DEFAULT_CONNECTION_FACTORS); - m_includeFracturesSummaryHeader.uiCapability()->setUiHidden(compdatExport == MULTI_SEGMENT_WELL || - compdatExport == WPIMULT_AND_DEFAULT_CONNECTION_FACTORS); + includeFractures.uiCapability()->setUiHidden(compdatExport == WPIMULT_AND_DEFAULT_CONNECTION_FACTORS && !includeMsw); + m_includeFracturesSummaryHeader.uiCapability()->setUiHidden(compdatExport == WPIMULT_AND_DEFAULT_CONNECTION_FACTORS); } if (!m_displayForSimWell) @@ -271,8 +263,6 @@ void RicExportCompletionDataSettingsUi::defineUiOrdering(QString uiConfigName, c excludeMainBoreForFishbones.uiCapability()->setUiReadOnly(true); else excludeMainBoreForFishbones.uiCapability()->setUiReadOnly(false); - - excludeMainBoreForFishbones.uiCapability()->setUiHidden(compdatExport == MULTI_SEGMENT_WELL); } } } diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.h b/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.h index 72367b7c28..bee33ab1e2 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.h +++ b/ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.h @@ -40,8 +40,7 @@ public: enum CompdatExport { TRANSMISSIBILITIES, - WPIMULT_AND_DEFAULT_CONNECTION_FACTORS, - MULTI_SEGMENT_WELL + WPIMULT_AND_DEFAULT_CONNECTION_FACTORS }; typedef caf::AppEnum CompdatExportType; @@ -60,6 +59,7 @@ public: caf::PdmField fileSplit; caf::PdmField compdatExport; + caf::PdmField includeMsw; caf::PdmField useLateralNTG; caf::PdmField includePerforations; caf::PdmField includeFishbones; diff --git a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp index 79ce2d52da..e0e5ff4d6d 100644 --- a/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp +++ b/ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp @@ -359,7 +359,8 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::ve } } } - else if (exportSettings.compdatExport == RicExportCompletionDataSettingsUi::MULTI_SEGMENT_WELL) + + if (exportSettings.includeMsw) { if (exportSettings.includeFractures()) {