From 1eecef9f728373c268689c6e27b6ccb02941a68e Mon Sep 17 00:00:00 2001
From: Rebecca Cox <rebecca.cox@acando.no>
Date: Tue, 19 Sep 2017 14:19:39 +0200
Subject: [PATCH] #1813 Observed data: Change ui names

---
 ApplicationCode/Commands/RicImportObservedDataFeature.h   | 3 ++-
 .../ProjectDataModel/RimContextCommandBuilder.cpp         | 8 ++++++--
 ApplicationCode/ProjectDataModel/RimObservedData.cpp      | 4 ++--
 ApplicationCode/ProjectDataModel/RimObservedData.h        | 7 +++++--
 .../ProjectDataModel/RimSummaryObservedDataFile.cpp       | 2 +-
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ApplicationCode/Commands/RicImportObservedDataFeature.h b/ApplicationCode/Commands/RicImportObservedDataFeature.h
index dd5a509b19..6e77691224 100644
--- a/ApplicationCode/Commands/RicImportObservedDataFeature.h
+++ b/ApplicationCode/Commands/RicImportObservedDataFeature.h
@@ -39,5 +39,6 @@ private:
     virtual bool    isCommandEnabled() override;
     virtual void    onActionTriggered(bool isChecked) override;
     virtual void    setupActionLook(QAction* actionToSetup) override;
-    static bool            createAndAddObservedDataFromFile(const QString& fileName);
+
+    static bool     createAndAddObservedDataFromFile(const QString& fileName);
 };
diff --git a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
index c96bb6c2cd..c60468aed5 100644
--- a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
+++ b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
@@ -35,9 +35,9 @@
 #include "RimEclipseWell.h"
 #include "RimEclipseWellCollection.h"
 #include "RimFault.h"
+#include "RimFlowCharacteristicsPlot.h"
 #include "RimFlowDiagSolution.h"
 #include "RimFlowPlotCollection.h"
-#include "RimFlowCharacteristicsPlot.h"
 #include "RimFormationNames.h"
 #include "RimFormationNamesCollection.h"
 #include "RimGeoMechCase.h"
@@ -48,6 +48,7 @@
 #include "RimIntersection.h"
 #include "RimIntersectionBox.h"
 #include "RimIntersectionCollection.h"
+#include "RimObservedData.h"
 #include "RimScriptCollection.h"
 #include "RimSummaryCase.h"
 #include "RimSummaryCurve.h"
@@ -322,7 +323,10 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
         }
         else if (dynamic_cast<RimSummaryCase*>(uiItem))
         {
-            commandIds << "RicNewSummaryPlotFeature";
+            if (!dynamic_cast<RimObservedData*>(uiItem))
+            {
+                commandIds << "RicNewSummaryPlotFeature";
+            }
         }
         else if (dynamic_cast<RimWellLogFileChannel*>(uiItem))
         {
diff --git a/ApplicationCode/ProjectDataModel/RimObservedData.cpp b/ApplicationCode/ProjectDataModel/RimObservedData.cpp
index 51dbf66569..e08e0666ff 100644
--- a/ApplicationCode/ProjectDataModel/RimObservedData.cpp
+++ b/ApplicationCode/ProjectDataModel/RimObservedData.cpp
@@ -30,8 +30,8 @@ RimObservedData::RimObservedData()
 {
     m_isObservedData = true;
 
-    CAF_PDM_InitFieldNoDefault(&m_identifierType, "identifierType", "Identifier Type", "", "", "");
-    CAF_PDM_InitFieldNoDefault(&m_identifierName, "identifierName", "Identifier Name", "", "", "");
+    CAF_PDM_InitFieldNoDefault(&m_summaryCategory, "SummaryType", "Summary Type", "", "", "");
+    CAF_PDM_InitFieldNoDefault(&m_identifierName, "IdentifierName", "Identifier Name", "", "", "");
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/RimObservedData.h b/ApplicationCode/ProjectDataModel/RimObservedData.h
index 8d7edac00b..e7b7d7e63d 100644
--- a/ApplicationCode/ProjectDataModel/RimObservedData.h
+++ b/ApplicationCode/ProjectDataModel/RimObservedData.h
@@ -17,8 +17,11 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
+
 #include "RimSummaryCase.h"
 
+#include "RifEclipseSummaryAddress.h"
+
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cvfObject.h"
@@ -38,6 +41,6 @@ public:
     virtual void           updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath) override;
 
 private:
-    caf::PdmField<QString>  m_identifierType;
-    caf::PdmField<QString>  m_identifierName;
+    caf::PdmField<caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory> >  m_summaryCategory;
+    caf::PdmField<QString>                                                      m_identifierName;
 };
diff --git a/ApplicationCode/ProjectDataModel/RimSummaryObservedDataFile.cpp b/ApplicationCode/ProjectDataModel/RimSummaryObservedDataFile.cpp
index 69c98e7d55..801c900c71 100644
--- a/ApplicationCode/ProjectDataModel/RimSummaryObservedDataFile.cpp
+++ b/ApplicationCode/ProjectDataModel/RimSummaryObservedDataFile.cpp
@@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT(RimSummaryObservedDataFile, "SummaryObservedDataFile");
 RimSummaryObservedDataFile::RimSummaryObservedDataFile()
 {
     CAF_PDM_InitObject("Observed data file", ":/Default.png", "", "");
-
+    m_summaryHeaderFilename.uiCapability()->setUiName("File");
 }
 
 //--------------------------------------------------------------------------------------------------