mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Result info : Improved display of text
This commit is contained in:
parent
76d6304f79
commit
473a701bf5
@ -1035,7 +1035,7 @@ RiuViewer* RimReservoirView::viewer()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
/// Get pick info text for given part ID, face index, and intersection point
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
bool RimReservoirView::pickInfo(size_t gridIndex, size_t cellIndex, cvf::StructGridInterface::FaceType face, const cvf::Vec3d& point, QString* pickInfoText) const
|
||||
bool RimReservoirView::pickInfo(size_t gridIndex, size_t cellIndex, cvf::StructGridInterface::FaceType face, const cvf::Vec3d& point, QString itemSeparator, QString* pickInfoText) const
|
||||
{
|
||||
CVF_ASSERT(pickInfoText);
|
||||
|
||||
@ -1060,10 +1060,12 @@ bool RimReservoirView::pickInfo(size_t gridIndex, size_t cellIndex, cvf::StructG
|
||||
|
||||
QString faceText = faceEnum.text();
|
||||
|
||||
*pickInfoText = QString("Hit grid %1, cell [%2, %3, %4] face %5, ").arg(gridIndex).arg(i).arg(j).arg(k).arg(faceText);
|
||||
*pickInfoText += QString("Hit grid %1").arg(gridIndex) + itemSeparator;
|
||||
*pickInfoText += QString("Cell : [%1, %2, %3]").arg(i).arg(j).arg(k) + itemSeparator;
|
||||
*pickInfoText += QString("Face : %1").arg(faceText) + itemSeparator;
|
||||
|
||||
QString formattedText;
|
||||
formattedText.sprintf("intersection point: [E: %.2f, N: %.2f, Depth: %.2f]", domainCoord.x(), domainCoord.y(), -domainCoord.z());
|
||||
formattedText.sprintf("Intersection point : [E: %.2f, N: %.2f, Depth: %.2f]", domainCoord.x(), domainCoord.y(), -domainCoord.z());
|
||||
|
||||
*pickInfoText += formattedText;
|
||||
return true;
|
||||
|
@ -159,7 +159,7 @@ public:
|
||||
|
||||
|
||||
// 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 itemSeparator, QString* pickInfoText) const;
|
||||
void appendCellResultInfo(size_t gridIndex, size_t cellIndex, cvf::StructGridInterface::FaceType face, QString* resultInfoText) ;
|
||||
void appendNNCResultInfo(size_t nncIndex, QString* resultInfo);
|
||||
static void appendTextFromResultSlot(RigCaseData* eclipseCase, size_t gridIndex, size_t cellIndex, size_t timeStepIndex, RimResultSlot* resultSlot, QString* resultInfoText);
|
||||
|
@ -416,10 +416,10 @@ void RiuViewer::handlePickAction(int winPosX, int winPosY)
|
||||
|
||||
cvf::StructGridInterface::FaceType face = rivSourceInfo->m_cellFaceFromTriangleMapper->cellFace(faceIndex);
|
||||
|
||||
m_reservoirView->pickInfo(gridIndex, cellIndex, face, localIntersectionPoint, &pickInfo);
|
||||
m_reservoirView->pickInfo(gridIndex, cellIndex, face, localIntersectionPoint, ", ", &pickInfo);
|
||||
|
||||
// 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, "\n", &resultInfo);
|
||||
resultInfo += "\n";
|
||||
m_reservoirView->appendCellResultInfo(gridIndex, cellIndex, face, &resultInfo);
|
||||
#if 0
|
||||
|
Loading…
Reference in New Issue
Block a user