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

Added hide fault to context menu in 3D view

Browse Source
This commit is contained in:
Magne Sjaastad
2014-07-25 14:48:37 +02:00
parent ff674d8eb0
commit 9925556579
7 changed files with 81 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ProjectDataModel/RimFaultCollection.h
View File

@@ -75,13 +75,12 @@ public:
caf::PdmField<bool> showFaultCollection;
caf::PdmPointersField<RimFault*> faults;
RimFault* findFaultByName(QString name);
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual caf::PdmFieldHandle* objectToggleField();
private:
RimFault* findFaultByName(QString name);
virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering );
private:

31
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@@ -2043,39 +2043,16 @@ void RimReservoirView::updateFaultColors()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimReservoirView::appendFaultName(RigGridBase* grid, size_t cellIndex, cvf::StructGridInterface::FaceType face, QString* resultInfoText)
void RimReservoirView::appendFaultName(RigGridBase* grid, size_t cellIndex, cvf::StructGridInterface::FaceType face, QString* textString)
{
if (grid->isMainGrid())
{
RigMainGrid* mainGrid = grid->mainGrid();
for (size_t i = 0; i < mainGrid->faults().size(); i++)
const RigFault* fault = mainGrid->findFaultFromCellIndexAndCellFace(cellIndex, face);
if (fault)
{
const RigFault* rigFault = mainGrid->faults().at(i);
const std::vector<RigFault::FaultFace>& faultFaces = rigFault->faultFaces();
for (size_t fIdx = 0; fIdx < faultFaces.size(); fIdx++)
{
if (faultFaces[fIdx].m_nativeGlobalCellIndex == cellIndex)
{
if (face == faultFaces[fIdx].m_nativeFace )
{
resultInfoText->append(QString("Fault Name: %1\n").arg(rigFault->name()));
}
return;
}
if (faultFaces[fIdx].m_oppositeGlobalCellIndex == cellIndex)
{
if (face == cvf::StructGridInterface::oppositeFace(faultFaces[fIdx].m_nativeFace))
{
resultInfoText->append(QString("Fault Name: %1\n").arg(rigFault->name()));
}
return;
}
}
textString->append(QString("Fault Name: %1\n").arg(fault->name()));
}
}
}

2
ApplicationCode/ProjectDataModel/RimReservoirView.h
View File

@@ -180,7 +180,7 @@ public:
// Display model generation
private:
void appendFaultName(RigGridBase* grid, size_t cellIndex, cvf::StructGridInterface::FaceType face, QString* resultInfoText);
void appendFaultName(RigGridBase* grid, size_t cellIndex, cvf::StructGridInterface::FaceType face, QString* textString);
void createDisplayModel();
void updateDisplayModelVisibility();