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 "RimCellEdgeResultSlot" to "RimCellEdgeColors"

Browse Source
This commit is contained in:
Pål Hagen
2015-06-25 13:41:55 +02:00
parent fd03a02645
commit 8e994914f5
19 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp
View File

@@ -44,7 +44,7 @@
void RivCellEdgeGeometryUtils::addCellEdgeResultsToDrawableGeo(
size_t timeStepIndex,
RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot,
RimCellEdgeColors* cellEdgeResultSlot,
const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper,
cvf::DrawableGeo* geo,
size_t gridIndex,
@@ -187,7 +187,7 @@ bool RivCellEdgeGeometryUtils::hideScalarValue(double scalarValue, double scalar
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivCellEdgeGeometryUtils::addTernaryCellEdgeResultsToDrawableGeo(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot,
void RivCellEdgeGeometryUtils::addTernaryCellEdgeResultsToDrawableGeo(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeColors* cellEdgeResultSlot,
const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper,
cvf::DrawableGeo* geo, size_t gridIndex, float opacityLevel)
{
@@ -286,7 +286,7 @@ void RivCellEdgeGeometryUtils::addTernaryCellEdgeResultsToDrawableGeo(size_t tim
//--------------------------------------------------------------------------------------------------
cvf::ref<RigResultAccessor> RivCellEdgeGeometryUtils::createCellEdgeCenterResultAccessor(
RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot,
RimCellEdgeColors* cellEdgeResultSlot,
size_t timeStepIndex,
RigCaseData* eclipseCase,
const RigGridBase* grid)

8
ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h
View File

@@ -28,7 +28,7 @@ namespace cvf
class StructGridQuadToCellFaceMapper;
}
class RimCellEdgeResultSlot;
class RimCellEdgeColors;
class RimEclipseCellColors;
class RigGridBase;
class RigResultAccessor;
@@ -40,7 +40,7 @@ class RivCellEdgeGeometryUtils
public:
static void addCellEdgeResultsToDrawableGeo(size_t timeStepIndex,
RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot,
RimCellEdgeColors* cellEdgeResultSlot,
const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper,
cvf::DrawableGeo* geo,
size_t gridIndex,
@@ -48,7 +48,7 @@ public:
static void addTernaryCellEdgeResultsToDrawableGeo(size_t timeStepIndex,
RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot,
RimCellEdgeColors* cellEdgeResultSlot,
const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper,
cvf::DrawableGeo* geo,
size_t gridIndex,
@@ -64,7 +64,7 @@ private:
static cvf::ref<RigResultAccessor> createCellEdgeCenterResultAccessor(
RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot,
RimCellEdgeColors* cellEdgeResultSlot,
size_t timeStepIndex,
RigCaseData* eclipseCase,
const RigGridBase* grid);

2
ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
View File

@@ -181,7 +181,7 @@ void RivFaultPartMgr::updateCellResultColor(size_t timeStepIndex, RimEclipseCell
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivFaultPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
void RivFaultPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeColors* cellEdgeResultSlot)
{
updateNNCColors(cellResultSlot);

4
ApplicationCode/ModelVisualization/RivFaultPartMgr.h
View File

@@ -38,7 +38,7 @@ namespace cvf
}
class RimEclipseCellColors;
class RimCellEdgeResultSlot;
class RimCellEdgeColors;
class RimFaultCollection;
//==================================================================================================
@@ -56,7 +56,7 @@ public:
void applySingleColorEffect();
void setOpacityLevel(float opacity) { m_opacityLevel = opacity; }
void updateCellResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot);
void updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot);
void updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeColors* cellEdgeResultSlot);
void appendNativeFaultFacesToModel(cvf::ModelBasicList* model);
void appendOppositeFaultFacesToModel(cvf::ModelBasicList* model);

2
ApplicationCode/ModelVisualization/RivGridPartMgr.cpp
View File

@@ -266,7 +266,7 @@ void RivGridPartMgr::updateCellResultColor(size_t timeStepIndex, RimEclipseCellC
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivGridPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
void RivGridPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeColors* cellEdgeResultSlot)
{
if (m_surfaceFaces.notNull())
{

4
ApplicationCode/ModelVisualization/RivGridPartMgr.h
View File

@@ -35,7 +35,7 @@ namespace cvf
}
class RimEclipseCellColors;
class RimCellEdgeResultSlot;
class RimCellEdgeColors;
@@ -60,7 +60,7 @@ public:
void updateCellResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot);
void updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot);
RimCellEdgeColors* cellEdgeResultSlot);
void appendPartsToModel(cvf::ModelBasicList* model);

2
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@@ -225,7 +225,7 @@ void RivReservoirFaultsPartMgr::updateColors(size_t timeStepIndex, RimEclipseCel
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirFaultsPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
void RivReservoirFaultsPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeColors* cellEdgeResultSlot)
{
for (size_t i = 0; i < m_faultParts.size(); i++)
{

4
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h
View File

@@ -31,7 +31,7 @@ namespace cvf
}
class RimEclipseCellColors;
class RimCellEdgeResultSlot;
class RimCellEdgeColors;
class RimEclipseView;
//==================================================================================================
@@ -51,7 +51,7 @@ public:
void applySingleColorEffect();
void updateColors(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot);
void updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot);
RimCellEdgeColors* cellEdgeResultSlot);
void appendPartsToModel(cvf::ModelBasicList* model);

