Index: Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs
===================================================================
diff -u -rbc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c -r96fff35cedc43c8be2da620efa3d1b9cb3e42238
--- Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs	(.../App.xaml.cs)	(revision bc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c)
+++ Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs	(.../App.xaml.cs)	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -156,10 +156,10 @@
                     new CommonToolsGuiPlugin(),
                     new RingtoetsGuiPlugin(),
                     new PipingGuiPlugin(),
+                    new OxyPlotGuiPlugin(),
                     new DotSpatialGuiPlugin()
 #if INCLUDE_DEMOPROJECT
                     , new DemoProjectGuiPlugin()
-                    , new OxyPlotGuiPlugin()
 #endif
                 }
             };
Index: Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml
===================================================================
diff -u -rbc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c -r96fff35cedc43c8be2da620efa3d1b9cb3e42238
--- Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml	(.../ChartingRibbon.xaml)	(revision bc173e2a73c395bf64d1d9b4ad8d81129a1cdd7c)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml	(.../ChartingRibbon.xaml)	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -16,12 +16,6 @@
         <fluent:Ribbon.ContextualGroups>
             <fluent:RibbonContextualTabGroup Header="{x:Static p:Resources.Ribbon_ContextualGroup_Charting}" Visibility="Visible" x:Name="ChartingContextualGroup" Background="MediumPurple" BorderBrush="MediumPurple" />
         </fluent:Ribbon.ContextualGroups>
-        
-        <fluent:RibbonTabItem Header="{x:Static p:Resources.Ribbon_Demo_Header}" fluent:KeyTip.Keys="D">
-            <fluent:RibbonGroupBox Header="{x:Static p:Resources.General_Chart}" fluent:KeyTip.Keys="C">
-                <fluent:Button x:Name="OpenChartViewButton"  Header="{x:Static p:Resources.General_Chart}" ToolTip="{x:Static p:Resources.OpenChartView_ToolTip}" LargeIcon="{Binding Source={x:Static p:Resources.DocumentIcon}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonOpenChartView_Click" fluent:KeyTip.Keys="O"/>
-            </fluent:RibbonGroupBox>
-        </fluent:RibbonTabItem>
 
         <fluent:RibbonTabItem Header="{x:Static common:Resources.Ribbon_TabItem_View}" fluent:KeyTip.Keys="B">
             <fluent:RibbonGroupBox Header="{x:Static common:Resources.Ribbon_GroupBox_Show_Hide}" fluent:KeyTip.Keys="S">
Index: Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml.cs
===================================================================
diff -u -rfbb37872d09f1ded75ce2209e8e48a6b64d8a78f -r96fff35cedc43c8be2da620efa3d1b9cb3e42238
--- Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml.cs	(.../ChartingRibbon.xaml.cs)	(revision fbb37872d09f1ded75ce2209e8e48a6b64d8a78f)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/ChartingRibbon.xaml.cs	(.../ChartingRibbon.xaml.cs)	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -65,11 +65,6 @@
         }
 
         /// <summary>
-        /// Sets the command used when the open chart button is clicked.
-        /// </summary>
-        public ICommand OpenChartViewCommand { private get; set; }
-
-        /// <summary>
         /// Sets the command used when the toggle legend view button is clicked.
         /// </summary>
         public ICommand ToggleLegendViewCommand { private get; set; }
