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: Rename RimFault -> RimFaultInView

Browse Source
This commit is contained in:
Rebecca Cox 2017-10-13 15:01:52 +02:00
parent 7da8e3091b
commit 97e60ab5f2
10 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/Commands/ExportCommands/RicExportFaultsFeature.cpp
View File

@ -26,7 +26,7 @@
#include "RigMainGrid.h"
#include "RimEclipseCase.h"
#include "RimFault.h"
#include "RimFaultInView.h"
#include "cafSelectionManager.h"
#include "cafUtils.h"
@ -44,7 +44,7 @@ CAF_CMD_SOURCE_INIT(RicExportFaultsFeature, "RicExportFaultsFeature");
//--------------------------------------------------------------------------------------------------
bool RicExportFaultsFeature::isCommandEnabled()
{
std::vector<RimFault*> selectedFaults;
std::vector<RimFaultInView*> selectedFaults;
caf::SelectionManager::instance()->objectsByType(&selectedFaults);
@ -58,7 +58,7 @@ void RicExportFaultsFeature::onActionTriggered(bool isChecked)
{
this->disableModelChangeContribution();
std::vector<RimFault*> selectedFaults;
std::vector<RimFaultInView*> selectedFaults;
caf::SelectionManager::instance()->objectsByType(&selectedFaults);
@ -76,7 +76,7 @@ void RicExportFaultsFeature::onActionTriggered(bool isChecked)
return;
}
for (RimFault* rimFault : selectedFaults)
for (RimFaultInView* rimFault : selectedFaults)
{
RimEclipseCase* eclCase = nullptr;
rimFault->firstAncestorOrThisOfType(eclCase);

6
ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
View File

@ -29,7 +29,7 @@
#include "RimEclipseCase.h"
#include "RimEclipseCellColors.h"
#include "RimEclipseView.h"
#include "RimFault.h"
#include "RimFaultInView.h"
#include "RimFaultCollection.h"
#include "RimLegendConfig.h"
#include "RimTernaryLegendConfig.h"
@ -55,7 +55,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivFaultPartMgr::RivFaultPartMgr(const RigGridBase* grid, const RimFaultCollection* rimFaultCollection, const RimFault* rimFault)
RivFaultPartMgr::RivFaultPartMgr(const RigGridBase* grid, const RimFaultCollection* rimFaultCollection, const RimFaultInView* rimFault)
: m_grid(grid),
m_rimFaultCollection(rimFaultCollection),
m_rimFault(rimFault),
@ -451,7 +451,7 @@ void RivFaultPartMgr::createLabelWithAnchorLine(const cvf::Part* part)
cvf::Color3f defWellLabelColor = RiaApplication::instance()->preferences()->defaultWellLabelColor();
{
RimFault* noConstRimFault = const_cast<RimFault*>(m_rimFault);
RimFaultInView* noConstRimFault = const_cast<RimFaultInView*>(m_rimFault);
if (noConstRimFault)
{
RimFaultCollection* parentObject;

6
ApplicationCode/ModelVisualization/RivFaultPartMgr.h
View File

@ -38,7 +38,7 @@ class RimCellEdgeColors;
class RimFaultCollection;
class RigGridBase;
class RimFaultCollection;
class RimFault;
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 RimFault* rimFault);
RivFaultPartMgr(const RigGridBase* grid, const RimFaultCollection* rimFaultCollection, const RimFaultInView* rimFault);
void setCellVisibility(cvf::UByteArray* cellVisibilities);
@ -79,7 +79,7 @@ private:
static cvf::Vec3f findClosestVertex(const cvf::Vec3f& point, const cvf::Vec3fArray* vertices);
private:
cvf::cref<RigGridBase> m_grid;
const RimFault* m_rimFault;
const RimFaultInView* m_rimFault;
const RimFaultCollection* m_rimFaultCollection;
float m_opacityLevel;

6
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@ -25,7 +25,7 @@
#include "RimEclipseCellColors.h"
#include "RimEclipseFaultColors.h"
#include "RimEclipseView.h"
#include "RimFault.h"
#include "RimFaultInView.h"
#include "RimFaultCollection.h"
#include "RivFaultPartMgr.h"
@ -125,7 +125,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
for (size_t i = 0; i < faultCollection->faults.size(); i++)
{
const RimFault* rimFault = faultCollection->faults[i];
const RimFaultInView* rimFault = faultCollection->faults[i];
cvf::ref<RivFaultPartMgr> rivFaultPart = m_faultParts[i];
CVF_ASSERT(rivFaultPart.notNull());
@ -260,7 +260,7 @@ void RivReservoirFaultsPartMgr::appendLabelPartsToModel(cvf::ModelBasicList* mod
for (size_t i = 0; i < faultCollection->faults.size(); i++)
{
const RimFault* rimFault = faultCollection->faults[i];
const RimFaultInView* rimFault = faultCollection->faults[i];
cvf::ref<RivFaultPartMgr> rivFaultPart = m_faultParts[i];
CVF_ASSERT(rivFaultPart.notNull());

6
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -32,7 +32,7 @@
#include "RimEclipsePropertyFilterCollection.h"
#include "RimEclipseStatisticsCase.h"
#include "RimEclipseView.h"
#include "RimFault.h"
#include "RimFaultInView.h"
#include "RimFlowCharacteristicsPlot.h"
#include "RimFlowDiagSolution.h"
#include "RimFlowPlotCollection.h"
@ -382,7 +382,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
commandIds << "Separator";
commandIds << "RicReloadFormationNamesFeature";
}
else if ( dynamic_cast<RimFault*>(uiItem) )
else if ( dynamic_cast<RimFaultInView*>(uiItem) )
{
commandIds << "RicExportFaultsFeature";
}
@ -522,7 +522,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
{
commandIds << "RicExportToLasFileFeature";
}
else if (dynamic_cast<RimFault*>(uiItem) )
else if (dynamic_cast<RimFaultInView*>(uiItem) )
{
commandIds << "RicExportFaultsFeature";
}

10
ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
View File

@ -28,7 +28,7 @@
#include "RiaDefines.h"
#include "RimEclipseCase.h"
#include "RimEclipseView.h"
#include "RimFault.h"
#include "RimFaultInView.h"
#include "RimNoCommonAreaNNC.h"
#include "RimNoCommonAreaNncCollection.h"
@ -155,7 +155,7 @@ caf::PdmFieldHandle* RimFaultCollection::objectToggleField()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFault* RimFaultCollection::findFaultByName(QString name)
RimFaultInView* RimFaultCollection::findFaultByName(QString name)
{
for (size_t i = 0; i < this->faults().size(); ++i)
{
@ -236,16 +236,16 @@ void RimFaultCollection::syncronizeFaults()
// Find faults with
std::vector<caf::PdmPointer<RimFault> > newFaults;
std::vector<caf::PdmPointer<RimFaultInView> > newFaults;
// Find corresponding fault from data model, or create a new
for (size_t fIdx = 0; fIdx < rigFaults.size(); ++fIdx)
{
RimFault* rimFault = this->findFaultByName(rigFaults[fIdx]->name());
RimFaultInView* rimFault = this->findFaultByName(rigFaults[fIdx]->name());
if (!rimFault)
{
rimFault = new RimFault();
rimFault = new RimFaultInView();
rimFault->faultColor = colorTable.cycledColor3f(fIdx);
QString faultName = rigFaults[fIdx]->name();

6
ApplicationCode/ProjectDataModel/RimFaultCollection.h
View File

@ -34,8 +34,8 @@
#include <QString>
class RimFault;
class RimEclipseView;
class RimFaultInView;
class RimNoCommonAreaNncCollection;
//==================================================================================================
@ -80,8 +80,8 @@ public:
caf::PdmField<bool> showNNCs;
caf::PdmField<bool> hideNncsWhenNoResultIsAvailable;
caf::PdmChildArrayField<RimFault*> faults;
RimFault* findFaultByName(QString name);
caf::PdmChildArrayField<RimFaultInView*> faults;
RimFaultInView* findFaultByName(QString name);
caf::PdmChildField<RimNoCommonAreaNncCollection*> noCommonAreaNnncCollection;

18
ApplicationCode/ProjectDataModel/RimFault.cpp → ApplicationCode/ProjectDataModel/RimFaultInView.cpp
View File

@ -17,18 +17,18 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimFault.h"
#include "RimFaultInView.h"
#include "RigFault.h"
#include "RimEclipseView.h"
CAF_PDM_SOURCE_INIT(RimFault, "Fault");
CAF_PDM_SOURCE_INIT(RimFaultInView, "Fault");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFault::RimFault()
RimFaultInView::RimFaultInView()
{
CAF_PDM_InitObject("RimFault", ":/draw_style_faults_24x24.png", "", "");
@ -47,14 +47,14 @@ RimFault::RimFault()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFault::~RimFault()
RimFaultInView::~RimFaultInView()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimFault::userDescriptionField()
caf::PdmFieldHandle* RimFaultInView::userDescriptionField()
{
return &name;
}
@ -62,7 +62,7 @@ caf::PdmFieldHandle* RimFault::userDescriptionField()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFault::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimFaultInView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
this->updateUiIconFromToggleField();
@ -82,7 +82,7 @@ void RimFault::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const Q
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimFault::objectToggleField()
caf::PdmFieldHandle* RimFaultInView::objectToggleField()
{
return &showFault;
}
@ -90,7 +90,7 @@ caf::PdmFieldHandle* RimFault::objectToggleField()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFault::setFaultGeometry(const RigFault* faultGeometry)
void RimFaultInView::setFaultGeometry(const RigFault* faultGeometry)
{
m_rigFault = faultGeometry;
@ -100,7 +100,7 @@ void RimFault::setFaultGeometry(const RigFault* faultGeometry)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const RigFault* RimFault::faultGeometry() const
const RigFault* RimFaultInView::faultGeometry() const
{
return m_rigFault;
}

6
ApplicationCode/ProjectDataModel/RimFault.h → ApplicationCode/ProjectDataModel/RimFaultInView.h
View File

@ -34,13 +34,13 @@ class RigFault;
///
///
//==================================================================================================
class RimFault : public caf::PdmObject
class RimFaultInView : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimFault();
virtual ~RimFault();
RimFaultInView();
virtual ~RimFaultInView();
void setFaultGeometry(const RigFault* faultGeometry);
const RigFault* faultGeometry() const;

4
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@ -42,7 +42,7 @@
#include "RimEclipseCellColors.h"
#include "RimEclipseFaultColors.h"
#include "RimEclipseView.h"
#include "RimFault.h"
#include "RimFaultInView.h"
#include "RimFaultCollection.h"
#include "RimGeoMechCase.h"
#include "RimGeoMechCellColors.h"
@ -439,7 +439,7 @@ void RiuViewerCommands::slotHideFault()
{
QString faultName = fault->name();
RimFault* rimFault = eclipseView->faultCollection()->findFaultByName(faultName);
RimFaultInView* rimFault = eclipseView->faultCollection()->findFaultByName(faultName);
if (rimFault)
{
rimFault->showFault.setValueWithFieldChanged(!rimFault->showFault);