4
ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp
View File

@@ -122,7 +122,7 @@ void RivReservoirPartMgr::updateCellResultColor(size_t timeStepIndex, RimEclipse
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
void RivReservoirPartMgr::updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeColors* cellEdgeResultSlot)
{
for (size_t i = 0; i < m_allGrids.size() ; ++i)
{
@@ -202,7 +202,7 @@ void RivReservoirPartMgr::setFaultForceVisibility(bool isGeneratedByFilter)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirPartMgr::updateFaultCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
void RivReservoirPartMgr::updateFaultCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeColors* cellEdgeResultSlot)
{
if (m_faultsPartMgr.notNull())
{

6
ApplicationCode/ModelVisualization/RivReservoirPartMgr.h
View File

@@ -33,7 +33,7 @@ namespace cvf
}
class RimEclipseCellColors;
class RimCellEdgeResultSlot;
class RimCellEdgeColors;
class RigCaseData;
class RimEclipseView;
@@ -59,7 +59,7 @@ public:
void updateCellColor(cvf::Color4f color);
void updateCellResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot);
void updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot);
RimCellEdgeColors* cellEdgeResultSlot);
void appendGridPartsToModel(cvf::ModelBasicList* model, const std::vector<size_t>& gridIdxes);
void appendGridPartsToModel(cvf::ModelBasicList* model);
@@ -67,7 +67,7 @@ public:
// Faults
void updateFaultColors(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot);
void updateFaultCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot);
RimCellEdgeColors* cellEdgeResultSlot);
void appendFaultPartsToModel(cvf::ModelBasicList* model);
void appendFaultLabelPartsToModel(cvf::ModelBasicList* model);
private:

4
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@@ -798,7 +798,7 @@ void RivReservoirViewPartMgr::updateCellResultColor(RivCellSetEnum geometryType,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::updateCellEdgeResultColor(RivCellSetEnum geometryType, size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
void RivReservoirViewPartMgr::updateCellEdgeResultColor(RivCellSetEnum geometryType, size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeColors* 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, RimEclipseCellColors* cellResultSlot, RimCellEdgeResultSlot* cellEdgeResultSlot)
void RivReservoirViewPartMgr::updateFaultCellEdgeResultColor(RivCellSetEnum geometryType, size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, RimCellEdgeColors* cellEdgeResultSlot)
{
RivReservoirPartMgr * pmgr = reservoirPartManager(geometryType, timeStepIndex);
pmgr->updateFaultCellEdgeResultColor(timeStepIndex, cellResultSlot, cellEdgeResultSlot);

4
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h
View File

@@ -53,7 +53,7 @@ public:
RimEclipseCellColors* cellResultSlot);
void updateCellEdgeResultColor(RivCellSetEnum geometryType, size_t timeStepIndex,
RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot);
RimCellEdgeColors* cellEdgeResultSlot);
// Faults
void appendFaultsStaticGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType);
@@ -61,7 +61,7 @@ public:
void updateFaultColors(RivCellSetEnum geometryType, size_t timeStepIndex, RimEclipseCellColors* cellResultSlot);
void updateFaultCellEdgeResultColor( RivCellSetEnum geometryType, size_t timeStepIndex,
RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot);
RimCellEdgeColors* cellEdgeResultSlot);
// Fault labels
RivCellSetEnum geometryTypeForFaultLabels(const std::vector<RivCellSetEnum>& geometryTypes) const;

2
ApplicationCode/ModelVisualization/RivScalarMapperUtils.cpp
View File

@@ -72,7 +72,7 @@ cvf::ref<cvf::Effect> RivScalarMapperUtils::createCellEdgeEffect(cvf::DrawableGe
size_t gridIndex,
size_t timeStepIndex,
RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot,
RimCellEdgeColors* cellEdgeResultSlot,
float opacityLevel,
cvf::Color3f defaultColor,
caf::FaceCulling faceCulling,

4
ApplicationCode/ModelVisualization/RivScalarMapperUtils.h
View File

@@ -35,7 +35,7 @@ namespace cvf
class RivTernaryScalarMapper;
class RimEclipseCellColors;
class RimCellEdgeResultSlot;
class RimCellEdgeColors;
//==================================================================================================
///
@@ -51,7 +51,7 @@ public:
size_t gridIndex,
size_t timeStepIndex,
RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot,
RimCellEdgeColors* cellEdgeResultSlot,
float opacityLevel,
cvf::Color3f defaultColor,
caf::FaceCulling faceCulling,