From 05c07693b6ea647248ec7be18506e1092d582057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= <bjorn.erik.jensen@acando.no>
Date: Mon, 25 Sep 2017 09:51:27 +0200
Subject: [PATCH] #1930 Curve creator. GUI adjustments

---
 .../SummaryPlotCommands/RicSummaryCurveCreator.cpp        | 8 +++++---
 .../Summary/RimSummaryCurveCollection.cpp                 | 2 +-
 .../ProjectDataModel/Summary/RimSummaryPlot.cpp           | 8 ++++++++
 ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h | 2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
index 4d644deae3..baaf907af1 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
@@ -180,15 +180,17 @@ RicSummaryCurveCreator::RicSummaryCurveCreator() : m_identifierFieldsMap(
     CAF_PDM_InitFieldNoDefault(&m_groupAppearanceType, "GroupAppearanceType", "Group", "", "", "");
     CAF_PDM_InitFieldNoDefault(&m_regionAppearanceType, "RegionAppearanceType", "Region", "", "", "");
 
-    //m_targetPlot
     m_previewPlot = new RimSummaryPlot();
+    m_previewPlot->setShowDescription(false);
 
     for (const auto& itemTypes : m_identifierFieldsMap)
     {
         for (const auto& itemInputType : itemTypes.second)
         {
             itemInputType->pdmField()->uiCapability()->setUiEditorTypeName(caf::PdmUiTreeSelectionEditor::uiEditorTypeName());
-            itemInputType->pdmField()->uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP);
+
+            itemInputType->pdmField()->uiCapability()->setUiLabelPosition(itemTypes.second.size() > 2 ?
+                                                                          caf::PdmUiItemInfo::TOP : caf::PdmUiItemInfo::HIDDEN);
         }
         itemTypes.second.back()->pdmField()->uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
     }
@@ -593,7 +595,7 @@ void RicSummaryCurveCreator::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
 
 
     // Appearance settings
-    caf::PdmUiGroup* appearanceGroup = uiOrdering.addNewGroupWithKeyword("Curve Appearance Settings", RicSummaryCurveCreatorUiKeywords::appearance());
+    caf::PdmUiGroup* appearanceGroup = uiOrdering.addNewGroupWithKeyword("Curve Appearance Assignment", RicSummaryCurveCreatorUiKeywords::appearance());
     caf::PdmUiGroup* appearanceSubGroup = appearanceGroup->addNewGroup("Appearance Type Assignment");
     appearanceGroup->setCollapsedByDefault(true);
     appearanceSubGroup->add(&m_useAutoAppearanceAssignment);
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp
index 33a4743422..73081e9f14 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp
@@ -36,7 +36,7 @@ CAF_PDM_SOURCE_INIT(RimSummaryCurveCollection, "RimSummaryCurveCollection");
 //--------------------------------------------------------------------------------------------------
 RimSummaryCurveCollection::RimSummaryCurveCollection()
 {
-    CAF_PDM_InitObject("Curve Collection", ":/SummaryCurveFilter16x16.png", "", "");
+    CAF_PDM_InitObject("Summary Curves", ":/SummaryCurveFilter16x16.png", "", "");
     
     CAF_PDM_InitFieldNoDefault(&m_curves, "CollectionCurves", "Collection Curves", "", "", "");
     m_curves.uiCapability()->setUiHidden(true);
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
index 8bbdb1d712..238eed2dcf 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
@@ -1134,6 +1134,14 @@ QString RimSummaryPlot::description() const
     return m_userName();
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RimSummaryPlot::setShowDescription(bool showDescription)
+{
+    m_showPlotTitle = showDescription;
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h
index f430ecfade..79fd28e19a 100644
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h
@@ -54,6 +54,7 @@ public:
 
     void                                            setDescription(const QString& description);
     QString                                         description() const;
+    void                                            setShowDescription(bool showDescription);
 
     void                                            addCurveAndUpdate(RimSummaryCurve* curve);
     void                                            addCurveNoUpdate(RimSummaryCurve* curve);
@@ -133,7 +134,6 @@ private:
     void                                            updateTimeAxis();
     void                                            setZoomIntervalsInQwtPlot();
 
-
 private:
     caf::PdmField<bool>                                 m_showPlotTitle;
     caf::PdmField<bool>                                 m_showLegend;