Result Info: Add support for multiple properties when clicking on a cell

* Result Info: Use monospace font
* #9447 Result Info: Add support for multiple properties when clicking on a cell
* Improve alignment in generated text

ApplicationLibCode/ProjectDataModel/CMakeLists_files.cmake

@@ -127,6 +127,7 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimEclipseResultAddress.h
     ${CMAKE_CURRENT_LIST_DIR}/RimEclipseResultAddressCollection.h
     ${CMAKE_CURRENT_LIST_DIR}/RimEclipseCaseTools.h
+    ${CMAKE_CURRENT_LIST_DIR}/RimMultipleEclipseResults.h
 )
 
 set(SOURCE_GROUP_SOURCE_FILES
@@ -253,6 +254,7 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RimEclipseResultAddress.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimEclipseResultAddressCollection.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RimEclipseCaseTools.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RimMultipleEclipseResults.cpp
 )
 
 if(RESINSIGHT_USE_QT_CHARTS)

ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp

@@ -244,6 +244,11 @@ void RimEclipseCellColors::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeO
         uiTreeOrdering.add( m_legendConfigPtrField() );
     }
 
+    for ( const auto& obj : m_additionalUiTreeObjects )
+    {
+        uiTreeOrdering.add( obj );
+    }
+
     uiTreeOrdering.skipRemainingChildren( true );
 }
 
