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 RimGeoMechResultSlot to RimGeoMechCellColors

Browse Source
This commit is contained in:
Pål Hagen
2015-06-25 12:03:02 +02:00
parent 5e050d3c38
commit 5eb673410e
12 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartPartMgr.cpp
View File

@@ -214,7 +214,7 @@ void RivFemPartPartMgr::updateCellColor(cvf::Color4f color)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivFemPartPartMgr::updateCellResultColor(size_t timeStepIndex, RimGeoMechResultSlot* cellResultSlot)
void RivFemPartPartMgr::updateCellResultColor(size_t timeStepIndex, RimGeoMechCellColors* cellResultSlot)
{
CVF_ASSERT(cellResultSlot);

4
ApplicationCode/GeoMech/GeoMechVisualization/RivFemPartPartMgr.h
View File

@@ -32,7 +32,7 @@ namespace cvf
class Effect;
}
class RimGeoMechResultSlot;
class RimGeoMechCellColors;
class RigFemPart;
@@ -54,7 +54,7 @@ public:
cvf::ref<cvf::UByteArray> cellVisibility() { return m_cellVisibility;}
void updateCellColor(cvf::Color4f color);
void updateCellResultColor(size_t timeStepIndex, RimGeoMechResultSlot* cellResultSlot);
void updateCellResultColor(size_t timeStepIndex, RimGeoMechCellColors* cellResultSlot);
void appendPartsToModel(cvf::ModelBasicList* model);

2
ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgr.cpp
View File

