Merge remote-tracking branch 'origin/dev' into pre-proto

This commit is contained in:
Magne Sjaastad
2017-08-15 15:26:36 +02:00
3 changed files with 15 additions and 7 deletions

View File

@@ -166,6 +166,7 @@ RifWellPathImporter::WellData RifWellPathImporter::readJsonWellData(const QStrin
double datumElevation = jsonMap["datumElevation"].toDouble();
QList<QVariant> pathList = jsonMap["path"].toList();
WellData wellData;
wellData.m_wellPathGeometry = new RigWellPath;
wellData.m_wellPathGeometry->setDatumElevation(datumElevation);
wellData.m_name = jsonMap["name"].toString();