Index: Core/Gui/src/Core.Gui/Core.Gui.csproj
===================================================================
diff -u -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 -r98da4d6cd59cac814ec00c54b22db4dc74b7eed0
--- Core/Gui/src/Core.Gui/Core.Gui.csproj	(.../Core.Gui.csproj)	(revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48)
+++ Core/Gui/src/Core.Gui/Core.Gui.csproj	(.../Core.Gui.csproj)	(revision 98da4d6cd59cac814ec00c54b22db4dc74b7eed0)
@@ -135,6 +135,7 @@
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls.TreeView\Core.Common.Controls.TreeView.csproj" />
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Controls\Core.Common.Controls.csproj" />
     <ProjectReference Include="..\..\..\Common\src\Core.Common.Util\Core.Common.Util.csproj" />
+    <ProjectReference Include="..\..\..\Components\src\Core.Components.Chart\Core.Components.Chart.csproj" />
     <ProjectReference Include="..\..\..\Components\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj" />
     <ProjectReference Include="..\..\..\Components\src\Core.Components.Gis\Core.Components.Gis.csproj" />
   </ItemGroup>
Index: Core/Gui/src/Core.Gui/PresentationObjects/Chart/ChartDataContext.cs
===================================================================
diff -u
--- Core/Gui/src/Core.Gui/PresentationObjects/Chart/ChartDataContext.cs	(revision 0)
+++ Core/Gui/src/Core.Gui/PresentationObjects/Chart/ChartDataContext.cs	(revision 98da4d6cd59cac814ec00c54b22db4dc74b7eed0)
@@ -0,0 +1,56 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Controls.PresentationObjects;
+using Core.Components.Chart.Data;
+
+namespace Core.Gui.PresentationObjects.Chart
+{
+    /// <summary>
+    /// Presentation object for <see cref="ChartData"/>.
+    /// </summary>
+    public class ChartDataContext : ObservableWrappedObjectContextBase<ChartData>
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="ChartDataContext"/>.
+        /// </summary>
+        /// <param name="wrappedData">The <see cref="ChartData"/> to wrap.</param>
+        /// <param name="parentChartData">The parent <see cref="ChartDataCollection"/> 
+        /// the <paramref name="wrappedData"/> belongs to.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        public ChartDataContext(ChartData wrappedData, ChartDataCollection parentChartData) : base(wrappedData)
+        {
+            if (parentChartData == null)
+            {
+                throw new ArgumentNullException(nameof(parentChartData));
+            }
+
+            ParentChartData = parentChartData;
+        }
+
+        /// <summary>
+        /// Gets the parent <see cref="ChartDataCollection"/>
+        /// the <see cref="WrappedObjectContextBase{T}.WrappedData"/> belongs to.
+        /// </summary>
+        public ChartDataCollection ParentChartData { get; }
+    }
+}
\ No newline at end of file
Index: Core/Gui/test/Core.Gui.Test/Core.Gui.Test.csproj
===================================================================
diff -u -r89e16fb45c79e575b0c335e71705694a9dac87c8 -r98da4d6cd59cac814ec00c54b22db4dc74b7eed0
--- Core/Gui/test/Core.Gui.Test/Core.Gui.Test.csproj	(.../Core.Gui.Test.csproj)	(revision 89e16fb45c79e575b0c335e71705694a9dac87c8)
+++ Core/Gui/test/Core.Gui.Test/Core.Gui.Test.csproj	(.../Core.Gui.Test.csproj)	(revision 98da4d6cd59cac814ec00c54b22db4dc74b7eed0)
@@ -17,7 +17,9 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj" />
+    <ProjectReference Include="..\..\..\Components\src\Core.Components.Chart\Core.Components.Chart.csproj" />
     <ProjectReference Include="..\..\..\Components\src\Core.Components.DotSpatial.Forms\Core.Components.DotSpatial.Forms.csproj" />
+    <ProjectReference Include="..\..\..\Components\test\Core.Components.Chart.TestUtil\Core.Components.Chart.TestUtil.csproj" />
     <ProjectReference Include="..\..\..\Components\test\Core.Components.Gis.TestUtil\Core.Components.Gis.TestUtil.csproj" />
     <ProjectReference Include="..\..\src\Core.Gui\Core.Gui.csproj" />
     <ProjectReference Include="..\Core.Gui.TestUtil\Core.Gui.TestUtil.csproj" />
