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 branch 'dev' into pre-proto

Browse Source
This commit is contained in:
Magne Sjaastad
2017-06-08 14:09:03 +02:00
parent 42563ac813 e1f4dbfcf8
commit dd912b4f97
80 changed files with 913 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/RicConvertFractureTemplateUnitFeature.cpp
View File

@@ -81,11 +81,11 @@ void RicConvertFractureTemplateUnitFeature::setupActionLook(QAction* actionToSet
objHandle->firstAncestorOrThisOfType(ellipseFractureTemplate);
QString text = "Convert Values to ";
if (ellipseFractureTemplate->fractureTemplateUnit == RimDefines::UNITS_METRIC)
if (ellipseFractureTemplate->fractureTemplateUnit == RimUnitSystem::UNITS_METRIC)
{
text += "Field";
}
else if (ellipseFractureTemplate->fractureTemplateUnit == RimDefines::UNITS_FIELD)
else if (ellipseFractureTemplate->fractureTemplateUnit == RimUnitSystem::UNITS_FIELD)
{
text += "Metric";
}