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

#916 Summary : Preferences - Autogenerate plot if summary is found, and default vector filter

Browse Source
This commit is contained in:
Magne Sjaastad 2016-10-24 13:54:35 +02:00
parent a65c800cf0
commit 81686707ec
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/Application/RiaApplication.cpp
View File

@ -847,10 +847,15 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas
{
newSumCase->loadCase();
RimMainPlotCollection* mainPlotColl = m_project->mainPlotCollection();
RimSummaryPlotCollection* summaryPlotColl = mainPlotColl->summaryPlotCollection();
if (m_preferences->autoCreatePlotsOnImport())
{
getOrCreateAndShowMainPlotWindow();
RimMainPlotCollection* mainPlotColl = m_project->mainPlotCollection();
RimSummaryPlotCollection* summaryPlotColl = mainPlotColl->summaryPlotCollection();
RicNewSummaryPlotFeature::createNewSummaryPlot(summaryPlotColl, newSumCase);
RicNewSummaryPlotFeature::createNewSummaryPlot(summaryPlotColl, newSumCase);
}
sumCaseColl->updateConnectedEditors();
}

14
ApplicationCode/Application/RiaPreferences.cpp
View File

@ -86,8 +86,14 @@ RiaPreferences::RiaPreferences(void)
CAF_PDM_InitFieldNoDefault(&readerSettings, "readerSettings", "Reader settings", "", "", "");
readerSettings = new RifReaderSettings;
CAF_PDM_InitField(&autoCreatePlotsOnImport, "AutoCreatePlotsOnImport", true, "Create Summary Plots When Importing Eclipse Case", "", "", "");
autoCreatePlotsOnImport.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitField(&defaultCurveFilter, "DefaultCurveFilter", QString("F*PT"), "Default Vector Selection Filter", "", "", "");
m_tabNames << "General";
m_tabNames << "Octave";
m_tabNames << "Summary";
}
//--------------------------------------------------------------------------------------------------
@ -120,7 +126,8 @@ void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt
field == &useShaders ||
field == &showHud ||
field == &appendClassNameToUiText ||
field == &showLasCurveWithoutTvdWarning )
field == &showLasCurveWithoutTvdWarning ||
field == &autoCreatePlotsOnImport)
{
caf::PdmUiCheckBoxEditorAttribute* myAttr = static_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute);
if (myAttr)
@ -178,6 +185,11 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
scriptGroup->add(&scriptDirectories);
scriptGroup->add(&scriptEditorExecutable);
}
else if (uiConfigName == m_tabNames[2])
{
uiOrdering.add(&autoCreatePlotsOnImport);
uiOrdering.add(&defaultCurveFilter);
}
uiOrdering.setForgetRemainingFields(true);
}

6
ApplicationCode/Application/RiaPreferences.h
View File

@ -75,6 +75,12 @@ public: // Pdm Fields
caf::PdmChildField<RifReaderSettings*> readerSettings;
// Summary
caf::PdmField<bool> autoCreatePlotsOnImport;
caf::PdmField<QString> defaultCurveFilter;
protected:
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute);
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);

3
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp
View File

@ -19,6 +19,7 @@
#include "RicNewSummaryPlotFeature.h"
#include "RiaApplication.h"
#include "RiaPreferences.h"
#include "RimMainPlotCollection.h"
#include "RimProject.h"
@ -102,7 +103,7 @@ void RicNewSummaryPlotFeature::createNewSummaryPlot(RimSummaryPlotCollection* su
if (summaryCase)
{
newCurveFilter->createCurves(summaryCase, "F*PT");
newCurveFilter->createCurves(summaryCase, RiaApplication::instance()->preferences()->defaultCurveFilter());
}
plot->addCurveFilter(newCurveFilter);