clang-format after intersection rename

2025-02-25 18:55:39 -06:00 · 2019-11-26 13:56:02 +01:00
parent 06596673dc
commit 191419b6b4
54 changed files with 164 additions and 149 deletions
--- a/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionGeometryGenerator.cpp
+++ b/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionGeometryGenerator.cpp
@@ -18,9 +18,9 @@

 #include "RivBoxIntersectionGeometryGenerator.h"

+#include "RimBoxIntersection.h"
 #include "RimCase.h"
 #include "RimGridView.h"
-#include "RimBoxIntersection.h"

 #include "cafHexGridIntersectionTools/cafHexGridIntersectionTools.h"

--- a/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/Intersections/RivBoxIntersectionPartMgr.cpp
@@ -25,13 +25,13 @@
 #include "RigResultAccessor.h"
 #include "RigResultAccessorFactory.h"

+#include "RimBoxIntersection.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseView.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechCellColors.h"
 #include "RimGeoMechView.h"
-#include "RimBoxIntersection.h"
 #include "RimIntersectionResultDefinition.h"
 #include "RimRegularLegendConfig.h"
 #include "RimTernaryLegendConfig.h"
--- a/ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionGeometryGenerator.cpp
+++ b/ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionGeometryGenerator.cpp
@@ -24,11 +24,11 @@

 #include "Rim3dView.h"
 #include "RimCase.h"
-#include "RimGridView.h"
 #include "RimExtrudedCurveIntersection.h"
+#include "RimGridView.h"

-#include "RivHexGridIntersectionTools.h"
 #include "RivExtrudedCurveIntersectionPartMgr.h"
+#include "RivHexGridIntersectionTools.h"
 #include "RivPolylineGenerator.h"

 #include "cafDisplayCoordTransform.h"
