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

Merge remote-tracking branch 'origin/dev' into summary-template-adjustments

Browse Source
This commit is contained in:
Magne Sjaastad
2019-09-30 19:41:07 +02:00
parent 7173f1d4be f2eac1e2ec
commit 7ce7211187
19 changed files with 300 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/PlotTemplateCommands/RicCreatePlotFromTemplateByShortcutFeature.cpp
View File

@@ -61,8 +61,10 @@ void RicCreatePlotFromTemplateByShortcutFeature::onActionTriggered( bool isCheck
if ( reply == QMessageBox::No ) return;
QString fileName = RicSummaryPlotTemplateTools::selectPlotTemplatePath();
QString fileNameSelectedInUi = RicSummaryPlotTemplateTools::selectPlotTemplatePath();
if ( fileNameSelectedInUi.isEmpty() ) return;
fileName = fileNameSelectedInUi;
RiaApplication::instance()->preferences()->setDefaultPlotTemplatePath( fileName );
}

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

@@ -240,8 +240,6 @@ QString RicSummaryPlotTemplateTools::htmlTextFromCount( const QString& itemText,
//--------------------------------------------------------------------------------------------------
QString RicSummaryPlotTemplateTools::selectPlotTemplatePath()
{
QString fileName;
RiuPlotMainWindow* plotwindow = RiaGuiApplication::instance()->mainPlotWindow();
RicSelectPlotTemplateUi* ui = RiaGuiApplication::instance()->project()->dialogData()->selectPlotTemplateUi();