From 8b258d6eddf09d5467bcef3a1860c958952cbc05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Wed, 11 Jul 2018 11:22:11 +0200 Subject: [PATCH] #3126 Stimplan import. Support for multi-selecting files --- .../RicNewStimPlanFractureTemplateFeature.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ApplicationCode/Commands/FractureCommands/RicNewStimPlanFractureTemplateFeature.cpp b/ApplicationCode/Commands/FractureCommands/RicNewStimPlanFractureTemplateFeature.cpp index b0905a59f8..e3e231be1c 100644 --- a/ApplicationCode/Commands/FractureCommands/RicNewStimPlanFractureTemplateFeature.cpp +++ b/ApplicationCode/Commands/FractureCommands/RicNewStimPlanFractureTemplateFeature.cpp @@ -45,9 +45,9 @@ void RicNewStimPlanFractureTemplateFeature::onActionTriggered(bool isChecked) { RiaApplication* app = RiaApplication::instance(); QString defaultDir = app->lastUsedDialogDirectory("BINARY_GRID"); - QString fileName = QFileDialog::getOpenFileName(nullptr, "Open StimPlan XML File", defaultDir, "StimPlan XML File (*.xml);;All files(*.*)"); + QStringList fileNames = QFileDialog::getOpenFileNames(nullptr, "Open StimPlan XML File", defaultDir, "StimPlan XML File (*.xml);;All files(*.*)"); - if (fileName.isEmpty()) return; + if (fileNames.isEmpty()) return; RimProject* project = RiaApplication::instance()->project(); CVF_ASSERT(project); @@ -56,9 +56,12 @@ void RicNewStimPlanFractureTemplateFeature::onActionTriggered(bool isChecked) if (oilfield == nullptr) return; RimFractureTemplateCollection* fracDefColl = oilfield->fractureDefinitionCollection(); + if (!fracDefColl) return; - if (fracDefColl) + for(auto fileName : fileNames) { + if (fileName.isEmpty()) continue; + RimStimPlanFractureTemplate* fractureDef = new RimStimPlanFractureTemplate(); fracDefColl->addFractureTemplate(fractureDef);