#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,39 +2,34 @@
//
// 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 "cvfCollection.h"
#include "cvfModelBasicList.h"
#include "cvfPart.h"
#include "cvfTransform.h"
#include "cvfScalarMapperDiscreteLinear.h"
#include "cvfTransform.h"
namespace cvf
{
class Camera;
class ShaderProgram;
}
class Camera;
class ShaderProgram;
} // namespace cvf
//==================================================================================================
//
@@ -45,14 +40,14 @@ class RivGridBoxGenerator
public:
RivGridBoxGenerator();
void setScaleZ(double scaleZ);
void setDisplayModelOffset(cvf::Vec3d offset);
void setGridBoxDomainCoordBoundingBox(const cvf::BoundingBox& boundingBox);
void updateFromBackgroundColor(const cvf::Color3f& backgroundColor);
void setScaleZ( double scaleZ );
void setDisplayModelOffset( cvf::Vec3d offset );
void setGridBoxDomainCoordBoundingBox( const cvf::BoundingBox& boundingBox );
void updateFromBackgroundColor( const cvf::Color3f& backgroundColor );
void createGridBoxParts();
void updateFromCamera(const cvf::Camera* camera);
void updateFromCamera( const cvf::Camera* camera );
cvf::Model* model();
@@ -93,18 +88,19 @@ private:
};
private:
void createGridBoxFaceParts();
void createGridBoxLegendParts();
void createLegend(EdgeType edge, cvf::Collection<cvf::Part>* parts);
void createGridBoxFaceParts();
void createGridBoxLegendParts();
void createLegend( EdgeType edge, cvf::Collection<cvf::Part>* parts );
void computeEdgeVisibility(const std::vector<bool>& faceVisibility, std::vector<bool>& edgeVisibility);
void computeEdgeVisibility( const std::vector<bool>& faceVisibility, std::vector<bool>& edgeVisibility );
void computeDisplayCoords();
cvf::Vec3d displayModelCoordFromDomainCoord(const cvf::Vec3d& domainCoord) const;
void computeDisplayCoords();
cvf::Vec3d displayModelCoordFromDomainCoord( const cvf::Vec3d& domainCoord ) const;
cvf::Vec3f sideNormalOutwards( FaceType face );
cvf::Vec3d pointOnSide( FaceType face );
cvf::Vec3f cornerDirection( FaceType face1, FaceType face2 );
cvf::Vec3f sideNormalOutwards(FaceType face);
cvf::Vec3d pointOnSide(FaceType face);
cvf::Vec3f cornerDirection(FaceType face1, FaceType face2);
private:
cvf::BoundingBox m_domainCoordsBoundingBox;
std::vector<double> m_domainCoordsXValues;
@@ -116,15 +112,14 @@ private:
std::vector<double> m_displayCoordsYValues;
std::vector<double> m_displayCoordsZValues;
double m_scaleZ;
cvf::Vec3d m_displayModelOffset;
double m_scaleZ;
cvf::Vec3d m_displayModelOffset;
cvf::Collection<cvf::Part> m_gridBoxFaceParts;
cvf::Collection<cvf::Part> m_gridBoxLegendParts;
cvf::Collection<cvf::Part> m_gridBoxFaceParts;
cvf::Collection<cvf::Part> m_gridBoxLegendParts;
cvf::ref<cvf::ModelBasicList> m_gridBoxModel;
cvf::ref<cvf::ModelBasicList> m_gridBoxModel;
cvf::Color3f m_gridColor;
cvf::Color3f m_gridLegendColor;
cvf::Color3f m_gridColor;
cvf::Color3f m_gridLegendColor;
};