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. Dialog adjustments

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-09-06 09:53:35 +02:00 committed by Magne Sjaastad
parent 99676897b3
commit 32e6a409b7
3 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp
View File

@ -35,7 +35,6 @@ namespace caf
{ {
addItem(RicExportCompletionDataSettingsUi::TRANSMISSIBILITIES, "TRANSMISSIBILITIES", "Calculated Transmissibilities"); 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::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); setDefault(RicExportCompletionDataSettingsUi::TRANSMISSIBILITIES);
} }
@ -64,6 +63,8 @@ RicExportCompletionDataSettingsUi::RicExportCompletionDataSettingsUi()
CAF_PDM_InitField(&timeStep, "TimeStepIndex", 0, " Time Step", "", "", ""); 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(&useLateralNTG, "UseLateralNTG", false, "Use NTG Horizontally", "", "", "");
CAF_PDM_InitField(&includePerforations, "IncludePerforations", true, "Perforations", "", "", ""); CAF_PDM_InitField(&includePerforations, "IncludePerforations", true, "Perforations", "", "", "");
@ -173,7 +174,7 @@ void RicExportCompletionDataSettingsUi::fieldChangedByUi(const caf::PdmFieldHand
{ {
includeFractures = false; includeFractures = false;
} }
else if (compdatExport == TRANSMISSIBILITIES || compdatExport == MULTI_SEGMENT_WELL) else if (compdatExport == TRANSMISSIBILITIES || includeMsw)
{ {
includeFractures = true; includeFractures = true;
} }
@ -217,20 +218,16 @@ void RicExportCompletionDataSettingsUi::defineUiOrdering(QString uiConfigName, c
caf::PdmUiGroup* group = uiOrdering.addNewGroup("Export Settings"); caf::PdmUiGroup* group = uiOrdering.addNewGroup("Export Settings");
group->add(&compdatExport); group->add(&compdatExport);
group->add(&includeMsw);
group->add(&useLateralNTG); group->add(&useLateralNTG);
group->add(&caseToApply); group->add(&caseToApply);
group->add(&fileSplit); group->add(&fileSplit);
group->add(&m_reportCompletionTypesSeparately); group->add(&m_reportCompletionTypesSeparately);
group->add(&folder); 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_displayForSimWell)
{ {
if (m_perforationsEnabled) if (m_perforationsEnabled)
@ -242,10 +239,6 @@ void RicExportCompletionDataSettingsUi::defineUiOrdering(QString uiConfigName, c
else else
timeStep.uiCapability()->setUiReadOnly(false); timeStep.uiCapability()->setUiReadOnly(false);
} }
// Set visibility
includePerforations.uiCapability()->setUiHidden(compdatExport == MULTI_SEGMENT_WELL);
timeStep.uiCapability()->setUiHidden(compdatExport == MULTI_SEGMENT_WELL);
} }
if (m_fracturesEnabled) if (m_fracturesEnabled)
@ -254,9 +247,8 @@ void RicExportCompletionDataSettingsUi::defineUiOrdering(QString uiConfigName, c
group->add(&m_includeFracturesSummaryHeader); group->add(&m_includeFracturesSummaryHeader);
// Set visibility // Set visibility
includeFractures.uiCapability()->setUiHidden(compdatExport == WPIMULT_AND_DEFAULT_CONNECTION_FACTORS); includeFractures.uiCapability()->setUiHidden(compdatExport == WPIMULT_AND_DEFAULT_CONNECTION_FACTORS && !includeMsw);
m_includeFracturesSummaryHeader.uiCapability()->setUiHidden(compdatExport == MULTI_SEGMENT_WELL || m_includeFracturesSummaryHeader.uiCapability()->setUiHidden(compdatExport == WPIMULT_AND_DEFAULT_CONNECTION_FACTORS);
compdatExport == WPIMULT_AND_DEFAULT_CONNECTION_FACTORS);
} }
if (!m_displayForSimWell) if (!m_displayForSimWell)
@ -271,8 +263,6 @@ void RicExportCompletionDataSettingsUi::defineUiOrdering(QString uiConfigName, c
excludeMainBoreForFishbones.uiCapability()->setUiReadOnly(true); excludeMainBoreForFishbones.uiCapability()->setUiReadOnly(true);
else else
excludeMainBoreForFishbones.uiCapability()->setUiReadOnly(false); excludeMainBoreForFishbones.uiCapability()->setUiReadOnly(false);
excludeMainBoreForFishbones.uiCapability()->setUiHidden(compdatExport == MULTI_SEGMENT_WELL);
} }
} }
} }

4
ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.h
View File

@ -40,8 +40,7 @@ public:
enum CompdatExport { enum CompdatExport {
TRANSMISSIBILITIES, TRANSMISSIBILITIES,
WPIMULT_AND_DEFAULT_CONNECTION_FACTORS, WPIMULT_AND_DEFAULT_CONNECTION_FACTORS
MULTI_SEGMENT_WELL
}; };
typedef caf::AppEnum<CompdatExport> CompdatExportType; typedef caf::AppEnum<CompdatExport> CompdatExportType;
@ -60,6 +59,7 @@ public:
caf::PdmField<ExportSplitType> fileSplit; caf::PdmField<ExportSplitType> fileSplit;
caf::PdmField<CompdatExportType> compdatExport; caf::PdmField<CompdatExportType> compdatExport;
caf::PdmField<bool> includeMsw;
caf::PdmField<bool> useLateralNTG; caf::PdmField<bool> useLateralNTG;
caf::PdmField<bool> includePerforations; caf::PdmField<bool> includePerforations;
caf::PdmField<bool> includeFishbones; caf::PdmField<bool> includeFishbones;

3
ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
View File

@ -359,7 +359,8 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::ve
} }
} }
} }
else if (exportSettings.compdatExport == RicExportCompletionDataSettingsUi::MULTI_SEGMENT_WELL)
if (exportSettings.includeMsw)
{ {
if (exportSettings.includeFractures()) if (exportSettings.includeFractures())
{ {