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

#3190 Completion Export Fracture Header : Remove flag for fracture summary header text

Browse Source
This commit is contained in:
Magne Sjaastad 2018-09-28 13:08:47 +02:00
parent 09baef3e1c
commit 719061ae62
3 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,14 +104,6 @@ RicExportCompletionDataSettingsUi::RicExportCompletionDataSettingsUi()
CAF_PDM_InitField(&transScalingWBHP, "TransScalingWBHP", 200.0, " PDD Default WBHP Value (BETA)", "", "", ""); CAF_PDM_InitField(&transScalingWBHP, "TransScalingWBHP", 200.0, " PDD Default WBHP Value (BETA)", "", "", "");
CAF_PDM_InitField(&transScalingSummaryWBHP, "TransScalingWBHPFromCurrentTime", true, " PDD WBHP from Summary File at Current Time (BETA)", "", "", ""); CAF_PDM_InitField(&transScalingSummaryWBHP, "TransScalingWBHPFromCurrentTime", true, " PDD WBHP from Summary File at Current Time (BETA)", "", "", "");
CAF_PDM_InitField(&m_includeFracturesSummaryHeader,
"IncludeFracturesSummaryHeader",
false,
" Append Detailed Text Summary (BETA)",
"",
"",
"");
CAF_PDM_InitField(&excludeMainBoreForFishbones, CAF_PDM_InitField(&excludeMainBoreForFishbones,
"ExcludeMainBoreForFishbones", "ExcludeMainBoreForFishbones",
false, false,
@ -186,14 +178,6 @@ bool RicExportCompletionDataSettingsUi::reportCompletionsTypesIndividually() con
return m_reportCompletionTypesSeparately() == INDIVIDUALLY; return m_reportCompletionTypesSeparately() == INDIVIDUALLY;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicExportCompletionDataSettingsUi::includeFracturesSummaryHeader() const
{
return m_includeFracturesSummaryHeader;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -282,8 +266,6 @@ void RicExportCompletionDataSettingsUi::defineUiOrdering(QString uiConfigName, c
if (RiaApplication::enableDevelopmentFeatures()) if (RiaApplication::enableDevelopmentFeatures())
{ {
group->add(&m_includeFracturesSummaryHeader);
group->add(&transScalingType); group->add(&transScalingType);
group->add(&transScalingCorrection); group->add(&transScalingCorrection);
group->add(&transScalingTimeStep); group->add(&transScalingTimeStep);
@ -298,7 +280,6 @@ void RicExportCompletionDataSettingsUi::defineUiOrdering(QString uiConfigName, c
// Set visibility // Set visibility
includeFractures.uiCapability()->setUiHidden(compdatExport == WPIMULT_AND_DEFAULT_CONNECTION_FACTORS && !includeMsw); includeFractures.uiCapability()->setUiHidden(compdatExport == WPIMULT_AND_DEFAULT_CONNECTION_FACTORS && !includeMsw);
m_includeFracturesSummaryHeader.uiCapability()->setUiHidden(compdatExport == WPIMULT_AND_DEFAULT_CONNECTION_FACTORS);
} }
if (!m_displayForSimWell) if (!m_displayForSimWell)

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

@ -90,7 +90,6 @@ public:
void showFishbonesInUi(bool enable); void showFishbonesInUi(bool enable);
bool reportCompletionsTypesIndividually() const; bool reportCompletionsTypesIndividually() const;
bool includeFracturesSummaryHeader() const;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
@ -100,7 +99,6 @@ protected:
private: private:
caf::PdmField<CombinationModeType> m_reportCompletionTypesSeparately; caf::PdmField<CombinationModeType> m_reportCompletionTypesSeparately;
caf::PdmField<bool> m_includeFracturesSummaryHeader;
bool m_displayForSimWell; bool m_displayForSimWell;
bool m_fracturesEnabled; bool m_fracturesEnabled;

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

@ -219,11 +219,8 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::ve
if (exportSettings.includeFractures()) if (exportSettings.includeFractures())
{ {
std::vector<RicWellPathFractureReportItem>* reportItems = nullptr; // If no report is wanted, set reportItems = nullptr
if (exportSettings.includeFracturesSummaryHeader()) std::vector<RicWellPathFractureReportItem>* reportItems = &fractureDataReportItems;
{
reportItems = &fractureDataReportItems;
}
std::vector<RigCompletionData> fractureCompletionData = std::vector<RigCompletionData> fractureCompletionData =
RicExportFractureCompletionsImpl::generateCompdatValuesForWellPath( RicExportFractureCompletionsImpl::generateCompdatValuesForWellPath(