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

#1915 Curve creator: Remove option to make default curve filter in preferences

Browse Source
This commit is contained in:
Rebecca Cox 2017-09-29 13:23:23 +02:00
parent e1c58fd1c3
commit 05e3774d36
5 changed files with 2 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/Application/RiaPreferences.cpp
View File

@ -83,15 +83,9 @@ RiaPreferences::RiaPreferences(void)
CAF_PDM_InitFieldNoDefault(&m_readerSettings, "readerSettings", "Reader Settings", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_readerSettings, "readerSettings", "Reader Settings", "", "", "");
m_readerSettings = new RifReaderSettings; m_readerSettings = new RifReaderSettings;
CAF_PDM_InitField(&autoCreatePlotsOnImport, "AutoCreatePlotsOnImport", true, "Automatically Create Summary Plots On Import", "", "", "");
autoCreatePlotsOnImport.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
CAF_PDM_InitField(&defaultCurveFilter, "DefaultCurveFilter", QString("F*PT"), "Default Vector Selection Filter", "", "", "");
m_tabNames << "General"; m_tabNames << "General";
m_tabNames << "Eclipse"; m_tabNames << "Eclipse";
m_tabNames << "Octave"; m_tabNames << "Octave";
m_tabNames << "Summary";
m_tabNames << "System"; m_tabNames << "System";
} }
@ -125,8 +119,7 @@ void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt
field == &useShaders || field == &useShaders ||
field == &showHud || field == &showHud ||
field == &appendClassNameToUiText || field == &appendClassNameToUiText ||
field == &showLasCurveWithoutTvdWarning || field == &showLasCurveWithoutTvdWarning)
field == &autoCreatePlotsOnImport)
{ {
caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute); caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute);
if (myAttr) if (myAttr)
@ -182,11 +175,6 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
scriptGroup->add(&scriptEditorExecutable); scriptGroup->add(&scriptEditorExecutable);
} }
else if (uiConfigName == m_tabNames[3]) else if (uiConfigName == m_tabNames[3])
{
uiOrdering.add(&autoCreatePlotsOnImport);
uiOrdering.add(&defaultCurveFilter);
}
else if (uiConfigName == m_tabNames[4])
{ {
uiOrdering.add(&appendClassNameToUiText); uiOrdering.add(&appendClassNameToUiText);
} }

7
ApplicationCode/Application/RiaPreferences.h
View File

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

10
ApplicationCode/Application/Tools/RiaImportEclipseCaseTools.cpp
View File

@ -200,16 +200,6 @@ bool RiaImportEclipseCaseTools::openEclipseCaseShowTimeStepFilterImpl(const QStr
delete existingFileSummaryCase; delete existingFileSummaryCase;
} }
else
{
if (app->preferences()->autoCreatePlotsOnImport())
{
RimMainPlotCollection* mainPlotColl = project->mainPlotCollection();
RimSummaryPlotCollection* summaryPlotColl = mainPlotColl->summaryPlotCollection();
RicNewSummaryPlotFeature::createNewSummaryPlot(summaryPlotColl, newSumCase);
}
}
sumCaseColl->updateConnectedEditors(); sumCaseColl->updateConnectedEditors();
} }

11
ApplicationCode/Commands/RicImportSummaryCaseFeature.cpp
View File

@ -100,16 +100,7 @@ bool RicImportSummaryCaseFeature::createAndAddSummaryCaseFromFile(const QString&
RimSummaryCaseMainCollection* sumCaseColl = proj->activeOilField() ? proj->activeOilField()->summaryCaseMainCollection() : nullptr; RimSummaryCaseMainCollection* sumCaseColl = proj->activeOilField() ? proj->activeOilField()->summaryCaseMainCollection() : nullptr;
if (!sumCaseColl) return false; if (!sumCaseColl) return false;
RimSummaryCase* newSumCase = sumCaseColl->createAndAddSummaryCaseFromFileName(fileName); sumCaseColl->createAndAddSummaryCaseFromFileName(fileName);
if (app->preferences()->autoCreatePlotsOnImport())
{
RimMainPlotCollection* mainPlotColl = proj->mainPlotCollection();
RimSummaryPlotCollection* summaryPlotColl = mainPlotColl->summaryPlotCollection();
RicNewSummaryPlotFeature::createNewSummaryPlot(summaryPlotColl, newSumCase);
}
sumCaseColl->updateConnectedEditors(); sumCaseColl->updateConnectedEditors();
app->addToRecentFiles(fileName); app->addToRecentFiles(fileName);

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

@ -96,24 +96,8 @@ RimSummaryPlot* RicNewSummaryPlotFeature::createNewSummaryPlot(RimSummaryPlotCol
plot->setDescription(QString("Summary Plot %1").arg(summaryPlotColl->summaryPlots.size())); plot->setDescription(QString("Summary Plot %1").arg(summaryPlotColl->summaryPlots.size()));
RimSummaryCurveFilter* newCurveFilter = new RimSummaryCurveFilter();
if (summaryCase)
{
newCurveFilter->createDefaultCurves(summaryCase, RiaApplication::instance()->preferences()->defaultCurveFilter());
}
plot->addCurveFilter(newCurveFilter);
summaryPlotColl->updateConnectedEditors(); summaryPlotColl->updateConnectedEditors();
plot->loadDataAndUpdate(); plot->loadDataAndUpdate();
RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->mainPlotWindow();
if (mainPlotWindow)
{
mainPlotWindow->selectAsCurrentItem(newCurveFilter);
mainPlotWindow->setExpanded(newCurveFilter, true);
}
return plot; return plot;
} }