Preferences: Move colorCurvesByPhase and hide Qt Charts settings

ApplicationLibCode/Application/RiaPreferences.cpp

@@ -262,9 +262,6 @@ RiaPreferences::RiaPreferences()
 
     CAF_PDM_InitFieldNoDefault( &m_systemPreferences, "systemPreferences", "systemPreferences" );
     m_systemPreferences = new RiaPreferencesSystem;
-
-    CAF_PDM_InitField( &m_curveColorByPhase, "curveColorByPhase", true, "Curve Color By Phase" );
-    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_curveColorByPhase );
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -388,7 +385,6 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
         caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Plot Templates" );
         group->add( &m_plotTemplateFolders );
         group->add( &m_searchPlotTemplateFoldersRecursively );
-        group->add( &m_curveColorByPhase );
 
         caf::PdmUiGroup* pageSetup = uiOrdering.addNewGroup( "Page Setup" );
         pageSetup->add( &m_pageSize );
@@ -399,6 +395,7 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
         pageSetup->add( &m_pageBottomMargin, false );
 
         uiOrdering.add( &m_useQtChartsPlotByDefault );
+        m_useQtChartsPlotByDefault.uiCapability()->setUiHidden( true );
 
         QString unitLabel = " [mm]";
         if ( QPageSize( m_pageSize() ).definitionUnits() == QPageSize::Inch )
@@ -750,14 +747,6 @@ bool RiaPreferences::useQtChartsAsDefaultPlotType() const
     return m_useQtChartsPlotByDefault;
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-bool RiaPreferences::colorCurvesByPhase() const
-{
-    return m_curveColorByPhase();
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Application/RiaPreferences.h

@@ -83,7 +83,6 @@ public:
     void        setDefaultPlotTemplatePath( const QString& templatePath );
     bool        openExportedPdfInViewer() const;
     bool        useQtChartsAsDefaultPlotType() const;
-    bool        colorCurvesByPhase() const;
 
     RiaDefines::ThemeEnum guiTheme() const;
 
@@ -188,7 +187,6 @@ private:
     caf::PdmField<bool>          m_searchPlotTemplateFoldersRecursively;
     caf::PdmField<caf::FilePath> m_defaultPlotTemplate;
     caf::PdmField<bool>          m_useQtChartsPlotByDefault;
-    caf::PdmField<bool>          m_curveColorByPhase;
 
     // Script paths
     caf::PdmField<QString> m_octaveExecutable;

ApplicationLibCode/Application/RiaPreferencesSummary.cpp

@@ -144,6 +144,9 @@ RiaPreferencesSummary::RiaPreferencesSummary()
     m_defaultColumnCount = RiaDefines::ColumnCount::COLUMNS_2;
     CAF_PDM_InitFieldNoDefault( &m_defaultRowsPerPage, "DefaultRowsPerPage", "Rows per Page" );
     m_defaultRowsPerPage = RiaDefines::RowCount::ROWS_2;
+
+    CAF_PDM_InitField( &m_curveColorByPhase, "curveColorByPhase", true, "Curve Color By Phase" );
+    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_curveColorByPhase );
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -227,6 +230,8 @@ void RiaPreferencesSummary::appendItemsToPlottingGroup( caf::PdmUiOrdering& uiOr
 {
     uiOrdering.add( &m_defaultSummaryCurvesTextFilter );
     uiOrdering.add( &m_defaultSummaryHistoryCurveStyle );
+    uiOrdering.add( &m_curveColorByPhase );
+
     uiOrdering.add( &m_showSummaryTimeAsLongString );
 
     auto multiGroup = uiOrdering.addNewGroup( "Multi Plot Defaults" );
@@ -291,6 +296,14 @@ QString RiaPreferencesSummary::defaultSummaryCurvesTextFilter() const
     return m_defaultSummaryCurvesTextFilter;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RiaPreferencesSummary::colorCurvesByPhase() const
+{
+    return m_curveColorByPhase();
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Application/RiaPreferencesSummary.h

@@ -82,6 +82,7 @@ public:
     SummaryRestartFilesImportMode gridImportMode() const;
     SummaryRestartFilesImportMode summaryEnsembleImportMode() const;
     QString                       defaultSummaryCurvesTextFilter() const;
+    bool                          colorCurvesByPhase() const;
 
     SummaryHistoryCurveStyleMode defaultSummaryHistoryCurveStyle() const;
 
@@ -105,6 +106,7 @@ private:
 
     caf::PdmField<QString>                          m_defaultSummaryCurvesTextFilter;
     caf::PdmField<SummaryHistoryCurveStyleModeType> m_defaultSummaryHistoryCurveStyle;
+    caf::PdmField<bool>                             m_curveColorByPhase;
 
     caf::PdmField<bool> m_showSummaryTimeAsLongString;
     caf::PdmField<bool> m_useMultipleThreadsWhenLoadingSummaryCases;

ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp

@@ -19,7 +19,7 @@
 #include "RimSummaryCurveAppearanceCalculator.h"
 
 #include "RiaColorTables.h"
-#include "RiaPreferences.h"
+#include "RiaPreferencesSummary.h"
 #include "RiaSummaryCurveDefinition.h"
 
 #include "RiuQwtPlotCurve.h"
@@ -300,7 +300,7 @@ void RimSummaryCurveAppearanceCalculator::setupCurveLook( RimSummaryCurve* curve
     setOneCurveAppearance( m_regionAppearanceType, m_regToAppearanceIdxMap.size(), regAppearanceIdx, curve );
 
     bool assignByPhase = false;
-    if ( RiaPreferences::current()->colorCurvesByPhase() )
+    if ( RiaPreferencesSummary::current()->colorCurvesByPhase() )
     {
         assignByPhase = ( m_varAppearanceType == COLOR );
     }

ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp

@@ -107,6 +107,7 @@ RimSummaryPlot::RimSummaryPlot( bool isCrossPlot )
 #ifdef USE_QTCHARTS
     bool useQtChart = RiaPreferences::current()->useQtChartsAsDefaultPlotType();
     CAF_PDM_InitScriptableField( &m_useQtChartsPlot, "useQtChartsPlot", useQtChart, "Use Qt Charts" );
+    m_useQtChartsPlot.uiCapability()->setUiHidden( true );
 #endif
     CAF_PDM_InitFieldNoDefault( &m_summaryCurveCollection, "SummaryCurveCollection", "" );
     m_summaryCurveCollection.uiCapability()->setUiTreeHidden( true );