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

Renamed class RimResultSlot to RimEclipseCellColors

Browse Source
This commit is contained in:
Pål Hagen 2015-06-25 12:04:46 +02:00
parent 5eb673410e
commit 87744fb8c4
29 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp
View File

@ -43,7 +43,7 @@
//--------------------------------------------------------------------------------------------------
void RivCellEdgeGeometryUtils::addCellEdgeResultsToDrawableGeo(
size_t timeStepIndex,
RimResultSlot* cellResultSlot,
RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot,
const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper,
cvf::DrawableGeo* geo,
@ -187,7 +187,7 @@ bool RivCellEdgeGeometryUtils::hideScalarValue(double scalarValue, double scalar
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivCellEdgeGeometryUtils::addTernaryCellEdgeResultsToDrawableGeo(size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot,
void RivCellEdgeGeometryUtils::addTernaryCellEdgeResultsToDrawableGeo(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot,
const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper,
cvf::DrawableGeo* geo, size_t gridIndex, float opacityLevel)
{
@ -285,7 +285,7 @@ void RivCellEdgeGeometryUtils::addTernaryCellEdgeResultsToDrawableGeo(size_t tim
///
//--------------------------------------------------------------------------------------------------
cvf::ref<RigResultAccessor> RivCellEdgeGeometryUtils::createCellEdgeCenterResultAccessor(
RimResultSlot* cellResultSlot,
RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot,
size_t timeStepIndex,
RigCaseData* eclipseCase,
@ -312,7 +312,7 @@ cvf::ref<RigResultAccessor> RivCellEdgeGeometryUtils::createCellEdgeCenterResult
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::ref<RigResultAccessor> RivCellEdgeGeometryUtils::createCellCenterResultAccessor(RimResultSlot* cellResultSlot, size_t timeStepIndex, RigCaseData* eclipseCase, const RigGridBase* grid)
cvf::ref<RigResultAccessor> RivCellEdgeGeometryUtils::createCellCenterResultAccessor(RimEclipseCellColors* cellResultSlot, size_t timeStepIndex, RigCaseData* eclipseCase, const RigGridBase* grid)
{
cvf::ref<RigResultAccessor> resultAccessor = NULL;

10
ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h
View File

@ -29,7 +29,7 @@ namespace cvf
}
class RimCellEdgeResultSlot;
class RimResultSlot;
class RimEclipseCellColors;
class RigGridBase;
class RigResultAccessor;
class RigCaseData;
@ -39,7 +39,7 @@ class RivCellEdgeGeometryUtils
{
public:
static void addCellEdgeResultsToDrawableGeo(size_t timeStepIndex,
RimResultSlot* cellResultSlot,
RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot,
const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper,
cvf::DrawableGeo* geo,
@ -47,7 +47,7 @@ public:
float opacityLevel);
static void addTernaryCellEdgeResultsToDrawableGeo(size_t timeStepIndex,
RimResultSlot* cellResultSlot,
RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot,
const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper,
cvf::DrawableGeo* geo,
@ -57,13 +57,13 @@ public:
private:
static cvf::ref<RigResultAccessor> createCellCenterResultAccessor(
RimResultSlot* cellResultSlot,
RimEclipseCellColors* cellResultSlot,
size_t timeStepIndex,
RigCaseData* eclipseCase,
const RigGridBase* grid);
static cvf::ref<RigResultAccessor> createCellEdgeCenterResultAccessor(
RimResultSlot* cellResultSlot,
RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot,
size_t timeStepIndex,
RigCaseData* eclipseCase,

6
ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
View File

@ -94,7 +94,7 @@ void RivFaultPartMgr::applySingleColorEffect()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivFaultPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot)
void RivFaultPartMgr::updateCellResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot)
{
CVF_ASSERT(cellResultSlot);
@ -181,7 +181,7 @@ void RivFaultPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultSlot*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivFaultPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
void RivFaultPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
{
updateNNCColors(cellResultSlot);
@ -643,7 +643,7 @@ caf::FaceCulling RivFaultPartMgr::faceCullingMode() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivFaultPartMgr::updateNNCColors(RimResultSlot* cellResultSlot)
void RivFaultPartMgr::updateNNCColors(RimEclipseCellColors* cellResultSlot)
{
if (m_NNCFaces.isNull()) return;

8
ApplicationCode/ModelVisualization/RivFaultPartMgr.h
View File

@ -37,7 +37,7 @@ namespace cvf
class Part;
}
class RimResultSlot;
class RimEclipseCellColors;
class RimCellEdgeResultSlot;
class RimFaultCollection;
@ -55,8 +55,8 @@ public:
void applySingleColorEffect();
void setOpacityLevel(float opacity) { m_opacityLevel = opacity; }
void updateCellResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot);
void updateCellEdgeResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot);
void updateCellResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot);
void updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot);
void appendNativeFaultFacesToModel(cvf::ModelBasicList* model);
void appendOppositeFaultFacesToModel(cvf::ModelBasicList* model);
@ -68,7 +68,7 @@ private:
void generatePartGeometry();
void updatePartEffect();
void updateNNCColors(RimResultSlot* cellResultSlot);
void updateNNCColors(RimEclipseCellColors* cellResultSlot);
caf::FaceCulling faceCullingMode() const;

4
ApplicationCode/ModelVisualization/RivGridPartMgr.cpp
View File

@ -221,7 +221,7 @@ void RivGridPartMgr::updateCellColor(cvf::Color4f color)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivGridPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot)
void RivGridPartMgr::updateCellResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot)
{
CVF_ASSERT(cellResultSlot);
@ -266,7 +266,7 @@ void RivGridPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultSlot*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivGridPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
void RivGridPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
{
if (m_surfaceFaces.notNull())
{

6
ApplicationCode/ModelVisualization/RivGridPartMgr.h
View File

@ -34,7 +34,7 @@ namespace cvf
class Effect;
}
class RimResultSlot;
class RimEclipseCellColors;
class RimCellEdgeResultSlot;
@ -57,9 +57,9 @@ public:
cvf::ref<cvf::UByteArray> cellVisibility() { return m_cellVisibility;}
void updateCellColor(cvf::Color4f color);
void updateCellResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot);
void updateCellResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot);
void updateCellEdgeResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot,
void updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot);
void appendPartsToModel(cvf::ModelBasicList* model);

6
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@ -143,7 +143,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
// Parts that is not overridden by the grid settings
RimFaultResultSlot* faultResultSlot = m_reservoirView->faultResultSettings();
RimResultSlot* cellResultSlot = m_reservoirView->cellResult();
RimEclipseCellColors* cellResultSlot = m_reservoirView->cellResult();
if (rimFault->showFault() && faultCollection->showFaultCollection())
{
@ -200,7 +200,7 @@ void RivReservoirFaultsPartMgr::applySingleColorEffect()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirFaultsPartMgr::updateColors(size_t timeStepIndex, RimResultSlot* cellResultSlot)
void RivReservoirFaultsPartMgr::updateColors(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot)
{
if (!m_reservoirView) return;
@ -225,7 +225,7 @@ void RivReservoirFaultsPartMgr::updateColors(size_t timeStepIndex, RimResultSlot
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirFaultsPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
void RivReservoirFaultsPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
{
for (size_t i = 0; i < m_faultParts.size(); i++)
{

6
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h
View File

@ -30,7 +30,7 @@ namespace cvf
class Transform;
}
class RimResultSlot;
class RimEclipseCellColors;
class RimCellEdgeResultSlot;
class RimEclipseView;
@ -49,8 +49,8 @@ public:
void setOpacityLevel(float opacity);
void applySingleColorEffect();
void updateColors(size_t timeStepIndex, RimResultSlot* cellResultSlot);
void updateCellEdgeResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot,
void updateColors(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot);
void updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot);
void appendPartsToModel(cvf::ModelBasicList* model);

8
ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp
View File

@ -111,7 +111,7 @@ void RivReservoirPartMgr::updateCellColor(cvf::Color4f color)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot)
void RivReservoirPartMgr::updateCellResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot)
{
for (size_t i = 0; i < m_allGrids.size() ; ++i)
{
@ -122,7 +122,7 @@ void RivReservoirPartMgr::updateCellResultColor(size_t timeStepIndex, RimResultS
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
void RivReservoirPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
{
for (size_t i = 0; i < m_allGrids.size() ; ++i)
{
@ -158,7 +158,7 @@ void RivReservoirPartMgr::appendGridPartsToModel(cvf::ModelBasicList* model, con
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirPartMgr::updateFaultColors(size_t timeStepIndex, RimResultSlot* cellResultSlot)
void RivReservoirPartMgr::updateFaultColors(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot)
{
if (m_faultsPartMgr.notNull())
{
@ -202,7 +202,7 @@ void RivReservoirPartMgr::setFaultForceVisibility(bool isGeneratedByFilter)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirPartMgr::updateFaultCellEdgeResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
void RivReservoirPartMgr::updateFaultCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
{
if (m_faultsPartMgr.notNull())
{

10
ApplicationCode/ModelVisualization/RivReservoirPartMgr.h
View File

@ -32,7 +32,7 @@ namespace cvf
class Transform;
}
class RimResultSlot;
class RimEclipseCellColors;
class RimCellEdgeResultSlot;
class RigCaseData;
class RimEclipseView;
@ -57,16 +57,16 @@ public:
cellVisibility(size_t gridIdx);
void updateCellColor(cvf::Color4f color);
void updateCellResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot);
void updateCellEdgeResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot,
void updateCellResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot);
void updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot);
void appendGridPartsToModel(cvf::ModelBasicList* model, const std::vector<size_t>& gridIdxes);
void appendGridPartsToModel(cvf::ModelBasicList* model);
// Faults
void updateFaultColors(size_t timeStepIndex, RimResultSlot* cellResultSlot);
void updateFaultCellEdgeResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot,
void updateFaultColors(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot);
void updateFaultCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot);
void appendFaultPartsToModel(cvf::ModelBasicList* model);
void appendFaultLabelPartsToModel(cvf::ModelBasicList* model);

8
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@ -789,7 +789,7 @@ void RivReservoirViewPartMgr::updateCellColor(RivCellSetEnum geometryType, cvf::
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::updateCellResultColor(RivCellSetEnum geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot)
void RivReservoirViewPartMgr::updateCellResultColor(RivCellSetEnum geometryType, size_t timeStepIndex, RimEclipseCellColors* cellResultSlot)
{
RivReservoirPartMgr * pmgr = reservoirPartManager( geometryType, timeStepIndex );
pmgr->updateCellResultColor(timeStepIndex, cellResultSlot);
@ -798,7 +798,7 @@ void RivReservoirViewPartMgr::updateCellResultColor(RivCellSetEnum geometryType,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::updateCellEdgeResultColor(RivCellSetEnum geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
void RivReservoirViewPartMgr::updateCellEdgeResultColor(RivCellSetEnum geometryType, size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
{
RivReservoirPartMgr * pmgr = reservoirPartManager( geometryType, timeStepIndex );
pmgr->updateCellEdgeResultColor(timeStepIndex, cellResultSlot, cellEdgeResultSlot);
@ -807,7 +807,7 @@ void RivReservoirViewPartMgr::updateCellEdgeResultColor(RivCellSetEnum geometryT
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::updateFaultCellEdgeResultColor(RivCellSetEnum geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
void RivReservoirViewPartMgr::updateFaultCellEdgeResultColor(RivCellSetEnum geometryType, size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
{
RivReservoirPartMgr * pmgr = reservoirPartManager(geometryType, timeStepIndex);
pmgr->updateFaultCellEdgeResultColor(timeStepIndex, cellResultSlot, cellEdgeResultSlot);
@ -841,7 +841,7 @@ RivReservoirPartMgr * RivReservoirViewPartMgr::reservoirPartManager(RivCellSetEn
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::updateFaultColors(RivCellSetEnum geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot)
void RivReservoirViewPartMgr::updateFaultColors(RivCellSetEnum geometryType, size_t timeStepIndex, RimEclipseCellColors* cellResultSlot)
{
if (geometryType == PROPERTY_FILTERED && timeStepIndex >= m_propFilteredGeometryFrames.size())
{

8
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h
View File

@ -50,17 +50,17 @@ public:
void updateCellColor (RivCellSetEnum geometryType, size_t timeStepIndex,
cvf::Color4f color);
void updateCellResultColor (RivCellSetEnum geometryType, size_t timeStepIndex,
RimResultSlot* cellResultSlot);
RimEclipseCellColors* cellResultSlot);
void updateCellEdgeResultColor(RivCellSetEnum geometryType, size_t timeStepIndex,
RimResultSlot* cellResultSlot,
RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot);
// Faults
void appendFaultsStaticGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType);
void appendFaultsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType, size_t frameIndex);
void updateFaultColors(RivCellSetEnum geometryType, size_t timeStepIndex, RimResultSlot* cellResultSlot);
void updateFaultColors(RivCellSetEnum geometryType, size_t timeStepIndex, RimEclipseCellColors* cellResultSlot);
void updateFaultCellEdgeResultColor( RivCellSetEnum geometryType, size_t timeStepIndex,
RimResultSlot* cellResultSlot,
RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot);
// Fault labels

2
ApplicationCode/ModelVisualization/RivScalarMapperUtils.cpp
View File

@ -71,7 +71,7 @@ cvf::ref<cvf::Effect> RivScalarMapperUtils::createCellEdgeEffect(cvf::DrawableGe
const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper,
size_t gridIndex,
size_t timeStepIndex,
RimResultSlot* cellResultSlot,
RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot,
float opacityLevel,
cvf::Color3f defaultColor,

4
ApplicationCode/ModelVisualization/RivScalarMapperUtils.h
View File

@ -34,7 +34,7 @@ namespace cvf
}
class RivTernaryScalarMapper;
class RimResultSlot;
class RimEclipseCellColors;
class RimCellEdgeResultSlot;
//==================================================================================================
@ -50,7 +50,7 @@ public:
const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper,
size_t gridIndex,
size_t timeStepIndex,
RimResultSlot* cellResultSlot,
RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot,
float opacityLevel,
cvf::Color3f defaultColor,

2
ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp
View File

@ -38,7 +38,7 @@
///
//--------------------------------------------------------------------------------------------------
RivTernaryTextureCoordsCreator::RivTernaryTextureCoordsCreator(
RimResultSlot* cellResultSlot,
RimEclipseCellColors* cellResultSlot,
RimTernaryLegendConfig* ternaryLegendConfig,
size_t timeStepIndex,
size_t gridIndex,

4
ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.h
View File

@ -26,7 +26,7 @@
#include "cvfObject.h"
#include "cvfArray.h"
class RimResultSlot;
class RimEclipseCellColors;
class RimTernaryLegendConfig;
namespace cvf
@ -41,7 +41,7 @@ namespace cvf
class RivTernaryTextureCoordsCreator
{
public:
RivTernaryTextureCoordsCreator( RimResultSlot* cellResultSlot,
RivTernaryTextureCoordsCreator( RimEclipseCellColors* cellResultSlot,
RimTernaryLegendConfig* ternaryLegendConfig,
size_t timeStepIndex,
size_t gridIndex,

2
ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp
View File

@ -32,7 +32,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivTextureCoordsCreator::RivTextureCoordsCreator(RimResultSlot* cellResultSlot, size_t timeStepIndex, size_t gridIndex, const cvf::StructGridQuadToCellFaceMapper* quadMapper)
RivTextureCoordsCreator::RivTextureCoordsCreator(RimEclipseCellColors* cellResultSlot, size_t timeStepIndex, size_t gridIndex, const cvf::StructGridQuadToCellFaceMapper* quadMapper)
{
RigCaseData* eclipseCase = cellResultSlot->reservoirView()->eclipseCase()->reservoirData();

4
ApplicationCode/ModelVisualization/RivTextureCoordsCreator.h
View File

@ -23,7 +23,7 @@
#include "cvfObject.h"
#include "cvfArray.h"
class RimResultSlot;
class RimEclipseCellColors;
class RigResultAccessor;
class RivResultToTextureMapper;
@ -36,7 +36,7 @@ namespace cvf
class RivTextureCoordsCreator
{
public:
RivTextureCoordsCreator(RimResultSlot* cellResultSlot,
RivTextureCoordsCreator(RimEclipseCellColors* cellResultSlot,
size_t timeStepIndex,
size_t gridIndex,
const cvf::StructGridQuadToCellFaceMapper* quadMapper);

4
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -160,7 +160,7 @@ void RimEclipseCase::removeResult(const QString& resultName)
RimEclipseView* reservoirView = reservoirViews()[i];
CVF_ASSERT(reservoirView);
RimResultSlot* result = reservoirView->cellResult;
RimEclipseCellColors* result = reservoirView->cellResult;
CVF_ASSERT(result);
bool rebuildDisplayModel = false;
@ -215,7 +215,7 @@ void RimEclipseCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
RimEclipseView* reservoirView = reservoirViews()[i];
CVF_ASSERT(reservoirView);
RimResultSlot* result = reservoirView->cellResult;
RimEclipseCellColors* result = reservoirView->cellResult;
CVF_ASSERT(result);
result->setResultVariable(RimDefines::undefinedResultName());

10
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -78,7 +78,7 @@ RimEclipseView::RimEclipseView()
CAF_PDM_InitObject("Reservoir View", ":/ReservoirView.png", "", "");
CAF_PDM_InitFieldNoDefault(&cellResult, "GridCellResult", "Cell Result", ":/CellResult.png", "", "");
cellResult = new RimResultSlot();
cellResult = new RimEclipseCellColors();
CAF_PDM_InitFieldNoDefault(&cellEdgeResult, "GridCellEdgeResult", "Cell Edge Result", ":/EdgeResult_1.png", "", "");
cellEdgeResult = new RimCellEdgeResultSlot();
@ -932,7 +932,7 @@ void RimEclipseView::updateLegends()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseView::updateMinMaxValuesAndAddLegendToView(QString legendLabel, RimResultSlot* resultSlot, RigCaseCellResultsData* cellResultsData)
void RimEclipseView::updateMinMaxValuesAndAddLegendToView(QString legendLabel, RimEclipseCellColors* resultSlot, RigCaseCellResultsData* cellResultsData)
{
if (resultSlot->hasResult())
{
@ -1371,7 +1371,7 @@ void RimEclipseView::updateFaultColors()
// Update all fault geometry
std::vector<RivCellSetEnum> faultGeometriesToRecolor = visibleFaultGeometryTypes();
RimResultSlot* faultResultSlot = currentFaultResultSlot();
RimEclipseCellColors* faultResultSlot = currentFaultResultSlot();
for (size_t i = 0; i < faultGeometriesToRecolor.size(); ++i)
{
@ -1414,9 +1414,9 @@ bool RimEclipseView::isTimeStepDependentDataVisible() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimResultSlot* RimEclipseView::currentFaultResultSlot()
RimEclipseCellColors* RimEclipseView::currentFaultResultSlot()
{
RimResultSlot* faultResultSlot = this->cellResult();
RimEclipseCellColors* faultResultSlot = this->cellResult();
if (this->faultResultSettings()->showCustomFaultResult())
{

8
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@ -50,7 +50,7 @@ class RimFaultCollection;
class RimFaultResultSlot;
class RimReservoirCellResultsStorage;
class RimReservoirCellResultsStorage;
class RimResultSlot;
class RimEclipseCellColors;
class RimWellCollection;
class RiuViewer;
class RivReservoirPipesPartMgr;
@ -84,7 +84,7 @@ public:
// Fields containing child objects :
caf::PdmField<RimResultSlot*> cellResult;
caf::PdmField<RimEclipseCellColors*> cellResult;
caf::PdmField<RimCellEdgeResultSlot*> cellEdgeResult;
caf::PdmField<RimFaultResultSlot*> faultResultSettings;
@ -103,7 +103,7 @@ public:
RimReservoirCellResultsStorage* currentGridCellResults();
RigActiveCellInfo* currentActiveCellInfo();
RimResultSlot* currentFaultResultSlot();
RimEclipseCellColors* currentFaultResultSlot();
void setEclipseCase(RimEclipseCase* reservoir);
RimEclipseCase* eclipseCase();
@ -142,7 +142,7 @@ private:
virtual void updateStaticCellColors();
void updateStaticCellColors(RivCellSetEnum geometryType);
void updateLegends();
void updateMinMaxValuesAndAddLegendToView(QString legendLabel, RimResultSlot* resultSlot, RigCaseCellResultsData* cellResultsData);
void updateMinMaxValuesAndAddLegendToView(QString legendLabel, RimEclipseCellColors* resultSlot, RigCaseCellResultsData* cellResultsData);
virtual void resetLegendsInViewer();
virtual void updateViewerWidgetWindowTitle();

4
ApplicationCode/ProjectDataModel/RimFaultResultSlot.cpp
View File

@ -43,7 +43,7 @@ RimFaultResultSlot::RimFaultResultSlot()
showCustomFaultResult.setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_customFaultResult, "CustomResultSlot", "Custom Fault Result", ":/CellResult.png", "", "");
m_customFaultResult = new RimResultSlot();
m_customFaultResult = new RimEclipseCellColors();
m_customFaultResult.setOwnerObject(this);
m_customFaultResult.setUiHidden(true);
@ -111,7 +111,7 @@ void RimFaultResultSlot::updateFieldVisibility()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimResultSlot* RimFaultResultSlot::customFaultResult()
RimEclipseCellColors* RimFaultResultSlot::customFaultResult()
{
return this->m_customFaultResult();
}

6
ApplicationCode/ProjectDataModel/RimFaultResultSlot.h
View File

@ -23,7 +23,7 @@
#include "cafPdmField.h"
#include "cafPdmObject.h"
class RimResultSlot;
class RimEclipseCellColors;
class RimEclipseView;
//==================================================================================================
@ -43,7 +43,7 @@ public:
caf::PdmField<bool> showCustomFaultResult;
bool hasValidCustomResult();
RimResultSlot* customFaultResult();
RimEclipseCellColors* customFaultResult();
void updateFieldVisibility();
@ -56,7 +56,7 @@ protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) ;
private:
caf::PdmField<RimResultSlot*> m_customFaultResult;
caf::PdmField<RimEclipseCellColors*> m_customFaultResult;
caf::PdmPointer<RimEclipseView> m_reservoirView;
};

16
ApplicationCode/ProjectDataModel/RimResultSlot.cpp
View File

@ -25,12 +25,12 @@
#include "RimUiTreeModelPdm.h"
#include "RiuMainWindow.h"
CAF_PDM_SOURCE_INIT(RimResultSlot, "ResultSlot");
CAF_PDM_SOURCE_INIT(RimEclipseCellColors, "ResultSlot");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimResultSlot::RimResultSlot()
RimEclipseCellColors::RimEclipseCellColors()
{
CAF_PDM_InitObject("Result Slot", "", "", "");
@ -52,7 +52,7 @@ RimResultSlot::RimResultSlot()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimResultSlot::~RimResultSlot()
RimEclipseCellColors::~RimEclipseCellColors()
{
delete legendConfig();
delete ternaryLegendConfig();
@ -61,7 +61,7 @@ RimResultSlot::~RimResultSlot()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimResultSlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimEclipseCellColors::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
RimEclipseResultDefinition::fieldChangedByUi(changedField, oldValue, newValue);
@ -87,7 +87,7 @@ void RimResultSlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, co
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimResultSlot::changeLegendConfig(QString resultVarNameOfNewLegend)
void RimEclipseCellColors::changeLegendConfig(QString resultVarNameOfNewLegend)
{
if (resultVarNameOfNewLegend == RimDefines::ternarySaturationResultName())
{
@ -139,7 +139,7 @@ void RimResultSlot::changeLegendConfig(QString resultVarNameOfNewLegend)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimResultSlot::initAfterRead()
void RimEclipseCellColors::initAfterRead()
{
RimEclipseResultDefinition::initAfterRead();
@ -154,7 +154,7 @@ void RimResultSlot::initAfterRead()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimResultSlot::setReservoirView(RimEclipseView* ownerReservoirView)
void RimEclipseCellColors::setReservoirView(RimEclipseView* ownerReservoirView)
{
RimEclipseResultDefinition::setReservoirView(ownerReservoirView);
@ -172,7 +172,7 @@ void RimResultSlot::setReservoirView(RimEclipseView* ownerReservoirView)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimResultSlot::setResultVariable(const QString& val)
void RimEclipseCellColors::setResultVariable(const QString& val)
{
RimEclipseResultDefinition::setResultVariable(val);

6
ApplicationCode/ProjectDataModel/RimResultSlot.h
View File

@ -30,12 +30,12 @@ class RimTernaryLegendConfig;
///
///
//==================================================================================================
class RimResultSlot : public RimEclipseResultDefinition
class RimEclipseCellColors : public RimEclipseResultDefinition
{
CAF_PDM_HEADER_INIT;
public:
RimResultSlot();
virtual ~RimResultSlot();
RimEclipseCellColors();
virtual ~RimEclipseCellColors();
virtual void setReservoirView(RimEclipseView* ownerReservoirView);
caf::PdmField<RimLegendConfig*> legendConfig;

4
ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
View File

@ -200,7 +200,7 @@ void RimUiTreeView::contextMenuEvent(QContextMenuEvent* event)
menu.addAction(QString("Delete"), this, SLOT(slotDeleteObjectFromContainer()));
menu.addAction(QString("Save Property To File"), this, SLOT(slotWriteInputProperty()));
}
else if (dynamic_cast<RimResultSlot*>(uiItem->dataObject().p()))
else if (dynamic_cast<RimEclipseCellColors*>(uiItem->dataObject().p()))
{
menu.addAction(QString("Save Property To File"), this, SLOT(slotWriteBinaryResultAsInputProperty()));
}
@ -887,7 +887,7 @@ void RimUiTreeView::slotWriteBinaryResultAsInputProperty()
RimUiTreeModelPdm* myModel = dynamic_cast<RimUiTreeModelPdm*>(model());
caf::PdmUiTreeItem* uiItem = myModel->getTreeItemFromIndex(currentIndex());
RimResultSlot* resultSlot = dynamic_cast<RimResultSlot*>(uiItem->dataObject().p());
RimEclipseCellColors* resultSlot = dynamic_cast<RimEclipseCellColors*>(uiItem->dataObject().p());
if (!resultSlot) return;
if (!resultSlot->reservoirView()) return;
if (!resultSlot->reservoirView()->eclipseCase()) return;

2
ApplicationCode/UserInterface/RiuFemResultTextBuilder.h
View File

@ -25,7 +25,7 @@
#include <QString>
class RimGeoMechView;
class RimResultSlot;
class RimEclipseCellColors;
class RigGeoMechCaseData;
class RimGeoMechCellColors;

4
ApplicationCode/UserInterface/RiuResultTextBuilder.cpp
View File

@ -307,7 +307,7 @@ QString RiuResultTextBuilder::nncResultText()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuResultTextBuilder::appendTextFromResultSlot(RigCaseData* eclipseCase, size_t gridIndex, size_t cellIndex, size_t timeStepIndex, RimResultSlot* resultSlot, QString* resultInfoText)
void RiuResultTextBuilder::appendTextFromResultSlot(RigCaseData* eclipseCase, size_t gridIndex, size_t cellIndex, size_t timeStepIndex, RimEclipseCellColors* resultSlot, QString* resultInfoText)
{
if (!resultSlot)
{
@ -574,7 +574,7 @@ void RiuResultTextBuilder::appendDetails(QString& text, const QString& details)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiuResultTextBuilder::cellResultText(RimResultSlot* resultSlot)
QString RiuResultTextBuilder::cellResultText(RimEclipseCellColors* resultSlot)
{
QString text;

6
ApplicationCode/UserInterface/RiuResultTextBuilder.h
View File

@ -25,7 +25,7 @@
class RimEclipseView;
class RimResultSlot;
class RimEclipseCellColors;
class QString;
class RigCaseData;
@ -62,9 +62,9 @@ private:
QString nncResultText();
QString wellResultText();
QString cellResultText(RimResultSlot* resultSlot);
QString cellResultText(RimEclipseCellColors* resultSlot);
void appendTextFromResultSlot(RigCaseData* eclipseCase, size_t gridIndex, size_t cellIndex, size_t timeStepIndex, RimResultSlot* resultSlot, QString* resultInfoText);
void appendTextFromResultSlot(RigCaseData* eclipseCase, size_t gridIndex, size_t cellIndex, size_t timeStepIndex, RimEclipseCellColors* resultSlot, QString* resultInfoText);
private:
caf::PdmPointer<RimEclipseView> m_reservoirView;