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

#4733 Summary Template : Add reload of templates

Browse Source 
Adjust save and load of templates
Add save path to preferences
This commit is contained in:
Magne Sjaastad
2019-09-19 11:39:32 +02:00
parent c6dbc34183
commit f2ac170b66
19 changed files with 535 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp
View File

@@ -55,6 +55,9 @@ RimPlotTemplateFolderItem::~RimPlotTemplateFolderItem() {}
//--------------------------------------------------------------------------------------------------
void RimPlotTemplateFolderItem::createRootFolderItemsFromFolderPaths( const QStringList& folderPaths )
{
m_fileNames.deleteAllChildObjects();
m_subFolders.deleteAllChildObjects();
createSubFolderItemsFromFolderPaths( folderPaths );
}

30
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@@ -21,6 +21,8 @@
#include "RiaApplication.h"
#include "PlotTemplates/RimPlotTemplateFileItem.h"
#include "PlotTemplates/RimPlotTemplateFolderItem.h"
#include "Rim3dOverlayInfoConfig.h"
#include "Rim3dWellLogCurveCollection.h"
#include "Rim3dWellLogExtractionCurve.h"
@@ -43,6 +45,7 @@
#include "RimEclipsePropertyFilterCollection.h"
#include "RimEclipseStatisticsCase.h"
#include "RimEclipseView.h"
#include "RimEllipseFractureTemplate.h"
#include "RimEnsembleCurveFilterCollection.h"
#include "RimEnsembleCurveSet.h"
#include "RimEnsembleCurveSetCollection.h"
@@ -55,6 +58,8 @@
#include "RimFlowPlotCollection.h"
#include "RimFormationNames.h"
#include "RimFormationNamesCollection.h"
#include "RimFractureTemplate.h"
#include "RimFractureTemplateCollection.h"
#include "RimGeoMechCase.h"
#include "RimGeoMechContourMapViewCollection.h"
#include "RimGeoMechPropertyFilter.h"
@@ -68,6 +73,7 @@
#include "RimIntersection.h"
#include "RimIntersectionBox.h"
#include "RimIntersectionCollection.h"
#include "RimModeledWellPath.h"
#include "RimObservedSummaryData.h"
#include "RimPerforationCollection.h"
#include "RimPerforationInterval.h"
@@ -76,8 +82,10 @@
#include "RimRftPlotCollection.h"
#include "RimSaturationPressurePlotCollection.h"
#include "RimScriptCollection.h"
#include "RimSimWellFracture.h"
#include "RimSimWellInView.h"
#include "RimSimWellInViewCollection.h"
#include "RimStimPlanFractureTemplate.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
@@ -87,6 +95,8 @@
#include "RimSummaryCurveCollection.h"
#include "RimSummaryPlot.h"
#include "RimSummaryPlotCollection.h"
#include "RimValveTemplate.h"
#include "RimValveTemplateCollection.h"
#include "RimViewController.h"
#include "RimViewLinker.h"
#include "RimViewLinkerCollection.h"
@@ -101,21 +111,11 @@
#include "RimWellPathAttributeCollection.h"
#include "RimWellPathCollection.h"
#include "RimWellPathCompletions.h"
#include "RimWellPathFracture.h"
#include "RimWellPathFractureCollection.h"
#include "RimWellPltPlot.h"
#include "RimWellRftPlot.h"
#include "RimEllipseFractureTemplate.h"
#include "RimFractureTemplate.h"
#include "RimFractureTemplateCollection.h"
#include "RimModeledWellPath.h"
#include "RimSimWellFracture.h"
#include "RimStimPlanFractureTemplate.h"
#include "RimValveTemplate.h"
#include "RimValveTemplateCollection.h"
#include "RimWellPathFracture.h"
#include "RimWellPathFractureCollection.h"
#include "RiuMainWindow.h"
#include "OctaveScriptCommands/RicExecuteScriptForCasesFeature.h"
@@ -548,14 +548,12 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicDuplicateSummaryCrossPlotFeature";
menuBuilder << "RicNewSummaryCrossPlotCurveFeature";
menuBuilder << "Separator";
menuBuilder << "RicShowSummaryCurveCalculatorFeature";
menuBuilder << "Separator";
menuBuilder << "RicSavePlotTemplateFeature";
menuBuilder << "Separator";
// Export is not supported for cross plot
if ( !summaryCrossPlot ) menuBuilder << "RicAsciiExportSummaryPlotFeature";
menuBuilder << "RicShowSummaryCurveCalculatorFeature";
menuBuilder << "Separator";
menuBuilder << "RicCopyReferencesToClipboardFeature";
menuBuilder << "Separator";
@@ -792,6 +790,10 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
{
menuBuilder << "RicCreateTextAnnotationFeature";
}
else if ( dynamic_cast<RimPlotTemplateFolderItem*>( uiItem ) || dynamic_cast<RimPlotTemplateFileItem*>( uiItem ) )
{
menuBuilder << "RicReloadPlotTemplatesFeature";
}
if ( dynamic_cast<Rim3dView*>( uiItem ) )
{
menuBuilder << "Separator";

12
ApplicationCode/ProjectDataModel/RimDialogData.cpp
View File

@@ -27,6 +27,7 @@
#include "ExportCommands/RicExportWellPathsUi.h"
#include "FractureCommands/RicCreateMultipleFracturesUi.h"
#include "HoloLensCommands/RicHoloLensExportToFolderUi.h"
#include "PlotTemplateCommands/RicSelectPlotTemplateUI.h"
CAF_PDM_SOURCE_INIT( RimDialogData, "RimDialogData" );
@@ -65,6 +66,9 @@ RimDialogData::RimDialogData()
CAF_PDM_InitFieldNoDefault( &m_mockModelSettings, "MockModelSettings", "Mock Model Settings", "", "", "" );
m_mockModelSettings = new RimMockModelSettings();
CAF_PDM_InitFieldNoDefault( &m_selectPlotTemplateUi, "SelectPlotTemplateUi", "Select Plot Template", "", "", "" );
m_selectPlotTemplateUi = new RicSelectPlotTemplateUi();
}
//--------------------------------------------------------------------------------------------------
@@ -155,3 +159,11 @@ RimMockModelSettings* RimDialogData::mockModelSettings() const
{
return m_mockModelSettings;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSelectPlotTemplateUi* RimDialogData::selectPlotTemplateUi() const
{
return m_selectPlotTemplateUi;
}

4
ApplicationCode/ProjectDataModel/RimDialogData.h
View File

@@ -29,6 +29,7 @@ class RicHoloLensExportToFolderUi;
class RicExportWellPathsUi;
class RicExportLgrUi;
class RimMockModelSettings;
class RicSelectPlotTemplateUi;
//==================================================================================================
///
@@ -62,6 +63,8 @@ public:
RicExportEclipseSectorModelUi* exportSectorModelUi() const;
RimMockModelSettings* mockModelSettings() const;
RicSelectPlotTemplateUi* selectPlotTemplateUi() const;
private:
caf::PdmChildField<RicExportCarfinUi*> m_exportCarfin;
caf::PdmChildField<RicExportCompletionDataSettingsUi*> m_exportCompletionData;
@@ -71,4 +74,5 @@ private:
caf::PdmChildField<RicExportLgrUi*> m_exportLgrData;
caf::PdmChildField<RicExportEclipseSectorModelUi*> m_exportSectorModelData;
caf::PdmChildField<RimMockModelSettings*> m_mockModelSettings;
caf::PdmChildField<RicSelectPlotTemplateUi*> m_selectPlotTemplateUi;
};

6
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@@ -363,8 +363,10 @@ void RimProject::setScriptDirectories( const QString& scriptDirectories )
//--------------------------------------------------------------------------------------------------
void RimProject::setPlotTemplateFolders( const QStringList& plotTemplateFolders )
{
if ( m_plotTemplateFolderItem() ) delete m_plotTemplateFolderItem();
m_plotTemplateFolderItem = new RimPlotTemplateFolderItem();
if ( !m_plotTemplateFolderItem() )
{
m_plotTemplateFolderItem = new RimPlotTemplateFolderItem();
}
m_plotTemplateFolderItem->createRootFolderItemsFromFolderPaths( plotTemplateFolders );
}