@@ -78,10 +73,6 @@
         {
             get
             {
-                if (OpenChartViewCommand != null)
-                {
-                    yield return OpenChartViewCommand;
-                }
                 if (ToggleLegendViewCommand != null)
                 {
                     yield return ToggleLegendViewCommand;
@@ -126,12 +117,7 @@
             // but more ideally be removed.
             return ChartingContextualGroup.Name == tabGroupName && ChartingContextualGroup.Visibility == Visibility.Visible;
         }
-
-        private void ButtonOpenChartView_Click(object sender, RoutedEventArgs e)
-        {
-            OpenChartViewCommand.Execute();
-        }
-
+        
         private void ButtonToggleLegend_Click(object sender, RoutedEventArgs e)
         {
             ToggleLegendViewCommand.Execute();
Fisheye: Tag 96fff35cedc43c8be2da620efa3d1b9cb3e42238 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.OxyPlot/Commands/OpenChartViewCommand.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Core.Plugins.OxyPlot.csproj
===================================================================
diff -u -ra49c98841cb7c943ff7abbfef8110b4bf6f52a8b -r96fff35cedc43c8be2da620efa3d1b9cb3e42238
--- Core/Plugins/src/Core.Plugins.OxyPlot/Core.Plugins.OxyPlot.csproj	(.../Core.Plugins.OxyPlot.csproj)	(revision a49c98841cb7c943ff7abbfef8110b4bf6f52a8b)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Core.Plugins.OxyPlot.csproj	(.../Core.Plugins.OxyPlot.csproj)	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -73,7 +73,6 @@
       <DependentUpon>LegendView.cs</DependentUpon>
     </Compile>
     <Compile Include="Forms\IChartView.cs" />
-    <Compile Include="Commands\OpenChartViewCommand.cs" />
     <Compile Include="Legend\LegendController.cs" />
     <Compile Include="OxyPlotGuiPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Index: Core/Plugins/src/Core.Plugins.OxyPlot/OxyPlotGuiPlugin.cs
===================================================================
diff -u -r4af57ec0ebbdb753668d1f7096c373672a38563f -r96fff35cedc43c8be2da620efa3d1b9cb3e42238
--- Core/Plugins/src/Core.Plugins.OxyPlot/OxyPlotGuiPlugin.cs	(.../OxyPlotGuiPlugin.cs)	(revision 4af57ec0ebbdb753668d1f7096c373672a38563f)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/OxyPlotGuiPlugin.cs	(.../OxyPlotGuiPlugin.cs)	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -103,7 +103,6 @@
         {
             return new ChartingRibbon
             {
-                OpenChartViewCommand = new OpenChartViewCommand(documentViewController),
                 ToggleLegendViewCommand = new ToggleLegendViewCommand(legendController)
             };
         }
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Properties/Resources.Designer.cs
===================================================================
diff -u -rc68064014494505f833de7749ee7b3d879f723d6 -r96fff35cedc43c8be2da620efa3d1b9cb3e42238
--- Core/Plugins/src/Core.Plugins.OxyPlot/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision c68064014494505f833de7749ee7b3d879f723d6)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Runtime Version:4.0.30319.34209
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -108,16 +108,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
-        /// </summary>
-        public static System.Drawing.Bitmap DocumentIcon {
-            get {
-                object obj = ResourceManager.GetObject("DocumentIcon", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Grafiek.
         /// </summary>
         public static string General_Chart {
@@ -137,15 +127,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Open een documentvenster met een diagram..
-        /// </summary>
-        public static string OpenChartView_ToolTip {
-            get {
-                return ResourceManager.GetString("OpenChartView_ToolTip", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap PanIcon {
@@ -185,15 +166,6 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Demo.
-        /// </summary>
-        public static string Ribbon_Demo_Header {
-            get {
-                return ResourceManager.GetString("Ribbon_Demo_Header", resourceCulture);
-            }
-        }
-        
-        /// <summary>
         ///   Looks up a localized string similar to Navigatie.
         /// </summary>
         public static string Ribbon_GroupBox_Navigation {
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Properties/Resources.resx
===================================================================
diff -u -rc68064014494505f833de7749ee7b3d879f723d6 -r96fff35cedc43c8be2da620efa3d1b9cb3e42238
--- Core/Plugins/src/Core.Plugins.OxyPlot/Properties/Resources.resx	(.../Resources.resx)	(revision c68064014494505f833de7749ee7b3d879f723d6)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Properties/Resources.resx	(.../Resources.resx)	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -133,18 +133,12 @@
   <data name="ChartIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\chart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="DocumentIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\document.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="General_Chart" xml:space="preserve">
     <value>Grafiek</value>
   </data>
   <data name="LineIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="OpenChartView_ToolTip" xml:space="preserve">
-    <value>Open een documentvenster met een diagram.</value>
-  </data>
   <data name="PanIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\hand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -157,9 +151,6 @@
   <data name="Ribbon_ContextualGroup_Charting" xml:space="preserve">
     <value>Grafieken</value>
   </data>
-  <data name="Ribbon_Demo_Header" xml:space="preserve">
-    <value>Demo</value>
-  </data>
   <data name="Ribbon_GroupBox_Navigation" xml:space="preserve">
     <value>Navigatie</value>
   </data>
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/ChartingRibbonTest.cs
===================================================================
diff -u -r0d7895f07d2c1b15457ffdc8e8762780a5837030 -r96fff35cedc43c8be2da620efa3d1b9cb3e42238
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/ChartingRibbonTest.cs	(.../ChartingRibbonTest.cs)	(revision 0d7895f07d2c1b15457ffdc8e8762780a5837030)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/ChartingRibbonTest.cs	(.../ChartingRibbonTest.cs)	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -35,23 +35,20 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var documentViewController = mocks.Stub<IDocumentViewController>();
             var toolViewController = mocks.Stub<IToolViewController>();
             mocks.ReplayAll();
 
-            var openChartViewCommand = new OpenChartViewCommand(documentViewController);
             var toggleLegendViewCommand = new ToggleLegendViewCommand(new LegendController(toolViewController));
             var ribbon = new ChartingRibbon
             {
-                OpenChartViewCommand = openChartViewCommand,
                 ToggleLegendViewCommand = toggleLegendViewCommand,
             };
 
             // Call
             var commands = ribbon.Commands.ToArray();
 
             // Assert
-            CollectionAssert.AreEqual(new ICommand[]{openChartViewCommand, toggleLegendViewCommand}, commands);
+            CollectionAssert.AreEqual(new ICommand[]{toggleLegendViewCommand}, commands);
 
             mocks.VerifyAll();
         }
@@ -80,23 +77,23 @@
 
         [Test]
         [RequiresSTA]
-        public void OpenChartViewButton_OnClick_ExecutesOpenChartViewCommand()
+        public void TogglePanning_OnClick_TogglePanning()
         {
             // Setup
             var mocks = new MockRepository();
-            var command = mocks.StrictMock<ICommand>();
-            command.Expect(c => c.Execute());
+            var chart = mocks.DynamicMock<IChart>();
+            chart.Expect(c => c.TogglePanning());
 
             mocks.ReplayAll();
 
             var ribbon = new ChartingRibbon
             {
-                OpenChartViewCommand = command
+                Chart = chart
             };
-            var button = ribbon.GetRibbonControl().FindName("OpenChartViewButton") as Button;
+            var button = ribbon.GetRibbonControl().FindName("TogglePanningButton") as ToggleButton;
 
             // Precondition
-            Assert.IsNotNull(button, "Ribbon should have an open chart view button.");
+            Assert.IsNotNull(button, "Ribbon should have a toggle panning button.");
 
             // Call
             button.RaiseEvent(new RoutedEventArgs(ButtonBase.ClickEvent));
@@ -107,6 +104,33 @@
 
         [Test]
         [RequiresSTA]
+        public void ToggleRectangleZooming_OnClick_ToggleRectangleZooming()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var chart = mocks.DynamicMock<IChart>();
+            chart.Expect(c => c.ToggleRectangleZooming());
+
+            mocks.ReplayAll();
+
+            var ribbon = new ChartingRibbon
+            {
+                Chart = chart
+            };
+            var button = ribbon.GetRibbonControl().FindName("ToggleRectangleZoomingButton") as ToggleButton;
+
+            // Precondition
+            Assert.IsNotNull(button, "Ribbon should have a toggle rectangle zooming button.");
+
+            // Call
+            button.RaiseEvent(new RoutedEventArgs(ButtonBase.ClickEvent));
+
+            // Assert
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        [RequiresSTA]
         public void ToggleLegendViewButton_OnClick_ExecutesToggleLegendViewCommand()
         {
             // Setup
Fisheye: Tag 96fff35cedc43c8be2da620efa3d1b9cb3e42238 refers to a dead (removed) revision in file `Core/Plugins/test/Core.Plugins.OxyPlot.Test/Commands/OpenChartViewCommandTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Core.Plugins.OxyPlot.Test.csproj
===================================================================
diff -u -ra49c98841cb7c943ff7abbfef8110b4bf6f52a8b -r96fff35cedc43c8be2da620efa3d1b9cb3e42238
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Core.Plugins.OxyPlot.Test.csproj	(.../Core.Plugins.OxyPlot.Test.csproj)	(revision a49c98841cb7c943ff7abbfef8110b4bf6f52a8b)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Core.Plugins.OxyPlot.Test.csproj	(.../Core.Plugins.OxyPlot.Test.csproj)	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -61,7 +61,6 @@
   <ItemGroup>
     <Compile Include="Commands\ToggleLegendViewCommandTest.cs" />
     <Compile Include="Forms\ChartDataViewTest.cs" />
-    <Compile Include="Commands\OpenChartViewCommandTest.cs" />
     <Compile Include="Legend\ChartDataCollectionTreeNodeInfoTest.cs" />
     <Compile Include="Legend\PointDataTreeNodeInfoTest.cs" />
     <Compile Include="Legend\AreaDataTreeNodeInfoTest.cs" />
Index: Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LineDataTreeNodeInfoTest.cs
===================================================================
diff -u -rb3883ecc0719d5df114cacc849796c0ca420507d -r96fff35cedc43c8be2da620efa3d1b9cb3e42238
--- Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LineDataTreeNodeInfoTest.cs	(.../LineDataTreeNodeInfoTest.cs)	(revision b3883ecc0719d5df114cacc849796c0ca420507d)
+++ Core/Plugins/test/Core.Plugins.OxyPlot.Test/Legend/LineDataTreeNodeInfoTest.cs	(.../LineDataTreeNodeInfoTest.cs)	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -121,6 +121,26 @@
 
         [TestCase(true)]
         [TestCase(false)]
+        public void IsChecked_Always_ReturnsAccordingToVisibleStateOfLineData(bool isVisible)
+        {
+            // Setup
+            var lineData = mocks.StrictMock<LineData>(Enumerable.Empty<Tuple<double, double>>());
+
+            lineData.IsVisible = isVisible;
+
+            mocks.ReplayAll();
+
+            // Call
+            var canCheck = info.IsChecked(lineData);
+
+            // Assert
+            Assert.AreEqual(isVisible, canCheck);
+
+            mocks.VerifyAll();
+        }
+
+        [TestCase(true)]
+        [TestCase(false)]
         public void LineDataNodeWithoutParent_SetsLineDataVisibility(bool initialVisibleState)
         {
             // Setup
Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs
===================================================================
diff -u
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs	(revision 0)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -0,0 +1,92 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets 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 System.Collections.Generic;
+using System.Collections.ObjectModel;
+using Core.Common.Controls.Commands;
+using Core.Common.Gui;
+using Core.Components.Charting.Data;
+
+namespace Demo.Ringtoets.Commands
+{
+    /// <summary>
+    /// This class describes the command for opening a view for <see cref="ChartData"/> with some arbitrary data.
+    /// </summary>
+    public class OpenChartViewCommand : ICommand
+    {
+        private readonly IDocumentViewController documentViewController;
+
+        public OpenChartViewCommand(IDocumentViewController documentViewController)
+        {
+            this.documentViewController = documentViewController;
+        }
+
+        public bool Enabled
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        public bool Checked
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        public void Execute(params object[] arguments)
+        {
+            var line = new LineData(new Collection<Tuple<double, double>>
+            {
+                new Tuple<double, double>(0.0, 1.1),    
+                new Tuple<double, double>(1.0, 2.1),
+                new Tuple<double, double>(1.6, 1.6)    
+            });
+            var area = new AreaData(new Collection<Tuple<double, double>>
+            {
+                new Tuple<double, double>(0.0, 1.1),    
+                new Tuple<double, double>(1.0, 2.1),
+                new Tuple<double, double>(1.6, 1.6),
+                new Tuple<double, double>(1.6, 0.5),
+                new Tuple<double, double>(0.0, 0.5),
+                new Tuple<double, double>(0.0, 1.1)
+            });
+            var clearArea = new AreaData(new Collection<Tuple<double, double>>
+            {
+                new Tuple<double, double>(0.5, 0.5),    
+                new Tuple<double, double>(0.5, 1.0),
+                new Tuple<double, double>(1.0, 1.0),
+                new Tuple<double, double>(0.5, 0.5)
+            });
+            var points = new PointData(new Collection<Tuple<double, double>>
+            {
+                new Tuple<double, double>(0.0, 1.1),    
+                new Tuple<double, double>(0.5, 1.6),  
+                new Tuple<double, double>(1.0, 2.1)
+            });
+            documentViewController.DocumentViewsResolver.OpenViewForData(new ChartDataCollection(new List<ChartData> { area, clearArea, line, points }));
+        }
+    }
+}
\ No newline at end of file
Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenMapViewCommand.cs
===================================================================
diff -u -r1a01c1a2825d37f773c817fbcab39d0cc5da9940 -r96fff35cedc43c8be2da620efa3d1b9cb3e42238
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenMapViewCommand.cs	(.../OpenMapViewCommand.cs)	(revision 1a01c1a2825d37f773c817fbcab39d0cc5da9940)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenMapViewCommand.cs	(.../OpenMapViewCommand.cs)	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -4,12 +4,11 @@
 using Core.Common.Controls.Commands;
 using Core.Common.Gui;
 using Core.Components.DotSpatial.Data;
-using Core.Plugins.DotSpatial.Forms;
 
 namespace Demo.Ringtoets.Commands
 {
     /// <summary>
-    /// The command for opening a <see cref="MapDataView"/> with some arbitrary data.
+    /// The command for opening a view for <see cref="MapData"/> with some arbitrary data.
     /// </summary>
     public class OpenMapViewCommand : ICommand
     {
Index: Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj
===================================================================
diff -u -rd182ae6d1a6590c4b52b17fd1f59c5b7c3780b48 -r96fff35cedc43c8be2da620efa3d1b9cb3e42238
--- Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj	(.../Demo.Ringtoets.csproj)	(revision d182ae6d1a6590c4b52b17fd1f59c5b7c3780b48)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj	(.../Demo.Ringtoets.csproj)	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -52,6 +52,7 @@
     </Compile>
     <Compile Include="Commands\AddNewDemoDikeAssessmentSectionCommand.cs" />
     <Compile Include="Commands\AddNewDemoDuneAssessmentSectionCommand.cs" />
+    <Compile Include="Commands\OpenChartViewCommand.cs" />
     <Compile Include="Commands\OpenMapViewCommand.cs" />
     <Compile Include="GUIs\DemoProjectGuiPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -90,14 +91,14 @@
       <Name>Core.Common.Version</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.Charting\Core.Components.Charting.csproj">
+      <Project>{516EBC95-B8F2-428C-B7F6-733F01BF8FDD}</Project>
+      <Name>Core.Components.Charting</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Components\src\Core.Components.DotSpatial\Core.Components.DotSpatial.csproj">
       <Project>{AA47E858-A2A7-470E-8B2D-C76AE8ED9CCD}</Project>
       <Name>Core.Components.DotSpatial</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\Core\Plugins\src\Core.Plugins.DotSpatial\Core.Plugins.DotSpatial.csproj">
-      <Project>{610E0A9C-1997-4C43-A10E-39D4C66ADA93}</Project>
-      <Name>Core.Plugins.DotSpatial</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Ringtoets\Common\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>
@@ -215,7 +216,9 @@
   <ItemGroup>
     <None Include="Resources\map.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="Resources\chart_line.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.Designer.cs
===================================================================
diff -u -rdbf6ecaa927e26f430d7c73290df7e825ec04744 -r96fff35cedc43c8be2da620efa3d1b9cb3e42238
--- Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision dbf6ecaa927e26f430d7c73290df7e825ec04744)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Runtime Version:4.0.30319.34209
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -61,6 +61,16 @@
         }
         
         /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap ChartIcon {
+            get {
+                object obj = ResourceManager.GetObject("ChartIcon", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Demo.
         /// </summary>
         public static string Demo {
@@ -327,6 +337,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Grafiek.
+        /// </summary>
+        public static string General_Chart {
+            get {
+                return ResourceManager.GetString("General_Chart", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Kaart.
         /// </summary>
         public static string General_Map {
@@ -346,6 +365,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Open een documentvenster met een diagram..
+        /// </summary>
+        public static string OpenChartView_ToolTip {
+            get {
+                return ResourceManager.GetString("OpenChartView_ToolTip", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Open een documentvenster met een kaart..
         /// </summary>
         public static string OpenMapView_ToolTip {
Index: Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.resx
===================================================================
diff -u -rdbf6ecaa927e26f430d7c73290df7e825ec04744 -r96fff35cedc43c8be2da620efa3d1b9cb3e42238
--- Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.resx	(.../Resources.resx)	(revision dbf6ecaa927e26f430d7c73290df7e825ec04744)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Properties/Resources.resx	(.../Resources.resx)	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -211,4 +211,13 @@
   <data name="Ribbon_Demo_Header" xml:space="preserve">
     <value>Demo</value>
   </data>
+  <data name="ChartIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\chart_line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="General_Chart" xml:space="preserve">
+    <value>Grafiek</value>
+  </data>
+  <data name="OpenChartView_ToolTip" xml:space="preserve">
+    <value>Open een documentvenster met een diagram.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Demo/Ringtoets/src/Demo.Ringtoets/Resources/chart_line.png
===================================================================
diff -u
Binary files differ
Index: Demo/Ringtoets/src/Demo.Ringtoets/Ribbons/RingtoetsDemoProjectRibbon.xaml
===================================================================
diff -u -r0c64d8a6c718c0aa67403a16c94dd0c10f862455 -r96fff35cedc43c8be2da620efa3d1b9cb3e42238
--- Demo/Ringtoets/src/Demo.Ringtoets/Ribbons/RingtoetsDemoProjectRibbon.xaml	(.../RingtoetsDemoProjectRibbon.xaml)	(revision 0c64d8a6c718c0aa67403a16c94dd0c10f862455)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Ribbons/RingtoetsDemoProjectRibbon.xaml	(.../RingtoetsDemoProjectRibbon.xaml)	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -5,7 +5,6 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:fluent="clr-namespace:Fluent;assembly=Fluent"
              xmlns:resx="clr-namespace:Demo.Ringtoets.Properties"
-             xmlns:gui="clr-namespace:Core.Common.Gui;assembly=Core.Common.Gui"
              xmlns:Converters="clr-namespace:Core.Common.Gui.Converters;assembly=Core.Common.Gui"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300">
@@ -26,6 +25,9 @@
                 <fluent:Button LargeIcon="pack://application:,,,/Demo.Ringtoets;component/Resources/folder-horizontal_large.png" Icon="pack://application:,,,/Demo.Ringtoets;component/Resources/folder-horizontal.png" Header="{x:Static resx:Resources.DemoDuneAssessmentSection}" SizeDefinition="Large,Medium,Small" KeyTip="P" Click="AddNewDemoDuneAssessmentSectionButton_Click"/>
                 <fluent:Button Name="OpenMapViewButton" Header="{x:Static resx:Resources.General_Map}" ToolTip="{x:Static resx:Resources.OpenMapView_ToolTip}" LargeIcon="{Binding Source={x:Static resx:Resources.map}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonOpenMapView_Click" fluent:KeyTip.Keys="K"/>
             </fluent:RibbonGroupBox>
+            <fluent:RibbonGroupBox Header="{x:Static resx:Resources.General_Chart}" fluent:KeyTip.Keys="C">
+                <fluent:Button Name="OpenChartViewButton"  Header="{x:Static resx:Resources.General_Chart}" ToolTip="{x:Static resx:Resources.OpenChartView_ToolTip}" LargeIcon="{Binding Source={x:Static resx:Resources.ChartIcon}, Converter={StaticResource IconConverter}}" SizeDefinition="Large" Click="ButtonOpenChartView_Click" fluent:KeyTip.Keys="O"/>
+            </fluent:RibbonGroupBox>
         </fluent:RibbonTabItem>
     </fluent:Ribbon>
 </UserControl>
Index: Demo/Ringtoets/src/Demo.Ringtoets/Ribbons/RingtoetsDemoProjectRibbon.xaml.cs
===================================================================
diff -u -rf9058d5293ecb785069c5b6b4c554dc6800ee771 -r96fff35cedc43c8be2da620efa3d1b9cb3e42238
--- Demo/Ringtoets/src/Demo.Ringtoets/Ribbons/RingtoetsDemoProjectRibbon.xaml.cs	(.../RingtoetsDemoProjectRibbon.xaml.cs)	(revision f9058d5293ecb785069c5b6b4c554dc6800ee771)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Ribbons/RingtoetsDemoProjectRibbon.xaml.cs	(.../RingtoetsDemoProjectRibbon.xaml.cs)	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -13,14 +13,15 @@
     /// </summary>
     public partial class RingtoetsDemoProjectRibbon : IRibbonCommandHandler
     {
-        private readonly ICommand addNewDikeAssessmentSection, addNewDuneAssessmentSection, openMapViewCommand;
+        private readonly ICommand addNewDikeAssessmentSection, addNewDuneAssessmentSection, openMapViewCommand, openChartViewCommand;
 
         public RingtoetsDemoProjectRibbon(IProjectOwner projectOwner, IDocumentViewController documentViewController)
         {
             InitializeComponent();
 
             addNewDikeAssessmentSection = new AddNewDemoDikeAssessmentSectionCommand(projectOwner);
             addNewDuneAssessmentSection = new AddNewDemoDuneAssessmentSectionCommand(projectOwner);
+            openChartViewCommand = new OpenChartViewCommand(documentViewController);
             openMapViewCommand = new OpenMapViewCommand(documentViewController);
         }
 
@@ -30,6 +31,7 @@
             {
                 yield return addNewDikeAssessmentSection;
                 yield return addNewDuneAssessmentSection;
+                yield return openChartViewCommand;
                 yield return openMapViewCommand;
             }
         }
@@ -56,6 +58,11 @@
             addNewDuneAssessmentSection.Execute();
         }
 
+        private void ButtonOpenChartView_Click(object sender, RoutedEventArgs e)
+        {
+            openChartViewCommand.Execute();
+        }
+
         private void ButtonOpenMapView_Click(object sender, RoutedEventArgs e)
         {
             openMapViewCommand.Execute();
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenChartViewCommandTest.cs
===================================================================
diff -u
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenChartViewCommandTest.cs	(revision 0)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/OpenChartViewCommandTest.cs	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -0,0 +1,69 @@
+using Core.Common.Gui;
+using Core.Common.Gui.Forms.ViewManager;
+using Demo.Ringtoets.Commands;
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace Demo.Ringtoets.Test.Commands
+{
+    [TestFixture]
+    public class OpenChartViewCommandTest
+    {
+        [Test]
+        public void Execute_Always_OpensViewForIChartData()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var documentViewController = mocks.StrictMock<IDocumentViewController>();
+            var viewResolverMock = mocks.StrictMock<IViewResolver>();
+            documentViewController.Expect(g => g.DocumentViewsResolver).Return(viewResolverMock);
+            viewResolverMock.Expect(vr => vr.OpenViewForData(null)).IgnoreArguments().Return(true);
+
+            mocks.ReplayAll();
+
+            var command = new OpenChartViewCommand(documentViewController);
+
+            // Call
+            command.Execute();
+
+            // Assert
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Enabled_Always_ReturnsTrue()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var documentViewControler = mocks.Stub<IDocumentViewController>();
+            mocks.ReplayAll();
+
+            var command = new OpenChartViewCommand(documentViewControler);
+
+            // Call
+            var isEnabled = command.Enabled;
+
+            // Assert
+            Assert.IsTrue(isEnabled);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Checked_Always_ReturnsFalse()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var documentViewController = mocks.Stub<IDocumentViewController>();
+            mocks.ReplayAll();
+
+            var command = new OpenChartViewCommand(documentViewController);
+
+            // Call
+            var isChecked = command.Checked;
+
+            // Assert
+            Assert.IsFalse(isChecked);
+            mocks.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Demo.Ringtoets.Test.csproj
===================================================================
diff -u -rd182ae6d1a6590c4b52b17fd1f59c5b7c3780b48 -r96fff35cedc43c8be2da620efa3d1b9cb3e42238
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Demo.Ringtoets.Test.csproj	(.../Demo.Ringtoets.Test.csproj)	(revision d182ae6d1a6590c4b52b17fd1f59c5b7c3780b48)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Demo.Ringtoets.Test.csproj	(.../Demo.Ringtoets.Test.csproj)	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -62,6 +62,7 @@
   <ItemGroup>
     <Compile Include="Commands\AddNewDemoDikeAssessmentSectionCommandTest.cs" />
     <Compile Include="Commands\AddNewDemoDuneAssessmentSectionCommandTest.cs" />
+    <Compile Include="Commands\OpenChartViewCommandTest.cs" />
     <Compile Include="Commands\OpenMapViewCommandTest.cs" />
     <Compile Include="GUIs\DemoProjectGuiPluginTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Ribbons/RingtoestDemoProjectRibbonTest.cs
===================================================================
diff -u -r3167b898b071fea4cf86c775bca5467fab086038 -r96fff35cedc43c8be2da620efa3d1b9cb3e42238
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Ribbons/RingtoestDemoProjectRibbonTest.cs	(.../RingtoestDemoProjectRibbonTest.cs)	(revision 3167b898b071fea4cf86c775bca5467fab086038)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Ribbons/RingtoestDemoProjectRibbonTest.cs	(.../RingtoestDemoProjectRibbonTest.cs)	(revision 96fff35cedc43c8be2da620efa3d1b9cb3e42238)
@@ -75,6 +75,34 @@
 
         [Test]
         [RequiresSTA]
+        public void OpenChartViewButton_OnClick_ExecutesOpenChartViewCommand()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var viewResolver = mocks.StrictMock<IViewResolver>();
+            viewResolver.Expect(vr => vr.OpenViewForData(null)).IgnoreArguments().Return(true);
+
+            var projectOwner = mocks.Stub<IProjectOwner>();
+            var documentViewController = mocks.Stub<IDocumentViewController>();
+            documentViewController.Expect(dvc => dvc.DocumentViewsResolver).Return(viewResolver);
+
+            mocks.ReplayAll();
+
+            var ribbon = new RingtoetsDemoProjectRibbon(projectOwner, documentViewController);
+            var button = ribbon.GetRibbonControl().FindName("OpenChartViewButton") as Button;
+
+            // Precondition
+            Assert.IsNotNull(button, "Ribbon should have an open chart view button.");
+
+            // Call
+            button.RaiseEvent(new RoutedEventArgs(ButtonBase.ClickEvent));
+
+            // Assert
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        [RequiresSTA]
         public void OpenMapViewButton_OnClick_OpensView()
         {
             // Setup
Index: shared/icons/famfamfam_silk_icons_v013/icons_32/chart_line.png
===================================================================
diff -u
Binary files differ