Whitespace

This commit is contained in:
Magne Sjaastad
2017-12-14 11:35:24 +01:00
parent 71b7523e3c
commit dabdcd0aa4
2 changed files with 50 additions and 56 deletions

View File

@@ -1,51 +1,49 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2016 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.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "cafPdmField.h"
#include "cafPdmObject.h"
class RifEclipseSummaryAddress;
class RimSummaryPlotNameHelper;
class RimSummaryCurveAutoName : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimSummaryCurveAutoName();;
RimSummaryCurveAutoName();
QString curveName(const RifEclipseSummaryAddress& summaryAddress, const RimSummaryPlotNameHelper* nameHelper) const;
void applySettings(const RimSummaryCurveAutoName& other);
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
protected:
friend class RimSummaryCurve;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
QString curveName(const RifEclipseSummaryAddress& summaryAddress, const RimSummaryPlotNameHelper* nameHelper) const;
void applySettings(const RimSummaryCurveAutoName& other);
private:
void appendWellName(std::string& text, const RifEclipseSummaryAddress& summaryAddress, const RimSummaryPlotNameHelper* nameHelper) const;
void appendLgrName(std::string& text, const RifEclipseSummaryAddress& summaryAddress) const;
friend class RimSummaryCurve;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue,
const QVariant& newValue) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void appendWellName(std::string& text, const RifEclipseSummaryAddress& summaryAddress,
const RimSummaryPlotNameHelper* nameHelper) const;
void appendLgrName(std::string& text, const RifEclipseSummaryAddress& summaryAddress) const;
private:
caf::PdmField<bool> m_vectorName;
@@ -57,9 +55,8 @@ private:
caf::PdmField<bool> m_lgrName;
caf::PdmField<bool> m_completion;
caf::PdmField<bool> m_aquiferNumber;
caf::PdmField<bool> m_caseName;
caf::PdmField<bool> m_showAdvancedProperties;
};