OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Preferences : Add flag for default plot type QtCharts or Qwt

Browse Source
This commit is contained in:
Magne Sjaastad 2022-02-04 10:48:55 +01:00
parent e92e2e8764
commit 15797bd739
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationLibCode/Application/RiaPreferences.cpp
View File

@ -230,6 +230,9 @@ RiaPreferences::RiaPreferences()
CAF_PDM_InitField( &m_openExportedPdfInViewer, "openExportedPdfInViewer", false, "Open Exported PDF in Viewer" ); CAF_PDM_InitField( &m_openExportedPdfInViewer, "openExportedPdfInViewer", false, "Open Exported PDF in Viewer" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_openExportedPdfInViewer ); caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_openExportedPdfInViewer );
CAF_PDM_InitField( &m_useQtChartsPlotByDefault, "useQtChartsPlotByDefault", false, "Use QtChart as Default Plot Type" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useQtChartsPlotByDefault );
CAF_PDM_InitField( &m_surfaceImportResamplingDistance, CAF_PDM_InitField( &m_surfaceImportResamplingDistance,
"SurfaceImportResamplingDistance", "SurfaceImportResamplingDistance",
100.0, 100.0,
@ -389,6 +392,8 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
pageSetup->add( &m_pageTopMargin ); pageSetup->add( &m_pageTopMargin );
pageSetup->add( &m_pageBottomMargin, false ); pageSetup->add( &m_pageBottomMargin, false );
uiOrdering.add( &m_useQtChartsPlotByDefault );
QString unitLabel = " [mm]"; QString unitLabel = " [mm]";
if ( QPageSize( m_pageSize() ).definitionUnits() == QPageSize::Inch ) if ( QPageSize( m_pageSize() ).definitionUnits() == QPageSize::Inch )
{ {
@ -729,6 +734,14 @@ bool RiaPreferences::openExportedPdfInViewer() const
return m_openExportedPdfInViewer; return m_openExportedPdfInViewer;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaPreferences::useQtChartsAsDefaultPlotType() const
{
return m_useQtChartsPlotByDefault;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/Application/RiaPreferences.h
View File

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

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@ -22,6 +22,7 @@
#include "RiaDefines.h" #include "RiaDefines.h"
#include "RiaFieldHandleTools.h" #include "RiaFieldHandleTools.h"
#include "RiaPlotDefines.h" #include "RiaPlotDefines.h"
#include "RiaPreferences.h"
#include "RiaRegressionTestRunner.h" #include "RiaRegressionTestRunner.h"
#include "RiaSummaryAddressAnalyzer.h" #include "RiaSummaryAddressAnalyzer.h"
#include "RiaSummaryCurveDefinition.h" #include "RiaSummaryCurveDefinition.h"
@ -213,7 +214,8 @@ RimSummaryPlot::RimSummaryPlot( bool isCrossPlot )
CAF_PDM_InitScriptableField( &m_description, "PlotDescription", QString( "Summary Plot" ), "Name" ); CAF_PDM_InitScriptableField( &m_description, "PlotDescription", QString( "Summary Plot" ), "Name" );
CAF_PDM_InitScriptableField( &m_normalizeCurveYValues, "normalizeCurveYValues", false, "Normalize all curves" ); CAF_PDM_InitScriptableField( &m_normalizeCurveYValues, "normalizeCurveYValues", false, "Normalize all curves" );
#ifdef USE_QTCHARTS #ifdef USE_QTCHARTS
CAF_PDM_InitScriptableField( &m_useQtChartsPlot, "useQtChartsPlot", false, "Use Qt Charts" ); bool useQtChart = RiaPreferences::current()->useQtChartsAsDefaultPlotType();
CAF_PDM_InitScriptableField( &m_useQtChartsPlot, "useQtChartsPlot", useQtChart, "Use Qt Charts" );
#endif #endif
CAF_PDM_InitFieldNoDefault( &m_summaryCurveCollection, "SummaryCurveCollection", "" ); CAF_PDM_InitFieldNoDefault( &m_summaryCurveCollection, "SummaryCurveCollection", "" );
m_summaryCurveCollection.uiCapability()->setUiTreeHidden( true ); m_summaryCurveCollection.uiCapability()->setUiTreeHidden( true );