Refactoring to be able to compile on Linux

This commit is contained in:
Magne Sjaastad 2017-05-16 13:36:14 +02:00
parent 7b4b13906f
commit 69116784ff
3 changed files with 26 additions and 20 deletions

View File

@ -132,22 +132,21 @@ void RicWellPathExportCompletionDataFeature::exportToFolder(RimWellPath* wellPat
// COMPDAT // COMPDAT
{ {
std::vector<RifEclipseOutputTableColumn> header = { std::vector<RifEclipseOutputTableColumn> header;
RifEclipseOutputTableColumn{"Well", LEFT}, header.push_back(RifEclipseOutputTableColumn("Well", LEFT));
RifEclipseOutputTableColumn{"I", LEFT}, header.push_back(RifEclipseOutputTableColumn("I", LEFT));
RifEclipseOutputTableColumn{"J", LEFT}, header.push_back(RifEclipseOutputTableColumn("J", LEFT));
RifEclipseOutputTableColumn{"K1", LEFT}, header.push_back(RifEclipseOutputTableColumn("K1", LEFT));
RifEclipseOutputTableColumn{"K2", LEFT}, header.push_back(RifEclipseOutputTableColumn("K2", LEFT));
RifEclipseOutputTableColumn{"Status", LEFT}, header.push_back(RifEclipseOutputTableColumn("Status", LEFT));
RifEclipseOutputTableColumn{"SAT", LEFT}, header.push_back(RifEclipseOutputTableColumn("SAT", LEFT));
RifEclipseOutputTableColumn{"TR", LEFT}, header.push_back(RifEclipseOutputTableColumn("TR", LEFT));
RifEclipseOutputTableColumn{"DIAM", LEFT}, header.push_back(RifEclipseOutputTableColumn("DIAM", LEFT));
RifEclipseOutputTableColumn{"KH", LEFT}, header.push_back(RifEclipseOutputTableColumn("KH", LEFT));
RifEclipseOutputTableColumn{"S", LEFT}, header.push_back(RifEclipseOutputTableColumn("S", LEFT));
RifEclipseOutputTableColumn{"Df", LEFT}, header.push_back(RifEclipseOutputTableColumn("Df", LEFT));
RifEclipseOutputTableColumn{"DIR", LEFT}, header.push_back(RifEclipseOutputTableColumn("DIR", LEFT));
RifEclipseOutputTableColumn{"r0", LEFT} header.push_back(RifEclipseOutputTableColumn("r0", LEFT));
};
formatter.keyword("COMPDAT"); formatter.keyword("COMPDAT");
formatter.header(header); formatter.header(header);

View File

@ -18,6 +18,8 @@
#include "RifEclipseOutputTableFormatter.h" #include "RifEclipseOutputTableFormatter.h"
#include "cvfAssert.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

View File

@ -18,8 +18,6 @@
#pragma once #pragma once
#include "cvfObject.h"
#include <QString> #include <QString>
#include <QTextStream> #include <QTextStream>
@ -57,16 +55,23 @@ struct RifEclipseOutputTableLine
//================================================================================================== //==================================================================================================
struct RifEclipseOutputTableColumn struct RifEclipseOutputTableColumn
{ {
RifEclipseOutputTableColumn(const QString& title, RifEclipseOutputTableAlignment alignment)
: title(title),
alignment(alignment),
width(-1)
{
}
QString title; QString title;
RifEclipseOutputTableAlignment alignment; RifEclipseOutputTableAlignment alignment;
int width = -1; int width;
}; };
//================================================================================================== //==================================================================================================
// //
//================================================================================================== //==================================================================================================
class RifEclipseOutputTableFormatter : public cvf::Object class RifEclipseOutputTableFormatter
{ {
public: public:
RifEclipseOutputTableFormatter(QTextStream& out); RifEclipseOutputTableFormatter(QTextStream& out);