diff --git a/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPointTangentManipulatorPartMgr.cpp b/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPointTangentManipulatorPartMgr.cpp index d901c9e410..64a5d142ab 100644 --- a/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPointTangentManipulatorPartMgr.cpp +++ b/ApplicationCode/Commands/WellPathCommands/PointTangentManipulator/RicPointTangentManipulatorPartMgr.cpp @@ -266,22 +266,22 @@ cvf::ref RicPointTangentManipulatorPartMgr::createHorizontalPl float cos_5pi_12 = cos( 5.5 * MY_PI / 12 ); float sin_5pi_12 = sin( 5.5 * MY_PI / 12 ); - vertexArray->set( 0, { 1.25, 0, 0 } ); - vertexArray->set( 1, { cos_pi_12, sin_pi_12, 0 } ); - vertexArray->set( 2, { cos_3pi_12, sin_3pi_12, 0 } ); - vertexArray->set( 3, { cos_5pi_12, sin_5pi_12, 0 } ); - vertexArray->set( 4, { 0, 1.25, 0 } ); - vertexArray->set( 5, { -cos_5pi_12, sin_5pi_12, 0 } ); - vertexArray->set( 6, { -cos_3pi_12, sin_3pi_12, 0 } ); - vertexArray->set( 7, { -cos_pi_12, sin_pi_12, 0 } ); - vertexArray->set( 8, { -1.25, 0, 0 } ); - vertexArray->set( 9, { -cos_pi_12, -sin_pi_12, 0 } ); - vertexArray->set( 10, { -cos_3pi_12, -sin_3pi_12, 0 } ); - vertexArray->set( 11, { -cos_5pi_12, -sin_5pi_12, 0 } ); - vertexArray->set( 12, { 0, -1.25, 0 } ); - vertexArray->set( 13, { cos_5pi_12, -sin_5pi_12, 0 } ); - vertexArray->set( 14, { cos_3pi_12, -sin_3pi_12, 0 } ); - vertexArray->set( 15, { cos_pi_12, -sin_pi_12, 0 } ); + vertexArray->set( 0, {1.25, 0, 0} ); + vertexArray->set( 1, {cos_pi_12, sin_pi_12, 0} ); + vertexArray->set( 2, {cos_3pi_12, sin_3pi_12, 0} ); + vertexArray->set( 3, {cos_5pi_12, sin_5pi_12, 0} ); + vertexArray->set( 4, {0, 1.25, 0} ); + vertexArray->set( 5, {-cos_5pi_12, sin_5pi_12, 0} ); + vertexArray->set( 6, {-cos_3pi_12, sin_3pi_12, 0} ); + vertexArray->set( 7, {-cos_pi_12, sin_pi_12, 0} ); + vertexArray->set( 8, {-1.25, 0, 0} ); + vertexArray->set( 9, {-cos_pi_12, -sin_pi_12, 0} ); + vertexArray->set( 10, {-cos_3pi_12, -sin_3pi_12, 0} ); + vertexArray->set( 11, {-cos_5pi_12, -sin_5pi_12, 0} ); + vertexArray->set( 12, {0, -1.25, 0} ); + vertexArray->set( 13, {cos_5pi_12, -sin_5pi_12, 0} ); + vertexArray->set( 14, {cos_3pi_12, -sin_3pi_12, 0} ); + vertexArray->set( 15, {cos_pi_12, -sin_pi_12, 0} ); Vec3f origin( m_origin ); for ( cvf::Vec3f& vx : *vertexArray ) @@ -340,7 +340,7 @@ cvf::ref RicPointTangentManipulatorPartMgr::createVerticalAxis float s = 0.5 * m_handleSize; Vec3f origin( m_origin ); - geomBuilder->transformVertexRange( 0, geomBuilder->vertexCount(), cvf::Mat4f::fromScaling( { s, s, s } ) ); + geomBuilder->transformVertexRange( 0, geomBuilder->vertexCount(), cvf::Mat4f::fromScaling( {s, s, s} ) ); geomBuilder->transformVertexRange( 0, geomBuilder->vertexCount(), cvf::Mat4f::fromTranslation( origin ) ); unsigned vxArraySizeFirstCylinder = geomBuilder->vertexCount(); @@ -349,10 +349,10 @@ cvf::ref RicPointTangentManipulatorPartMgr::createVerticalAxis geomBuilder->transformVertexRange( vxArraySizeFirstCylinder, geomBuilder->vertexCount(), - cvf::Mat4f::fromTranslation( { 0.0f, 0.0f, -1.0f } ) ); + cvf::Mat4f::fromTranslation( {0.0f, 0.0f, -1.0f} ) ); geomBuilder->transformVertexRange( vxArraySizeFirstCylinder, geomBuilder->vertexCount(), - cvf::Mat4f::fromScaling( { s, s, s } ) ); + cvf::Mat4f::fromScaling( {s, s, s} ) ); geomBuilder->transformVertexRange( vxArraySizeFirstCylinder, geomBuilder->vertexCount(), cvf::Mat4f::fromTranslation( origin ) ); diff --git a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp index bced642fa9..e299f89ea3 100644 --- a/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp +++ b/ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp @@ -306,7 +306,7 @@ bool RifEclipseInputFileTools::exportGrid( const QString& fileName, cvf::Vec2f origin( mapAxes[2] - minPoint2f.x(), mapAxes[3] - minPoint2f.y() ); cvf::Vec2f xPoint = cvf::Vec2f( mapAxes[4], mapAxes[5] ) - minPoint2f; cvf::Vec2f yPoint = cvf::Vec2f( mapAxes[0], mapAxes[1] ) - minPoint2f; - mapAxes = { yPoint.x(), yPoint.y(), origin.x(), origin.y(), xPoint.x(), xPoint.y() }; + mapAxes = {yPoint.x(), yPoint.y(), origin.x(), origin.y(), xPoint.x(), xPoint.y()}; mapAxisTrans.setTranslation( mapAxisTrans.translation() - minPoint3d ); } diff --git a/ApplicationCode/ModelVisualization/GridBox/RivGridBoxGenerator.h b/ApplicationCode/ModelVisualization/GridBox/RivGridBoxGenerator.h index be89687a33..f346d0d677 100644 --- a/ApplicationCode/ModelVisualization/GridBox/RivGridBoxGenerator.h +++ b/ApplicationCode/ModelVisualization/GridBox/RivGridBoxGenerator.h @@ -123,5 +123,5 @@ private: cvf::Color3f m_gridColor; cvf::Color3f m_gridLegendColor; - bool m_needsRegeneration; + bool m_needsRegeneration; }; diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp index 0d72b941d2..315849bf45 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp @@ -124,7 +124,7 @@ RimWellAllocationPlot::RimWellAllocationPlot() m_accumulatedWellFlowPlot->setAvailableDepthUnits( {} ); m_accumulatedWellFlowPlot->setAvailableDepthTypes( - { RimWellLogPlot::CONNECTION_NUMBER, RimWellLogPlot::TRUE_VERTICAL_DEPTH, RimWellLogPlot::PSEUDO_LENGTH } ); + {RimWellLogPlot::CONNECTION_NUMBER, RimWellLogPlot::TRUE_VERTICAL_DEPTH, RimWellLogPlot::PSEUDO_LENGTH} ); m_accumulatedWellFlowPlot->setCommonDataSourceEnabled( false ); } diff --git a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp index 0226825367..82a4075871 100644 --- a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp +++ b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp @@ -1104,7 +1104,7 @@ void RimGridCrossPlot::setShowInfoBox( bool enable ) //-------------------------------------------------------------------------------------------------- std::set RimGridCrossPlot::allPlotAxes() const { - return { m_xAxisProperties, m_yAxisProperties }; + return {m_xAxisProperties, m_yAxisProperties}; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp b/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp index 3b509b12c8..b6d2a988db 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp @@ -2240,7 +2240,7 @@ void RimWellLogTrack::updateCurveDataRegionsOnPlot() caf::ColorTable colorTable( RimRegularLegendConfig::colorArrayFromColorType( m_colorShadingPalette() ) ); std::vector sourceNames = - { "", "PP=Grid", "PP=Las-File", "PP=Element Property Table", "", "PP=Hydrostatic" }; + {"", "PP=Grid", "PP=Las-File", "PP=Element Property Table", "", "PP=Hydrostatic"}; curveData.data = ppValues; std::vector sourceNamesToPlot; @@ -2264,12 +2264,12 @@ void RimWellLogTrack::updateCurveDataRegionsOnPlot() caf::ColorTable colorTable( RimRegularLegendConfig::colorArrayFromColorType( m_colorShadingPalette() ) ); std::vector sourceNames = - { "", - "", - "Poisson=Las-File", - "Poisson=Element Property Table", - QString( "Poisson=%1" ).arg( wellBoreStabilityPlot->userDefinedPoissonRatio() ), - "" }; + {"", + "", + "Poisson=Las-File", + "Poisson=Element Property Table", + QString( "Poisson=%1" ).arg( wellBoreStabilityPlot->userDefinedPoissonRatio() ), + ""}; curveData.data = poissonValues; std::vector sourceNamesToPlot; @@ -2292,12 +2292,12 @@ void RimWellLogTrack::updateCurveDataRegionsOnPlot() { caf::ColorTable colorTable( RimRegularLegendConfig::colorArrayFromColorType( m_colorShadingPalette() ) ); - std::vector sourceNames = { "", - "", - "UCS=Las-File", - "UCS=Element Property Table", - QString( "UCS=%1" ).arg( wellBoreStabilityPlot->userDefinedUcs() ), - "" }; + std::vector sourceNames = {"", + "", + "UCS=Las-File", + "UCS=Element Property Table", + QString( "UCS=%1" ).arg( wellBoreStabilityPlot->userDefinedUcs() ), + ""}; curveData.data = ucsValues; @@ -2367,16 +2367,16 @@ void RimWellLogTrack::updateWellPathAttributesOnPlot() } } - const std::map sortIndices = { { RiaDefines::WELL_PATH, 0 }, - { RiaDefines::CASING, 1 }, - { RiaDefines::LINER, 2 }, - { RiaDefines::PERFORATION_INTERVAL, 3 }, - { RiaDefines::FISHBONES, 4 }, - { RiaDefines::FRACTURE, 5 }, - { RiaDefines::PACKER, 6 }, - { RiaDefines::ICD, 7 }, - { RiaDefines::AICD, 8 }, - { RiaDefines::ICV, 9 } }; + const std::map sortIndices = {{RiaDefines::WELL_PATH, 0}, + {RiaDefines::CASING, 1}, + {RiaDefines::LINER, 2}, + {RiaDefines::PERFORATION_INTERVAL, 3}, + {RiaDefines::FISHBONES, 4}, + {RiaDefines::FRACTURE, 5}, + {RiaDefines::PACKER, 6}, + {RiaDefines::ICD, 7}, + {RiaDefines::AICD, 8}, + {RiaDefines::ICV, 9}}; std::stable_sort( allWellPathComponents.begin(), allWellPathComponents.end(), diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index 769d49d65e..c41c357c79 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -334,7 +334,7 @@ QString RimSummaryPlot::asciiDataForSummaryPlotExport( DateTimePeriod resampling populateTimeHistoryCurvesData( m_gridTimeHistoryCurves.childObjects(), &timeHistoryCurvesData ); // Export observed data - appendToExportData( out, { summaryCurvesObsData }, showTimeAsLongString ); + appendToExportData( out, {summaryCurvesObsData}, showTimeAsLongString ); std::vector exportData( 2 ); @@ -356,7 +356,7 @@ QString RimSummaryPlot::asciiDataForSummaryPlotExport( DateTimePeriod resampling CurvesData asciiCurvesData; populateAsciiDataCurvesData( m_asciiDataCurves.childObjects(), &asciiCurvesData ); - appendToExportData( out, { asciiCurvesData }, showTimeAsLongString ); + appendToExportData( out, {asciiCurvesData}, showTimeAsLongString ); } return out; @@ -1179,7 +1179,7 @@ void RimSummaryPlot::addCurveNoUpdate( RimSummaryCurve* curve ) //-------------------------------------------------------------------------------------------------- void RimSummaryPlot::deleteCurve( RimSummaryCurve* curve ) { - deleteCurves( { curve } ); + deleteCurves( {curve} ); } //-------------------------------------------------------------------------------------------------- @@ -1505,7 +1505,7 @@ void RimSummaryPlot::updateZoomFromQwt() //-------------------------------------------------------------------------------------------------- std::set RimSummaryPlot::allPlotAxes() const { - return { m_timeAxisProperties, m_bottomAxisProperties, m_leftYAxisProperties, m_rightYAxisProperties }; + return {m_timeAxisProperties, m_bottomAxisProperties, m_leftYAxisProperties, m_rightYAxisProperties}; } //-------------------------------------------------------------------------------------------------- @@ -2121,13 +2121,13 @@ void populateTimeHistoryCurvesData( std::vector curves if ( curveCaseName == curvesData->caseNames[i] ) casePosInList = i; } - CurveData curveData = { curve->curveExportDescription(), RifEclipseSummaryAddress(), curve->yValues() }; + CurveData curveData = {curve->curveExportDescription(), RifEclipseSummaryAddress(), curve->yValues()}; if ( casePosInList == cvf::UNDEFINED_SIZE_T ) { curvesData->caseNames.push_back( curveCaseName ); curvesData->timeSteps.push_back( curve->timeStepValues() ); - curvesData->allCurveData.push_back( std::vector( { curveData } ) ); + curvesData->allCurveData.push_back( std::vector( {curveData} ) ); } else { @@ -2153,13 +2153,13 @@ void populateAsciiDataCurvesData( std::vector curves, Curves size_t casePosInList = cvf::UNDEFINED_SIZE_T; - CurveData curveData = { curve->curveExportDescription(), RifEclipseSummaryAddress(), curve->yValues() }; + CurveData curveData = {curve->curveExportDescription(), RifEclipseSummaryAddress(), curve->yValues()}; if ( casePosInList == cvf::UNDEFINED_SIZE_T ) { curvesData->caseNames.push_back( "" ); curvesData->timeSteps.push_back( curve->timeSteps() ); - curvesData->allCurveData.push_back( std::vector( { curveData } ) ); + curvesData->allCurveData.push_back( std::vector( {curveData} ) ); } else { @@ -2195,7 +2195,7 @@ void populateSummaryCurvesData( std::vector curves, SummaryCur if ( curveCaseName == curvesData->caseNames[i] ) casePosInList = i; } - CurveData curveData = { curve->curveExportDescription(), curve->summaryAddressY(), curve->valuesY() }; + CurveData curveData = {curve->curveExportDescription(), curve->summaryAddressY(), curve->valuesY()}; CurveData errorCurveData; // Error data @@ -2211,7 +2211,7 @@ void populateSummaryCurvesData( std::vector curves, SummaryCur if ( casePosInList == cvf::UNDEFINED_SIZE_T ) { - auto curveDataList = std::vector( { curveData } ); + auto curveDataList = std::vector( {curveData} ); if ( hasErrorData ) curveDataList.push_back( errorCurveData ); curvesData->caseNames.push_back( curveCaseName ); diff --git a/ApplicationCode/UserInterface/RiuGridPlotWindow.cpp b/ApplicationCode/UserInterface/RiuGridPlotWindow.cpp index 7204cf854a..4744a977d6 100644 --- a/ApplicationCode/UserInterface/RiuGridPlotWindow.cpp +++ b/ApplicationCode/UserInterface/RiuGridPlotWindow.cpp @@ -482,7 +482,7 @@ void RiuGridPlotWindow::dropEvent( QDropEvent* event ) if ( insertAfter != plotToMove ) { - m_plotDefinition->movePlotsToThis( { plotToMove }, insertAfter ); + m_plotDefinition->movePlotsToThis( {plotToMove}, insertAfter ); } } }