@@ -58,12 +58,13 @@ cvf::ref<caf::DisplayCoordTransform> displayCoordTransform( const RimExtrudedCur
 /// isFlattened means to transform each flat section of the intersection onto the XZ plane
 /// placed adjacent to each other as if they were rotated around the common extrusion line like a hinge
 //--------------------------------------------------------------------------------------------------
-RivExtrudedCurveIntersectionGeometryGenerator::RivExtrudedCurveIntersectionGeometryGenerator( RimExtrudedCurveIntersection*                      crossSection,
-                                                                    std::vector<std::vector<cvf::Vec3d>>& polylines,
-                                                                    const cvf::Vec3d& extrusionDirection,
-                                                                    const RivIntersectionHexGridInterface* grid,
-                                                                    bool                                   isFlattened,
-                                                                    const cvf::Vec3d& flattenedPolylineStartPoint )
+RivExtrudedCurveIntersectionGeometryGenerator::RivExtrudedCurveIntersectionGeometryGenerator(
+    RimExtrudedCurveIntersection*          crossSection,
+    std::vector<std::vector<cvf::Vec3d>>&  polylines,
+    const cvf::Vec3d&                      extrusionDirection,
+    const RivIntersectionHexGridInterface* grid,
+    bool                                   isFlattened,
+    const cvf::Vec3d&                      flattenedPolylineStartPoint )
    : m_intersection( crossSection )
    , m_polyLines( polylines )
    , m_extrusionDirection( extrusionDirection )
@@ -508,8 +509,8 @@ cvf::ref<cvf::DrawableGeo> RivExtrudedCurveIntersectionGeometryGenerator::create
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-cvf::ref<cvf::DrawableGeo>
-    RivExtrudedCurveIntersectionGeometryGenerator::createLineAlongExtrusionLineDrawable( const std::vector<cvf::Vec3d>& extrusionLine )
+cvf::ref<cvf::DrawableGeo> RivExtrudedCurveIntersectionGeometryGenerator::createLineAlongExtrusionLineDrawable(
+    const std::vector<cvf::Vec3d>& extrusionLine )
 {
    cvf::ref<caf::DisplayCoordTransform> transform = displayCoordTransform( intersection() );
    std::vector<cvf::Vec3d>              displayCoords;
@@ -534,8 +535,8 @@ cvf::ref<cvf::DrawableGeo> RivExtrudedCurveIntersectionGeometryGenerator::create
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-cvf::ref<cvf::DrawableGeo>
-    RivExtrudedCurveIntersectionGeometryGenerator::createPointsFromExtrusionLineDrawable( const std::vector<cvf::Vec3d>& extrusionLine )
+cvf::ref<cvf::DrawableGeo> RivExtrudedCurveIntersectionGeometryGenerator::createPointsFromExtrusionLineDrawable(
+    const std::vector<cvf::Vec3d>& extrusionLine )
 {
    cvf::ref<caf::DisplayCoordTransform> transform = displayCoordTransform( intersection() );
    std::vector<cvf::Vec3d>              displayCoords;
--- a/ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionGeometryGenerator.h
+++ b/ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionGeometryGenerator.h
@@ -49,12 +49,12 @@ class DrawableGeo;
 class RivExtrudedCurveIntersectionGeometryGenerator : public cvf::Object, public RivIntersectionGeometryGeneratorIF
 {
 public:
-    RivExtrudedCurveIntersectionGeometryGenerator( RimExtrudedCurveIntersection*                       intersection,
-                                      std::vector<std::vector<cvf::Vec3d>>&  polylines,
-                                      const cvf::Vec3d&                      extrusionDirection,
-                                      const RivIntersectionHexGridInterface* grid,
-                                      bool                                   isFlattened,
-                                      const cvf::Vec3d&                      flattenedPolylineStartPoint );
+    RivExtrudedCurveIntersectionGeometryGenerator( RimExtrudedCurveIntersection*          intersection,
+                                                   std::vector<std::vector<cvf::Vec3d>>&  polylines,
+                                                   const cvf::Vec3d&                      extrusionDirection,
+                                                   const RivIntersectionHexGridInterface* grid,
+                                                   bool                                   isFlattened,
+                                                   const cvf::Vec3d&                      flattenedPolylineStartPoint );

    ~RivExtrudedCurveIntersectionGeometryGenerator() override;

@@ -93,7 +93,7 @@ private:
    void calculateSegementTransformPrLinePoint();
    void calculateFlattenedOrOffsetedPolyline();

-    RimExtrudedCurveIntersection*                           m_intersection;
+    RimExtrudedCurveIntersection*              m_intersection;
    cvf::cref<RivIntersectionHexGridInterface> m_hexGrid;
    const std::vector<std::vector<cvf::Vec3d>> m_polyLines;
    cvf::Vec3d                                 m_extrusionDirection;
--- a/ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionPartMgr.cpp
@@ -34,12 +34,12 @@
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseView.h"
+#include "RimExtrudedCurveIntersection.h"
 #include "RimFaultInView.h"
 #include "RimFaultInViewCollection.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechCellColors.h"
 #include "RimGeoMechView.h"
-#include "RimExtrudedCurveIntersection.h"
 #include "RimRegularLegendConfig.h"
 #include "RimSimWellInView.h"
 #include "RimSimWellInViewCollection.h"
@@ -49,10 +49,10 @@

 #include "RiuGeoMechXfTensorResultAccessor.h"

-#include "RivHexGridIntersectionTools.h"
 #include "RivExtrudedCurveIntersectionGeometryGenerator.h"
-#include "RivIntersectionResultsColoringTools.h"
 #include "RivExtrudedCurveIntersectionSourceInfo.h"
+#include "RivHexGridIntersectionTools.h"
+#include "RivIntersectionResultsColoringTools.h"
 #include "RivMeshLinesSourceInfo.h"
 #include "RivObjectSourceInfo.h"
 #include "RivPartPriority.h"
@@ -84,7 +84,8 @@
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RivExtrudedCurveIntersectionPartMgr::RivExtrudedCurveIntersectionPartMgr( RimExtrudedCurveIntersection* rimCrossSection, bool isFlattened )
+RivExtrudedCurveIntersectionPartMgr::RivExtrudedCurveIntersectionPartMgr( RimExtrudedCurveIntersection* rimCrossSection,
+                                                                          bool                          isFlattened )
    : m_rimIntersection( rimCrossSection )
    , m_isFlattened( isFlattened )
 {
@@ -99,12 +100,12 @@ RivExtrudedCurveIntersectionPartMgr::RivExtrudedCurveIntersectionPartMgr( RimExt
    {
        cvf::Vec3d                                direction = m_rimIntersection->extrusionDirection();
        cvf::ref<RivIntersectionHexGridInterface> hexGrid   = m_rimIntersection->createHexGridInterface();
-        m_intersectionGenerator                             = new RivExtrudedCurveIntersectionGeometryGenerator( m_rimIntersection,
-                                                                        polyLines,
-                                                                        direction,
-                                                                        hexGrid.p(),
-                                                                        m_isFlattened,
-                                                                        flattenedPolylineStartPoint );
+        m_intersectionGenerator = new RivExtrudedCurveIntersectionGeometryGenerator( m_rimIntersection,
+                                                                                     polyLines,
+                                                                                     direction,
+                                                                                     hexGrid.p(),
+                                                                                     m_isFlattened,
+                                                                                     flattenedPolylineStartPoint );
    }
 }

@@ -149,9 +150,9 @@ void RivExtrudedCurveIntersectionPartMgr::applySingleColorEffect()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivExtrudedCurveIntersectionPartMgr::updateCellResultColor( size_t                        timeStepIndex,
-                                                    const cvf::ScalarMapper*      explicitScalarColorMapper,
-                                                    const RivTernaryScalarMapper* explicitTernaryColorMapper )
+void RivExtrudedCurveIntersectionPartMgr::updateCellResultColor( size_t                   timeStepIndex,
+                                                                 const cvf::ScalarMapper* explicitScalarColorMapper,
+                                                                 const RivTernaryScalarMapper* explicitTernaryColorMapper )
 {
    RivIntersectionResultsColoringTools::calculateIntersectionResultColors( timeStepIndex,
                                                                            !m_isFlattened,
@@ -243,7 +244,8 @@ void RivExtrudedCurveIntersectionPartMgr::generatePartGeometry()
            part->setDrawable( geo.p() );

            // Set mapping from triangle face index to cell index
-            cvf::ref<RivExtrudedCurveIntersectionSourceInfo> si = new RivExtrudedCurveIntersectionSourceInfo( m_intersectionGenerator.p() );
+            cvf::ref<RivExtrudedCurveIntersectionSourceInfo> si = new RivExtrudedCurveIntersectionSourceInfo(
+                m_intersectionGenerator.p() );
            part->setSourceInfo( si.p() );

            part->updateBoundingBox();
@@ -313,7 +315,8 @@ void RivExtrudedCurveIntersectionPartMgr::generatePartGeometry()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivExtrudedCurveIntersectionPartMgr::createFaultLabelParts( const std::vector<std::pair<QString, cvf::Vec3d>>& labelAndAnchors )
+void RivExtrudedCurveIntersectionPartMgr::createFaultLabelParts(
+    const std::vector<std::pair<QString, cvf::Vec3d>>& labelAndAnchors )
 {
    m_faultMeshLabels     = nullptr;
    m_faultMeshLabelLines = nullptr;
@@ -588,7 +591,7 @@ void RivExtrudedCurveIntersectionPartMgr::createExtrusionDirParts( bool useBuffe
 ///
 //--------------------------------------------------------------------------------------------------
 void RivExtrudedCurveIntersectionPartMgr::appendNativeIntersectionFacesToModel( cvf::ModelBasicList* model,
-                                                                   cvf::Transform*      scaleTransform )
+                                                                                cvf::Transform*      scaleTransform )
 {
    if ( m_intersectionFaces.isNull() )
    {
@@ -605,7 +608,8 @@ void RivExtrudedCurveIntersectionPartMgr::appendNativeIntersectionFacesToModel(
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RivExtrudedCurveIntersectionPartMgr::appendMeshLinePartsToModel( cvf::ModelBasicList* model, cvf::Transform* scaleTransform )
+void RivExtrudedCurveIntersectionPartMgr::appendMeshLinePartsToModel( cvf::ModelBasicList* model,
+                                                                      cvf::Transform*      scaleTransform )
 {
    if ( m_intersectionGridLines.isNull() )
    {
@@ -641,8 +645,8 @@ void RivExtrudedCurveIntersectionPartMgr::appendMeshLinePartsToModel( cvf::Model
 ///
 //--------------------------------------------------------------------------------------------------
 void RivExtrudedCurveIntersectionPartMgr::appendPolylinePartsToModel( Rim3dView&           view,
-                                                         cvf::ModelBasicList* model,
-                                                         cvf::Transform*      scaleTransform )
+                                                                      cvf::ModelBasicList* model,
+                                                                      cvf::Transform*      scaleTransform )
 {
    Rim2dIntersectionView* curr2dView = dynamic_cast<Rim2dIntersectionView*>( &view );

--- a/ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionPartMgr.h
+++ b/ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionPartMgr.h
@@ -64,7 +64,8 @@ class RivPipeGeometryGenerator;
 class RivExtrudedCurveIntersectionPartMgr : public cvf::Object
 {
 public:
-    explicit RivExtrudedCurveIntersectionPartMgr( RimExtrudedCurveIntersection* rimIntersection, bool isFlattened = false );
+    explicit RivExtrudedCurveIntersectionPartMgr( RimExtrudedCurveIntersection* rimIntersection,
+                                                  bool                          isFlattened = false );

    void applySingleColorEffect();
    void updateCellResultColor( size_t                        timeStepIndex,
--- a/ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionSourceInfo.cpp
+++ b/ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionSourceInfo.cpp
@@ -24,7 +24,8 @@
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-RivExtrudedCurveIntersectionSourceInfo::RivExtrudedCurveIntersectionSourceInfo( RivExtrudedCurveIntersectionGeometryGenerator* geometryGenerator )
+RivExtrudedCurveIntersectionSourceInfo::RivExtrudedCurveIntersectionSourceInfo(
+    RivExtrudedCurveIntersectionGeometryGenerator* geometryGenerator )
    : m_intersectionGeometryGenerator( geometryGenerator )
 {
    CVF_ASSERT( m_intersectionGeometryGenerator.notNull() );
--- a/ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionSourceInfo.h
+++ b/ApplicationCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionSourceInfo.h
@@ -31,9 +31,9 @@ class RivExtrudedCurveIntersectionSourceInfo : public cvf::Object
 public:
    explicit RivExtrudedCurveIntersectionSourceInfo( RivExtrudedCurveIntersectionGeometryGenerator* geometryGenerator );

-    const std::vector<size_t>& triangleToCellIndex() const;
-    std::array<cvf::Vec3f, 3>  triangle( int triangleIdx ) const;
-    RimExtrudedCurveIntersection*           intersection() const;
+    const std::vector<size_t>&    triangleToCellIndex() const;
+    std::array<cvf::Vec3f, 3>     triangle( int triangleIdx ) const;
+    RimExtrudedCurveIntersection* intersection() const;

 private:
    cvf::cref<RivExtrudedCurveIntersectionGeometryGenerator> m_intersectionGeometryGenerator;
--- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionResultsColoringTools.cpp
+++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionResultsColoringTools.cpp
@@ -51,7 +51,7 @@
 void RivIntersectionResultsColoringTools::calculateIntersectionResultColors(
    size_t                                    timeStepIndex,
    bool                                      useSeparateIntersectionResDefTimeStep,
-    RimIntersection*                    rimIntersectionHandle,
+    RimIntersection*                          rimIntersectionHandle,
    const RivIntersectionGeometryGeneratorIF* intersectionGeomGenIF,
    const cvf::ScalarMapper*                  explicitScalarColorMapper,
    const RivTernaryScalarMapper*             explicitTernaryColorMapper,
--- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionResultsColoringTools.h
+++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionResultsColoringTools.h
@@ -43,8 +43,8 @@ class ScalarMapper;
 class RivIntersectionResultsColoringTools
 {
 public:
-    static void calculateIntersectionResultColors( size_t                 timeStepIndex,
-                                                   bool                   useSeparateIntersectionResDefTimeStep,
+    static void calculateIntersectionResultColors( size_t           timeStepIndex,
+                                                   bool             useSeparateIntersectionResDefTimeStep,
                                                   RimIntersection* rimIntersectionHandle,
                                                   const RivIntersectionGeometryGeneratorIF* intersectionGeomGenIF,
                                                   const cvf::ScalarMapper*                  explicitScalarColorMapper,