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

#7632 Preferences : Add separate tab Eclipse Summary

Browse Source 
Remove obsolete includes
This commit is contained in:
Magne Sjaastad
2021-04-28 10:29:53 +02:00
parent 46f186b72d
commit 1cf1eef048
64 changed files with 153 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationLibCode/Application/RiaDefines.cpp
View File

@@ -134,6 +134,16 @@ void caf::AppEnum<RiaDefines::ThemeEnum>::setUp()
setDefault( RiaDefines::ThemeEnum::DEFAULT );
}
template <>
void AppEnum<RiaDefines::RINavigationPolicy>::setUp()
{
addItem( RiaDefines::RINavigationPolicy::NAVIGATION_POLICY_CEETRON, "NAVIGATION_POLICY_CEETRON", "Ceetron" );
addItem( RiaDefines::RINavigationPolicy::NAVIGATION_POLICY_CAD, "NAVIGATION_POLICY_CAD", "CAD" );
addItem( RiaDefines::RINavigationPolicy::NAVIGATION_POLICY_GEOQUEST, "NAVIGATION_POLICY_GEOQUEST", "GEOQUEST" );
addItem( RiaDefines::RINavigationPolicy::NAVIGATION_POLICY_RMS, "NAVIGATION_POLICY_RMS", "RMS" );
setDefault( RiaDefines::RINavigationPolicy::NAVIGATION_POLICY_RMS );
}
} // namespace caf
//--------------------------------------------------------------------------------------------------

8
ApplicationLibCode/Application/RiaDefines.h
View File

@@ -175,4 +175,12 @@ enum class ThemeEnum
UNDEFINED
};
enum class RINavigationPolicy : short
{
NAVIGATION_POLICY_CEETRON,
NAVIGATION_POLICY_CAD,
NAVIGATION_POLICY_GEOQUEST,
NAVIGATION_POLICY_RMS
};
}; // namespace RiaDefines

15
ApplicationLibCode/Application/RiaGuiApplication.cpp
View File

@@ -139,19 +139,6 @@
#include "gtest/gtest.h"
#endif // USE_UNIT_TESTS
namespace caf
{
template <>
void AppEnum<RiaGuiApplication::RINavigationPolicy>::setUp()
{
addItem( RiaGuiApplication::RINavigationPolicy::NAVIGATION_POLICY_CEETRON, "NAVIGATION_POLICY_CEETRON", "Ceetron" );
addItem( RiaGuiApplication::RINavigationPolicy::NAVIGATION_POLICY_CAD, "NAVIGATION_POLICY_CAD", "CAD" );
addItem( RiaGuiApplication::RINavigationPolicy::NAVIGATION_POLICY_GEOQUEST, "NAVIGATION_POLICY_GEOQUEST", "GEOQUEST" );
addItem( RiaGuiApplication::RINavigationPolicy::NAVIGATION_POLICY_RMS, "NAVIGATION_POLICY_RMS", "RMS" );
setDefault( RiaGuiApplication::RINavigationPolicy::NAVIGATION_POLICY_RMS );
}
} // namespace caf
//==================================================================================================
///
/// \class RiaGuiApplication
@@ -404,7 +391,7 @@ bool RiaGuiApplication::useShaders() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaGuiApplication::RINavigationPolicy RiaGuiApplication::navigationPolicy() const
RiaDefines::RINavigationPolicy RiaGuiApplication::navigationPolicy() const
{
return m_preferences->navigationPolicy();
}

16
ApplicationLibCode/Application/RiaGuiApplication.h
View File

