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 with Flow Gui additions

Browse Source
This commit is contained in:
Jacob Støren
2016-12-14 11:14:21 +01:00
parent 3d49651b0c 0fc23c5610
commit 8562d0e98b
38 changed files with 531 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/WellPathCommands/RicWellPathsImportSsihubFeature.cpp
View File

@@ -80,7 +80,7 @@ void RicWellPathsImportSsihubFeature::onActionTriggered(bool isChecked)
// Keep a copy of the import settings, and restore if cancel is pressed in the import wizard
QString copyOfOriginalObject = xmlObj(app->project()->wellPathImport())->writeObjectToXmlString();
QString copyOfOriginalObject = app->project()->wellPathImport()->writeObjectToXmlString();
RiuWellImportWizard wellImportwizard(app->preferences()->ssihubAddress, wellPathsFolderPath, app->project()->wellPathImport(), RiuMainWindow::instance());
@@ -111,7 +111,7 @@ void RicWellPathsImportSsihubFeature::onActionTriggered(bool isChecked)
}
else
{
xmlObj(app->project()->wellPathImport())->readObjectFromXmlString(copyOfOriginalObject, caf::PdmDefaultObjectFactory::instance());
app->project()->wellPathImport()->readObjectFromXmlString(copyOfOriginalObject, caf::PdmDefaultObjectFactory::instance());
}
}