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

#4683 clang-format on all files in ApplicationCode

Browse Source
This commit is contained in:
Magne Sjaastad
2019-09-06 10:40:57 +02:00
parent 3a317504bb
commit fe9e567825
2092 changed files with 117952 additions and 111846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
ApplicationCode/FileInterface/RifColumnBasedUserDataParser.cpp
View File

@@ -1,17 +1,17 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2017- Statoil ASA
//
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
@@ -30,48 +30,45 @@
#include <QStringList>
#include <QTextStream>
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
RifColumnBasedUserDataParser::RifColumnBasedUserDataParser(const QString& data, QString* errorText)
: m_errorText(errorText)
RifColumnBasedUserDataParser::RifColumnBasedUserDataParser( const QString& data, QString* errorText )
: m_errorText( errorText )
{
parseTableData(data);
parseTableData( data );
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
const std::vector<TableData>& RifColumnBasedUserDataParser::tableData() const
{
return m_tableDatas;
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
const Column* RifColumnBasedUserDataParser::columnInfo(size_t tableIndex, size_t columnIndex) const
const Column* RifColumnBasedUserDataParser::columnInfo( size_t tableIndex, size_t columnIndex ) const
{
if (tableIndex >= m_tableDatas.size()) return nullptr;
if ( tableIndex >= m_tableDatas.size() ) return nullptr;
if (columnIndex >= m_tableDatas[tableIndex].columnInfos().size()) return nullptr;
if ( columnIndex >= m_tableDatas[tableIndex].columnInfos().size() ) return nullptr;
return &(m_tableDatas[tableIndex].columnInfos()[columnIndex]);
return &( m_tableDatas[tableIndex].columnInfos()[columnIndex] );
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
void RifColumnBasedUserDataParser::parseTableData(const QString& data)
void RifColumnBasedUserDataParser::parseTableData( const QString& data )
{
std::string stdData = data.toStdString();
bool isFixedWidth = RifEclipseUserDataParserTools::isFixedWidthHeader(stdData);
std::string stdData = data.toStdString();
bool isFixedWidth = RifEclipseUserDataParserTools::isFixedWidthHeader( stdData );
std::stringstream streamData;
streamData.str(stdData);
streamData.str( stdData );
std::vector<TableData> rawTables;
@@ -81,71 +78,70 @@ void RifColumnBasedUserDataParser::parseTableData(const QString& data)
TableData table;
if (isFixedWidth)
if ( isFixedWidth )
{
auto columnInfos = RifEclipseUserDataParserTools::columnInfoForFixedColumnWidth(streamData);
table = TableData("", "", columnInfos);
auto columnInfos = RifEclipseUserDataParserTools::columnInfoForFixedColumnWidth( streamData );
table = TableData( "", "", columnInfos );
}
else
{
table = RifEclipseUserDataParserTools::tableDataFromText(streamData, &errorStrings);
table = RifEclipseUserDataParserTools::tableDataFromText( streamData, &errorStrings );
}
if (m_errorText)
if ( m_errorText )
{
for (auto s : errorStrings)
for ( auto s : errorStrings )
{
QString errorText = QString("\n%1").arg(QString::fromStdString(s));
m_errorText->append(errorText);
QString errorText = QString( "\n%1" ).arg( QString::fromStdString( s ) );
m_errorText->append( errorText );
}
}
std::vector<Column>& columnInfos = table.columnInfos();
int columnCount = static_cast<int>(columnInfos.size());
if (columnCount == 0) break;
int columnCount = static_cast<int>( columnInfos.size() );
if ( columnCount == 0 ) break;
int stepTypeIndex = -1;
for (size_t i = 0; i < columnInfos.size(); i++)
for ( size_t i = 0; i < columnInfos.size(); i++ )
{
if (RifEclipseUserDataKeywordTools::isStepType(columnInfos[i].summaryAddress.quantityName()))
if ( RifEclipseUserDataKeywordTools::isStepType( columnInfos[i].summaryAddress.quantityName() ) )
{
stepTypeIndex = static_cast<int>(i);
stepTypeIndex = static_cast<int>( i );
}
}
std::string line;
std::getline(streamData, line);
std::getline( streamData, line );
do
{
QString qLine = QString::fromStdString(line);
QStringList entries = qLine.split(" ", QString::SkipEmptyParts);
QString qLine = QString::fromStdString( line );
QStringList entries = qLine.split( " ", QString::SkipEmptyParts );
if (stepTypeIndex > -1 &&
(unsigned int)entries.size() < columnInfos.size())
if ( stepTypeIndex > -1 && (unsigned int)entries.size() < columnInfos.size() )
{
entries.insert(stepTypeIndex, " ");
entries.insert( stepTypeIndex, " " );
}
if (entries.size() < columnCount) break;
if ( entries.size() < columnCount ) break;
for (int i = 0; i < columnCount; i++)
for ( int i = 0; i < columnCount; i++ )
{
if (columnInfos[i].dataType == Column::TEXT)
if ( columnInfos[i].dataType == Column::TEXT )
{
columnInfos[i].textValues.push_back(entries[i].toStdString());
columnInfos[i].textValues.push_back( entries[i].toStdString() );
}
else
{
double entry = entries[i].toDouble();
columnInfos[i].values.push_back(entry);
columnInfos[i].values.push_back( entry );
}
}
} while (std::getline(streamData, line));
} while ( std::getline( streamData, line ) );
rawTables.push_back(table);
rawTables.push_back( table );
} while (streamData.good());
} while ( streamData.good() );
m_tableDatas = RifEclipseUserDataParserTools::mergeEqualTimeSteps(rawTables);
m_tableDatas = RifEclipseUserDataParserTools::mergeEqualTimeSteps( rawTables );
}