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

#4819 Add separate header prefix for RifTextDataTableFormatter.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/Commands/ExportCommands/RicExportSelectedWellPathsFeature.cpp
View File

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

1
ApplicationCode/Commands/RicExportContourMapToAsciiFeature.cpp
View File

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

19
ApplicationCode/FileInterface/RifTextDataTableFormatter.cpp
View File

@@ -33,6 +33,7 @@ RifTextDataTableFormatter::RifTextDataTableFormatter( QTextStream& out )
, m_tableRowPrependText( " " )
, m_tableRowAppendText( " /" )
, m_commentPrefix( "-- " )
, m_headerPrefix( "-- " )
, m_maxDataRowWidth( MAX_ECLIPSE_DATA_ROW_WIDTH )
{
}
@@ -123,6 +124,22 @@ void RifTextDataTableFormatter::setCommentPrefix( const QString& 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 ) )
{
m_out << m_commentPrefix;
m_out << m_headerPrefix;
for ( size_t i = 0u; i < m_columns.size(); ++i )
{
m_out << formatColumn( m_columns[i].title, i );

3
ApplicationCode/FileInterface/RifTextDataTableFormatter.h
View File

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

1
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp
View File

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