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
Show Stats 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( void RivCellEdgeGeometryUtils::addCellEdgeResultsToDrawableGeo(
size_t timeStepIndex, size_t timeStepIndex,
RimEclipseCellColors* cellResultSlot, RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot, RimCellEdgeColors* cellEdgeResultSlot,
const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper, const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper,
cvf::DrawableGeo* geo, cvf::DrawableGeo* geo,
size_t gridIndex, 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, const cvf::StructGridQuadToCellFaceMapper* quadToCellFaceMapper,
cvf::DrawableGeo* geo, size_t gridIndex, float opacityLevel) cvf::DrawableGeo* geo, size_t gridIndex, float opacityLevel)
{ {
@ -286,7 +286,7 @@ void RivCellEdgeGeometryUtils::addTernaryCellEdgeResultsToDrawableGeo(size_t tim
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
cvf::ref<RigResultAccessor> RivCellEdgeGeometryUtils::createCellEdgeCenterResultAccessor( cvf::ref<RigResultAccessor> RivCellEdgeGeometryUtils::createCellEdgeCenterResultAccessor(
RimEclipseCellColors* cellResultSlot, RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot, RimCellEdgeColors* cellEdgeResultSlot,
size_t timeStepIndex, size_t timeStepIndex,
RigCaseData* eclipseCase, RigCaseData* eclipseCase,
const RigGridBase* grid) const RigGridBase* grid)

8
ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.h
View File

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

4
ApplicationCode/ModelVisualization/RivFaultPartMgr.h
View File

@ -38,7 +38,7 @@ namespace cvf
} }
class RimEclipseCellColors; class RimEclipseCellColors;
class RimCellEdgeResultSlot; class RimCellEdgeColors;
class RimFaultCollection; class RimFaultCollection;
//================================================================================================== //==================================================================================================
@ -56,7 +56,7 @@ public:
void applySingleColorEffect(); void applySingleColorEffect();
void setOpacityLevel(float opacity) { m_opacityLevel = opacity; } void setOpacityLevel(float opacity) { m_opacityLevel = opacity; }
void updateCellResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot); 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 appendNativeFaultFacesToModel(cvf::ModelBasicList* model);
void appendOppositeFaultFacesToModel(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()) if (m_surfaceFaces.notNull())
{ {

4
ApplicationCode/ModelVisualization/RivGridPartMgr.h
View File

@ -35,7 +35,7 @@ namespace cvf
} }
class RimEclipseCellColors; class RimEclipseCellColors;
class RimCellEdgeResultSlot; class RimCellEdgeColors;
@ -60,7 +60,7 @@ public:
void updateCellResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot); void updateCellResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot);
void updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, void updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot); RimCellEdgeColors* cellEdgeResultSlot);
void appendPartsToModel(cvf::ModelBasicList* model); 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++) 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 RimEclipseCellColors;
class RimCellEdgeResultSlot; class RimCellEdgeColors;
class RimEclipseView; class RimEclipseView;
//================================================================================================== //==================================================================================================
@ -51,7 +51,7 @@ public:
void applySingleColorEffect(); void applySingleColorEffect();
void updateColors(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot); void updateColors(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot);
void updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot, void updateCellEdgeResultColor(size_t timeStepIndex, RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot); RimCellEdgeColors* cellEdgeResultSlot);
void appendPartsToModel(cvf::ModelBasicList* model); 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) 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()) if (m_faultsPartMgr.notNull())
{ {

6
ApplicationCode/ModelVisualization/RivReservoirPartMgr.h
View File

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

4
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h
View File

@ -53,7 +53,7 @@ public:
RimEclipseCellColors* cellResultSlot); RimEclipseCellColors* cellResultSlot);
void updateCellEdgeResultColor(RivCellSetEnum geometryType, size_t timeStepIndex, void updateCellEdgeResultColor(RivCellSetEnum geometryType, size_t timeStepIndex,
RimEclipseCellColors* cellResultSlot, RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot); RimCellEdgeColors* cellEdgeResultSlot);
// Faults // Faults
void appendFaultsStaticGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType); void appendFaultsStaticGeometryPartsToModel(cvf::ModelBasicList* model, RivCellSetEnum geometryType);
@ -61,7 +61,7 @@ public:
void updateFaultColors(RivCellSetEnum geometryType, size_t timeStepIndex, RimEclipseCellColors* cellResultSlot); void updateFaultColors(RivCellSetEnum geometryType, size_t timeStepIndex, RimEclipseCellColors* cellResultSlot);
void updateFaultCellEdgeResultColor( RivCellSetEnum geometryType, size_t timeStepIndex, void updateFaultCellEdgeResultColor( RivCellSetEnum geometryType, size_t timeStepIndex,
RimEclipseCellColors* cellResultSlot, RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot); RimCellEdgeColors* cellEdgeResultSlot);
// Fault labels // Fault labels
RivCellSetEnum geometryTypeForFaultLabels(const std::vector<RivCellSetEnum>& geometryTypes) const; 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 gridIndex,
size_t timeStepIndex, size_t timeStepIndex,
RimEclipseCellColors* cellResultSlot, RimEclipseCellColors* cellResultSlot,
RimCellEdgeResultSlot* cellEdgeResultSlot, RimCellEdgeColors* cellEdgeResultSlot,
float opacityLevel, float opacityLevel,
cvf::Color3f defaultColor, cvf::Color3f defaultColor,
caf::FaceCulling faceCulling, caf::FaceCulling faceCulling,