@@ -106,7 +106,7 @@ void RivGeoMechPartMgr::updateCellColor(cvf::Color4f color)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivGeoMechPartMgr::updateCellResultColor(size_t timeStepIndex, RimGeoMechResultSlot* cellResultSlot)
void RivGeoMechPartMgr::updateCellResultColor(size_t timeStepIndex, RimGeoMechCellColors* cellResultSlot)
{
for (size_t i = 0; i < m_femPartPartMgrs.size() ; ++i)
{

4
ApplicationCode/GeoMech/GeoMechVisualization/RivGeoMechPartMgr.h
View File

@@ -30,7 +30,7 @@ namespace cvf
class Transform;
}
class RimGeoMechResultSlot;
class RimGeoMechCellColors;
class RigGeoMechCaseData;
class RimGeoMechView;
@@ -56,7 +56,7 @@ public:
cellVisibility(size_t partIndex);
void updateCellColor(cvf::Color4f color);
void updateCellResultColor(size_t timeStepIndex, RimGeoMechResultSlot* cellResultSlot);
void updateCellResultColor(size_t timeStepIndex, RimGeoMechCellColors* cellResultSlot);
void appendGridPartsToModel(cvf::ModelBasicList* model, const std::vector<size_t>& partIndices);
void appendGridPartsToModel(cvf::ModelBasicList* model);

2
ApplicationCode/ModelVisualization/RivGeoMechVizLogic.cpp
View File

@@ -80,7 +80,7 @@ void RivGeoMechVizLogic::appendPartsToModel(int timeStepIndex, cvf::ModelBasicLi
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RivGeoMechVizLogic::updateCellResultColor(int timeStepIndex, RimGeoMechResultSlot* cellResultSlot)
void RivGeoMechVizLogic::updateCellResultColor(int timeStepIndex, RimGeoMechCellColors* cellResultSlot)
{
std::vector<RivGeoMechPartMgrCache::Key> visiblePartMgrs = keysToVisiblePartMgrs(timeStepIndex);
for (size_t pmIdx = 0; pmIdx < visiblePartMgrs.size(); ++pmIdx)

4
ApplicationCode/ModelVisualization/RivGeoMechVizLogic.h
View File

@@ -28,7 +28,7 @@
#include <vector>
class RimGeoMechView;
class RimGeoMechResultSlot;
class RimGeoMechCellColors;
namespace cvf
{
@@ -44,7 +44,7 @@ public:
void appendNoAnimPartsToModel(cvf::ModelBasicList* model);
void appendPartsToModel(int timeStepIndex, cvf::ModelBasicList* model);
void updateCellResultColor(int timeStepIndex, RimGeoMechResultSlot* cellResultSlot);
void updateCellResultColor(int timeStepIndex, RimGeoMechCellColors* cellResultSlot);
void updateStaticCellColors(int timeStepIndex);
void scheduleGeometryRegen(RivCellSetEnum geometryType);
private:

6
ApplicationCode/ProjectDataModel/RimGeoMechResultSlot.cpp
View File

@@ -22,13 +22,13 @@
#include "RimView.h"
CAF_PDM_SOURCE_INIT(RimGeoMechResultSlot, "GeoMechResultSlot");
CAF_PDM_SOURCE_INIT(RimGeoMechCellColors, "GeoMechResultSlot");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGeoMechResultSlot::RimGeoMechResultSlot(void)
RimGeoMechCellColors::RimGeoMechCellColors(void)
{
CAF_PDM_InitFieldNoDefault(&legendConfig, "LegendDefinition", "Legend Definition", "", "", "");
this->legendConfig = new RimLegendConfig();
@@ -37,6 +37,6 @@ RimGeoMechResultSlot::RimGeoMechResultSlot(void)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGeoMechResultSlot::~RimGeoMechResultSlot(void)
RimGeoMechCellColors::~RimGeoMechCellColors(void)
{
}

6
ApplicationCode/ProjectDataModel/RimGeoMechResultSlot.h
View File

@@ -29,13 +29,13 @@ class RimLegendConfig;
///
///
//==================================================================================================
class RimGeoMechResultSlot : public RimGeoMechResultDefinition
class RimGeoMechCellColors : public RimGeoMechResultDefinition
{
CAF_PDM_HEADER_INIT;
public:
RimGeoMechResultSlot(void);
virtual ~RimGeoMechResultSlot(void);
RimGeoMechCellColors(void);
virtual ~RimGeoMechCellColors(void);
caf::PdmField<RimLegendConfig*> legendConfig;
};

2
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@@ -67,7 +67,7 @@ RimGeoMechView::RimGeoMechView(void)
CAF_PDM_InitObject("Geomechanical View", ":/ReservoirView.png", "", "");
CAF_PDM_InitFieldNoDefault(&cellResult, "GridCellResult", "Color Result", ":/CellResult.png", "", "");
cellResult = new RimGeoMechResultSlot();
cellResult = new RimGeoMechCellColors();
CAF_PDM_InitFieldNoDefault(&rangeFilterCollection, "RangeFilters", "Range Filters", "", "", "");
rangeFilterCollection = new RimCellRangeFilterCollection();

4
ApplicationCode/ProjectDataModel/RimGeoMechView.h
View File

@@ -29,7 +29,7 @@
#include "cvfObject.h"
#include "RimView.h"
class RimGeoMechResultSlot;
class RimGeoMechCellColors;
class Rim3dOverlayInfoConfig;
class RiuViewer;
class RimGeoMechCase;
@@ -61,7 +61,7 @@ public:
virtual void loadDataAndUpdate();
caf::PdmField<RimGeoMechResultSlot*> cellResult;
caf::PdmField<RimGeoMechCellColors*> cellResult;
caf::PdmField<RimGeoMechPropertyFilterCollection*> propertyFilterCollection;
bool isTimeStepDependentDataVisible();

4
ApplicationCode/UserInterface/RiuFemResultTextBuilder.cpp
View File

@@ -156,7 +156,7 @@ QString RiuFemResultTextBuilder::gridResultDetails()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuFemResultTextBuilder::appendTextFromResultSlot(RigGeoMechCaseData* geomData, int gridIndex, int cellIndex, int timeStepIndex, RimGeoMechResultSlot* resultSlot, QString* resultInfoText)
void RiuFemResultTextBuilder::appendTextFromResultSlot(RigGeoMechCaseData* geomData, int gridIndex, int cellIndex, int timeStepIndex, RimGeoMechCellColors* resultSlot, QString* resultInfoText)
{
if (!resultSlot)
{
@@ -215,7 +215,7 @@ void RiuFemResultTextBuilder::appendDetails(QString& text, const QString& detail
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiuFemResultTextBuilder::closestNodeResultText(RimGeoMechResultSlot* resultSlot)
QString RiuFemResultTextBuilder::closestNodeResultText(RimGeoMechCellColors* resultSlot)
{
QString text;
if (!resultSlot)

6
ApplicationCode/UserInterface/RiuFemResultTextBuilder.h
View File

@@ -27,7 +27,7 @@
class RimGeoMechView;
class RimResultSlot;
class RigGeoMechCaseData;
class RimGeoMechResultSlot;
class RimGeoMechCellColors;
namespace cvf {
class Part;
@@ -53,9 +53,9 @@ private:
QString gridResultDetails();
QString closestNodeResultText(RimGeoMechResultSlot* resultSlot);
QString closestNodeResultText(RimGeoMechCellColors* resultSlot);
void appendTextFromResultSlot(RigGeoMechCaseData* eclipseCase, int gridIndex, int cellIndex, int timeStepIndex, RimGeoMechResultSlot* resultSlot, QString* resultInfoText);
void appendTextFromResultSlot(RigGeoMechCaseData* eclipseCase, int gridIndex, int cellIndex, int timeStepIndex, RimGeoMechCellColors* resultSlot, QString* resultInfoText);
private:
caf::PdmPointer<RimGeoMechView> m_reservoirView;