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

Result Info: Show fault name only when picking on fault

Browse Source
This commit is contained in:
Magne Sjaastad 2014-01-23 08:19:37 +01:00
parent 8f56fa6ad4
commit f8254075cd
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@ -1098,7 +1098,7 @@ bool RimReservoirView::pickInfo(size_t gridIndex, size_t cellIndex, cvf::StructG
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Append fault name and result value for the given cell to the string /// Append fault name and result value for the given cell to the string
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimReservoirView::appendCellResultInfo(size_t gridIndex, size_t cellIndex, QString* resultInfoText) void RimReservoirView::appendCellResultInfo(size_t gridIndex, size_t cellIndex, cvf::StructGridInterface::FaceType face, QString* resultInfoText)
{ {
CVF_ASSERT(resultInfoText); CVF_ASSERT(resultInfoText);
@ -1190,7 +1190,7 @@ void RimReservoirView::appendCellResultInfo(size_t gridIndex, size_t cellIndex,
} }
} }
appendFaultName(grid, cellIndex, resultInfoText); appendFaultName(grid, cellIndex, face, resultInfoText);
} }
} }
@ -1821,7 +1821,7 @@ void RimReservoirView::appendNNCResultInfo(size_t nncIndex, QString* resultInfo)
QString gridName = QString::fromStdString(hostGrid->gridName()); QString gridName = QString::fromStdString(hostGrid->gridName());
resultInfo->append(QString("NNC 1 : cell [%1, %2, %3] face %4 (%5)\n").arg(i).arg(j).arg(k).arg(face.text()).arg(gridName)); resultInfo->append(QString("NNC 1 : cell [%1, %2, %3] face %4 (%5)\n").arg(i).arg(j).arg(k).arg(face.text()).arg(gridName));
appendFaultName(hostGrid, conn.m_c1GlobIdx, &faultName); appendFaultName(hostGrid, conn.m_c1GlobIdx, conn.m_c1Face, &faultName);
} }
} }
@ -1848,7 +1848,7 @@ void RimReservoirView::appendNNCResultInfo(size_t nncIndex, QString* resultInfo)
if (faultName.isEmpty()) if (faultName.isEmpty())
{ {
appendFaultName(hostGrid, conn.m_c2GlobIdx, &faultName); appendFaultName(hostGrid, conn.m_c2GlobIdx, cvf::StructGridInterface::oppositeFace(conn.m_c1Face), &faultName);
} }
} }
} }
@ -1985,7 +1985,7 @@ void RimReservoirView::updateFaultColors()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimReservoirView::appendFaultName(RigGridBase* grid, size_t cellIndex, QString* resultInfoText) void RimReservoirView::appendFaultName(RigGridBase* grid, size_t cellIndex, cvf::StructGridInterface::FaceType face, QString* resultInfoText)
{ {
if (grid->isMainGrid()) if (grid->isMainGrid())
{ {
@ -1998,10 +1998,23 @@ void RimReservoirView::appendFaultName(RigGridBase* grid, size_t cellIndex, QStr
for (size_t fIdx = 0; fIdx < faultFaces.size(); fIdx++) for (size_t fIdx = 0; fIdx < faultFaces.size(); fIdx++)
{ {
if (faultFaces[fIdx].m_nativeGlobalCellIndex == cellIndex || if (faultFaces[fIdx].m_nativeGlobalCellIndex == cellIndex)
faultFaces[fIdx].m_oppositeGlobalCellIndex == cellIndex) {
if (face == faultFaces[fIdx].m_nativeFace )
{ {
resultInfoText->append(QString("Fault Name: %1\n").arg(rigFault->name())); 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; return;
} }
} }

4
ApplicationCode/ProjectDataModel/RimReservoirView.h
View File

@ -158,7 +158,7 @@ public:
// Picking info // Picking info
bool pickInfo(size_t gridIndex, size_t cellIndex, cvf::StructGridInterface::FaceType face, const cvf::Vec3d& point, QString* pickInfoText) const; bool pickInfo(size_t gridIndex, size_t cellIndex, cvf::StructGridInterface::FaceType face, const cvf::Vec3d& point, QString* pickInfoText) const;
void appendCellResultInfo(size_t gridIndex, size_t cellIndex, QString* resultInfoText) ; void appendCellResultInfo(size_t gridIndex, size_t cellIndex, cvf::StructGridInterface::FaceType face, QString* resultInfoText) ;
void appendNNCResultInfo(size_t nncIndex, QString* resultInfo); void appendNNCResultInfo(size_t nncIndex, QString* resultInfo);
// Does this belong here, really ? // Does this belong here, really ?
@ -181,7 +181,7 @@ public:
// Display model generation // Display model generation
private: private:
void appendFaultName(RigGridBase* grid, size_t cellIndex, QString* resultInfoText); void appendFaultName(RigGridBase* grid, size_t cellIndex, cvf::StructGridInterface::FaceType face, QString* resultInfoText);
void createDisplayModel(); void createDisplayModel();
void updateDisplayModelVisibility(); void updateDisplayModelVisibility();

2
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@ -449,7 +449,7 @@ void RiuViewer::handlePickAction(int winPosX, int winPosY)
// Build up result from from both pick info and result values // Build up result from from both pick info and result values
m_reservoirView->pickInfo(gridIndex, cellIndex, face, localIntersectionPoint, &resultInfo); m_reservoirView->pickInfo(gridIndex, cellIndex, face, localIntersectionPoint, &resultInfo);
resultInfo += "\n"; resultInfo += "\n";
m_reservoirView->appendCellResultInfo(gridIndex, cellIndex, &resultInfo); m_reservoirView->appendCellResultInfo(gridIndex, cellIndex, face, &resultInfo);
#if 0 #if 0
const RigCaseData* reservoir = m_reservoirView->eclipseCase()->reservoirData(); const RigCaseData* reservoir = m_reservoirView->eclipseCase()->reservoirData();
const RigGridBase* grid = reservoir->grid(gridIndex); const RigGridBase* grid = reservoir->grid(gridIndex);