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

#1996 Remane RimFieldCollection -> RimFaultInViewCollection

Browse Source
This commit is contained in:
Rebecca Cox 2017-10-15 21:20:03 +02:00
parent f0cb458550
commit 9bd556a1b9
15 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Application/RiaApplication.cpp
View File

@ -43,7 +43,7 @@
#include "RimEclipseCase.h"
#include "RimEclipseCaseCollection.h"
#include "RimEclipseView.h"
#include "RimFaultCollection.h"
#include "RimFaultInViewCollection.h"
#include "RimFlowCharacteristicsPlot.h"
#include "RimFlowPlotCollection.h"
#include "RimFormationNamesCollection.h"

2
ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeatureImpl.cpp
View File

@ -31,7 +31,7 @@
#include "RimEclipseResultCase.h"
#include "RimEclipseView.h"
#include "RimSimWellInViewCollection.h"
#include "RimFaultCollection.h"
#include "RimFaultInViewCollection.h"
#include "RimFlowDiagSolution.h"
#include "RimProject.h"
#include "RimSimWellInView.h"

10
ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
View File

@ -30,7 +30,7 @@
#include "RimEclipseCellColors.h"
#include "RimEclipseView.h"
#include "RimFaultInView.h"
#include "RimFaultCollection.h"
#include "RimFaultInViewCollection.h"
#include "RimLegendConfig.h"
#include "RimTernaryLegendConfig.h"
@ -55,7 +55,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivFaultPartMgr::RivFaultPartMgr(const RigGridBase* grid, const RimFaultCollection* rimFaultCollection, const RimFaultInView* rimFault)
RivFaultPartMgr::RivFaultPartMgr(const RigGridBase* grid, const RimFaultInViewCollection* rimFaultCollection, const RimFaultInView* rimFault)
: m_grid(grid),
m_rimFaultCollection(rimFaultCollection),
m_rimFault(rimFault),
@ -454,7 +454,7 @@ void RivFaultPartMgr::createLabelWithAnchorLine(const cvf::Part* part)
RimFaultInView* noConstRimFault = const_cast<RimFaultInView*>(m_rimFault);
if (noConstRimFault)
{
RimFaultCollection* parentObject;
RimFaultInViewCollection* parentObject;
noConstRimFault->firstAncestorOrThisOfType(parentObject);
if (parentObject)
{
@ -604,7 +604,7 @@ caf::FaceCulling RivFaultPartMgr::faceCullingMode() const
bool isShowingGrid = m_rimFaultCollection->isGridVisualizationMode();
if (!isShowingGrid )
{
if (m_rimFaultCollection->faultResult() == RimFaultCollection::FAULT_BACK_FACE_CULLING)
if (m_rimFaultCollection->faultResult() == RimFaultInViewCollection::FAULT_BACK_FACE_CULLING)
{
if (m_grid->mainGrid()->isFaceNormalsOutwards())
{
@ -615,7 +615,7 @@ caf::FaceCulling RivFaultPartMgr::faceCullingMode() const
return caf::FC_FRONT;
}
}
else if (m_rimFaultCollection->faultResult() == RimFaultCollection::FAULT_FRONT_FACE_CULLING)
else if (m_rimFaultCollection->faultResult() == RimFaultInViewCollection::FAULT_FRONT_FACE_CULLING)
{
if (m_grid->mainGrid()->isFaceNormalsOutwards())
{

8
ApplicationCode/ModelVisualization/RivFaultPartMgr.h
View File

@ -35,9 +35,9 @@ namespace cvf
class RimEclipseCellColors;
class RimCellEdgeColors;
class RimFaultCollection;
class RimFaultInViewCollection;
class RigGridBase;
class RimFaultCollection;
class RimFaultInViewCollection;
class RimFaultInView;
class RivFaultGeometryGenerator;
class RivNNCGeometryGenerator;
@ -51,7 +51,7 @@ class RivNNCGeometryGenerator;
class RivFaultPartMgr : public cvf::Object
{
public:
RivFaultPartMgr(const RigGridBase* grid, const RimFaultCollection* rimFaultCollection, const RimFaultInView* rimFault);
RivFaultPartMgr(const RigGridBase* grid, const RimFaultInViewCollection* rimFaultCollection, const RimFaultInView* rimFault);
void setCellVisibility(cvf::UByteArray* cellVisibilities);
@ -80,7 +80,7 @@ private:
private:
cvf::cref<RigGridBase> m_grid;
const RimFaultInView* m_rimFault;
const RimFaultCollection* m_rimFaultCollection;
const RimFaultInViewCollection* m_rimFaultCollection;
float m_opacityLevel;
cvf::Color3f m_defaultColor;

10
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@ -26,7 +26,7 @@
#include "RimEclipseFaultColors.h"
#include "RimEclipseView.h"
#include "RimFaultInView.h"
#include "RimFaultCollection.h"
#include "RimFaultInViewCollection.h"
#include "RivFaultPartMgr.h"
@ -49,7 +49,7 @@ RivReservoirFaultsPartMgr::RivReservoirFaultsPartMgr(const RigMainGrid* grid, R
if (reservoirView)
{
RimFaultCollection* faultCollection = reservoirView->faultCollection();
RimFaultInViewCollection* faultCollection = reservoirView->faultCollection();
if (faultCollection)
{
for (size_t i = 0; i < faultCollection->faults.size(); i++)
@ -97,7 +97,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
{
CVF_ASSERT(model != NULL);
RimFaultCollection* faultCollection = m_reservoirView->faultCollection();
RimFaultInViewCollection* faultCollection = m_reservoirView->faultCollection();
if (!faultCollection) return;
@ -211,7 +211,7 @@ void RivReservoirFaultsPartMgr::updateColors(size_t timeStepIndex, RimEclipseCel
{
if (!m_reservoirView) return;
RimFaultCollection* faultCollection = m_reservoirView->faultCollection();
RimFaultInViewCollection* faultCollection = m_reservoirView->faultCollection();
CVF_ASSERT(faultCollection);
for (size_t i = 0; i < faultCollection->faults.size(); i++)
@ -246,7 +246,7 @@ void RivReservoirFaultsPartMgr::appendLabelPartsToModel(cvf::ModelBasicList* mod
CVF_ASSERT(model != NULL);
if (!m_reservoirView) return;
RimFaultCollection* faultCollection = m_reservoirView->faultCollection();
RimFaultInViewCollection* faultCollection = m_reservoirView->faultCollection();
CVF_ASSERT(faultCollection);
if (!faultCollection->showFaultCollection()) return;

2
ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
View File

@ -37,7 +37,7 @@
#include "RimEclipsePropertyFilterCollection.h"
#include "RimEclipseResultDefinition.h"
#include "RimEclipseView.h"
#include "RimFaultCollection.h"
#include "RimFaultInViewCollection.h"
#include "RimReservoirCellResultsStorage.h"
#include "RimSimWellInViewCollection.h"
#include "RimViewController.h"

4
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@ -43,7 +43,7 @@ ${CEE_CURRENT_LIST_DIR}RimMimeData.h
${CEE_CURRENT_LIST_DIR}RimCommandObject.h
${CEE_CURRENT_LIST_DIR}RimTools.h
${CEE_CURRENT_LIST_DIR}RimFaultInView.h
${CEE_CURRENT_LIST_DIR}RimFaultCollection.h
${CEE_CURRENT_LIST_DIR}RimFaultInViewCollection.h
${CEE_CURRENT_LIST_DIR}RimFormationNames.h
${CEE_CURRENT_LIST_DIR}RimFormationNamesCollection.h
${CEE_CURRENT_LIST_DIR}RimMockModelSettings.h
@ -143,7 +143,7 @@ ${CEE_CURRENT_LIST_DIR}RimMimeData.cpp
${CEE_CURRENT_LIST_DIR}RimCommandObject.cpp
${CEE_CURRENT_LIST_DIR}RimTools.cpp
${CEE_CURRENT_LIST_DIR}RimFaultInView.cpp
${CEE_CURRENT_LIST_DIR}RimFaultCollection.cpp
${CEE_CURRENT_LIST_DIR}RimFaultInViewCollection.cpp
${CEE_CURRENT_LIST_DIR}RimFormationNames.cpp
${CEE_CURRENT_LIST_DIR}RimFormationNamesCollection.cpp
${CEE_CURRENT_LIST_DIR}RimMockModelSettings.cpp

2
ApplicationCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp
View File

@ -29,7 +29,7 @@
#include "RimEclipseView.h"
#include "RimEclipsePropertyFilter.h"
#include "RimEclipsePropertyFilterCollection.h"
#include "RimFaultCollection.h"
#include "RimFaultInViewCollection.h"
#include "RicEclipsePropertyFilterFeatureImpl.h"
#include "RicSelectOrCreateViewFeatureImpl.h"

6
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
View File

@ -38,7 +38,7 @@
#include "RimEclipsePropertyFilterCollection.h"
#include "RimEclipseView.h"
#include "RimSimWellInViewCollection.h"
#include "RimFaultCollection.h"
#include "RimFaultInViewCollection.h"
#include "RimGeoMechCase.h"
#include "RimGeoMechResultDefinition.h"
#include "RimGeoMechView.h"
@ -397,11 +397,11 @@ void Rim3dOverlayInfoConfig::updateEclipse3DInfo(RimEclipseView * eclipseView)
bool isShowingGrid = eclipseView->faultCollection()->isGridVisualizationMode();
if (!isShowingGrid)
{
if (eclipseView->faultCollection()->faultResult() == RimFaultCollection::FAULT_BACK_FACE_CULLING)
if (eclipseView->faultCollection()->faultResult() == RimFaultInViewCollection::FAULT_BACK_FACE_CULLING)
{
faultMapping = "Cells behind fault";
}
else if (eclipseView->faultCollection()->faultResult() == RimFaultCollection::FAULT_FRONT_FACE_CULLING)
else if (eclipseView->faultCollection()->faultResult() == RimFaultInViewCollection::FAULT_FRONT_FACE_CULLING)
{
faultMapping = "Cells in front of fault";
}

4
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -41,7 +41,7 @@
#include "RimEclipseFaultColors.h"
#include "RimEclipsePropertyFilterCollection.h"
#include "RimEclipseResultDefinition.h"
#include "RimFaultCollection.h"
#include "RimFaultInViewCollection.h"
#include "RimFlowCharacteristicsPlot.h"
#include "RimFlowDiagSolution.h"
#include "RimGridCollection.h"
@ -130,7 +130,7 @@ RimEclipseView::RimEclipseView()
wellCollection.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&faultCollection, "FaultCollection", "Faults", "", "", "");
faultCollection = new RimFaultCollection;
faultCollection = new RimFaultInViewCollection;
faultCollection.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_propertyFilterCollection, "PropertyFilters", "Property Filters", "", "", "");

4
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@ -49,7 +49,7 @@ class RimEclipseCellColors;
class RimEclipseFaultColors;
class RimEclipsePropertyFilter;
class RimEclipsePropertyFilterCollection;
class RimFaultCollection;
class RimFaultInViewCollection;
class RimReservoirCellResultsStorage;
class RimReservoirCellResultsStorage;
class RimSimWellInViewCollection;
@ -98,7 +98,7 @@ public:
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
caf::PdmChildField<RimSimWellInViewCollection*> wellCollection;
caf::PdmChildField<RimFaultCollection*> faultCollection;
caf::PdmChildField<RimFaultInViewCollection*> faultCollection;
// Fields

40
ApplicationCode/ProjectDataModel/RimFaultCollection.cpp → ApplicationCode/ProjectDataModel/RimFaultInViewCollection.cpp
View File

@ -17,7 +17,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimFaultCollection.h"
#include "RimFaultInViewCollection.h"
#include "RiaApplication.h"
#include "RiaPreferences.h"
@ -41,23 +41,23 @@
namespace caf
{
template<>
void AppEnum< RimFaultCollection::FaultFaceCullingMode >::setUp()
void AppEnum< RimFaultInViewCollection::FaultFaceCullingMode >::setUp()
{
addItem(RimFaultCollection::FAULT_BACK_FACE_CULLING, "FAULT_BACK_FACE_CULLING", "Cell behind fault");
addItem(RimFaultCollection::FAULT_FRONT_FACE_CULLING, "FAULT_FRONT_FACE_CULLING", "Cell in front of fault");
addItem(RimFaultCollection::FAULT_NO_FACE_CULLING, "FAULT_NO_FACE_CULLING", "Show both");
setDefault(RimFaultCollection::FAULT_NO_FACE_CULLING);
addItem(RimFaultInViewCollection::FAULT_BACK_FACE_CULLING, "FAULT_BACK_FACE_CULLING", "Cell behind fault");
addItem(RimFaultInViewCollection::FAULT_FRONT_FACE_CULLING, "FAULT_FRONT_FACE_CULLING", "Cell in front of fault");
addItem(RimFaultInViewCollection::FAULT_NO_FACE_CULLING, "FAULT_NO_FACE_CULLING", "Show both");
setDefault(RimFaultInViewCollection::FAULT_NO_FACE_CULLING);
}
}
CAF_PDM_SOURCE_INIT(RimFaultCollection, "Faults");
CAF_PDM_SOURCE_INIT(RimFaultInViewCollection, "Faults");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFaultCollection::RimFaultCollection()
RimFaultInViewCollection::RimFaultInViewCollection()
{
CAF_PDM_InitObject("Faults", ":/draw_style_faults_24x24.png", "", "");
@ -68,7 +68,7 @@ RimFaultCollection::RimFaultCollection()
CAF_PDM_InitField(&showOppositeFaultFaces, "ShowOppositeFaultFaces", true, "Show opposite faces", "", "", "");
CAF_PDM_InitField(&m_showFaultsOutsideFilters, "ShowFaultsOutsideFilters", true, "Show faults outside filters", "", "", "");
CAF_PDM_InitField(&faultResult, "FaultFaceCulling", caf::AppEnum<RimFaultCollection::FaultFaceCullingMode>(RimFaultCollection::FAULT_BACK_FACE_CULLING), "Dynamic Face Selection", "", "", "");
CAF_PDM_InitField(&faultResult, "FaultFaceCulling", caf::AppEnum<RimFaultInViewCollection::FaultFaceCullingMode>(RimFaultInViewCollection::FAULT_BACK_FACE_CULLING), "Dynamic Face Selection", "", "", "");
CAF_PDM_InitField(&showFaultLabel, "ShowFaultLabel", false, "Show labels", "", "", "");
cvf::Color3f defWellLabelColor = RiaApplication::instance()->preferences()->defaultWellLabelColor();
@ -90,7 +90,7 @@ RimFaultCollection::RimFaultCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFaultCollection::~RimFaultCollection()
RimFaultInViewCollection::~RimFaultInViewCollection()
{
faults.deleteAllChildObjects();
@ -101,7 +101,7 @@ RimFaultCollection::~RimFaultCollection()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFaultCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimFaultInViewCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
this->updateUiIconFromToggleField();
@ -138,7 +138,7 @@ void RimFaultCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedFiel
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFaultCollection::setReservoirView(RimEclipseView* ownerReservoirView)
void RimFaultInViewCollection::setReservoirView(RimEclipseView* ownerReservoirView)
{
m_reservoirView = ownerReservoirView;
}
@ -147,7 +147,7 @@ void RimFaultCollection::setReservoirView(RimEclipseView* ownerReservoirView)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimFaultCollection::objectToggleField()
caf::PdmFieldHandle* RimFaultInViewCollection::objectToggleField()
{
return &showFaultCollection;
}
@ -155,7 +155,7 @@ caf::PdmFieldHandle* RimFaultCollection::objectToggleField()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFaultInView* RimFaultCollection::findFaultByName(QString name)
RimFaultInView* RimFaultInViewCollection::findFaultByName(QString name)
{
for (size_t i = 0; i < this->faults().size(); ++i)
{
@ -183,7 +183,7 @@ bool faultComparator(const cvf::ref<RigFault>& a, const cvf::ref<RigFault>& b)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFaultCollection::syncronizeFaults()
void RimFaultInViewCollection::syncronizeFaults()
{
if (!(m_reservoirView && m_reservoirView->mainGrid()) ) return;
@ -338,7 +338,7 @@ void RimFaultCollection::syncronizeFaults()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimFaultCollection::isGridVisualizationMode() const
bool RimFaultInViewCollection::isGridVisualizationMode() const
{
CVF_ASSERT(m_reservoirView);
@ -348,7 +348,7 @@ bool RimFaultCollection::isGridVisualizationMode() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFaultCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RimFaultInViewCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
bool isGridVizMode = isGridVisualizationMode();
@ -377,7 +377,7 @@ void RimFaultCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderi
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimFaultCollection::showFaultsOutsideFilters() const
bool RimFaultInViewCollection::showFaultsOutsideFilters() const
{
if (!showFaultCollection) return false;
@ -387,7 +387,7 @@ bool RimFaultCollection::showFaultsOutsideFilters() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFaultCollection::setShowFaultsOutsideFilters(bool enableState)
void RimFaultInViewCollection::setShowFaultsOutsideFilters(bool enableState)
{
m_showFaultsOutsideFilters = enableState;
}
@ -395,7 +395,7 @@ void RimFaultCollection::setShowFaultsOutsideFilters(bool enableState)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFaultCollection::addMockData()
void RimFaultInViewCollection::addMockData()
{
if (!(m_reservoirView && m_reservoirView->mainGrid())) return;

6
ApplicationCode/ProjectDataModel/RimFaultCollection.h → ApplicationCode/ProjectDataModel/RimFaultInViewCollection.h
View File

@ -42,7 +42,7 @@ class RimNoCommonAreaNncCollection;
///
///
//==================================================================================================
class RimFaultCollection : public caf::PdmObject
class RimFaultInViewCollection : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
@ -54,8 +54,8 @@ public:
};
public:
RimFaultCollection();
virtual ~RimFaultCollection();
RimFaultInViewCollection();
virtual ~RimFaultInViewCollection();
void setReservoirView(RimEclipseView* ownerReservoirView);
void syncronizeFaults();

2
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -28,7 +28,7 @@
#include "RimCommandObject.h"
#include "RimEclipseCase.h"
#include "RimEclipseView.h"
#include "RimFaultCollection.h"
#include "RimFaultInViewCollection.h"
#include "RimGeoMechCase.h"
#include "RimGeoMechView.h"
#include "RimProject.h"

2
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@ -43,7 +43,7 @@
#include "RimEclipseFaultColors.h"
#include "RimEclipseView.h"
#include "RimFaultInView.h"
#include "RimFaultCollection.h"
#include "RimFaultInViewCollection.h"
#include "RimGeoMechCase.h"
#include "RimGeoMechCellColors.h"
#include "RimGeoMechView.h"