@@ -271,6 +276,14 @@ void RimEclipseCellColors::useDiscreteLogLevels( bool enable )
     m_useDiscreteLogLevels = true;
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimEclipseCellColors::setAdditionalUiTreeObjects( const std::vector<caf::PdmObject*>& objects )
+{
+    m_additionalUiTreeObjects = objects;
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.h

@@ -62,6 +62,8 @@ public:
 
     void useDiscreteLogLevels( bool enable );
 
+    void setAdditionalUiTreeObjects( const std::vector<caf::PdmObject*>& objects );
+
 protected:
     // Overridden methods
     void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
@@ -85,6 +87,8 @@ private:
 
     caf::PdmPointer<RimEclipseView> m_reservoirView;
 
+    std::vector<caf::PdmObject*> m_additionalUiTreeObjects;
+
     bool m_useDiscreteLogLevels;
 
     // Obsolete

ApplicationLibCode/ProjectDataModel/RimEclipseView.cpp

@@ -66,6 +66,7 @@
 #include "RimIntersectionCollection.h"
 #include "RimIntersectionResultDefinition.h"
 #include "RimIntersectionResultsDefinitionCollection.h"
+#include "RimMultipleEclipseResults.h"
 #include "RimOilField.h"
 #include "RimProject.h"
 #include "RimRegularLegendConfig.h"
@@ -211,6 +212,14 @@ RimEclipseView::RimEclipseView()
     nameConfig()->hidePropertyField( false );
     nameConfig()->hideSampleSpacingField( true );
 
+    CAF_PDM_InitFieldNoDefault( &m_additionalResultsForResultInfo,
+                                "AdditionalResultsForResultInfo",
+                                "Additional Result Info" );
+    m_additionalResultsForResultInfo = new RimMultipleEclipseResults;
+    m_additionalResultsForResultInfo->setEclipseView( this );
+
+    m_cellResult()->setAdditionalUiTreeObjects( { m_additionalResultsForResultInfo() } );
+
     setDeletable( true );
 
     this->updateAnimations.connect( this, &RimEclipseView::onAnimationsUpdate );
@@ -1639,6 +1648,14 @@ void RimEclipseView::syncronizeLocalAnnotationsFromGlobal()
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+std::vector<RigEclipseResultAddress> RimEclipseView::additionalResultsForResultInfo() const
+{
+    return m_additionalResultsForResultInfo()->additionalResultAddresses();
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -1904,7 +1921,6 @@ void RimEclipseView::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrderin
 {
     uiTreeOrdering.add( m_overlayInfoConfig() );
     uiTreeOrdering.add( m_gridCollection() );
-
     uiTreeOrdering.add( cellResult() );
     uiTreeOrdering.add( cellEdgeResult() );
     uiTreeOrdering.add( cellFilterCollection() );

ApplicationLibCode/ProjectDataModel/RimEclipseView.h

@@ -66,6 +66,8 @@ class RimTernaryLegendConfig;
 class RimEclipseResultDefinition;
 class RimElementVectorResult;
 class RimStreamlineInViewCollection;
+class RimMultipleEclipseResults;
+class RigEclipseResultAddress;
 
 namespace cvf
 {
@@ -156,6 +158,8 @@ public:
 
     void syncronizeLocalAnnotationsFromGlobal();
 
+    std::vector<RigEclipseResultAddress> additionalResultsForResultInfo() const;
+
 protected:
     void initAfterRead() override;
     void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
@@ -237,4 +241,6 @@ private:
     cvf::ref<RivStreamlinesPartMgr>       m_streamlinesPartManager;
 
     std::vector<RivCellSetEnum> m_visibleGridParts;
+
+    caf::PdmChildField<RimMultipleEclipseResults*> m_additionalResultsForResultInfo;
 };

ApplicationLibCode/ProjectDataModel/RimMultipleEclipseResults.cpp

@@ -0,0 +1,121 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2022 Equinor ASA
+//
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+//
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RimMultipleEclipseResults.h"
+
+#include "RimEclipseCellColors.h"
+#include "RimEclipseView.h"
+
+#include "cafPdmUiTreeSelectionEditor.h"
+
+CAF_PDM_SOURCE_INIT( RimMultipleEclipseResults, "RimMultipleEclipseResults" );
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RimMultipleEclipseResults::RimMultipleEclipseResults()
+{
+    CAF_PDM_InitObject( "Result Info Data", ":/TextAnnotation16x16.png" );
+
+    CAF_PDM_InitFieldNoDefault( &m_selectedKeywords, "SelectedProperties", "Properties" );
+    m_selectedKeywords.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
+
+    m_selectedKeywords.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() );
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimMultipleEclipseResults::setEclipseView( RimEclipseView* eclipseView )
+{
+    m_eclipseView = eclipseView;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+std::vector<RigEclipseResultAddress> RimMultipleEclipseResults::additionalResultAddresses() const
+{
+    if ( !m_eclipseView || !m_eclipseView->currentGridCellResults() ) return {};
+
+    std::set<QString> selectedResults;
+    for ( const auto& result : m_selectedKeywords() )
+    {
+        selectedResults.insert( result );
+    }
+
+    std::vector<RigEclipseResultAddress> resultAddresses;
+
+    auto gridCellResult = m_eclipseView->currentGridCellResults();
+    for ( const auto& res : gridCellResult->existingResults() )
+    {
+        auto candidate = res.resultName();
+        if ( selectedResults.count( candidate ) > 0 )
+        {
+            resultAddresses.emplace_back( res );
+        }
+    }
+
+    return resultAddresses;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QList<caf::PdmOptionItemInfo>
+    RimMultipleEclipseResults::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions )
+{
+    if ( fieldNeedingOptions == &m_selectedKeywords )
+    {
+        if ( !m_eclipseView || !m_eclipseView->currentGridCellResults() ) return {};
+
+        QList<caf::PdmOptionItemInfo> options;
+
+        RigCaseCellResultsData*                resultData       = m_eclipseView->currentGridCellResults();
+        std::vector<RiaDefines::ResultCatType> resultCategories = { RiaDefines::ResultCatType::STATIC_NATIVE,
+                                                                    RiaDefines::ResultCatType::DYNAMIC_NATIVE,
+                                                                    RiaDefines::ResultCatType::INPUT_PROPERTY };
+        for ( auto catType : resultCategories )
+        {
+            QList<caf::PdmOptionItemInfo> allOptions =
+                RimEclipseResultDefinition::calcOptionsForVariableUiFieldStandard( catType, resultData );
+
+            bool isFirstOfCategory = true;
+            for ( const caf::PdmOptionItemInfo& option : allOptions )
+            {
+                if ( resultData->hasResultEntry( RigEclipseResultAddress( catType, option.optionUiText() ) ) )
+                {
+                    if ( isFirstOfCategory )
+                    {
+                        // Add the category title only when there is at least one valid result
+                        options.push_back(
+                            caf::PdmOptionItemInfo::createHeader( caf::AppEnum<RiaDefines::ResultCatType>::uiText( catType ),
+                                                                  true ) );
+                        isFirstOfCategory = false;
+                    }
+
+                    options.push_back( option );
+                }
+            }
+        }
+
+        return options;
+    }
+
+    return {};
+}

ApplicationLibCode/ProjectDataModel/RimMultipleEclipseResults.h

@@ -0,0 +1,50 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2022 Equinor ASA
+//
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+//
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "cafPdmField.h"
+#include "cafPdmObject.h"
+
+#include <QString>
+
+class RigEclipseResultAddress;
+class RimEclipseView;
+
+//==================================================================================================
+///
+///
+//==================================================================================================
+class RimMultipleEclipseResults : public caf::PdmObject
+{
+    CAF_PDM_HEADER_INIT;
+
+public:
+    RimMultipleEclipseResults();
+
+    void setEclipseView( RimEclipseView* eclipseView );
+
+    std::vector<RigEclipseResultAddress> additionalResultAddresses() const;
+
+private:
+    QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions ) override;
+
+private:
+    caf::PdmField<std::vector<QString>> m_selectedKeywords;
+    caf::PdmPointer<RimEclipseView>     m_eclipseView;
+};