#4587 Summ. Comm. Line: Use only cases defined in --summaryplot when creating curves. Use first of them as history refernce etc.

This commit is contained in:
Jacob Støren 2019-08-20 12:16:28 +02:00 committed by Gaute Lindkvist
parent 46104f426a
commit 0770517c9f

View File

@ -37,6 +37,9 @@
#include "RicImportGeneralDataFeature.h" #include "RicImportGeneralDataFeature.h"
#include <QStringList> #include <QStringList>
#include "RicImportSummaryCasesFeature.h"
#include "RiaDefines.h"
#include <QFileInfo>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@ -209,10 +212,12 @@ RimSummaryPlot* RicSummaryPlotFeatureImpl::createSummaryPlotFromArgumentLine(con
RiaLogging::error("Needs at least one summary vector to create a plot."); RiaLogging::error("Needs at least one summary vector to create a plot.");
} }
std::vector<RimSummaryCase*> summaryCasesToUse;
if ( summaryFiles.size() ) if ( summaryFiles.size() )
{ {
RicImportGeneralDataFeature::OpenCaseResults results = RicImportSummaryCasesFeature::createAndAddSummaryCasesFromFiles(summaryFiles, false, &summaryCasesToUse);
RicImportGeneralDataFeature::openEclipseFilesFromFileNames(summaryFiles, false); RiaApplication::instance()->setLastUsedDialogDirectory(RiaDefines::defaultDirectoryLabel(RiaDefines::ECLIPSE_SUMMARY_FILE), QFileInfo(summaryFiles[0]).absolutePath());
} }
bool hideLegend = options.contains("-nl"); bool hideLegend = options.contains("-nl");
@ -220,7 +225,7 @@ RimSummaryPlot* RicSummaryPlotFeatureImpl::createSummaryPlotFromArgumentLine(con
bool isNormalizedY = options.contains("-n"); bool isNormalizedY = options.contains("-n");
bool isSinglePlot = options.contains("-s"); bool isSinglePlot = options.contains("-s");
std::vector<RimSummaryCase*> summaryCasesToUse = RiaApplication::instance()->project()->allSummaryCases();
if ( summaryCasesToUse.size() ) if ( summaryCasesToUse.size() )
{ {