#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

@@ -2,26 +2,26 @@
//
// Copyright (C) 2015- Statoil ASA
// Copyright (C) 2015- Ceetron Solutions AS
//
//
// 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 "cafPdmObject.h"
#include "cafPdmChildArrayField.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
class Rim3dView;
class RimIntersection;
@@ -30,15 +30,16 @@ class RimEclipseCellColors;
class RimSimWellInView;
class RivTernaryScalarMapper;
namespace cvf {
class ModelBasicList;
class Transform;
class ScalarMapper;
}
namespace cvf
{
class ModelBasicList;
class Transform;
class ScalarMapper;
} // namespace cvf
//==================================================================================================
//
//
//
//
//==================================================================================================
class RimIntersectionCollection : public caf::PdmObject
@@ -51,13 +52,13 @@ public:
caf::PdmField<bool> isActive;
void appendIntersectionAndUpdate(RimIntersection* intersection);
void appendIntersectionNoUpdate(RimIntersection* intersection);
void appendIntersectionBoxAndUpdate(RimIntersectionBox* intersectionBox);
void appendIntersectionBoxNoUpdate(RimIntersectionBox* intersectionBox);
void appendIntersectionAndUpdate( RimIntersection* intersection );
void appendIntersectionNoUpdate( RimIntersection* intersection );
bool hasActiveIntersectionForSimulationWell(const RimSimWellInView* simWell) const;
void appendIntersectionBoxAndUpdate( RimIntersectionBox* intersectionBox );
void appendIntersectionBoxNoUpdate( RimIntersectionBox* intersectionBox );
bool hasActiveIntersectionForSimulationWell( const RimSimWellInView* simWell ) const;
void updateIntersectionBoxGeometry();
@@ -68,18 +69,20 @@ public:
// Visualization interface
void applySingleColorEffect();
void updateCellResultColor(size_t timeStepIndex,
const cvf::ScalarMapper* scalarColorMapper,
const RivTernaryScalarMapper* ternaryColorMapper);
void appendPartsToModel(Rim3dView& view, cvf::ModelBasicList* model, cvf::Transform* scaleTransform);
void updateCellResultColor( size_t timeStepIndex,
const cvf::ScalarMapper* scalarColorMapper,
const RivTernaryScalarMapper* ternaryColorMapper );
void appendPartsToModel( Rim3dView& view, cvf::ModelBasicList* model, cvf::Transform* scaleTransform );
void rebuildGeometry();
std::vector<RimIntersection*> intersections() const;
std::vector<RimIntersectionBox*> intersectionBoxes() const;
std::vector<RimIntersection*> intersections() const;
std::vector<RimIntersectionBox*> intersectionBoxes() const;
protected:
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
caf::PdmFieldHandle* objectToggleField() override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue ) override;
caf::PdmFieldHandle* objectToggleField() override;
private:
caf::PdmChildArrayField<RimIntersection*> m_intersections;