#4819 Add separate header prefix for RifTextDataTableFormatter.

This commit is contained in:
Gaute Lindkvist
2019-10-15 14:18:57 +02:00
committed by Kristian Bendiksen
parent 7f3240fd70
commit b3dd2109ac
5 changed files with 24 additions and 1 deletions

View File

@@ -104,6 +104,7 @@ void RicExportSelectedWellPathsFeature::writeWellPathGeometryToStream( QTextStre
double endMd = wellPathGeom->measureDepths().back(); double endMd = wellPathGeom->measureDepths().back();
RifTextDataTableFormatter formatter( stream ); RifTextDataTableFormatter formatter( stream );
formatter.setHeaderPrefix( "# " );
formatter.setCommentPrefix( "# " ); formatter.setCommentPrefix( "# " );
formatter.setTableRowPrependText( " " ); formatter.setTableRowPrependText( " " );

View File

@@ -106,6 +106,7 @@ void RicExportContourMapToAsciiFeature::onActionTriggered( bool isChecked )
formatter.setTableRowLineAppendText( "" ); formatter.setTableRowLineAppendText( "" );
formatter.setTableRowPrependText( "" ); formatter.setTableRowPrependText( "" );
formatter.setCommentPrefix( "#" ); formatter.setCommentPrefix( "#" );
formatter.setHeaderPrefix( "" );
std::vector<RifTextDataTableColumn> header = { std::vector<RifTextDataTableColumn> header = {
RifTextDataTableColumn( "x" ), RifTextDataTableColumn( "x" ),

View File

@@ -33,6 +33,7 @@ RifTextDataTableFormatter::RifTextDataTableFormatter( QTextStream& out )
, m_tableRowPrependText( " " ) , m_tableRowPrependText( " " )
, m_tableRowAppendText( " /" ) , m_tableRowAppendText( " /" )
, m_commentPrefix( "-- " ) , m_commentPrefix( "-- " )
, m_headerPrefix( "-- " )
, m_maxDataRowWidth( MAX_ECLIPSE_DATA_ROW_WIDTH ) , m_maxDataRowWidth( MAX_ECLIPSE_DATA_ROW_WIDTH )
{ {
} }
@@ -123,6 +124,22 @@ void RifTextDataTableFormatter::setCommentPrefix( const QString& commentPrefix )
m_commentPrefix = commentPrefix; m_commentPrefix = commentPrefix;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RifTextDataTableFormatter::headerPrefix() const
{
return m_headerPrefix;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifTextDataTableFormatter::setHeaderPrefix( const QString& headerPrefix )
{
m_headerPrefix = headerPrefix;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -146,7 +163,7 @@ void RifTextDataTableFormatter::outputBuffer()
{ {
if ( !m_columns.empty() && !isAllHeadersEmpty( m_columns ) ) if ( !m_columns.empty() && !isAllHeadersEmpty( m_columns ) )
{ {
m_out << m_commentPrefix; m_out << m_headerPrefix;
for ( size_t i = 0u; i < m_columns.size(); ++i ) for ( size_t i = 0u; i < m_columns.size(); ++i )
{ {
m_out << formatColumn( m_columns[i].title, i ); m_out << formatColumn( m_columns[i].title, i );

View File

@@ -119,6 +119,8 @@ public:
void setTableRowLineAppendText( const QString& text ); void setTableRowLineAppendText( const QString& text );
QString commentPrefix() const; QString commentPrefix() const;
void setCommentPrefix( const QString& commentPrefix ); void setCommentPrefix( const QString& commentPrefix );
QString headerPrefix() const;
void setHeaderPrefix( const QString& headerPrefix );
void setUnlimitedDataRowWidth(); void setUnlimitedDataRowWidth();
int maxDataRowWidth() const; int maxDataRowWidth() const;
@@ -167,5 +169,6 @@ private:
QString m_tableRowPrependText; QString m_tableRowPrependText;
QString m_tableRowAppendText; QString m_tableRowAppendText;
QString m_commentPrefix; QString m_commentPrefix;
QString m_headerPrefix;
int m_maxDataRowWidth; int m_maxDataRowWidth;
}; };

View File

@@ -606,6 +606,7 @@ QString RimGridCrossPlot::asciiDataForPlotExport( int dataSetIndex ) const
RifTextDataTableFormatter formatter( stringStream ); RifTextDataTableFormatter formatter( stringStream );
formatter.setCommentPrefix( "" ); formatter.setCommentPrefix( "" );
formatter.setHeaderPrefix( "" );
formatter.setTableRowPrependText( "" ); formatter.setTableRowPrependText( "" );
formatter.setTableRowLineAppendText( "" ); formatter.setTableRowLineAppendText( "" );
formatter.setColumnSpacing( 3 ); formatter.setColumnSpacing( 3 );