From 801b1aefb80a206bea5e76d2f37ebb2b1e37ef0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= <bjorn.erik.jensen@acando.no>
Date: Mon, 5 Mar 2018 14:36:42 +0100
Subject: [PATCH] #2565 Campaction. Remove enable compaction checkbox

---
 .../GeoMechDataModel/RigFemResultAddress.h    |  2 --
 .../RimGeoMechResultDefinition.cpp            | 21 +++----------------
 .../RimGeoMechResultDefinition.h              |  2 --
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemResultAddress.h b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemResultAddress.h
index 2e9f4d92f9..c2717d5a9e 100644
--- a/ApplicationCode/GeoMech/GeoMechDataModel/RigFemResultAddress.h
+++ b/ApplicationCode/GeoMech/GeoMechDataModel/RigFemResultAddress.h
@@ -62,8 +62,6 @@ public:
     bool isTimeLapse() const { return timeLapseBaseFrameIdx > NO_TIME_LAPSE;}
     bool representsAllTimeLapses() const { return timeLapseBaseFrameIdx == ALL_TIME_LAPSES;}
 
-    bool isCompaction() const { return refKLayerIndex > NO_COMPACTION; }
-
     bool isValid() const
     {
         bool isTypeValid =     resultPosType == RIG_NODAL 
diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
index 8eefa9dcf5..26653e834d 100644
--- a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
+++ b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
@@ -79,9 +79,6 @@ RimGeoMechResultDefinition::RimGeoMechResultDefinition(void)
     CAF_PDM_InitField(&m_timeLapseBaseTimestep, "TimeLapseBaseTimeStep", 0, "Base Time Step", "", "", "");
     m_timeLapseBaseTimestep.uiCapability()->setUiHidden(true);
 
-    CAF_PDM_InitField(&m_isCompaction, "IsCompaction", false, "Compaction", "", "", "");
-    m_isCompaction.uiCapability()->setUiHidden(true);
-
     CAF_PDM_InitField(&m_compactionRefLayer, "CompactionRefLayer", 0, "Compaction Ref Layer", "", "", "");
     m_compactionRefLayer.uiCapability()->setUiHidden(true);
 
@@ -104,10 +101,6 @@ RimGeoMechResultDefinition::RimGeoMechResultDefinition(void)
     m_resultVariableUiField.uiCapability()->setUiEditorTypeName(caf::PdmUiListEditor::uiEditorTypeName());
     m_resultVariableUiField.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP);
 
-    CAF_PDM_InitField(&m_isCompactionUiField, "IsCompactionUi", false, "Enable Compaction", "", "", "");
-    m_isCompactionUiField.xmlCapability()->setIOWritable(false);
-    m_isCompactionUiField.xmlCapability()->setIOReadable(false);
-
     CAF_PDM_InitField(&m_compactionRefLayerUiField, "CompactionRefLayerUi", 0, "Compaction Ref Layer", "", "The compaction is calculated with reference to this layer. Default layer is the topmost layer with POR", "");
     m_compactionRefLayerUiField.xmlCapability()->setIOWritable(false);
     m_compactionRefLayerUiField.xmlCapability()->setIOReadable(false);
@@ -142,9 +135,7 @@ void RimGeoMechResultDefinition::defineUiOrdering(QString uiConfigName, caf::Pdm
     if (m_resultPositionTypeUiField() == RIG_NODAL)
     {
         caf::PdmUiGroup * compactionGroup = uiOrdering.addNewGroup("Compaction Options");
-        compactionGroup->add(&m_isCompactionUiField);
-        if (m_isCompactionUiField())
-            compactionGroup->add(&m_compactionRefLayerUiField);
+        compactionGroup->add(&m_compactionRefLayerUiField);
     }
 
     if (!m_isChangedByField)
@@ -180,8 +171,6 @@ QList<caf::PdmOptionItemInfo> RimGeoMechResultDefinition::calculateValueOptions(
 
             for (int oIdx = 0; oIdx < uiVarNames.size(); ++oIdx)
             {
-                if (uiVarNames[oIdx].startsWith(RigFemPartResultsCollection::FIELD_NAME_COMPACTION.data()) && !m_isCompactionUiField()) continue;
-
                 options.push_back(caf::PdmOptionItemInfo(uiVarNames[oIdx], varNames[oIdx]));
             }
         }
@@ -291,7 +280,6 @@ void RimGeoMechResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
 
                 m_isTimeLapseResult     = m_isTimeLapseResultUiField();
                 m_timeLapseBaseTimestep = m_timeLapseBaseTimestepUiField();
-                m_isCompaction          = m_isCompactionUiField();
                 m_compactionRefLayer    = m_compactionRefLayerUiField();
             }
 
