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

Refactor: Extract parser options from RicPasteAsciiDataToSummaryPlotFeatureUi

Browse Source
This commit is contained in:
Kristian Bendiksen
2024-05-27 19:13:54 +02:00
parent c79f7939b4
commit d1d3ee129f
18 changed files with 114 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.cpp
View File

@@ -153,7 +153,7 @@ std::vector<RimAsciiDataCurve*> RicPasteAsciiDataToSummaryPlotFeature::parseCurv
const RicPasteAsciiDataToSummaryPlotFeatureUi& settings )
{
std::vector<RimAsciiDataCurve*> curves;
const AsciiDataParseOptions& parseOptions = settings.parseOptions();
const RifAsciiDataParseOptions& parseOptions = settings.parseOptions();
RifCsvUserDataPastedTextParser parser = RifCsvUserDataPastedTextParser( data );
if ( !parser.parse( parseOptions ) )

4
ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp
View File

@@ -233,9 +233,9 @@ RicPasteAsciiDataToSummaryPlotFeatureUi::UiMode RicPasteAsciiDataToSummaryPlotFe
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const AsciiDataParseOptions RicPasteAsciiDataToSummaryPlotFeatureUi::parseOptions() const
const RifAsciiDataParseOptions RicPasteAsciiDataToSummaryPlotFeatureUi::parseOptions() const
{
AsciiDataParseOptions parseOptions;
RifAsciiDataParseOptions parseOptions;
parseOptions.assumeNumericDataColumns = true;
parseOptions.plotTitle = m_plotTitle();

44
ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h
View File

@@ -20,6 +20,7 @@
#include "RimPlotCurve.h"
#include "RifAsciiDataParseOptions.h"
#include "RifCsvUserDataParser.h"
#include "RifEclipseSummaryAddressDefines.h"
@@ -32,43 +33,6 @@
#include <memory>
//==================================================================================================
///
//==================================================================================================
class AsciiDataParseOptions
{
public:
AsciiDataParseOptions()
: useCustomDateTimeFormat( false )
, assumeNumericDataColumns( false )
, curveSymbolSkipDistance( 0.0f )
, defaultCategory( RifEclipseSummaryAddressDefines::SummaryCategory::SUMMARY_INVALID )
{
}
QString plotTitle;
QString curvePrefix;
QString decimalSeparator;
QLocale locale;
bool useCustomDateTimeFormat;
QString dateFormat;
QString timeFormat;
QString fallbackDateTimeFormat;
QString dateTimeFormat;
QString cellSeparator;
QString timeSeriesColumnName;
QDateTime startDateTime;
bool assumeNumericDataColumns;
RifEclipseSummaryAddressDefines::SummaryCategory defaultCategory;
RiuQwtPlotCurveDefines::LineStyleEnum curveLineStyle;
RiuPlotCurveSymbol::PointSymbolEnum curveSymbol;
float curveSymbolSkipDistance;
};
//==================================================================================================
///
//==================================================================================================
@@ -132,9 +96,9 @@ public:
void setUiModeImport( const QString& fileName );
void setUiModePasteText( const QString& text );
UiMode uiModeImport() const;
const AsciiDataParseOptions parseOptions() const;
void setCreateNewPlot();
UiMode uiModeImport() const;
const RifAsciiDataParseOptions parseOptions() const;
void setCreateNewPlot();
QString contextString() const;