mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#4683 clang-format on all files in ApplicationCode
This commit is contained in:
@@ -1,22 +1,21 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// 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 "RimObservedDataCollection.h"
|
||||
|
||||
#include "RiaGuiApplication.h"
|
||||
@@ -26,39 +25,39 @@
|
||||
|
||||
#include "RifKeywordVectorParser.h"
|
||||
|
||||
#include "RimObservedFmuRftData.h"
|
||||
#include "RimObservedSummaryData.h"
|
||||
#include "RimCsvUserData.h"
|
||||
#include "RimObservedEclipseUserData.h"
|
||||
#include "RimObservedFmuRftData.h"
|
||||
#include "RimObservedSummaryData.h"
|
||||
#include "RimSummaryObservedDataFile.h"
|
||||
|
||||
#include "RiuPlotMainWindowTools.h"
|
||||
#include "RiuPlotMainWindow.h"
|
||||
#include "RiuPlotMainWindowTools.h"
|
||||
|
||||
#include "cafUtils.h"
|
||||
#include "cafPdmSettings.h"
|
||||
#include "cafPdmUiPropertyViewDialog.h"
|
||||
#include "cafPdmUiObjectEditorHandle.h"
|
||||
#include "cafPdmUiPropertyViewDialog.h"
|
||||
#include "cafUtils.h"
|
||||
|
||||
#include <QFile>
|
||||
|
||||
CAF_PDM_SOURCE_INIT(RimObservedDataCollection, "ObservedDataCollection");
|
||||
CAF_PDM_SOURCE_INIT( RimObservedDataCollection, "ObservedDataCollection" );
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimObservedDataCollection::RimObservedDataCollection()
|
||||
{
|
||||
CAF_PDM_InitObject("Observed Data", ":/Folder.png", "", "");
|
||||
|
||||
CAF_PDM_InitFieldNoDefault(&m_observedDataArray, "ObservedDataArray", "", "", "", "");
|
||||
CAF_PDM_InitFieldNoDefault(&m_observedFmuRftArray, "ObservedFmuRftDataArray", "", "", "", "");
|
||||
m_observedDataArray.uiCapability()->setUiHidden(true);
|
||||
m_observedFmuRftArray.uiCapability()->setUiHidden(true);
|
||||
CAF_PDM_InitObject( "Observed Data", ":/Folder.png", "", "" );
|
||||
|
||||
CAF_PDM_InitFieldNoDefault( &m_observedDataArray, "ObservedDataArray", "", "", "", "" );
|
||||
CAF_PDM_InitFieldNoDefault( &m_observedFmuRftArray, "ObservedFmuRftDataArray", "", "", "", "" );
|
||||
m_observedDataArray.uiCapability()->setUiHidden( true );
|
||||
m_observedFmuRftArray.uiCapability()->setUiHidden( true );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimObservedDataCollection::~RimObservedDataCollection()
|
||||
{
|
||||
@@ -67,25 +66,25 @@ RimObservedDataCollection::~RimObservedDataCollection()
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimObservedDataCollection::removeObservedSummaryData(RimObservedSummaryData* observedData)
|
||||
void RimObservedDataCollection::removeObservedSummaryData( RimObservedSummaryData* observedData )
|
||||
{
|
||||
m_observedDataArray.removeChildObject(observedData);
|
||||
m_observedDataArray.removeChildObject( observedData );
|
||||
caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimObservedDataCollection::removeObservedFmuRftData(RimObservedFmuRftData* observedFmuRftData)
|
||||
void RimObservedDataCollection::removeObservedFmuRftData( RimObservedFmuRftData* observedFmuRftData )
|
||||
{
|
||||
m_observedFmuRftArray.removeChildObject(observedFmuRftData);
|
||||
m_observedFmuRftArray.removeChildObject( observedFmuRftData );
|
||||
caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::vector<RimObservedSummaryData*> RimObservedDataCollection::allObservedSummaryData() const
|
||||
{
|
||||
@@ -101,118 +100,62 @@ std::vector<RimObservedFmuRftData*> RimObservedDataCollection::allObservedFmuRft
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RimObservedDataCollection::fileExists(const QString& fileName, QString* errorText /*= nullptr*/)
|
||||
bool RimObservedDataCollection::fileExists( const QString& fileName, QString* errorText /*= nullptr*/ )
|
||||
{
|
||||
QFile file(fileName);
|
||||
if (!file.exists())
|
||||
QFile file( fileName );
|
||||
if ( !file.exists() )
|
||||
{
|
||||
QString s = QString("File does not exist, %1").arg(fileName);
|
||||
RiaLogging::error(s);
|
||||
QString s = QString( "File does not exist, %1" ).arg( fileName );
|
||||
RiaLogging::error( s );
|
||||
|
||||
if (errorText) errorText->append(s);
|
||||
if ( errorText ) errorText->append( s );
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void updateNewObservedDataCreated(caf::PdmObject* object)
|
||||
void updateNewObservedDataCreated( caf::PdmObject* object )
|
||||
{
|
||||
RiuPlotMainWindowTools::showPlotMainWindow();
|
||||
RiuPlotMainWindowTools::selectAsCurrentItem(object);
|
||||
RiuPlotMainWindowTools::setExpanded(object);
|
||||
RiuPlotMainWindowTools::selectAsCurrentItem( object );
|
||||
RiuPlotMainWindowTools::setExpanded( object );
|
||||
|
||||
caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();
|
||||
|
||||
RiuPlotMainWindow* mpw = RiaGuiApplication::instance()->mainPlotWindow();
|
||||
if (mpw) mpw->updateSummaryPlotToolBar();
|
||||
if ( mpw ) mpw->updateSummaryPlotToolBar();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimObservedSummaryData* RimObservedDataCollection::createAndAddRsmObservedSummaryDataFromFile(const QString& fileName, QString* errorText /*= nullptr*/)
|
||||
RimObservedSummaryData*
|
||||
RimObservedDataCollection::createAndAddRsmObservedSummaryDataFromFile( const QString& fileName,
|
||||
QString* errorText /*= nullptr*/ )
|
||||
{
|
||||
if (!fileExists(fileName, errorText)) return nullptr;
|
||||
if ( !fileExists( fileName, errorText ) ) return nullptr;
|
||||
|
||||
RimObservedSummaryData* observedData = nullptr;
|
||||
RimObservedSummaryData* observedData = nullptr;
|
||||
RimObservedEclipseUserData* columnBasedUserData = new RimObservedEclipseUserData();
|
||||
observedData = columnBasedUserData;
|
||||
observedData = columnBasedUserData;
|
||||
|
||||
this->m_observedDataArray.push_back(observedData);
|
||||
observedData->setSummaryHeaderFileName(fileName);
|
||||
this->m_observedDataArray.push_back( observedData );
|
||||
observedData->setSummaryHeaderFileName( fileName );
|
||||
observedData->createSummaryReaderInterface();
|
||||
observedData->updateMetaData();
|
||||
observedData->updateOptionSensitivity();
|
||||
|
||||
if (errorText && !observedData->errorMessagesFromReader().isEmpty())
|
||||
if ( errorText && !observedData->errorMessagesFromReader().isEmpty() )
|
||||
{
|
||||
errorText->append(observedData->errorMessagesFromReader());
|
||||
errorText->append( observedData->errorMessagesFromReader() );
|
||||
}
|
||||
|
||||
updateNewObservedDataCreated(observedData);
|
||||
|
||||
this->updateConnectedEditors();
|
||||
|
||||
return observedData;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimObservedSummaryData* RimObservedDataCollection::createAndAddCvsObservedSummaryDataFromFile(const QString& fileName, bool useSavedFieldsValuesInDialog, QString* errorText /*= nullptr*/)
|
||||
{
|
||||
if (!fileExists(fileName, errorText)) return nullptr;
|
||||
|
||||
RimObservedSummaryData* observedData = nullptr;
|
||||
|
||||
RimCsvUserData* userData = new RimCsvUserData();
|
||||
RicPasteAsciiDataToSummaryPlotFeatureUi* parseOptions = userData->parseOptions();
|
||||
|
||||
if (useSavedFieldsValuesInDialog)
|
||||
{
|
||||
caf::PdmSettings::readFieldsFromApplicationStore(parseOptions);
|
||||
}
|
||||
parseOptions->setUiModeImport(fileName);
|
||||
|
||||
if (parseOptions->uiModeImport() != RicPasteAsciiDataToSummaryPlotFeatureUi::UI_MODE_SILENT)
|
||||
{
|
||||
caf::PdmUiPropertyViewDialog propertyDialog(nullptr, parseOptions, "CSV Import Options", "");
|
||||
if (propertyDialog.exec() != QDialog::Accepted)
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
caf::PdmSettings::writeFieldsToApplicationStore(parseOptions);
|
||||
|
||||
//userData->setParseOptions(parseOptionsUi.parseOptions());
|
||||
userData->setSummaryHeaderFileName(fileName);
|
||||
userData->createSummaryReaderInterface();
|
||||
userData->updateMetaData();
|
||||
userData->updateOptionSensitivity();
|
||||
|
||||
if (errorText && !userData->errorMessagesFromReader().isEmpty())
|
||||
{
|
||||
errorText->append(userData->errorMessagesFromReader());
|
||||
}
|
||||
|
||||
if (userData->summaryReader())
|
||||
{
|
||||
this->m_observedDataArray.push_back(userData);
|
||||
observedData = userData;
|
||||
}
|
||||
else
|
||||
{
|
||||
delete userData;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
updateNewObservedDataCreated(observedData);
|
||||
updateNewObservedDataCreated( observedData );
|
||||
|
||||
this->updateConnectedEditors();
|
||||
|
||||
@@ -222,17 +165,76 @@ RimObservedSummaryData* RimObservedDataCollection::createAndAddCvsObservedSummar
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimObservedFmuRftData* RimObservedDataCollection::createAndAddFmuRftDataFromPath(const QString& directoryPath)
|
||||
RimObservedSummaryData* RimObservedDataCollection::createAndAddCvsObservedSummaryDataFromFile(
|
||||
const QString& fileName, bool useSavedFieldsValuesInDialog, QString* errorText /*= nullptr*/ )
|
||||
{
|
||||
QString name = QString("Imported FMU RFT Data %1").arg(m_observedFmuRftArray.size() + 1);
|
||||
if ( !fileExists( fileName, errorText ) ) return nullptr;
|
||||
|
||||
RimObservedSummaryData* observedData = nullptr;
|
||||
|
||||
RimCsvUserData* userData = new RimCsvUserData();
|
||||
RicPasteAsciiDataToSummaryPlotFeatureUi* parseOptions = userData->parseOptions();
|
||||
|
||||
if ( useSavedFieldsValuesInDialog )
|
||||
{
|
||||
caf::PdmSettings::readFieldsFromApplicationStore( parseOptions );
|
||||
}
|
||||
parseOptions->setUiModeImport( fileName );
|
||||
|
||||
if ( parseOptions->uiModeImport() != RicPasteAsciiDataToSummaryPlotFeatureUi::UI_MODE_SILENT )
|
||||
{
|
||||
caf::PdmUiPropertyViewDialog propertyDialog( nullptr, parseOptions, "CSV Import Options", "" );
|
||||
if ( propertyDialog.exec() != QDialog::Accepted )
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
caf::PdmSettings::writeFieldsToApplicationStore( parseOptions );
|
||||
|
||||
// userData->setParseOptions(parseOptionsUi.parseOptions());
|
||||
userData->setSummaryHeaderFileName( fileName );
|
||||
userData->createSummaryReaderInterface();
|
||||
userData->updateMetaData();
|
||||
userData->updateOptionSensitivity();
|
||||
|
||||
if ( errorText && !userData->errorMessagesFromReader().isEmpty() )
|
||||
{
|
||||
errorText->append( userData->errorMessagesFromReader() );
|
||||
}
|
||||
|
||||
if ( userData->summaryReader() )
|
||||
{
|
||||
this->m_observedDataArray.push_back( userData );
|
||||
observedData = userData;
|
||||
}
|
||||
else
|
||||
{
|
||||
delete userData;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
updateNewObservedDataCreated( observedData );
|
||||
|
||||
this->updateConnectedEditors();
|
||||
|
||||
return observedData;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimObservedFmuRftData* RimObservedDataCollection::createAndAddFmuRftDataFromPath( const QString& directoryPath )
|
||||
{
|
||||
QString name = QString( "Imported FMU RFT Data %1" ).arg( m_observedFmuRftArray.size() + 1 );
|
||||
|
||||
RimObservedFmuRftData* fmuRftData = new RimObservedFmuRftData;
|
||||
fmuRftData->setDirectoryPath(directoryPath);
|
||||
fmuRftData->setDirectoryPath( directoryPath );
|
||||
fmuRftData->createRftReaderInterface();
|
||||
fmuRftData->setName(name);
|
||||
m_observedFmuRftArray.push_back(fmuRftData);
|
||||
fmuRftData->setName( name );
|
||||
m_observedFmuRftArray.push_back( fmuRftData );
|
||||
|
||||
updateNewObservedDataCreated(fmuRftData);
|
||||
updateNewObservedDataCreated( fmuRftData );
|
||||
this->updateConnectedEditors();
|
||||
|
||||
return fmuRftData;
|
||||
|
||||
Reference in New Issue
Block a user