#4258 Rename Grid Cross Plot "Curve Sets" to "Data Sets". Also renamed code

* Kept XML-strings to avoid breaking compatibility

ApplicationCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp

@@ -155,7 +155,7 @@ public:
     virtual int tabCount() const override
     {
         CVF_ASSERT(m_crossPlot.notNull() && "Need to check that provider is valid");
-        return (int)m_crossPlot->curveSets().size();
+        return (int)m_crossPlot->dataSets().size();
     }
 
 private:

ApplicationCode/Commands/GridCrossPlotCommands/CMakeLists_files.cmake

@@ -1,18 +1,18 @@
 
 set (SOURCE_GROUP_HEADER_FILES
 ${CMAKE_CURRENT_LIST_DIR}/RicCreateGridCrossPlotFeature.h
-${CMAKE_CURRENT_LIST_DIR}/RicCreateGridCrossPlotCurveSetFeature.h
-${CMAKE_CURRENT_LIST_DIR}/RicSwapGridCrossPlotCurveSetAxesFeature.h
-${CMAKE_CURRENT_LIST_DIR}/RicPasteGridCrossPlotCurveSetFeature.h
+${CMAKE_CURRENT_LIST_DIR}/RicCreateGridCrossPlotDataSetFeature.h
+${CMAKE_CURRENT_LIST_DIR}/RicSwapGridCrossPlotDataSetAxesFeature.h
+${CMAKE_CURRENT_LIST_DIR}/RicPasteGridCrossPlotDataSetFeature.h
 ${CMAKE_CURRENT_LIST_DIR}/RicCreateSaturationPressurePlotsFeature.h
 ${CMAKE_CURRENT_LIST_DIR}/RicSaturationPressureUi.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
 ${CMAKE_CURRENT_LIST_DIR}/RicCreateGridCrossPlotFeature.cpp
-${CMAKE_CURRENT_LIST_DIR}/RicCreateGridCrossPlotCurveSetFeature.cpp
-${CMAKE_CURRENT_LIST_DIR}/RicSwapGridCrossPlotCurveSetAxesFeature.cpp
-${CMAKE_CURRENT_LIST_DIR}/RicPasteGridCrossPlotCurveSetFeature.cpp
+${CMAKE_CURRENT_LIST_DIR}/RicCreateGridCrossPlotDataSetFeature.cpp
+${CMAKE_CURRENT_LIST_DIR}/RicSwapGridCrossPlotDataSetAxesFeature.cpp
+${CMAKE_CURRENT_LIST_DIR}/RicPasteGridCrossPlotDataSetFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicCreateSaturationPressurePlotsFeature.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RicSaturationPressureUi.cpp
 )

ApplicationCode/Commands/GridCrossPlotCommands/RicCreateGridCrossPlotDataSetFeature.cpp

@@ -15,12 +15,12 @@
 //  for more details.
 //
 /////////////////////////////////////////////////////////////////////////////////
-#include "RicCreateGridCrossPlotCurveSetFeature.h"
+#include "RicCreateGridCrossPlotDataSetFeature.h"
 
 #include "RiaApplication.h"
 
 #include "RimGridCrossPlot.h"
-#include "RimGridCrossPlotCurveSet.h"
+#include "RimGridCrossPlotDataSet.h"
 #include "RimProject.h"
 
 #include "RiuPlotMainWindowTools.h"
@@ -29,12 +29,12 @@
 
 #include <QAction>
 
-CAF_CMD_SOURCE_INIT(RicCreateGridCrossPlotCurveSetFeature, "RicCreateGridCrossPlotCurveSetFeature");
+CAF_CMD_SOURCE_INIT(RicCreateGridCrossPlotDataSetFeature, "RicCreateGridCrossPlotDataSetFeature");
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-bool RicCreateGridCrossPlotCurveSetFeature::isCommandEnabled()
+bool RicCreateGridCrossPlotDataSetFeature::isCommandEnabled()
 {
     return caf::SelectionManager::instance()->selectedItemOfType<RimGridCrossPlot>() != nullptr;
 }
