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

Fix crash and typo and set stat Ensemble index to 1

Browse Source
This commit is contained in:
Jacob Støren 2018-04-19 09:18:09 +02:00
parent dcde9ccf72
commit 02049abe78
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/Commands/RicImportEnsambleFeature.cpp
View File

@ -144,13 +144,13 @@ bool RicImportEnsambleFeature::validateEnsambleCases(std::vector<RimSummaryCase*
QString RicImportEnsambleFeature::askForEnsambleName() QString RicImportEnsambleFeature::askForEnsambleName()
{ {
RimProject* project = RiaApplication::instance()->project(); RimProject* project = RiaApplication::instance()->project();
int groupCount = (int)project->summaryGroups().size(); int groupCount = (int)project->summaryGroups().size() + 1;
QInputDialog dialog; QInputDialog dialog;
dialog.setInputMode(QInputDialog::TextInput); dialog.setInputMode(QInputDialog::TextInput);
dialog.setWindowTitle("Ensamble Name"); dialog.setWindowTitle("Ensemble Name");
dialog.setLabelText("Ensamble Name"); dialog.setLabelText("Ensemble Name");
dialog.setTextValue(QString("Ensamble %1").arg(groupCount)); dialog.setTextValue(QString("Ensemble %1").arg(groupCount));
dialog.resize(300, 50); dialog.resize(300, 50);
dialog.exec(); dialog.exec();
return dialog.result() == QDialog::Accepted ? dialog.textValue() : QString(""); return dialog.result() == QDialog::Accepted ? dialog.textValue() : QString("");

2
ApplicationCode/ProjectDataModel/Summary/RimEnsambleCurveSet.cpp
View File

@ -464,6 +464,8 @@ void RimEnsambleCurveSet::appendOptionItemsForSummaryAddresses(QList<caf::PdmOpt
RimSummaryCaseCollection* summaryCaseGroup, RimSummaryCaseCollection* summaryCaseGroup,
RimSummaryFilter* summaryFilter) RimSummaryFilter* summaryFilter)
{ {
if (!summaryCaseGroup) return;
std::set<RifEclipseSummaryAddress> allAddresses; std::set<RifEclipseSummaryAddress> allAddresses;
for (RimSummaryCase* summaryCase : summaryCaseGroup->allSummaryCases()) for (RimSummaryCase* summaryCase : summaryCaseGroup->allSummaryCases())