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

ASCII import dialog. Determine default decimal separator

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-11-27 12:39:12 +01:00
parent e53059e2c8
commit bdc680bc03
3 changed files with 72 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp
View File

@@ -103,6 +103,17 @@ QString mapCellSeparator(RicPasteAsciiDataToSummaryPlotFeatureUi::CellSeparator
return "";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicPasteAsciiDataToSummaryPlotFeatureUi::DecimalSeparator mapDecimalSeparator(const QString& sep)
{
if (sep == ".") return RicPasteAsciiDataToSummaryPlotFeatureUi::DECIMAL_DOT;
if (sep == ",") return RicPasteAsciiDataToSummaryPlotFeatureUi::DECIMAL_COMMA;
return RicPasteAsciiDataToSummaryPlotFeatureUi::DECIMAL_DOT;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -173,12 +184,12 @@ const AsciiDataParseOptions RicPasteAsciiDataToSummaryPlotFeatureUi::parseOption
{
case DECIMAL_COMMA:
parseOptions.decimalSeparator = ",";
parseOptions.locale = QLocale::Norwegian;
parseOptions.locale = RifCsvUserDataParser::localeFromDecimalSeparator(",");
break;
case DECIMAL_DOT:
default:
parseOptions.decimalSeparator = ".";
parseOptions.locale = QLocale::c();
parseOptions.locale = RifCsvUserDataParser::localeFromDecimalSeparator(".");
break;
}
}
@@ -340,6 +351,12 @@ void RicPasteAsciiDataToSummaryPlotFeatureUi::initialize(RifCsvUserDataParser* p
if (!cellSep.isEmpty())
{
m_cellSeparator = mapCellSeparator(cellSep);
QString decimalSep = parser->tryDetermineDecimalSeparator(cellSep);
if (!decimalSep.isEmpty())
{
m_decimalSeparator = mapDecimalSeparator(decimalSep);
}
}
parser->parseColumnInfo(parseOptions().cellSeparator);