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

#1756 Allow 'Include Fractures' to be un-checked

Browse Source
This commit is contained in:
Magne Sjaastad 2017-08-14 22:30:22 +02:00
parent 7dfcfde1d1
commit 362eb249b5
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ApplicationCode/Commands/CompletionCommands/RicExportCompletionDataSettingsUi.cpp
View File

@ -95,6 +95,26 @@ void RicExportCompletionDataSettingsUi::showForWellPath()
m_displayForSimWell = false; m_displayForSimWell = false;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicExportCompletionDataSettingsUi::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if (changedField == &compdatExport)
{
if (compdatExport == WPIMULT_AND_DEFAULT_CONNECTION_FACTORS)
{
includeFractures = false;
includeFractures.uiCapability()->setUiReadOnly(true);
}
else if (compdatExport == TRANSMISSIBILITIES)
{
includeFractures = true;
includeFractures.uiCapability()->setUiReadOnly(false);
}
}
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -139,7 +159,6 @@ QList<caf::PdmOptionItemInfo> RicExportCompletionDataSettingsUi::calculateValueO
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicExportCompletionDataSettingsUi::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RicExportCompletionDataSettingsUi::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{ {
caf::PdmUiGroup* generalExportSettings = uiOrdering.addNewGroup("General Export Settings"); caf::PdmUiGroup* generalExportSettings = uiOrdering.addNewGroup("General Export Settings");
generalExportSettings->add(&folder); generalExportSettings->add(&folder);
generalExportSettings->add(&caseToApply); generalExportSettings->add(&caseToApply);
@ -152,7 +171,6 @@ void RicExportCompletionDataSettingsUi::defineUiOrdering(QString uiConfigName, c
if (!m_displayForSimWell) if (!m_displayForSimWell)
{ {
caf::PdmUiGroup* fishboneGroup = uiOrdering.addNewGroup("Export of Fishbone Completions"); caf::PdmUiGroup* fishboneGroup = uiOrdering.addNewGroup("Export of Fishbone Completions");
fishboneGroup->add(&includeFishbones); fishboneGroup->add(&includeFishbones);
fishboneGroup->add(&excludeMainBoreForFishbones); fishboneGroup->add(&excludeMainBoreForFishbones);
@ -170,15 +188,13 @@ void RicExportCompletionDataSettingsUi::defineUiOrdering(QString uiConfigName, c
if (compdatExport == WPIMULT_AND_DEFAULT_CONNECTION_FACTORS) if (compdatExport == WPIMULT_AND_DEFAULT_CONNECTION_FACTORS)
{ {
includeFractures = false;
includeFractures.uiCapability()->setUiReadOnly(true); includeFractures.uiCapability()->setUiReadOnly(true);
} }
else if (compdatExport == TRANSMISSIBILITIES) else if (compdatExport == TRANSMISSIBILITIES)
{ {
includeFractures = true;
includeFractures.uiCapability()->setUiReadOnly(false); includeFractures.uiCapability()->setUiReadOnly(false);
} }
} }
uiOrdering.skipRemainingFields(); uiOrdering.skipRemainingFields();
} }

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

@ -72,6 +72,8 @@ public:
void showForSimWells(); void showForSimWells();
void showForWellPath(); void showForWellPath();
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
protected: protected:
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override; virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;