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

Prefix enum values with RIF_

Browse Source 
FLOAT causes Cotire compile to fail
This commit is contained in:
Magne Sjaastad 2017-08-10 15:07:56 +02:00
parent 5775c3bb20
commit 624f14da46
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp
View File

@ -469,7 +469,7 @@ void RicWellPathExportCompletionDataFeature::generateCompdatTable(RifEclipseData
RifEclipseOutputTableColumn("K2"), RifEclipseOutputTableColumn("K2"),
RifEclipseOutputTableColumn("Status"), RifEclipseOutputTableColumn("Status"),
RifEclipseOutputTableColumn("SAT"), RifEclipseOutputTableColumn("SAT"),
RifEclipseOutputTableColumn("TR", RifEclipseOutputTableDoubleFormatting(RifEclipseOutputTableDoubleFormat::SCIENTIFIC)), RifEclipseOutputTableColumn("TR", RifEclipseOutputTableDoubleFormatting(RifEclipseOutputTableDoubleFormat::RIF_SCIENTIFIC)),
RifEclipseOutputTableColumn("DIAM"), RifEclipseOutputTableColumn("DIAM"),
RifEclipseOutputTableColumn("KH"), RifEclipseOutputTableColumn("KH"),
RifEclipseOutputTableColumn("S"), RifEclipseOutputTableColumn("S"),

4
ApplicationCode/FileInterface/RifEclipseDataTableFormatter.cpp
View File

@ -248,9 +248,9 @@ QString RifEclipseDataTableFormatter::format(double num, RifEclipseOutputTableDo
{ {
switch (doubleFormat.format) switch (doubleFormat.format)
{ {
case RifEclipseOutputTableDoubleFormat::FLOAT: case RifEclipseOutputTableDoubleFormat::RIF_FLOAT:
return QString("%1").arg(num, 0, 'f', doubleFormat.width); return QString("%1").arg(num, 0, 'f', doubleFormat.width);
case RifEclipseOutputTableDoubleFormat::SCIENTIFIC: case RifEclipseOutputTableDoubleFormat::RIF_SCIENTIFIC:
return QString("%1").arg(num, 0, 'E'); return QString("%1").arg(num, 0, 'E');
default: default:
return QString("%1"); return QString("%1");

6
ApplicationCode/FileInterface/RifEclipseDataTableFormatter.h
View File

@ -46,8 +46,8 @@ enum RifEclipseOutputTableAlignment
//================================================================================================== //==================================================================================================
enum RifEclipseOutputTableDoubleFormat enum RifEclipseOutputTableDoubleFormat
{ {
SCIENTIFIC, RIF_SCIENTIFIC,
FLOAT, RIF_FLOAT,
}; };
//================================================================================================== //==================================================================================================
@ -64,7 +64,7 @@ struct RifEclipseOutputTableLine
//================================================================================================== //==================================================================================================
struct RifEclipseOutputTableDoubleFormatting struct RifEclipseOutputTableDoubleFormatting
{ {
RifEclipseOutputTableDoubleFormatting(RifEclipseOutputTableDoubleFormat format = FLOAT, int width = 5) RifEclipseOutputTableDoubleFormatting(RifEclipseOutputTableDoubleFormat format = RIF_FLOAT, int width = 5)
: format(format), : format(format),
width(width) width(width)
{} {}