@@ -42,22 +42,22 @@ bool RicCreateGridCrossPlotCurveSetFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RicCreateGridCrossPlotCurveSetFeature::onActionTriggered(bool isChecked)
+void RicCreateGridCrossPlotDataSetFeature::onActionTriggered(bool isChecked)
 {
     RimGridCrossPlot* crossPlot = caf::SelectionManager::instance()->selectedItemOfType<RimGridCrossPlot>();
 
-    RimGridCrossPlotCurveSet* curveSet = crossPlot->createCurveSet();
-    curveSet->loadDataAndUpdate(true);
+    RimGridCrossPlotDataSet* dataSet = crossPlot->createDataSet();
+    dataSet->loadDataAndUpdate(true);
     
     RiaApplication::instance()->getOrCreateMainPlotWindow();
-    RiuPlotMainWindowTools::selectAsCurrentItem(curveSet);
+    RiuPlotMainWindowTools::selectAsCurrentItem(dataSet);
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RicCreateGridCrossPlotCurveSetFeature::setupActionLook(QAction* actionToSetup)
+void RicCreateGridCrossPlotDataSetFeature::setupActionLook(QAction* actionToSetup)
 {
-    actionToSetup->setText("New Cross Plot Curve Set");
+    actionToSetup->setText("New Data Set");
     actionToSetup->setIcon(QIcon(":/WellLogCurve16x16.png"));
 }

ApplicationCode/Commands/GridCrossPlotCommands/RicCreateGridCrossPlotDataSetFeature.h

@@ -22,7 +22,7 @@
 //==================================================================================================
 ///
 //==================================================================================================
-class RicCreateGridCrossPlotCurveSetFeature : public caf::CmdFeature
+class RicCreateGridCrossPlotDataSetFeature : public caf::CmdFeature
 {
     CAF_CMD_HEADER_INIT;
 

ApplicationCode/Commands/GridCrossPlotCommands/RicCreateGridCrossPlotFeature.cpp

@@ -22,7 +22,7 @@
 #include "RimEclipseView.h"
 #include "RimGridCrossPlot.h"
 #include "RimGridCrossPlotCollection.h"
-#include "RimGridCrossPlotCurveSet.h"
+#include "RimGridCrossPlotDataSet.h"
 #include "RimGridView.h"
 #include "RimMainPlotCollection.h"
 #include "RimProject.h"
@@ -59,11 +59,11 @@ void RicCreateGridCrossPlotFeature::onActionTriggered(bool isChecked)
         launchedFromPlotCollection = false;
     }
     RimGridCrossPlot* plot = collection->createGridCrossPlot();    
-    RimGridCrossPlotCurveSet* curveSet = plot->createCurveSet();
+    RimGridCrossPlotDataSet* dataSet = plot->createDataSet();
 
     if (!launchedFromPlotCollection)
     {
-        curveSet->setCellFilterView(RiaApplication::instance()->activeGridView());
+        dataSet->setCellFilterView(RiaApplication::instance()->activeGridView());
     }
     
     plot->loadDataAndUpdate();

ApplicationCode/Commands/GridCrossPlotCommands/RicPasteGridCrossPlotDataSetFeature.cpp

@@ -16,11 +16,11 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RicPasteGridCrossPlotCurveSetFeature.h"
+#include "RicPasteGridCrossPlotDataSetFeature.h"
 
 #include "RiaApplication.h"
 #include "RimGridCrossPlot.h"
-#include "RimGridCrossPlotCurveSet.h"
+#include "RimGridCrossPlotDataSet.h"
 #include "RiuPlotMainWindowTools.h"
 
 #include "OperationsUsingObjReferences/RicPasteFeatureImpl.h"
@@ -30,14 +30,14 @@
 
 #include <QAction>
 
-CAF_CMD_SOURCE_INIT(RicPasteGridCrossPlotCurveSetFeature, "RicPasteGridCrossPlotCurveSetFeature");
+CAF_CMD_SOURCE_INIT(RicPasteGridCrossPlotDataSetFeature, "RicPasteGridCrossPlotDataSetFeature");
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-bool RicPasteGridCrossPlotCurveSetFeature::isCommandEnabled()
+bool RicPasteGridCrossPlotDataSetFeature::isCommandEnabled()
 {
-    auto curvesOnClipboard = gridCrossPlotCurveSetsOnClipboard();
+    auto curvesOnClipboard = gridCrossPlotDataSetsOnClipboard();
     if (curvesOnClipboard.empty()) return false;
 
     return caf::SelectionManager::instance()->selectedItemAncestorOfType<RimGridCrossPlot>() != nullptr;
@@ -46,27 +46,27 @@ bool RicPasteGridCrossPlotCurveSetFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RicPasteGridCrossPlotCurveSetFeature::onActionTriggered(bool isChecked)
+void RicPasteGridCrossPlotDataSetFeature::onActionTriggered(bool isChecked)
 {
     RimGridCrossPlot* crossPlot = caf::SelectionManager::instance()->selectedItemAncestorOfType<RimGridCrossPlot>();
 
     if (crossPlot)
     {
-        auto curvesOnClipboard = gridCrossPlotCurveSetsOnClipboard();
+        auto curvesOnClipboard = gridCrossPlotDataSetsOnClipboard();
         if (!curvesOnClipboard.empty())
         {
-            RimGridCrossPlotCurveSet* objectToSelect = nullptr;
+            RimGridCrossPlotDataSet* objectToSelect = nullptr;
 
-            for (RimGridCrossPlotCurveSet* crossPlotCurveSet : gridCrossPlotCurveSetsOnClipboard())
+            for (RimGridCrossPlotDataSet* dataSet : gridCrossPlotDataSetsOnClipboard())
             {
-                RimGridCrossPlotCurveSet* newCurveSet = dynamic_cast<RimGridCrossPlotCurveSet*>(
-                    crossPlotCurveSet->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance()));
+                RimGridCrossPlotDataSet* newDataSet = dynamic_cast<RimGridCrossPlotDataSet*>(
+                    dataSet->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance()));
 
-                crossPlot->addCurveSet(newCurveSet);
-                newCurveSet->resolveReferencesRecursively();
-                newCurveSet->initAfterReadRecursively();
+                crossPlot->addDataSet(newDataSet);
+                newDataSet->resolveReferencesRecursively();
+                newDataSet->initAfterReadRecursively();
 
-                objectToSelect = newCurveSet;
+                objectToSelect = newDataSet;
             }
 
 
@@ -82,21 +82,21 @@ void RicPasteGridCrossPlotCurveSetFeature::onActionTriggered(bool isChecked)
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RicPasteGridCrossPlotCurveSetFeature::setupActionLook(QAction* actionToSetup)
+void RicPasteGridCrossPlotDataSetFeature::setupActionLook(QAction* actionToSetup)
 {
-    actionToSetup->setText("Paste Cross Plot Curve Set");
+    actionToSetup->setText("Paste Data Set");
     RicPasteFeatureImpl::setIconAndShortcuts(actionToSetup);
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-std::vector<caf::PdmPointer<RimGridCrossPlotCurveSet>> RicPasteGridCrossPlotCurveSetFeature::gridCrossPlotCurveSetsOnClipboard()
+std::vector<caf::PdmPointer<RimGridCrossPlotDataSet>> RicPasteGridCrossPlotDataSetFeature::gridCrossPlotDataSetsOnClipboard()
 {
     caf::PdmObjectGroup objectGroup;
     RicPasteFeatureImpl::findObjectsFromClipboardRefs(&objectGroup);
 
-    std::vector<caf::PdmPointer<RimGridCrossPlotCurveSet>> typedObjects;
+    std::vector<caf::PdmPointer<RimGridCrossPlotDataSet>> typedObjects;
     objectGroup.objectsByType(&typedObjects);
 
     return typedObjects;

ApplicationCode/Commands/GridCrossPlotCommands/RicPasteGridCrossPlotDataSetFeature.h

@@ -21,12 +21,12 @@
 #include "cafCmdFeature.h"
 #include "cafPdmPointer.h"
 
-class RimGridCrossPlotCurveSet;
+class RimGridCrossPlotDataSet;
 
 //==================================================================================================
 ///
 //==================================================================================================
-class RicPasteGridCrossPlotCurveSetFeature : public caf::CmdFeature
+class RicPasteGridCrossPlotDataSetFeature : public caf::CmdFeature
 {
     CAF_CMD_HEADER_INIT;
 
@@ -36,7 +36,7 @@ protected:
     void setupActionLook(QAction* actionToSetup) override;
 
 private:
-    static std::vector<caf::PdmPointer<RimGridCrossPlotCurveSet>> gridCrossPlotCurveSetsOnClipboard();
+    static std::vector<caf::PdmPointer<RimGridCrossPlotDataSet>> gridCrossPlotDataSetsOnClipboard();
 
 };
 

ApplicationCode/Commands/GridCrossPlotCommands/RicSwapGridCrossPlotDataSetAxesFeature.cpp

@@ -1,27 +1,27 @@
-#include "RicSwapGridCrossPlotCurveSetAxesFeature.h"
+#include "RicSwapGridCrossPlotDataSetAxesFeature.h"
 
 #include "RimGridCrossPlot.h"
-#include "RimGridCrossPlotCurveSet.h"
+#include "RimGridCrossPlotDataSet.h"
 
 #include <cafSelectionManager.h>
 
 #include <QAction>
 
-CAF_CMD_SOURCE_INIT(RicSwapGridCrossPlotCurveSetAxesFeature, "RicSwapGridCrossPlotCurveSetAxesFeature");
+CAF_CMD_SOURCE_INIT(RicSwapGridCrossPlotDataSetAxesFeature, "RicSwapGridCrossPlotDataSetAxesFeature");
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-bool RicSwapGridCrossPlotCurveSetAxesFeature::isCommandEnabled()
+bool RicSwapGridCrossPlotDataSetAxesFeature::isCommandEnabled()
 {
-    if (caf::SelectionManager::instance()->selectedItemOfType<RimGridCrossPlotCurveSet>())
+    if (caf::SelectionManager::instance()->selectedItemOfType<RimGridCrossPlotDataSet>())
     {
         return true;
     }
     else if (caf::SelectionManager::instance()->selectedItemOfType<RimGridCrossPlot>())
     {
         auto plot = caf::SelectionManager::instance()->selectedItemOfType<RimGridCrossPlot>();
-        if (!plot->curveSets().empty())
+        if (!plot->dataSets().empty())
             return true;
     }
     return false;
@@ -30,12 +30,12 @@ bool RicSwapGridCrossPlotCurveSetAxesFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RicSwapGridCrossPlotCurveSetAxesFeature::onActionTriggered(bool isChecked)
+void RicSwapGridCrossPlotDataSetAxesFeature::onActionTriggered(bool isChecked)
 {
-    if (caf::SelectionManager::instance()->selectedItemOfType<RimGridCrossPlotCurveSet>())
+    if (caf::SelectionManager::instance()->selectedItemOfType<RimGridCrossPlotDataSet>())
     {
-        auto curveSet = caf::SelectionManager::instance()->selectedItemOfType<RimGridCrossPlotCurveSet>();
-        curveSet->swapAxisProperties(true);
+        auto dataSet = caf::SelectionManager::instance()->selectedItemOfType<RimGridCrossPlotDataSet>();
+        dataSet->swapAxisProperties(true);
     }
     else if (caf::SelectionManager::instance()->selectedItemOfType<RimGridCrossPlot>())
     {
@@ -47,9 +47,9 @@ void RicSwapGridCrossPlotCurveSetAxesFeature::onActionTriggered(bool isChecked)
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RicSwapGridCrossPlotCurveSetAxesFeature::setupActionLook(QAction* actionToSetup)
+void RicSwapGridCrossPlotDataSetAxesFeature::setupActionLook(QAction* actionToSetup)
 {
-    if (caf::SelectionManager::instance()->selectedItemOfType<RimGridCrossPlotCurveSet>())
+    if (caf::SelectionManager::instance()->selectedItemOfType<RimGridCrossPlotDataSet>())
     {
         actionToSetup->setText("Swap Axis Properties");
     }

ApplicationCode/Commands/GridCrossPlotCommands/RicSwapGridCrossPlotDataSetAxesFeature.h

@@ -22,7 +22,7 @@
 //==================================================================================================
 ///
 //==================================================================================================
-class RicSwapGridCrossPlotCurveSetAxesFeature : public caf::CmdFeature
+class RicSwapGridCrossPlotDataSetAxesFeature : public caf::CmdFeature
 {
     CAF_CMD_HEADER_INIT;
 

ApplicationCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp

@@ -24,7 +24,7 @@
 #include "RimEnsembleCurveSet.h"
 #include "RimFractureTemplate.h"
 #include "RimGeoMechView.h"
-#include "RimGridCrossPlotCurveSet.h"
+#include "RimGridCrossPlotDataSet.h"
 #include "RimIntersection.h"
 #include "RimIntersectionBox.h"
 #include "RimMimeData.h"
@@ -171,7 +171,7 @@ bool RicCopyReferencesToClipboardFeature::isCopyOfObjectSupported(caf::PdmObject
     {
         return true;
     }
-    else if (dynamic_cast<RimGridCrossPlotCurveSet*>(pdmObject))
+    else if (dynamic_cast<RimGridCrossPlotDataSet*>(pdmObject))
     {
         return true;
     }

ApplicationCode/Commands/RicDeleteItemFeature.cpp

@@ -35,7 +35,7 @@
 #include "RimGeoMechView.h"
 #include "RimGridTimeHistoryCurve.h"
 #include "RimGridCrossPlot.h"
-#include "RimGridCrossPlotCurveSet.h"
+#include "RimGridCrossPlotDataSet.h"
 #include "RimIdenticalGridCaseGroup.h"
 #include "RimIntersection.h"
 #include "RimIntersectionBox.h"
@@ -134,7 +134,7 @@ bool isDeletable(caf::PdmUiItem* uiItem)
     if (dynamic_cast<RimReachCircleAnnotation*>(uiItem))         return true;
     if (dynamic_cast<RimPolylinesAnnotation*>(uiItem))           return true;
     if (dynamic_cast<RimGridCrossPlot*>(uiItem))                 return true;
-    if (dynamic_cast<RimGridCrossPlotCurveSet*>(uiItem))         return true;
+    if (dynamic_cast<RimGridCrossPlotDataSet*>(uiItem))         return true;
     return false;    
 }