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

#5232 Templates: Do not write dialog fields to project file

Browse Source
This commit is contained in:
Magne Sjaastad
2019-12-17 07:32:19 +01:00
parent af6e713414
commit 0b2a78b211
3 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp
View File

@@ -330,15 +330,15 @@ QString RicSummaryPlotTemplateTools::htmlTextFromCount( const QString& itemText,
//--------------------------------------------------------------------------------------------------
QString RicSummaryPlotTemplateTools::selectPlotTemplatePath()
{
RiuPlotMainWindow* plotwindow = RiaGuiApplication::instance()->mainPlotWindow();
RicSelectPlotTemplateUi* ui = RiaGuiApplication::instance()->project()->dialogData()->selectPlotTemplateUi();
RiuPlotMainWindow* plotwindow = RiaGuiApplication::instance()->mainPlotWindow();
RicSelectPlotTemplateUi ui;
caf::PdmUiPropertyViewDialog propertyDialog( plotwindow, ui, "Select Plot Template", "" );
caf::PdmUiPropertyViewDialog propertyDialog( plotwindow, &ui, "Select Plot Template", "" );
propertyDialog.resize( QSize( 400, 600 ) );
if ( propertyDialog.exec() == QDialog::Accepted && !ui->selectedPlotTemplates().empty() )
if ( propertyDialog.exec() == QDialog::Accepted && !ui.selectedPlotTemplates().empty() )
{
QString fileName = ui->selectedPlotTemplates().front()->absoluteFilePath();
QString fileName = ui.selectedPlotTemplates().front()->absoluteFilePath();
RiaApplication::instance()->preferences()->setDefaultPlotTemplatePath( fileName );
RiaApplication::instance()->preferences()->writePreferencesToApplicationStore();

12
ApplicationCode/ProjectDataModel/RimDialogData.cpp
View File

@@ -27,7 +27,6 @@
#include "ExportCommands/RicExportWellPathsUi.h"
#include "FractureCommands/RicCreateMultipleFracturesUi.h"
#include "HoloLensCommands/RicHoloLensExportToFolderUi.h"
#include "PlotTemplateCommands/RicSelectPlotTemplateUi.h"
CAF_PDM_SOURCE_INIT( RimDialogData, "RimDialogData" );
@@ -66,9 +65,6 @@ 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();
}
//--------------------------------------------------------------------------------------------------
@@ -159,11 +155,3 @@ RimMockModelSettings* RimDialogData::mockModelSettings() const
{
return m_mockModelSettings;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSelectPlotTemplateUi* RimDialogData::selectPlotTemplateUi() const
{
return m_selectPlotTemplateUi;
}

4
ApplicationCode/ProjectDataModel/RimDialogData.h
View File

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