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

Faults: Renaming

Browse Source
This commit is contained in:
Magne Sjaastad
2014-01-06 13:03:57 +01:00
parent c569b9fac1
commit 38aca20b84
7 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@@ -45,7 +45,7 @@ RivReservoirFaultsPartMgr::RivReservoirFaultsPartMgr(const RigMainGrid* grid, c
} }
} }
m_isFilterPart = false; m_isFilterGenerated = false;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -103,7 +103,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
// Parts that is overridden by the grid settings // Parts that is overridden by the grid settings
bool forceDisplayOfFault = false; bool forceDisplayOfFault = false;
if (isShowingGrid && m_isFilterPart) if (isShowingGrid && m_isFilterGenerated)
{ {
forceDisplayOfFault = true; forceDisplayOfFault = true;
} }
@@ -229,8 +229,8 @@ void RivReservoirFaultsPartMgr::appendLabelPartsToModel(cvf::ModelBasicList* mod
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirFaultsPartMgr::setFilterPart(bool filterPart) void RivReservoirFaultsPartMgr::setGeneratedByFilter(bool isFilterGenerated)
{ {
m_isFilterPart = filterPart; m_isFilterGenerated = isFilterGenerated;
} }

5
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h
View File

@@ -44,7 +44,7 @@ public:
void setTransform(cvf::Transform* scaleTransform); void setTransform(cvf::Transform* scaleTransform);
void setCellVisibility(cvf::UByteArray* cellVisibilities); void setCellVisibility(cvf::UByteArray* cellVisibilities);
void setFilterPart(bool filterPart); void setGeneratedByFilter(bool isFilterGenerated);
void applySingleColorEffect(); void applySingleColorEffect();
void updateCellResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot); void updateCellResultColor(size_t timeStepIndex, RimResultSlot* cellResultSlot);
@@ -60,6 +60,5 @@ private:
cvf::ref<cvf::Transform> m_scaleTransform; cvf::ref<cvf::Transform> m_scaleTransform;
const RimFaultCollection* m_faultCollection; const RimFaultCollection* m_faultCollection;
cvf::Collection<RivFaultPartMgr> m_faultParts; cvf::Collection<RivFaultPartMgr> m_faultParts;
bool m_isFilterGenerated;
bool m_isFilterPart;
}; };

4
ApplicationCode/ModelVisualization/RivReservoirPartMgr.cpp
View File

