#3200 Plot editor. Remove curve sets correctly

ApplicationCode/Application/CMakeLists_files.cmake

@@ -7,6 +7,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiaFractureDefines.h
 ${CMAKE_CURRENT_LIST_DIR}/RiaPreferences.h
 ${CMAKE_CURRENT_LIST_DIR}/RiaPorosityModel.h
 ${CMAKE_CURRENT_LIST_DIR}/RiaSummaryCurveDefinition.h
+${CMAKE_CURRENT_LIST_DIR}/RiaCurveSetDefinition.h
 ${CMAKE_CURRENT_LIST_DIR}/RiaRftPltCurveDefinition.h
 ${CMAKE_CURRENT_LIST_DIR}/RiaViewRedrawScheduler.h
 ${CMAKE_CURRENT_LIST_DIR}/RiaMemoryCleanup.h
@@ -21,6 +22,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiaMain.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RiaPreferences.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RiaPorosityModel.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RiaSummaryCurveDefinition.cpp
+${CMAKE_CURRENT_LIST_DIR}/RiaCurveSetDefinition.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RiaRftPltCurveDefinition.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RiaViewRedrawScheduler.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RiaMemoryCleanup.cpp

ApplicationCode/Application/RiaCurveSetDefinition.cpp

@@ -0,0 +1,71 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2017     Statoil 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 "RiaCurveSetDefinition.h"
+
+#include "RifSummaryReaderInterface.h"
+#include "RimSummaryCaseCollection.h"
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RiaCurveSetDefinition::RiaCurveSetDefinition() :
+    m_ensemble(nullptr)
+{
+
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RiaCurveSetDefinition::RiaCurveSetDefinition(RimSummaryCaseCollection* ensemble, const RifEclipseSummaryAddress& summaryAddress) :
+    m_ensemble(ensemble),
+    m_summaryAddress(summaryAddress)
+{
+
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimSummaryCaseCollection* RiaCurveSetDefinition::ensemble() const
+{
+    return m_ensemble;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+const RifEclipseSummaryAddress& RiaCurveSetDefinition::summaryAddress() const
+{
+    return m_summaryAddress;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RiaCurveSetDefinition::operator<(const RiaCurveSetDefinition& other) const
+{
+    if (m_ensemble != other.ensemble())
+    {
+        return (m_ensemble < other.ensemble());
+    }
+
+    return (m_summaryAddress < other.summaryAddress());
+}

ApplicationCode/Application/RiaCurveSetDefinition.h

@@ -0,0 +1,48 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2017     Statoil 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 "RifEclipseSummaryAddress.h"
+
+#include <QString>
+
+#include <utility>
+#include <vector>
+
+class RimSummaryCaseCollection;
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RiaCurveSetDefinition
+{
+public:
+    RiaCurveSetDefinition();
+    explicit RiaCurveSetDefinition(RimSummaryCaseCollection* emsemble,
+                                   const RifEclipseSummaryAddress& summaryAddress);
+
+    RimSummaryCaseCollection*       ensemble() const;
+    const RifEclipseSummaryAddress& summaryAddress() const;
+
+    bool operator < (const RiaCurveSetDefinition& other) const;
+
+private:
+    RimSummaryCaseCollection * m_ensemble;
+    RifEclipseSummaryAddress   m_summaryAddress;
+};