#4683 clang-format on all files in ApplicationCode

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

View File

@@ -1,25 +1,25 @@
/////////////////////////////////////////////////////////////////////////////////
//
// 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.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RifReaderObservedData.h"
#include "RifEclipseSummaryAddress.h"
#include "RifCsvUserDataParser.h"
#include "RifEclipseSummaryAddress.h"
#include "SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h"
@@ -27,58 +27,76 @@
#include <QTextStream>
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
RifReaderObservedData::RifReaderObservedData()
{
}
RifReaderObservedData::RifReaderObservedData() {}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
RifReaderObservedData::~RifReaderObservedData()
{
}
RifReaderObservedData::~RifReaderObservedData() {}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
bool RifReaderObservedData::open(const QString& headerFileName,
const QString& identifierName,
RifEclipseSummaryAddress::SummaryVarCategory summaryCategory)
bool RifReaderObservedData::open( const QString& headerFileName,
const QString& identifierName,
RifEclipseSummaryAddress::SummaryVarCategory summaryCategory )
{
AsciiDataParseOptions parseOptions;
parseOptions.dateFormat = "yyyy-MM-dd";
parseOptions.dateFormat = "yyyy-MM-dd";
parseOptions.cellSeparator = "\t";
parseOptions.locale = QLocale::Norwegian;
parseOptions.locale = QLocale::Norwegian;
QString data;
QTextStream out(&data);
out << "Date" << "\t" << "Oil" << "\t" << "PW" << "\n";
out << "1993-02-23" << "\t" << "10" << "\t" << "1" << "\n";
out << "1993-06-15" << "\t" << "20" << "\t" << "2" << "\n";
out << "1994-02-26" << "\t" << "30" << "\t" << "3" << "\n";
out << "1994-05-23" << "\t" << "40" << "\t" << "4" << "\n";
QString data;
QTextStream out( &data );
out << "Date"
<< "\t"
<< "Oil"
<< "\t"
<< "PW"
<< "\n";
out << "1993-02-23"
<< "\t"
<< "10"
<< "\t"
<< "1"
<< "\n";
out << "1993-06-15"
<< "\t"
<< "20"
<< "\t"
<< "2"
<< "\n";
out << "1994-02-26"
<< "\t"
<< "30"
<< "\t"
<< "3"
<< "\n";
out << "1994-05-23"
<< "\t"
<< "40"
<< "\t"
<< "4"
<< "\n";
m_asciiParser = std::unique_ptr<RifCsvUserDataParser>(new RifCsvUserDataPastedTextParser(data));
m_asciiParser = std::unique_ptr<RifCsvUserDataParser>( new RifCsvUserDataPastedTextParser( data ) );
m_timeSteps.clear();
if (m_asciiParser->parse(parseOptions))
if ( m_asciiParser->parse( parseOptions ) )
{
if (m_asciiParser && m_asciiParser->dateTimeColumn())
if ( m_asciiParser && m_asciiParser->dateTimeColumn() )
{
for (time_t timeStep : m_asciiParser->dateTimeColumn()->dateTimeValues)
for ( time_t timeStep : m_asciiParser->dateTimeColumn()->dateTimeValues )
{
m_timeSteps.push_back(timeStep);
m_timeSteps.push_back( timeStep );
}
m_allResultAddresses.clear();
for (auto s : m_asciiParser->tableData().columnInfos())
for ( auto s : m_asciiParser->tableData().columnInfos() )
{
m_allResultAddresses.insert(s.summaryAddress);
m_allResultAddresses.insert( s.summaryAddress );
}
}
@@ -88,30 +106,30 @@ bool RifReaderObservedData::open(const QString& headerFileName,
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
bool RifReaderObservedData::values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values) const
bool RifReaderObservedData::values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const
{
size_t columnIndex = m_allResultAddresses.size();
int i = 0;
for(auto& address : m_allResultAddresses)
for ( auto& address : m_allResultAddresses )
{
if (address == resultAddress)
if ( address == resultAddress )
{
columnIndex = i;
}
i++;
}
if (columnIndex != m_allResultAddresses.size())
if ( columnIndex != m_allResultAddresses.size() )
{
const Column* col = m_asciiParser->columnInfo(columnIndex);
if (col && col->dataType == Column::NUMERIC)
const Column* col = m_asciiParser->columnInfo( columnIndex );
if ( col && col->dataType == Column::NUMERIC )
{
for (auto& v : col->values)
for ( auto& v : col->values )
{
values->push_back(v);
values->push_back( v );
}
}
}
@@ -120,65 +138,67 @@ bool RifReaderObservedData::values(const RifEclipseSummaryAddress& resultAddress
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RifReaderObservedData::timeSteps(const RifEclipseSummaryAddress& resultAddress) const
const std::vector<time_t>& RifReaderObservedData::timeSteps( const RifEclipseSummaryAddress& resultAddress ) const
{
return m_timeSteps;
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
RifEclipseSummaryAddress RifReaderObservedData::address(const QString& quantity,
const QString& identifierName,
RifEclipseSummaryAddress::SummaryVarCategory summaryCategory)
RifEclipseSummaryAddress RifReaderObservedData::address( const QString& quantity,
const QString& identifierName,
RifEclipseSummaryAddress::SummaryVarCategory summaryCategory )
{
std::string quantityName = quantity.toStdString();
int regionNumber(-1);
int regionNumber2(-1);
std::string wellGroupName;
std::string wellName;
int wellSegmentNumber(-1);
std::string lgrName;
int cellI(-1);
int cellJ(-1);
int cellK(-1);
int aquiferNumber(-1);
bool isErrorResult(false);
std::string quantityName = quantity.toStdString();
int regionNumber( -1 );
int regionNumber2( -1 );
std::string wellGroupName;
std::string wellName;
int wellSegmentNumber( -1 );
std::string lgrName;
int cellI( -1 );
int cellJ( -1 );
int cellK( -1 );
int aquiferNumber( -1 );
bool isErrorResult( false );
switch (summaryCategory)
switch ( summaryCategory )
{
case RifEclipseSummaryAddress::SUMMARY_WELL_GROUP:
wellGroupName = identifierName.toStdString();
break;
case RifEclipseSummaryAddress::SUMMARY_WELL:
wellName = identifierName.toStdString();
break;
case RifEclipseSummaryAddress::SUMMARY_WELL_LGR:
lgrName = identifierName.toStdString();
break;
default:
break;
case RifEclipseSummaryAddress::SUMMARY_WELL_GROUP:
wellGroupName = identifierName.toStdString();
break;
case RifEclipseSummaryAddress::SUMMARY_WELL:
wellName = identifierName.toStdString();
break;
case RifEclipseSummaryAddress::SUMMARY_WELL_LGR:
lgrName = identifierName.toStdString();
break;
default:
break;
}
return RifEclipseSummaryAddress(summaryCategory,
quantityName,
regionNumber,
regionNumber2,
wellGroupName,
wellName,
wellSegmentNumber,
lgrName,
cellI, cellJ, cellK,
aquiferNumber,
isErrorResult);
return RifEclipseSummaryAddress( summaryCategory,
quantityName,
regionNumber,
regionNumber2,
wellGroupName,
wellName,
wellSegmentNumber,
lgrName,
cellI,
cellJ,
cellK,
aquiferNumber,
isErrorResult );
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
std::string RifReaderObservedData::unitName(const RifEclipseSummaryAddress& resultAddress) const
std::string RifReaderObservedData::unitName( const RifEclipseSummaryAddress& resultAddress ) const
{
std::string str = "";
return str;