OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-12 16:32:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename to m_applyToAllCases

Browse Source
This commit is contained in:
Magne Sjaastad committed 2023-12-06 15:07:13 +01:00
1 parent f247df5079
commit 27f9ef4700
2 files changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/RimGridCalculation.cpp
+6 -6
View File
@@ -72,7 +72,7 @@ RimGridCalculation::RimGridCalculation()
CAF_PDM_InitFieldNoDefault( &m_defaultValueType, "DefaultValueType", "Non-visible Cell Value" ); CAF_PDM_InitFieldNoDefault( &m_defaultValueType, "DefaultValueType", "Non-visible Cell Value" );
CAF_PDM_InitField( &m_defaultValue, "DefaultValue", 0.0, "Custom Value" ); CAF_PDM_InitField( &m_defaultValue, "DefaultValue", 0.0, "Custom Value" );
CAF_PDM_InitFieldNoDefault( &m_destinationCase, "DestinationCase", "Destination Case" ); CAF_PDM_InitFieldNoDefault( &m_destinationCase, "DestinationCase", "Destination Case" );
CAF_PDM_InitField( &m_allCases, "AllDestinationCase", false, "Apply to All Cases" ); CAF_PDM_InitField( &m_applyToAllCases, "AllDestinationCase", false, "Apply to All Cases" );
CAF_PDM_InitField( &m_defaultPropertyVariableIndex, "DefaultPropertyVariableName", 0, "Property Variable Name" ); CAF_PDM_InitField( &m_defaultPropertyVariableIndex, "DefaultPropertyVariableName", 0, "Property Variable Name" );
} }
@@ -81,7 +81,7 @@ RimGridCalculation::RimGridCalculation()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimGridCalculation::preCalculate() const bool RimGridCalculation::preCalculate() const
{ {
if ( RiaGuiApplication::isRunning() && m_allCases() ) if ( RiaGuiApplication::isRunning() && m_applyToAllCases() )
{ {
const QString cacheKey = "GridCalculatorMessage"; const QString cacheKey = "GridCalculatorMessage";
@@ -166,7 +166,7 @@ bool RimGridCalculation::calculate()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RimEclipseCase*> RimGridCalculation::outputEclipseCases() const std::vector<RimEclipseCase*> RimGridCalculation::outputEclipseCases() const
{ {
if ( m_allCases ) if ( m_applyToAllCases )
{ {
// Find all Eclipse cases suitable for grid calculations. This includes all single grid cases and source cases in a grid case group. // Find all Eclipse cases suitable for grid calculations. This includes all single grid cases and source cases in a grid case group.
// Exclude the statistics cases, as it is not possible to use them in a grid calculations. // Exclude the statistics cases, as it is not possible to use them in a grid calculations.
@@ -217,12 +217,12 @@ void RimGridCalculation::defineUiOrdering( QString uiConfigName, caf::PdmUiOrder
uiOrdering.add( &m_destinationCase ); uiOrdering.add( &m_destinationCase );
uiOrdering.add( &m_allCases ); uiOrdering.add( &m_applyToAllCases );
if ( !allSourceCasesAreEqualToDestinationCase() ) if ( !allSourceCasesAreEqualToDestinationCase() )
{ {
m_allCases = false; m_applyToAllCases = false;
} }
m_allCases.uiCapability()->setUiReadOnly( !allSourceCasesAreEqualToDestinationCase() ); m_applyToAllCases.uiCapability()->setUiReadOnly( !allSourceCasesAreEqualToDestinationCase() );
caf::PdmUiGroup* filterGroup = uiOrdering.addNewGroup( "Cell Filter" ); caf::PdmUiGroup* filterGroup = uiOrdering.addNewGroup( "Cell Filter" );
filterGroup->setCollapsedByDefault(); filterGroup->setCollapsedByDefault();
ApplicationLibCode/ProjectDataModel/RimGridCalculation.h
+1 -1
View File
@@ -115,7 +115,7 @@ private:
caf::PdmField<caf::AppEnum<DefaultValueType>> m_defaultValueType; caf::PdmField<caf::AppEnum<DefaultValueType>> m_defaultValueType;
caf::PdmField<double> m_defaultValue; caf::PdmField<double> m_defaultValue;
caf::PdmPtrField<RimEclipseCase*> m_destinationCase; caf::PdmPtrField<RimEclipseCase*> m_destinationCase;
caf::PdmField<bool> m_allCases; caf::PdmField<bool> m_applyToAllCases;
caf::PdmField<int> m_defaultPropertyVariableIndex; caf::PdmField<int> m_defaultPropertyVariableIndex;
}; };