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

Rename RifEclipseOutputDataTable* to RifTextDataTable*

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-10-15 11:30:06 +02:00
committed by Kristian Bendiksen
parent 98f9eef0da
commit d681b75d24
26 changed files with 611 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp
View File

@@ -774,13 +774,13 @@ QString RimFlowCharacteristicsPlot::curveDataAsText() const
QTextStream stream( &tableText );
RifCsvDataTableFormatter formatter( stream, fieldSeparator );
std::vector<RifEclipseOutputTableColumn> header = {
RifEclipseOutputTableColumn( "Date" ),
RifEclipseOutputTableColumn( "StorageCapacity" ),
RifEclipseOutputTableColumn( "FlowCapacity" ),
RifEclipseOutputTableColumn( "SweepEfficiency" ),
RifEclipseOutputTableColumn( "DimensionlessTime" ),
RifEclipseOutputTableColumn( "LorentzCoefficient" ),
std::vector<RifTextDataTableColumn> header = {
RifTextDataTableColumn( "Date" ),
RifTextDataTableColumn( "StorageCapacity" ),
RifTextDataTableColumn( "FlowCapacity" ),
RifTextDataTableColumn( "SweepEfficiency" ),
RifTextDataTableColumn( "DimensionlessTime" ),
RifTextDataTableColumn( "LorentzCoefficient" ),
};
formatter.header( header );

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

@@ -21,7 +21,7 @@
#include "RiaFontCache.h"
#include "RiaPreferences.h"
#include "RifEclipseDataTableFormatter.h"
#include "RifTextDataTableFormatter.h"
#include "RiuGridCrossQwtPlot.h"
#include "RiuPlotMainWindowTools.h"
#include "RiuQwtPlotTools.h"
@@ -604,7 +604,7 @@ QString RimGridCrossPlot::asciiDataForPlotExport( int dataSetIndex ) const
QString asciiData;
QTextStream stringStream( &asciiData );
RifEclipseDataTableFormatter formatter( stringStream );
RifTextDataTableFormatter formatter( stringStream );
formatter.setCommentPrefix( "" );
formatter.setTableRowPrependText( "" );
formatter.setTableRowLineAppendText( "" );

15
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp
View File

@@ -22,7 +22,7 @@
#include "RiaColorTables.h"
#include "RiaLogging.h"
#include "RifEclipseDataTableFormatter.h"
#include "RifTextDataTableFormatter.h"
#include "RigActiveCellInfo.h"
#include "RigActiveCellsResultAccessor.h"
@@ -1093,7 +1093,7 @@ void RimGridCrossPlotDataSet::swapAxisProperties( bool updatePlot )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridCrossPlotDataSet::exportFormattedData( RifEclipseDataTableFormatter& formatter ) const
void RimGridCrossPlotDataSet::exportFormattedData( RifTextDataTableFormatter& formatter ) const
{
if ( m_groupedResults.empty() ) return;
@@ -1102,17 +1102,16 @@ void RimGridCrossPlotDataSet::exportFormattedData( RifEclipseDataTableFormatter&
if ( m_grouping != NO_GROUPING )
{
std::vector<RifEclipseOutputTableColumn> header = {RifEclipseOutputTableColumn( xTitle ),
RifEclipseOutputTableColumn( yTitle ),
RifEclipseOutputTableColumn( "Group Index" ),
RifEclipseOutputTableColumn( "Group Description" )};
std::vector<RifTextDataTableColumn> header = {RifTextDataTableColumn( xTitle ),
RifTextDataTableColumn( yTitle ),
RifTextDataTableColumn( "Group Index" ),
RifTextDataTableColumn( "Group Description" )};
formatter.header( header );
}
else
{
std::vector<RifEclipseOutputTableColumn> header = {RifEclipseOutputTableColumn( xTitle ),
RifEclipseOutputTableColumn( yTitle )};
std::vector<RifTextDataTableColumn> header = {RifTextDataTableColumn( xTitle ), RifTextDataTableColumn( yTitle )};
formatter.header( header );
}

4
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.h
View File

@@ -38,7 +38,7 @@
#include <QList>
#include <map>
class RifEclipseDataTableFormatter;
class RifTextDataTableFormatter;
class RimCase;
class RimGridCrossPlotCurve;
class RimGridView;
@@ -122,7 +122,7 @@ public:
bool groupingByCategoryResult() const;
bool groupingEnabled() const;
void swapAxisProperties( bool updatePlot );
void exportFormattedData( RifEclipseDataTableFormatter& formatter ) const;
void exportFormattedData( RifTextDataTableFormatter& formatter ) const;
bool isXAxisLogarithmic() const;
bool isYAxisLogarithmic() const;

6
ApplicationCode/ProjectDataModel/RimModeledWellPath.cpp
View File

@@ -24,7 +24,7 @@
#include "RigWellPath.h"
#include "RiaCompletionTypeCalculationScheduler.h"
#include "RifEclipseDataTableFormatter.h"
#include "RifTextDataTableFormatter.h"
#include "RimIntersection.h"
#include "RimPlotCurve.h"
#include "RimWellPath.h"
@@ -120,12 +120,12 @@ QString RimModeledWellPath::wellPlanText()
QString planText;
QTextStream qtxtStream( &planText );
RifEclipseDataTableFormatter formatter( qtxtStream );
RifTextDataTableFormatter formatter( qtxtStream );
formatter.setUnlimitedDataRowWidth();
formatter.setTableRowPrependText( "" );
formatter.setTableRowLineAppendText( "" );
std::vector<RifEclipseOutputTableColumn> tableHeader;
std::vector<RifTextDataTableColumn> tableHeader;
tableHeader.push_back( {"MDRKB"} );
tableHeader.push_back( {"CL"} );
tableHeader.push_back( {"Inc"} );