4
ApplicationCode/ModelVisualization/RivScalarMapperUtils.h
View File

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

44
ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.cpp
View File

@ -29,12 +29,12 @@
#include "cvfMath.h" #include "cvfMath.h"
CAF_PDM_SOURCE_INIT(RimCellEdgeResultSlot, "CellEdgeResultSlot"); CAF_PDM_SOURCE_INIT(RimCellEdgeColors, "CellEdgeResultSlot");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimCellEdgeResultSlot::RimCellEdgeResultSlot() RimCellEdgeColors::RimCellEdgeColors()
{ {
CAF_PDM_InitObject("Cell Edge Result", "", "", ""); CAF_PDM_InitObject("Cell Edge Result", "", "", "");
@ -56,7 +56,7 @@ RimCellEdgeResultSlot::RimCellEdgeResultSlot()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimCellEdgeResultSlot::~RimCellEdgeResultSlot() RimCellEdgeColors::~RimCellEdgeColors()
{ {
delete legendConfig(); delete legendConfig();
} }
@ -64,7 +64,7 @@ RimCellEdgeResultSlot::~RimCellEdgeResultSlot()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellEdgeResultSlot::setReservoirView(RimEclipseView* ownerReservoirView) void RimCellEdgeColors::setReservoirView(RimEclipseView* ownerReservoirView)
{ {
m_reservoirView = ownerReservoirView; m_reservoirView = ownerReservoirView;
this->legendConfig()->setReservoirView(ownerReservoirView); this->legendConfig()->setReservoirView(ownerReservoirView);
@ -73,7 +73,7 @@ void RimCellEdgeResultSlot::setReservoirView(RimEclipseView* ownerReservoirView)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellEdgeResultSlot::loadResult() void RimCellEdgeColors::loadResult()
{ {
CVF_ASSERT(m_reservoirView && m_reservoirView->currentGridCellResults()); CVF_ASSERT(m_reservoirView && m_reservoirView->currentGridCellResults());
@ -106,7 +106,7 @@ void RimCellEdgeResultSlot::loadResult()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellEdgeResultSlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) void RimCellEdgeColors::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{ {
loadResult(); loadResult();
@ -116,14 +116,14 @@ void RimCellEdgeResultSlot::fieldChangedByUi(const caf::PdmFieldHandle* changedF
namespace caf namespace caf
{ {
template<> template<>
void RimCellEdgeResultSlot::EdgeFaceEnum::setUp() void RimCellEdgeColors::EdgeFaceEnum::setUp()
{ {
addItem(RimCellEdgeResultSlot::X, "X", ""); addItem(RimCellEdgeColors::X, "X", "");
addItem(RimCellEdgeResultSlot::NEG_X, "X-", ""); addItem(RimCellEdgeColors::NEG_X, "X-", "");
addItem(RimCellEdgeResultSlot::Y, "Y", ""); addItem(RimCellEdgeColors::Y, "Y", "");
addItem(RimCellEdgeResultSlot::NEG_Y, "Y-", ""); addItem(RimCellEdgeColors::NEG_Y, "Y-", "");
addItem(RimCellEdgeResultSlot::Z, "Z", ""); addItem(RimCellEdgeColors::Z, "Z", "");
addItem(RimCellEdgeResultSlot::NEG_Z, "Z-", ""); addItem(RimCellEdgeColors::NEG_Z, "Z-", "");
} }
} }
@ -132,7 +132,7 @@ namespace caf
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimCellEdgeResultSlot::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) QList<caf::PdmOptionItemInfo> RimCellEdgeColors::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
{ {
if (fieldNeedingOptions == &resultVariable) if (fieldNeedingOptions == &resultVariable)
{ {
@ -209,7 +209,7 @@ QList<caf::PdmOptionItemInfo> RimCellEdgeResultSlot::calculateValueOptions(const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QStringList RimCellEdgeResultSlot::findResultVariableNames() QStringList RimCellEdgeColors::findResultVariableNames()
{ {
QStringList varNames; QStringList varNames;
@ -238,7 +238,7 @@ QStringList RimCellEdgeResultSlot::findResultVariableNames()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellEdgeResultSlot::gridScalarIndices(size_t resultIndices[6]) void RimCellEdgeColors::gridScalarIndices(size_t resultIndices[6])
{ {
int cubeFaceIndex; int cubeFaceIndex;
for (cubeFaceIndex = 0; cubeFaceIndex < 6; ++cubeFaceIndex) for (cubeFaceIndex = 0; cubeFaceIndex < 6; ++cubeFaceIndex)
@ -250,7 +250,7 @@ void RimCellEdgeResultSlot::gridScalarIndices(size_t resultIndices[6])
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellEdgeResultSlot::gridScalarResultNames(QStringList* resultNames) void RimCellEdgeColors::gridScalarResultNames(QStringList* resultNames)
{ {
CVF_ASSERT(resultNames); CVF_ASSERT(resultNames);
@ -265,7 +265,7 @@ void RimCellEdgeResultSlot::gridScalarResultNames(QStringList* resultNames)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellEdgeResultSlot::resetResultIndices() void RimCellEdgeColors::resetResultIndices()
{ {
int cubeFaceIndex; int cubeFaceIndex;
for (cubeFaceIndex = 0; cubeFaceIndex < 6; ++cubeFaceIndex) for (cubeFaceIndex = 0; cubeFaceIndex < 6; ++cubeFaceIndex)
@ -277,7 +277,7 @@ void RimCellEdgeResultSlot::resetResultIndices()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimCellEdgeResultSlot::hasResult() const bool RimCellEdgeColors::hasResult() const
{ {
bool hasResult = false; bool hasResult = false;
int cubeFaceIndex; int cubeFaceIndex;
@ -292,7 +292,7 @@ bool RimCellEdgeResultSlot::hasResult() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellEdgeResultSlot::updateIgnoredScalarValue() void RimCellEdgeColors::updateIgnoredScalarValue()
{ {
if (resultVariable == "MULT" || resultVariable == "riMULT") if (resultVariable == "MULT" || resultVariable == "riMULT")
{ {
@ -307,7 +307,7 @@ void RimCellEdgeResultSlot::updateIgnoredScalarValue()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellEdgeResultSlot::minMaxCellEdgeValues(double& min, double& max) void RimCellEdgeColors::minMaxCellEdgeValues(double& min, double& max)
{ {
double globalMin, globalMax; double globalMin, globalMax;
globalMin = HUGE_VAL; globalMin = HUGE_VAL;
@ -338,7 +338,7 @@ void RimCellEdgeResultSlot::minMaxCellEdgeValues(double& min, double& max)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCellEdgeResultSlot::posNegClosestToZero(double& pos, double& neg) void RimCellEdgeColors::posNegClosestToZero(double& pos, double& neg)
{ {
pos = HUGE_VAL; pos = HUGE_VAL;
neg = -HUGE_VAL; neg = -HUGE_VAL;

8
ApplicationCode/ProjectDataModel/RimCellEdgeResultSlot.h
View File

@ -35,12 +35,12 @@ class RimEclipseView;
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RimCellEdgeResultSlot : public caf::PdmObject class RimCellEdgeColors : public caf::PdmObject
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public: public:
RimCellEdgeResultSlot(); RimCellEdgeColors();
virtual ~RimCellEdgeResultSlot(); virtual ~RimCellEdgeColors();
enum EdgeFaceType enum EdgeFaceType
{ {
@ -49,7 +49,7 @@ public:
Z, NEG_Z Z, NEG_Z
}; };
typedef caf::AppEnum<RimCellEdgeResultSlot::EdgeFaceType> EdgeFaceEnum; typedef caf::AppEnum<RimCellEdgeColors::EdgeFaceType> EdgeFaceEnum;
void setReservoirView(RimEclipseView* ownerReservoirView); void setReservoirView(RimEclipseView* ownerReservoirView);

2
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -221,7 +221,7 @@ void RimEclipseCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
result->setResultVariable(RimDefines::undefinedResultName()); result->setResultVariable(RimDefines::undefinedResultName());
result->loadResult(); result->loadResult();
RimCellEdgeResultSlot* cellEdgeResult = reservoirView->cellEdgeResult; RimCellEdgeColors* cellEdgeResult = reservoirView->cellEdgeResult;
CVF_ASSERT(cellEdgeResult); CVF_ASSERT(cellEdgeResult);
cellEdgeResult->resultVariable.v() = RimDefines::undefinedResultName(); cellEdgeResult->resultVariable.v() = RimDefines::undefinedResultName();

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -81,7 +81,7 @@ RimEclipseView::RimEclipseView()
cellResult = new RimEclipseCellColors(); cellResult = new RimEclipseCellColors();
CAF_PDM_InitFieldNoDefault(&cellEdgeResult, "GridCellEdgeResult", "Cell Edge Result", ":/EdgeResult_1.png", "", ""); CAF_PDM_InitFieldNoDefault(&cellEdgeResult, "GridCellEdgeResult", "Cell Edge Result", ":/EdgeResult_1.png", "", "");
cellEdgeResult = new RimCellEdgeResultSlot(); cellEdgeResult = new RimCellEdgeColors();
CAF_PDM_InitFieldNoDefault(&faultResultSettings, "FaultResultSettings", "Separate Fault Result", "", "", ""); CAF_PDM_InitFieldNoDefault(&faultResultSettings, "FaultResultSettings", "Separate Fault Result", "", "", "");
faultResultSettings = new RimEclipseFaultColors(); faultResultSettings = new RimEclipseFaultColors();

4
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@ -41,7 +41,7 @@ class RigGridBase;
class RigGridCellFaceVisibilityFilter; class RigGridCellFaceVisibilityFilter;
class Rim3dOverlayInfoConfig; class Rim3dOverlayInfoConfig;
class RimEclipseCase; class RimEclipseCase;
class RimCellEdgeResultSlot; class RimCellEdgeColors;
class RimEclipsePropertyFilter; class RimEclipsePropertyFilter;
class RimEclipsePropertyFilterCollection; class RimEclipsePropertyFilterCollection;
class RimCellRangeFilter; class RimCellRangeFilter;
@ -85,7 +85,7 @@ public:
// Fields containing child objects : // Fields containing child objects :
caf::PdmField<RimEclipseCellColors*> cellResult; caf::PdmField<RimEclipseCellColors*> cellResult;
caf::PdmField<RimCellEdgeResultSlot*> cellEdgeResult; caf::PdmField<RimCellEdgeColors*> cellEdgeResult;
caf::PdmField<RimEclipseFaultColors*> faultResultSettings; caf::PdmField<RimEclipseFaultColors*> faultResultSettings;
caf::PdmField<RimEclipsePropertyFilterCollection*> propertyFilterCollection; caf::PdmField<RimEclipsePropertyFilterCollection*> propertyFilterCollection;