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

#3975 Avoid wrapping header lines in eclipse output + well plan

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-01-18 14:55:12 +01:00
parent b800510568
commit 4cd43d76d2
4 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ApplicationCode/FileInterface/RifEclipseDataTableFormatter.cpp
View File

@@ -20,6 +20,8 @@
#include "cvfAssert.h"
#define MAX_ECLIPSE_DATA_ROW_WIDTH 132 // Maximum eclipse data row width
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -29,6 +31,7 @@ RifEclipseDataTableFormatter::RifEclipseDataTableFormatter(QTextStream& out)
, m_tableRowPrependText(" ")
, m_tableRowAppendText(" /")
, m_commentPrefix("--")
, m_maxDataRowWidth(MAX_ECLIPSE_DATA_ROW_WIDTH)
{
}
@@ -117,6 +120,30 @@ void RifEclipseDataTableFormatter::setCommentPrefix(const QString& commentPrefix
m_commentPrefix = commentPrefix;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifEclipseDataTableFormatter::setUnlimitedDataRowWidth()
{
m_maxDataRowWidth = std::numeric_limits<int>::max();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifEclipseDataTableFormatter::setMaxDataRowWidth(int maxWidth)
{
m_maxDataRowWidth = maxWidth;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RifEclipseDataTableFormatter::maxDataRowWidth() const
{
return m_maxDataRowWidth;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -145,6 +172,7 @@ void RifEclipseDataTableFormatter::outputBuffer()
else if (line.lineType == CONTENTS)
{
QString lineText = m_tableRowPrependText;
bool isComment = m_tableRowPrependText.startsWith(m_commentPrefix);
QString appendText = (line.appendTextSet ? line.appendText : m_tableRowAppendText);
for (size_t i = 0; i < line.data.size(); ++i)
@@ -155,7 +183,7 @@ void RifEclipseDataTableFormatter::outputBuffer()
{
newLineText += appendText;
}
if (newLineText.length() > maxEclipseRowWidth())
if (!isComment && newLineText.length() > maxDataRowWidth())
{
m_out << lineText << "\n";
lineText = m_tableRowPrependText;
@@ -483,14 +511,6 @@ int RifEclipseDataTableFormatter::tableWidth() const
return characterCount;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RifEclipseDataTableFormatter::maxEclipseRowWidth()
{
return 132;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------