@@ -414,7 +402,6 @@ void RimGeoMechResultDefinition::initAfterRead()
     m_resultVariableUiField = composeFieldCompString(m_resultFieldName(), m_resultComponentName());
     m_isTimeLapseResultUiField = m_isTimeLapseResult;
     m_timeLapseBaseTimestepUiField = m_timeLapseBaseTimestep;
-    m_isCompactionUiField = m_isCompaction;
     m_compactionRefLayerUiField = m_compactionRefLayer;
 }
 
@@ -439,7 +426,7 @@ RigFemResultAddress RimGeoMechResultDefinition::resultAddress()
                                resultFieldName().toStdString(), 
                                resultComponentName().toStdString(),
                                m_isTimeLapseResult() ? m_timeLapseBaseTimestep() : RigFemResultAddress::NO_TIME_LAPSE,
-                               m_isCompaction() && resultFieldName().toStdString() == RigFemPartResultsCollection::FIELD_NAME_COMPACTION ? m_compactionRefLayer() : RigFemResultAddress::NO_COMPACTION);
+                               resultFieldName().toStdString() == RigFemPartResultsCollection::FIELD_NAME_COMPACTION ? m_compactionRefLayer() : RigFemResultAddress::NO_COMPACTION);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -517,15 +504,13 @@ void RimGeoMechResultDefinition::setResultAddress( const RigFemResultAddress& re
     m_resultFieldName       = QString::fromStdString(resultAddress.fieldName);
     m_resultComponentName   = QString::fromStdString(resultAddress.componentName);
     m_isTimeLapseResult     = resultAddress.isTimeLapse();
-    m_isCompaction          = resultAddress.isCompaction();
 
     m_timeLapseBaseTimestep = m_isTimeLapseResult ? resultAddress.timeLapseBaseFrameIdx: -1;
-    m_compactionRefLayer = m_isCompaction ? resultAddress.refKLayerIndex : -1;
+    m_compactionRefLayer = resultAddress.refKLayerIndex;
 
     m_resultPositionTypeUiField = m_resultPositionType;
     m_resultVariableUiField = composeFieldCompString(m_resultFieldName(), m_resultComponentName());
     m_isTimeLapseResultUiField = m_isTimeLapseResult;
     m_timeLapseBaseTimestepUiField = m_timeLapseBaseTimestep;
-    m_isCompactionUiField = m_isCompaction;
     m_compactionRefLayerUiField = m_compactionRefLayer;
 }
diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h
index dd10008d92..0cc449b192 100644
--- a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h
+++ b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h
@@ -101,7 +101,6 @@ private:
     caf::PdmField<QString>                            m_resultComponentName;
     caf::PdmField<bool>                               m_isTimeLapseResult;
     caf::PdmField<int>                                m_timeLapseBaseTimestep;
-    caf::PdmField<bool>                               m_isCompaction;
     caf::PdmField<int>                                m_compactionRefLayer;
 
     // UI Fields only
@@ -114,7 +113,6 @@ private:
     caf::PdmField<QString>                            m_resultVariableUiField;
     caf::PdmField<bool>                               m_isTimeLapseResultUiField;
     caf::PdmField<int>                                m_timeLapseBaseTimestepUiField;
-    caf::PdmField<bool>                               m_isCompactionUiField;
     caf::PdmField<int>                                m_compactionRefLayerUiField;
     caf::PdmPointer<RimGeoMechCase>                   m_geomCase;