Index: Core/Gui/test/Core.Gui.Test/PresentationObjects/Chart/ChartDataContextTest.cs
===================================================================
diff -u
--- Core/Gui/test/Core.Gui.Test/PresentationObjects/Chart/ChartDataContextTest.cs	(revision 0)
+++ Core/Gui/test/Core.Gui.Test/PresentationObjects/Chart/ChartDataContextTest.cs	(revision 98da4d6cd59cac814ec00c54b22db4dc74b7eed0)
@@ -0,0 +1,63 @@
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program 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 Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Controls.PresentationObjects;
+using Core.Components.Chart.Data;
+using Core.Components.Chart.TestUtil;
+using Core.Gui.PresentationObjects.Chart;
+using NUnit.Framework;
+
+namespace Core.Gui.Test.PresentationObjects.Chart
+{
+    [TestFixture]
+    public class ChartDataContextTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Setup
+            ChartData data = new TestChartData();
+            var collection = new ChartDataCollection("test");
+
+            collection.Add(data);
+
+            // Call
+            var context = new ChartDataContext(data, collection);
+
+            // Assert
+            Assert.IsInstanceOf<ObservableWrappedObjectContextBase<ChartData>>(context);
+            Assert.AreSame(data, context.WrappedData);
+            Assert.AreSame(collection, context.ParentChartData);
+        }
+
+        [Test]
+        public void Constructor_ParentChartDataNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new ChartDataContext(new TestChartData(), null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("parentChartData", exception.ParamName);
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs
===================================================================
diff -u -raa0d4106896bc6c0c8bf941809dba9df73ed88d3 -r98da4d6cd59cac814ec00c54b22db4dc74b7eed0
--- Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision aa0d4106896bc6c0c8bf941809dba9df73ed88d3)
+++ Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision 98da4d6cd59cac814ec00c54b22db4dc74b7eed0)
@@ -29,7 +29,7 @@
 using Core.Components.Chart.Data;
 using Core.Components.Chart.Forms;
 using Core.Gui.ContextMenu;
-using Core.Plugins.Chart.PresentationObjects;
+using Core.Gui.PresentationObjects.Chart;
 using ChartResources = Core.Plugins.Chart.Properties.Resources;
 using GuiResources = Core.Gui.Properties.Resources;
 
Fisheye: Tag 98da4d6cd59cac814ec00c54b22db4dc74b7eed0 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.Chart/PresentationObjects/ChartDataContext.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs
===================================================================
diff -u -raa0d4106896bc6c0c8bf941809dba9df73ed88d3 -r98da4d6cd59cac814ec00c54b22db4dc74b7eed0
--- Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs	(.../ChartDataCollectionTreeNodeInfoTest.cs)	(revision aa0d4106896bc6c0c8bf941809dba9df73ed88d3)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataCollectionTreeNodeInfoTest.cs	(.../ChartDataCollectionTreeNodeInfoTest.cs)	(revision 98da4d6cd59cac814ec00c54b22db4dc74b7eed0)
@@ -34,8 +34,8 @@
 using Core.Components.Chart.Data;
 using Core.Components.Chart.Forms;
 using Core.Components.Chart.TestUtil;
+using Core.Gui.PresentationObjects.Chart;
 using Core.Plugins.Chart.Legend;
-using Core.Plugins.Chart.PresentationObjects;
 using Core.Plugins.Chart.Properties;
 using NUnit.Framework;
 using Rhino.Mocks;
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs
===================================================================
diff -u -raa0d4106896bc6c0c8bf941809dba9df73ed88d3 -r98da4d6cd59cac814ec00c54b22db4dc74b7eed0
--- Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs	(.../ChartDataContextTreeNodeInfoTest.cs)	(revision aa0d4106896bc6c0c8bf941809dba9df73ed88d3)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartDataContextTreeNodeInfoTest.cs	(.../ChartDataContextTreeNodeInfoTest.cs)	(revision 98da4d6cd59cac814ec00c54b22db4dc74b7eed0)
@@ -34,8 +34,8 @@
 using Core.Components.Chart.Data;
 using Core.Components.Chart.Forms;
 using Core.Components.Chart.TestUtil;
+using Core.Gui.PresentationObjects.Chart;
 using Core.Plugins.Chart.Legend;
-using Core.Plugins.Chart.PresentationObjects;
 using Core.Plugins.Chart.Properties;
 using NUnit.Framework;
 using Rhino.Mocks;
Index: Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartLegendViewTest.cs
===================================================================
diff -u -rab3938a73513858354f1240bb86c0098f930ef3d -r98da4d6cd59cac814ec00c54b22db4dc74b7eed0
--- Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartLegendViewTest.cs	(.../ChartLegendViewTest.cs)	(revision ab3938a73513858354f1240bb86c0098f930ef3d)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/Legend/ChartLegendViewTest.cs	(.../ChartLegendViewTest.cs)	(revision 98da4d6cd59cac814ec00c54b22db4dc74b7eed0)
@@ -31,8 +31,8 @@
 using Core.Common.Util.Reflection;
 using Core.Components.Chart.Data;
 using Core.Components.Chart.TestUtil;
+using Core.Gui.PresentationObjects.Chart;
 using Core.Plugins.Chart.Legend;
-using Core.Plugins.Chart.PresentationObjects;
 using Core.Plugins.Chart.Properties;
 using NUnit.Framework;
 using Rhino.Mocks;
Fisheye: Tag 98da4d6cd59cac814ec00c54b22db4dc74b7eed0 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.Chart.Test/PresentationObjects/ChartDataContextTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?