@@ -66,6 +66,11 @@ class RiuPlotMainWindow;
class RiuRecentFileActionProvider;
class RiaArgumentParser;
namespace RiaDefines
{
enum class RINavigationPolicy : short;
}
namespace caf
{
class FontHolderInterface;
@@ -80,15 +85,6 @@ class RiaGuiApplication : public QApplication, public RiaApplication
{
Q_OBJECT
public:
enum class RINavigationPolicy
{
NAVIGATION_POLICY_CEETRON,
NAVIGATION_POLICY_CAD,
NAVIGATION_POLICY_GEOQUEST,
NAVIGATION_POLICY_RMS
};
public:
static bool isRunning();
static RiaGuiApplication* instance();
@@ -106,7 +102,7 @@ public:
const QString& snapshotFolderName );
bool useShaders() const;
RINavigationPolicy navigationPolicy() const;
RiaDefines::RINavigationPolicy navigationPolicy() const;
RiuMainWindow* getOrCreateAndShowMainWindow();
RiuMainWindow* mainWindow();

40
ApplicationLibCode/Application/RiaPreferences.cpp
View File

@@ -21,9 +21,11 @@
#include "RiaPreferences.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"
#include "RiaPreferencesSummary.h"
#include "RiaValidRegExpValidator.h"
#include "RifReaderSettings.h"
#include "RiuGuiTheme.h"
@@ -76,8 +78,7 @@ RiaPreferences::RiaPreferences()
{
CAF_PDM_InitField( &m_navigationPolicy,
"navigationPolicy",
caf::AppEnum<RiaGuiApplication::RINavigationPolicy>(
RiaGuiApplication::RINavigationPolicy::NAVIGATION_POLICY_RMS ),
caf::AppEnum<RiaDefines::RINavigationPolicy>( RiaDefines::RINavigationPolicy::NAVIGATION_POLICY_RMS ),
"Navigation Mode",
"",
"",
@@ -445,15 +446,23 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
otherGroup->add( &holoLensDisableCertificateVerification );
otherGroup->add( &m_useUndoRedo );
}
else if ( uiConfigName == RiaPreferences::tabNameEclipse() )
else if ( uiConfigName == RiaPreferences::tabNameEclipseGrid() )
{
caf::PdmUiGroup* newCaseBehaviourGroup = uiOrdering.addNewGroup( "Behavior When Loading Data" );
newCaseBehaviourGroup->add( &autocomputeDepthRelatedProperties );
newCaseBehaviourGroup->add( &loadAndShowSoil );
m_readerSettings->uiOrdering( uiConfigName, *newCaseBehaviourGroup );
}
else if ( uiConfigName == RiaPreferences::tabNameEclipseSummary() )
{
m_summaryPreferences->appendRestartFileGroup( uiOrdering );
{
caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Summary Data Import" );
m_summaryPreferences()->uiOrdering( uiConfigName, *group );
}
}
else if ( uiConfigName == RiaPreferences::tabNamePlotting() )
{
@@ -483,12 +492,6 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
m_pageRightMargin.uiCapability()->setUiName( "Right Margin" + unitLabel );
m_pageTopMargin.uiCapability()->setUiName( "Top Margin" + unitLabel );
m_pageBottomMargin.uiCapability()->setUiName( "Bottom Margin" + unitLabel );
{
caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Summary Data Import" );
m_summaryPreferences()->uiOrdering( uiConfigName, *group );
}
}
else if ( uiConfigName == RiaPreferences::tabNameScripting() )
@@ -620,9 +623,17 @@ QString RiaPreferences::tabNameGeneral()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiaPreferences::tabNameEclipse()
QString RiaPreferences::tabNameEclipseGrid()
{
return "Eclipse";
return "Eclipse Grid";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiaPreferences::tabNameEclipseSummary()
{
return "Eclipse Summary";
}
//--------------------------------------------------------------------------------------------------
@@ -689,7 +700,8 @@ QStringList RiaPreferences::tabNames()
QStringList names;
names << tabNameGeneral();
names << tabNameEclipse();
names << tabNameEclipseGrid();
names << tabNameEclipseSummary();
names << tabNamePlotting();
names << tabNameScripting();
names << tabNameExport();
@@ -993,7 +1005,7 @@ RiaDefines::MeshModeType RiaPreferences::defaultMeshModeType() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaGuiApplication::RINavigationPolicy RiaPreferences::navigationPolicy() const
RiaDefines::RINavigationPolicy RiaPreferences::navigationPolicy() const
{
return m_navigationPolicy();
}

30
ApplicationLibCode/Application/RiaPreferences.h
View File

@@ -23,7 +23,6 @@
#include "RiaDefines.h"
#include "RiaFontCache.h"
#include "RiaGuiApplication.h"
#include "RiaQDateTimeTools.h"
#include "cafAppEnum.h"
@@ -110,12 +109,12 @@ public:
static QString defaultMultiLateralWellNamePattern();
// 3D view
RiaDefines::MeshModeType defaultMeshModeType() const;
RiaGuiApplication::RINavigationPolicy navigationPolicy() const;
int defaultScaleFactorZ() const;
bool showLegendBackground() const;
bool showInfoBox() const;
bool showGridBox() const;
RiaDefines::MeshModeType defaultMeshModeType() const;
RiaDefines::RINavigationPolicy navigationPolicy() const;
int defaultScaleFactorZ() const;
bool showLegendBackground() const;
bool showInfoBox() const;
bool showGridBox() const;
// Script paths
QString pythonExecutable() const;
@@ -165,7 +164,8 @@ protected:
private:
static QString tabNameGeneral();
static QString tabNameEclipse();
static QString tabNameEclipseGrid();
static QString tabNameEclipseSummary();
static QString tabNamePlotting();
static QString tabNameScripting();
static QString tabNameExport();
@@ -223,13 +223,13 @@ private:
caf::PdmChildField<RiaPreferencesSummary*> m_summaryPreferences;
// 3d view
caf::PdmField<caf::AppEnum<RiaDefines::MeshModeType>> m_defaultMeshModeType;
caf::PdmField<caf::AppEnum<RiaGuiApplication::RINavigationPolicy>> m_navigationPolicy;
caf::PdmField<int> m_defaultScaleFactorZ;
caf::PdmField<bool> m_showLegendBackground;
caf::PdmField<bool> m_enableFaultsByDefault;
caf::PdmField<bool> m_showInfoBox;
caf::PdmField<bool> m_showGridBox;
caf::PdmField<caf::AppEnum<RiaDefines::MeshModeType>> m_defaultMeshModeType;
caf::PdmField<caf::AppEnum<RiaDefines::RINavigationPolicy>> m_navigationPolicy;
caf::PdmField<int> m_defaultScaleFactorZ;
caf::PdmField<bool> m_showLegendBackground;
caf::PdmField<bool> m_enableFaultsByDefault;
caf::PdmField<bool> m_showInfoBox;
caf::PdmField<bool> m_showGridBox;
QStringList m_tabNames;
};

12
ApplicationLibCode/Application/RiaPreferencesSummary.cpp
View File

@@ -162,14 +162,14 @@ RiaPreferencesSummary::RiaPreferencesSummary()
"" );
m_showSummaryTimeAsLongString.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
CAF_PDM_InitField( &m_useMultipleThreadsWhenLoadingSummaryData,
"useMultipleThreadsWhenLoadingSummaryData",
CAF_PDM_InitField( &m_useMultipleThreadsWhenLoadingSummaryCases,
"useMultipleThreadsWhenLoadingSummaryCases",
true,
"Use Multiple Threads for Import of Summary Files",
"",
"",
"" );
m_useMultipleThreadsWhenLoadingSummaryData.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
m_useMultipleThreadsWhenLoadingSummaryCases.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
}
//--------------------------------------------------------------------------------------------------
@@ -277,7 +277,7 @@ bool RiaPreferencesSummary::showSummaryTimeAsLongString() const
//--------------------------------------------------------------------------------------------------
bool RiaPreferencesSummary::useMultipleThreadsWhenLoadingSummaryData() const
{
return m_useMultipleThreadsWhenLoadingSummaryData;
return m_useMultipleThreadsWhenLoadingSummaryCases;
}
//--------------------------------------------------------------------------------------------------
@@ -336,7 +336,7 @@ void RiaPreferencesSummary::defineEditorAttribute( const caf::PdmFieldHandle* fi
caf::PdmUiEditorAttribute* attribute )
{
if ( field == &m_createOptimizedSummaryDataFile || field == &m_showSummaryTimeAsLongString ||
field == &m_useMultipleThreadsWhenLoadingSummaryData || field == &m_summaryRestartFilesShowImportDialog ||
field == &m_useMultipleThreadsWhenLoadingSummaryCases || field == &m_summaryRestartFilesShowImportDialog ||
field == &m_useOptimizedSummaryDataFile || field == &m_createH5SummaryDataFile || field == &m_checkH5FileTimeStamp )
{
auto myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>( attribute );
@@ -370,7 +370,7 @@ void RiaPreferencesSummary::defineUiOrdering( QString uiConfigName, caf::PdmUiOr
}
}
uiOrdering.add( &m_useMultipleThreadsWhenLoadingSummaryData );
uiOrdering.add( &m_useMultipleThreadsWhenLoadingSummaryCases );
uiOrdering.skipRemainingFields();
}

2
ApplicationLibCode/Application/RiaPreferencesSummary.h
View File

@@ -100,7 +100,7 @@ private:
caf::PdmField<SummaryHistoryCurveStyleModeType> m_defaultSummaryHistoryCurveStyle;
caf::PdmField<bool> m_showSummaryTimeAsLongString;
caf::PdmField<bool> m_useMultipleThreadsWhenLoadingSummaryData;
caf::PdmField<bool> m_useMultipleThreadsWhenLoadingSummaryCases;
caf::PdmField<bool> m_createOptimizedSummaryDataFile;
caf::PdmField<bool> m_useOptimizedSummaryDataFile;

1
ApplicationLibCode/Application/Tools/RiaArgumentParser.cpp
View File

@@ -21,7 +21,6 @@
#include "RiaBaseDefs.h"
#include "RiaImportEclipseCaseTools.h"
#include "RiaLogging.h"
#include "RiaPreferences.h"
#include "RiaProjectModifier.h"
#include "RiaRegressionTestRunner.h"

1
ApplicationLibCode/Application/Tools/RiaImportEclipseCaseTools.cpp
View File

@@ -27,7 +27,6 @@
#include "RiaApplication.h"
#include "RiaGuiApplication.h"
#include "RiaLogging.h"
#include "RiaPreferences.h"
#include "RifEclipseSummaryTools.h"
#include "RifSummaryCaseRestartSelector.h"