@@ -185,11 +185,11 @@ void RivReservoirPartMgr::appendFaultLabelPartsToModel(cvf::ModelBasicList* mode
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirPartMgr::setFilterPart(bool filterPart) void RivReservoirPartMgr::setGeneratedByFilter(bool isGeneratedByFilter)
{ {
if (m_faultsPartMgr.notNull()) if (m_faultsPartMgr.notNull())
{ {
m_faultsPartMgr->setFilterPart(filterPart); m_faultsPartMgr->setGeneratedByFilter(isGeneratedByFilter);
} }
} }

2
ApplicationCode/ModelVisualization/RivReservoirPartMgr.h
View File

@@ -48,7 +48,7 @@ public:
void clearAndSetReservoir(const RigCaseData* eclipseCase, const RimFaultCollection* faultCollection); void clearAndSetReservoir(const RigCaseData* eclipseCase, const RimFaultCollection* faultCollection);
void setTransform(cvf::Transform* scaleTransform); void setTransform(cvf::Transform* scaleTransform);
void setCellVisibility(size_t gridIndex, cvf::UByteArray* cellVisibilities ); void setCellVisibility(size_t gridIndex, cvf::UByteArray* cellVisibilities );
void setFilterPart(bool filterPart); void setGeneratedByFilter(bool isGeneratedByFilter);
//size_t gridCount() { return m_allGrids.size(); } //size_t gridCount() { return m_allGrids.size(); }
cvf::ref<cvf::UByteArray> cvf::ref<cvf::UByteArray>

18
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@@ -240,7 +240,7 @@ void RivReservoirViewPartMgr::createGeometry(ReservoirGeometryCacheType geometry
RigCaseData* res = m_reservoirView->eclipseCase()->reservoirData(); RigCaseData* res = m_reservoirView->eclipseCase()->reservoirData();
m_geometries[geometryType].clearAndSetReservoir(res, m_reservoirView->faultCollection()); m_geometries[geometryType].clearAndSetReservoir(res, m_reservoirView->faultCollection());
m_geometries[geometryType].setTransform(m_scaleTransform.p()); m_geometries[geometryType].setTransform(m_scaleTransform.p());
setFilterPartFromGeometryType(&m_geometries[geometryType], geometryType); setGeneratedByFilterFromGeometryType(&m_geometries[geometryType], geometryType);
std::vector<RigGridBase*> grids; std::vector<RigGridBase*> grids;
res->allGrids(&grids); res->allGrids(&grids);
@@ -397,7 +397,7 @@ void RivReservoirViewPartMgr::createPropertyFilteredNoneWellCellGeometry(size_t
m_propFilteredGeometryFrames[frameIndex]->clearAndSetReservoir(res, m_reservoirView->faultCollection()); m_propFilteredGeometryFrames[frameIndex]->clearAndSetReservoir(res, m_reservoirView->faultCollection());
m_propFilteredGeometryFrames[frameIndex]->setTransform(m_scaleTransform.p()); m_propFilteredGeometryFrames[frameIndex]->setTransform(m_scaleTransform.p());
setFilterPartFromGeometryType(m_propFilteredGeometryFrames[frameIndex].p(), PROPERTY_FILTERED); setGeneratedByFilterFromGeometryType(m_propFilteredGeometryFrames[frameIndex].p(), PROPERTY_FILTERED);
std::vector<RigGridBase*> grids; std::vector<RigGridBase*> grids;
res->allGrids(&grids); res->allGrids(&grids);
@@ -475,7 +475,7 @@ void RivReservoirViewPartMgr::createPropertyFilteredWellGeometry(size_t frameInd
m_propFilteredWellGeometryFrames[frameIndex]->clearAndSetReservoir(res, m_reservoirView->faultCollection()); m_propFilteredWellGeometryFrames[frameIndex]->clearAndSetReservoir(res, m_reservoirView->faultCollection());
m_propFilteredWellGeometryFrames[frameIndex]->setTransform(m_scaleTransform.p()); m_propFilteredWellGeometryFrames[frameIndex]->setTransform(m_scaleTransform.p());
setFilterPartFromGeometryType(m_propFilteredWellGeometryFrames[frameIndex].p(), PROPERTY_FILTERED_WELL_CELLS); setGeneratedByFilterFromGeometryType(m_propFilteredWellGeometryFrames[frameIndex].p(), PROPERTY_FILTERED_WELL_CELLS);
std::vector<RigGridBase*> grids; std::vector<RigGridBase*> grids;
res->allGrids(&grids); res->allGrids(&grids);
@@ -910,22 +910,24 @@ void RivReservoirViewPartMgr::appendFaultLabelsDynamicGeometryPartsToModel(cvf::
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RivReservoirViewPartMgr::setFilterPartFromGeometryType(RivReservoirPartMgr* reservoirPartManager, ReservoirGeometryCacheType cacheType) void RivReservoirViewPartMgr::setGeneratedByFilterFromGeometryType(RivReservoirPartMgr* reservoirPartManager, ReservoirGeometryCacheType cacheType)
{ {
CVF_ASSERT(reservoirPartManager);
if (cacheType == RANGE_FILTERED || if (cacheType == RANGE_FILTERED ||
cacheType == RANGE_FILTERED_INACTIVE || cacheType == RANGE_FILTERED_INACTIVE ||
cacheType == RANGE_FILTERED_WELL_CELLS || cacheType == RANGE_FILTERED_WELL_CELLS ||
cacheType == PROPERTY_FILTERED || cacheType == PROPERTY_FILTERED ||
cacheType == PROPERTY_FILTERED_WELL_CELLS) cacheType == PROPERTY_FILTERED_WELL_CELLS)
{ {
reservoirPartManager->setFilterPart(true); reservoirPartManager->setGeneratedByFilter(true);
} }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> RivReservoirViewPartMgr::allDefaultVisibleFaultTypes() std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> RivReservoirViewPartMgr::defaultVisibleFaultTypes()
{ {
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> types; std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> types;
@@ -933,14 +935,10 @@ std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> RivReservoirVie
types.push_back(ALL_WELL_CELLS); types.push_back(ALL_WELL_CELLS);
types.push_back(VISIBLE_WELL_CELLS); types.push_back(VISIBLE_WELL_CELLS);
types.push_back(VISIBLE_WELL_FENCE_CELLS); types.push_back(VISIBLE_WELL_FENCE_CELLS);
//types.push_back(INACTIVE);
types.push_back(RANGE_FILTERED); types.push_back(RANGE_FILTERED);
//types.push_back(RANGE_FILTERED_INACTIVE);
types.push_back(RANGE_FILTERED_WELL_CELLS); types.push_back(RANGE_FILTERED_WELL_CELLS);
types.push_back(VISIBLE_WELL_CELLS_OUTSIDE_RANGE_FILTER); types.push_back(VISIBLE_WELL_CELLS_OUTSIDE_RANGE_FILTER);
types.push_back(VISIBLE_WELL_FENCE_CELLS_OUTSIDE_RANGE_FILTER); types.push_back(VISIBLE_WELL_FENCE_CELLS_OUTSIDE_RANGE_FILTER);
// types.push_back(PROPERTY_FILTERED);
// types.push_back(PROPERTY_FILTERED_WELL_CELLS);
return types; return types;
} }

4
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.h
View File

@@ -78,7 +78,7 @@ public:
void appendFaultLabelsStaticGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType); void appendFaultLabelsStaticGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType);
void appendFaultLabelsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType, size_t frameIndex); void appendFaultLabelsDynamicGeometryPartsToModel(cvf::ModelBasicList* model, ReservoirGeometryCacheType geometryType, size_t frameIndex);
static std::vector<ReservoirGeometryCacheType> allDefaultVisibleFaultTypes(); static std::vector<ReservoirGeometryCacheType> defaultVisibleFaultTypes();
private: private:
void createGeometry(ReservoirGeometryCacheType geometryType); void createGeometry(ReservoirGeometryCacheType geometryType);
@@ -97,7 +97,7 @@ private:
RivReservoirPartMgr * reservoirPartManager(ReservoirGeometryCacheType geometryType, size_t timeStepIndex ); RivReservoirPartMgr * reservoirPartManager(ReservoirGeometryCacheType geometryType, size_t timeStepIndex );
void setFilterPartFromGeometryType(RivReservoirPartMgr* reservoirPartManager, ReservoirGeometryCacheType cacheType); void setGeneratedByFilterFromGeometryType(RivReservoirPartMgr* reservoirPartManager, ReservoirGeometryCacheType cacheType);
private: private:

26
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@@ -631,26 +631,26 @@ void RimReservoirView::createDisplayModel()
if (!this->propertyFilterCollection()->hasActiveFilters() || faultCollection()->showFaultsOutsideFilters) if (!this->propertyFilterCollection()->hasActiveFilters() || faultCollection()->showFaultsOutsideFilters)
{ {
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometryTypesToAdd; std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometryTypesToAppend;
if (!faultCollection()->showFaultsOutsideFilters) if (!faultCollection()->showFaultsOutsideFilters)
{ {
if (this->rangeFilterCollection()->hasActiveFilters()) if (this->rangeFilterCollection()->hasActiveFilters())
{ {
faultGeometryTypesToAdd.push_back(RivReservoirViewPartMgr::RANGE_FILTERED); faultGeometryTypesToAppend.push_back(RivReservoirViewPartMgr::RANGE_FILTERED);
faultGeometryTypesToAdd.push_back(RivReservoirViewPartMgr::RANGE_FILTERED_WELL_CELLS); faultGeometryTypesToAppend.push_back(RivReservoirViewPartMgr::RANGE_FILTERED_WELL_CELLS);
if (this->showInactiveCells()) if (this->showInactiveCells())
{ {
faultGeometryTypesToAdd.push_back(RivReservoirViewPartMgr::RANGE_FILTERED_INACTIVE); faultGeometryTypesToAppend.push_back(RivReservoirViewPartMgr::RANGE_FILTERED_INACTIVE);
} }
} }
else else
{ {
faultGeometryTypesToAdd = RivReservoirViewPartMgr::allDefaultVisibleFaultTypes(); faultGeometryTypesToAppend = RivReservoirViewPartMgr::defaultVisibleFaultTypes();
if (this->showInactiveCells()) if (this->showInactiveCells())
{ {
faultGeometryTypesToAdd.push_back(RivReservoirViewPartMgr::INACTIVE); faultGeometryTypesToAppend.push_back(RivReservoirViewPartMgr::INACTIVE);
} }
} }
@@ -658,22 +658,22 @@ void RimReservoirView::createDisplayModel()
} }
else else
{ {
faultGeometryTypesToAdd = RivReservoirViewPartMgr::allDefaultVisibleFaultTypes(); faultGeometryTypesToAppend = RivReservoirViewPartMgr::defaultVisibleFaultTypes();
if (this->showInactiveCells()) if (this->showInactiveCells())
{ {
faultGeometryTypesToAdd.push_back(RivReservoirViewPartMgr::INACTIVE); faultGeometryTypesToAppend.push_back(RivReservoirViewPartMgr::INACTIVE);
} }
} }
RivReservoirViewPartMgr::ReservoirGeometryCacheType faultLabelType = m_reservoirGridPartManager->geometryTypeForFaultLabels(faultGeometryTypesToAdd); RivReservoirViewPartMgr::ReservoirGeometryCacheType faultLabelType = m_reservoirGridPartManager->geometryTypeForFaultLabels(faultGeometryTypesToAppend);
size_t frameIdx; size_t frameIdx;
for (frameIdx = 0; frameIdx < frameModels.size(); ++frameIdx) for (frameIdx = 0; frameIdx < frameModels.size(); ++frameIdx)
{ {
for (size_t gtIdx = 0; gtIdx < faultGeometryTypesToAdd.size(); ++gtIdx) for (size_t gtIdx = 0; gtIdx < faultGeometryTypesToAppend.size(); ++gtIdx)
{ {
m_reservoirGridPartManager->appendFaultsStaticGeometryPartsToModel(frameModels[frameIdx].p(), faultGeometryTypesToAdd[gtIdx]); m_reservoirGridPartManager->appendFaultsStaticGeometryPartsToModel(frameModels[frameIdx].p(), faultGeometryTypesToAppend[gtIdx]);
} }
m_reservoirGridPartManager->appendFaultLabelsStaticGeometryPartsToModel(frameModels[frameIdx].p(), faultLabelType); m_reservoirGridPartManager->appendFaultLabelsStaticGeometryPartsToModel(frameModels[frameIdx].p(), faultLabelType);
@@ -756,7 +756,7 @@ void RimReservoirView::updateCurrentTimeStep()
if (faultCollection()->showFaultsOutsideFilters) if (faultCollection()->showFaultsOutsideFilters)
{ {
std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometryTypesToAdd = RivReservoirViewPartMgr::allDefaultVisibleFaultTypes(); std::vector<RivReservoirViewPartMgr::ReservoirGeometryCacheType> faultGeometryTypesToAdd = RivReservoirViewPartMgr::defaultVisibleFaultTypes();
if (this->showInactiveCells()) if (this->showInactiveCells())
{ {
@@ -869,7 +869,7 @@ void RimReservoirView::updateCurrentTimeStep()
} }
else else
{ {
faultGeometriesToRecolor = RivReservoirViewPartMgr::allDefaultVisibleFaultTypes(); faultGeometriesToRecolor = RivReservoirViewPartMgr::defaultVisibleFaultTypes();
} }
for (size_t i = 0; i < faultGeometriesToRecolor.size(); ++i) for (size_t i = 0; i < faultGeometriesToRecolor.size(); ++i)