OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

6655 - Rename of text in UI

Browse Source 
Renamed Element Vector Result to Flow Vector Result.
Rename text for VectorView.
This commit is contained in:
Ruben Thoms
2020-09-30 12:20:37 +02:00
committed by Magne Sjaastad
parent b6cca51593
commit b233c331cf
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ModelVisualization/RivElementVectorResultPartMgr.cpp
View File

@@ -149,7 +149,7 @@ void RivElementVectorResultPartMgr::appendDynamicGeometryPartsToModel( cvf::Mode
if ( !cells[gcIdx].isInvalid() && activeCellInfo->isActive( gcIdx ) ) if ( !cells[gcIdx].isInvalid() && activeCellInfo->isActive( gcIdx ) )
{ {
size_t resultIdx = activeCellInfo->cellResultIndex( gcIdx ); size_t resultIdx = activeCellInfo->cellResultIndex( gcIdx );
if ( result->vectorView() == RimElementVectorResult::VectorView::INDIVIDUAL ) if ( result->vectorView() == RimElementVectorResult::VectorView::PER_FACE )
{ {
for ( int dir = 0; dir < static_cast<int>( directions.size() ); dir++ ) for ( int dir = 0; dir < static_cast<int>( directions.size() ); dir++ )
{ {
@@ -183,7 +183,7 @@ void RivElementVectorResultPartMgr::appendDynamicGeometryPartsToModel( cvf::Mode
} }
} }
} }
else if ( result->vectorView() == RimElementVectorResult::VectorView::AGGREGATED ) else if ( result->vectorView() == RimElementVectorResult::VectorView::CELL_CENTER_TOTAL )
{ {
cvf::Vec3d aggregatedVector; cvf::Vec3d aggregatedVector;
cvf::Vec3d aggregatedResult; cvf::Vec3d aggregatedResult;
@@ -420,7 +420,7 @@ std::array<cvf::Vec3f, 7>
cvf::Vec3f headTop = evrViz.faceCenter + evrViz.faceNormal; cvf::Vec3f headTop = evrViz.faceCenter + evrViz.faceNormal;
cvf::Vec3f shaftStart = evrViz.faceCenter; cvf::Vec3f shaftStart = evrViz.faceCenter;
if ( result->vectorSuraceCrossingLocation() == RimElementVectorResult::VectorSurfaceCrossingLocation::VECTOR_CENTER && if ( result->vectorSuraceCrossingLocation() == RimElementVectorResult::VectorSurfaceCrossingLocation::VECTOR_CENTER &&
result->vectorView() == RimElementVectorResult::VectorView::INDIVIDUAL ) result->vectorView() == RimElementVectorResult::VectorView::PER_FACE )
{ {
headTop = evrViz.faceCenter + evrViz.faceNormal / 2.0; headTop = evrViz.faceCenter + evrViz.faceNormal / 2.0;
shaftStart = evrViz.faceCenter - evrViz.faceNormal / 2.0; shaftStart = evrViz.faceCenter - evrViz.faceNormal / 2.0;
@@ -428,7 +428,7 @@ std::array<cvf::Vec3f, 7>
// Flip arrow for negative results and if the vector is not aggregated (in which case we do not have any negative // Flip arrow for negative results and if the vector is not aggregated (in which case we do not have any negative
// result) // result)
if ( evrViz.result < 0 && result->vectorView() != RimElementVectorResult::VectorView::AGGREGATED ) if ( evrViz.result < 0 && result->vectorView() != RimElementVectorResult::VectorView::CELL_CENTER_TOTAL )
{ {
std::swap( headTop, shaftStart ); std::swap( headTop, shaftStart );
} }

22
ApplicationCode/ProjectDataModel/RimElementVectorResult.cpp
View File

@@ -59,10 +59,10 @@ void AppEnum<RimElementVectorResult::ScaleMethod>::setUp()
template <> template <>
void AppEnum<RimElementVectorResult::VectorView>::setUp() void AppEnum<RimElementVectorResult::VectorView>::setUp()
{ {
addItem( RimElementVectorResult::VectorView::AGGREGATED, "AGGREGATED", "Aggregated" ); addItem( RimElementVectorResult::VectorView::CELL_CENTER_TOTAL, "AGGREGATED", "Cell Center Total" );
addItem( RimElementVectorResult::VectorView::INDIVIDUAL, "INDIVIDUAL", "Individual" ); addItem( RimElementVectorResult::VectorView::PER_FACE, "INDIVIDUAL", "Per Face" );
setDefault( RimElementVectorResult::VectorView::AGGREGATED ); setDefault( RimElementVectorResult::VectorView::CELL_CENTER_TOTAL );
} }
template <> template <>
@@ -80,7 +80,7 @@ void AppEnum<RimElementVectorResult::VectorSurfaceCrossingLocation>::setUp()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimElementVectorResult::RimElementVectorResult() RimElementVectorResult::RimElementVectorResult()
{ {
CAF_PDM_InitObject( "Element Vector Result", ":/CellResult.png", "", "" ); CAF_PDM_InitObject( "Flow Vector Result", ":/CellResult.png", "", "" );
CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendDefinition", "Color Legend", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_legendConfig, "LegendDefinition", "Color Legend", "", "", "" );
m_legendConfig = new RimRegularLegendConfig(); m_legendConfig = new RimRegularLegendConfig();
@@ -100,8 +100,8 @@ RimElementVectorResult::RimElementVectorResult()
"", "",
"", "",
"" ); "" );
m_vectorSurfaceCrossingLocation.uiCapability()->setUiReadOnly( m_vectorView() == m_vectorSurfaceCrossingLocation.uiCapability()->setUiReadOnly(
RimElementVectorResult::VectorView::AGGREGATED ); m_vectorView() == RimElementVectorResult::VectorView::CELL_CENTER_TOTAL );
CAF_PDM_InitField( &m_showVectorI, "ShowVectorI", true, "I", "", "", "" ); CAF_PDM_InitField( &m_showVectorI, "ShowVectorI", true, "I", "", "", "" );
CAF_PDM_InitField( &m_showVectorJ, "ShowVectorJ", true, "J", "", "", "" ); CAF_PDM_InitField( &m_showVectorJ, "ShowVectorJ", true, "J", "", "", "" );
@@ -342,7 +342,7 @@ void RimElementVectorResult::mappingRange( double& min, double& max ) const
{ {
resultsData->minMaxCellScalarValues( resVarAddr, currentTimeStep, localMin, localMax ); resultsData->minMaxCellScalarValues( resVarAddr, currentTimeStep, localMin, localMax );
} }
if ( vectorView() == RimElementVectorResult::VectorView::AGGREGATED ) if ( vectorView() == RimElementVectorResult::VectorView::CELL_CENTER_TOTAL )
{ {
aggregatedVectorMax += unitVectors.at( dir ) * localMax; aggregatedVectorMax += unitVectors.at( dir ) * localMax;
aggregatedVectorMin += unitVectors.at( dir ) * localMin; aggregatedVectorMin += unitVectors.at( dir ) * localMin;
@@ -353,7 +353,7 @@ void RimElementVectorResult::mappingRange( double& min, double& max ) const
directionsMin[dir] += localMin; directionsMin[dir] += localMin;
} }
} }
if ( vectorView() == RimElementVectorResult::VectorView::AGGREGATED ) if ( vectorView() == RimElementVectorResult::VectorView::CELL_CENTER_TOTAL )
{ {
directionsMax[0] += aggregatedVectorMax.length(); directionsMax[0] += aggregatedVectorMax.length();
directionsMin[0] += aggregatedVectorMin.length(); directionsMin[0] += aggregatedVectorMin.length();
@@ -361,7 +361,7 @@ void RimElementVectorResult::mappingRange( double& min, double& max ) const
} }
min = directionsMin.front(); min = directionsMin.front();
max = directionsMax.front(); max = directionsMax.front();
if ( vectorView() != RimElementVectorResult::VectorView::AGGREGATED ) if ( vectorView() != RimElementVectorResult::VectorView::CELL_CENTER_TOTAL )
{ {
for ( size_t i = 0; i < directionsMax.size(); i++ ) for ( size_t i = 0; i < directionsMax.size(); i++ )
{ {
@@ -472,8 +472,8 @@ void RimElementVectorResult::fieldChangedByUi( const caf::PdmFieldHandle* change
} }
if ( changedField == &m_vectorView ) if ( changedField == &m_vectorView )
{ {
m_vectorSurfaceCrossingLocation.uiCapability()->setUiReadOnly( vectorView() == m_vectorSurfaceCrossingLocation.uiCapability()->setUiReadOnly(
RimElementVectorResult::VectorView::AGGREGATED ); vectorView() == RimElementVectorResult::VectorView::CELL_CENTER_TOTAL );
} }
RimEclipseView* view; RimEclipseView* view;

4
ApplicationCode/ProjectDataModel/RimElementVectorResult.h
View File

@@ -59,8 +59,8 @@ public:
enum class VectorView enum class VectorView
{ {
AGGREGATED, CELL_CENTER_TOTAL,
INDIVIDUAL PER_FACE
}; };
enum class VectorSurfaceCrossingLocation enum class VectorSurfaceCrossingLocation