#8995 Drag drop summary vector : Optionally include history vector

ApplicationLibCode/Application/RiaPreferencesSummary.cpp

@@ -173,6 +173,12 @@ RiaPreferencesSummary::RiaPreferencesSummary()
 
     CAF_PDM_InitField( &m_curveColorByPhase, "curveColorByPhase", true, "Curve Color By Phase" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_curveColorByPhase );
+
+    CAF_PDM_InitField( &m_appendHistoryVectorForDragDrop,
+                       "appendHistoryVectorForDragDrop",
+                       false,
+                       "Append History Vector for Drag/Drop" );
+    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_appendHistoryVectorForDragDrop );
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -273,6 +279,7 @@ void RiaPreferencesSummary::appendItemsToPlottingGroup( caf::PdmUiOrdering& uiOr
 
     uiOrdering.add( &m_defaultSummaryHistoryCurveStyle );
     uiOrdering.add( &m_curveColorByPhase );
+    uiOrdering.add( &m_appendHistoryVectorForDragDrop );
 
     uiOrdering.add( &m_showSummaryTimeAsLongString );
 
@@ -346,6 +353,14 @@ bool RiaPreferencesSummary::colorCurvesByPhase() const
     return m_curveColorByPhase();
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RiaPreferencesSummary::appendHistoryVectorForDragDrop() const
+{
+    return m_appendHistoryVectorForDragDrop();
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Application/RiaPreferencesSummary.h

@@ -101,6 +101,7 @@ public:
     SummaryRestartFilesImportMode summaryEnsembleImportMode() const;
     QString                       defaultSummaryCurvesTextFilter() const;
     bool                          colorCurvesByPhase() const;
+    bool                          appendHistoryVectorForDragDrop() const;
 
     SummaryHistoryCurveStyleMode defaultSummaryHistoryCurveStyle() const;
 
@@ -129,6 +130,7 @@ private:
     caf::PdmField<QString>                          m_defaultSummaryCurvesTextFilter;
     caf::PdmField<SummaryHistoryCurveStyleModeType> m_defaultSummaryHistoryCurveStyle;
     caf::PdmField<bool>                             m_curveColorByPhase;
+    caf::PdmField<bool>                             m_appendHistoryVectorForDragDrop;
 
     caf::PdmField<bool> m_showSummaryTimeAsLongString;
     caf::PdmField<bool> m_useMultipleThreadsWhenLoadingSummaryCases;

ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp

@@ -23,12 +23,14 @@
 #include "RiaFieldHandleTools.h"
 #include "RiaPlotDefines.h"
 #include "RiaPreferences.h"
+#include "RiaPreferencesSummary.h"
 #include "RiaRegressionTestRunner.h"
 #include "RiaStdStringTools.h"
 #include "RiaSummaryAddressAnalyzer.h"
 #include "RiaSummaryCurveDefinition.h"
 #include "RiaSummaryTools.h"
 #include "RiaTimeHistoryCurveResampler.h"
+#include "RifReaderEclipseSummary.h"
 
 #include "RicfCommandObject.h"
 
@@ -1922,8 +1924,15 @@ std::pair<int, std::vector<RimSummaryCurve*>> RimSummaryPlot::handleSummaryCaseD
 
     for ( auto& curve : summaryCurves() )
     {
-        const auto curveAddress = curve->summaryAddressY();
+        const auto addr = curve->summaryAddressY();
-        dataVectorMap[curveAddress].insert( curve->summaryCaseY() );
+        dataVectorMap[addr].insert( curve->summaryCaseY() );
+
+        if ( !addr.isHistoryVector() && RiaPreferencesSummary::current()->appendHistoryVectorForDragDrop() )
+        {
+            auto historyAddr = addr;
+            historyAddr.setVectorName( addr.vectorName() + RifReaderEclipseSummary::historyIdentifier() );
+            dataVectorMap[historyAddr].insert( curve->summaryCaseY() );
+        }
     }
 
     for ( const auto& [addr, cases] : dataVectorMap )
@@ -1975,32 +1984,45 @@ std::pair<int, std::vector<RimSummaryCurve*>>
     {
         auto        newCurveDef = curveDef;
         auto        curveAdr    = newCurveDef.summaryAddress();
+        std::string objectIdentifierString;
         if ( ( curveAdr.category() == RifEclipseSummaryAddress::SUMMARY_WELL ) &&
              ( addressCollection->contentType() == RimSummaryAddressCollection::CollectionContentType::WELL ) )
         {
-            auto currentObjectString = curveAdr.wellName();
+            objectIdentifierString = curveAdr.wellName();
             curveAdr.setWellName( droppedName );
             newCurveDef.setSummaryAddress( curveAdr );
-            newCurveDefsWithObjectNames[newCurveDef].insert( currentObjectString );
         }
         else if ( ( curveAdr.category() == RifEclipseSummaryAddress::SUMMARY_GROUP ) &&
                   ( addressCollection->contentType() == RimSummaryAddressCollection::CollectionContentType::GROUP ) )
         {
-            auto currentObjectString = curveAdr.groupName();
+            objectIdentifierString = curveAdr.groupName();
             curveAdr.setGroupName( droppedName );
             newCurveDef.setSummaryAddress( curveAdr );
-            newCurveDefsWithObjectNames[newCurveDef].insert( currentObjectString );
         }
         else if ( ( curveAdr.category() == RifEclipseSummaryAddress::SUMMARY_REGION ) &&
                   ( addressCollection->contentType() == RimSummaryAddressCollection::CollectionContentType::REGION ) )
         {
-            auto currentObjectString = std::to_string( curveAdr.regionNumber() );
+            objectIdentifierString = std::to_string( curveAdr.regionNumber() );
 
             int droppedRegion = std::stoi( droppedName );
 
             curveAdr.setRegion( droppedRegion );
             newCurveDef.setSummaryAddress( curveAdr );
-            newCurveDefsWithObjectNames[newCurveDef].insert( currentObjectString );
+        }
+
+        if ( !objectIdentifierString.empty() )
+        {
+            newCurveDefsWithObjectNames[newCurveDef].insert( objectIdentifierString );
+            const auto& addr = curveDef.summaryAddress();
+            if ( !addr.isHistoryVector() && RiaPreferencesSummary::current()->appendHistoryVectorForDragDrop() )
+            {
+                auto historyAddr = addr;
+                historyAddr.setVectorName( addr.vectorName() + RifReaderEclipseSummary::historyIdentifier() );
+
+                auto historyCurveDef = newCurveDef;
+                historyCurveDef.setSummaryAddress( historyAddr );
+                newCurveDefsWithObjectNames[historyCurveDef].insert( objectIdentifierString );
+            }
         }
     }
 
@@ -2032,21 +2054,30 @@ std::pair<int, std::vector<RimSummaryCurve*>> RimSummaryPlot::handleSummaryAddre
     int                           newCurves = 0;
     std::vector<RimSummaryCurve*> curves;
 
+    std::vector<RifEclipseSummaryAddress> newCurveAddresses;
+    newCurveAddresses.push_back( summaryAddr->address() );
+    if ( !summaryAddr->address().isHistoryVector() && RiaPreferencesSummary::current()->appendHistoryVectorForDragDrop() )
+    {
+        auto historyAddr = summaryAddr->address();
+        historyAddr.setVectorName( summaryAddr->address().vectorName() + RifReaderEclipseSummary::historyIdentifier() );
+        newCurveAddresses.push_back( historyAddr );
+    }
+
     if ( summaryAddr->isEnsemble() )
     {
         std::map<RifEclipseSummaryAddress, std::set<RimSummaryCaseCollection*>> dataVectorMap;
 
         for ( auto& curve : curveSets() )
         {
-            const auto curveAddress = curve->summaryAddress();
+            const auto addr = curve->summaryAddress();
-            dataVectorMap[curveAddress].insert( curve->summaryCaseCollection() );
+            dataVectorMap[addr].insert( curve->summaryCaseCollection() );
         }
 
         auto ensemble = RiaSummaryTools::ensembleById( summaryAddr->ensembleId() );
         if ( ensemble )
         {
-            RifEclipseSummaryAddress droppedAddress = summaryAddr->address();
+            for ( const auto& droppedAddress : newCurveAddresses )
-
+            {
                 bool skipAddress = false;
 
                 if ( dataVectorMap.count( droppedAddress ) > 0 )
@@ -2061,21 +2092,22 @@ std::pair<int, std::vector<RimSummaryCurve*>> RimSummaryPlot::handleSummaryAddre
                 }
             }
         }
+    }
     else
     {
         std::map<RifEclipseSummaryAddress, std::set<RimSummaryCase*>> dataVectorMap;
 
         for ( auto& curve : summaryCurves() )
         {
-            const auto curveAddress = curve->summaryAddressY();
+            const auto addr = curve->summaryAddressY();
-            dataVectorMap[curveAddress].insert( curve->summaryCaseY() );
+            dataVectorMap[addr].insert( curve->summaryCaseY() );
         }
 
         auto summaryCase = RiaSummaryTools::summaryCaseById( summaryAddr->caseId() );
         if ( summaryCase )
         {
-            RifEclipseSummaryAddress droppedAddress = summaryAddr->address();
+            for ( const auto& droppedAddress : newCurveAddresses )
-
+            {
                 bool skipAddress = false;
 
                 if ( dataVectorMap.count( droppedAddress ) > 0 )
@@ -2090,6 +2122,7 @@ std::pair<int, std::vector<RimSummaryCurve*>> RimSummaryPlot::handleSummaryAddre
                 }
             }
         }
+    }
     return { newCurves, curves };
 }