Index: Application/Application.Ringtoets/App.xaml.cs
===================================================================
diff -u -rd616e06dd49f563130b2d571107e0e54f09b0bbb -rb7ca402d4388054a86a27c5f76fc81d53afc2461
--- Application/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision d616e06dd49f563130b2d571107e0e54f09b0bbb)
+++ Application/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision b7ca402d4388054a86a27c5f76fc81d53afc2461)
@@ -17,6 +17,7 @@
using Core.Common.Gui.Forms.MainWindow;
using Core.Plugins.Charting;
using Core.Plugins.CommonTools.Gui;
+using Core.Plugins.OxyPlot;
using Core.Plugins.ProjectExplorer;
using Core.Plugins.SharpMapGis;
using Core.Plugins.SharpMapGis.Gui;
@@ -156,6 +157,7 @@
new PipingGuiPlugin()
#if INCLUDE_DEMOPROJECT
, new DemoProjectGuiPlugin()
+ , new OxyPlotGuiPlugin()
#endif
}
};
Index: Application/Application.Ringtoets/Application.Ringtoets.csproj
===================================================================
diff -u -rd616e06dd49f563130b2d571107e0e54f09b0bbb -rb7ca402d4388054a86a27c5f76fc81d53afc2461
--- Application/Application.Ringtoets/Application.Ringtoets.csproj (.../Application.Ringtoets.csproj) (revision d616e06dd49f563130b2d571107e0e54f09b0bbb)
+++ Application/Application.Ringtoets/Application.Ringtoets.csproj (.../Application.Ringtoets.csproj) (revision b7ca402d4388054a86a27c5f76fc81d53afc2461)
@@ -132,6 +132,10 @@
Core.Plugins.CommonTools.Gui
False
+
+ {4163B996-3455-4324-A38A-9F2F0E6FCB52}
+ Core.Plugins.OxyPlot
+
{ED20DBA9-D577-423F-A68D-A0A8130FB10B}
Core.Plugins.ProjectExplorer
Index: Core/Components/src/Core.Components.OxyPlot/ChartData.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.OxyPlot/ChartData.cs (revision 0)
+++ Core/Components/src/Core.Components.OxyPlot/ChartData.cs (revision b7ca402d4388054a86a27c5f76fc81d53afc2461)
@@ -0,0 +1,4 @@
+namespace Core.Components.OxyPlot
+{
+ public class ChartData {}
+}
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot/Core.Components.OxyPlot.csproj
===================================================================
diff -u -rbbb0ff8397bcb1097043adeed8f78710a9779fb5 -rb7ca402d4388054a86a27c5f76fc81d53afc2461
--- Core/Components/src/Core.Components.OxyPlot/Core.Components.OxyPlot.csproj (.../Core.Components.OxyPlot.csproj) (revision bbb0ff8397bcb1097043adeed8f78710a9779fb5)
+++ Core/Components/src/Core.Components.OxyPlot/Core.Components.OxyPlot.csproj (.../Core.Components.OxyPlot.csproj) (revision b7ca402d4388054a86a27c5f76fc81d53afc2461)
@@ -13,7 +13,6 @@
true
DEBUG;TRACE
- 1591
full
false
prompt
@@ -25,8 +24,6 @@
none
TRACE
true
-
-
none
prompt
AllRules.ruleset
@@ -59,6 +56,7 @@
Properties\GlobalAssembly.cs
+
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Core.Plugins.OxyPlot.csproj
===================================================================
diff -u -r3d4b98ca16e7a608e4db4ba639c028ce81bd440f -rb7ca402d4388054a86a27c5f76fc81d53afc2461
--- Core/Plugins/src/Core.Plugins.OxyPlot/Core.Plugins.OxyPlot.csproj (.../Core.Plugins.OxyPlot.csproj) (revision 3d4b98ca16e7a608e4db4ba639c028ce81bd440f)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Core.Plugins.OxyPlot.csproj (.../Core.Plugins.OxyPlot.csproj) (revision b7ca402d4388054a86a27c5f76fc81d53afc2461)
@@ -13,7 +13,6 @@
true
DEBUG;TRACE
- 1591
full
false
prompt
@@ -25,8 +24,6 @@
none
TRACE
true
-
-
none
prompt
AllRules.ruleset
@@ -41,20 +38,72 @@
AllRules.ruleset
+
+ ..\..\..\..\packages\Fluent.Ribbon.3.4.0\lib\net40\Fluent.dll
+ True
+
+
+
-
+
+
+
+
Properties\GlobalAssembly.cs
+
+ UserControl
+
+
+
+
+ True
+ True
+ Resources.resx
+
+
+ Ribbon.xaml
+
+
+
+ {9A2D67E6-26AC-4D17-B11A-2B4372F2F572}
+ Core.Common.Controls
+
+
+ {30E4C2AE-719E-4D70-9FA9-668A9767FBFA}
+ Core.Common.Gui
+
+
+ {2344A7BD-7E25-4A1A-982E-6C674AF5167A}
+ Core.Components.OxyPlot
+
+
+
+
+ Designer
+ MSBuild:Compile
+
+
+
+
+ PublicResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+ ..\resources\chart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Demo
+
+
+ ..\resources\document.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Diagram
+
+
+ Open een documentvenster met een diagram.
+
+
+ Diagram
+
+
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Resources/chart.png
===================================================================
diff -u
Binary files differ
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Resources/document.png
===================================================================
diff -u
Binary files differ
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Ribbon.xaml
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.OxyPlot/Ribbon.xaml (revision 0)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Ribbon.xaml (revision b7ca402d4388054a86a27c5f76fc81d53afc2461)
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
Index: Core/Plugins/src/Core.Plugins.OxyPlot/Ribbon.xaml.cs
===================================================================
diff -u
--- Core/Plugins/src/Core.Plugins.OxyPlot/Ribbon.xaml.cs (revision 0)
+++ Core/Plugins/src/Core.Plugins.OxyPlot/Ribbon.xaml.cs (revision b7ca402d4388054a86a27c5f76fc81d53afc2461)
@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using Core.Common.Controls.Commands;
+using Core.Common.Gui.Forms;
+
+namespace Core.Plugins.OxyPlot
+{
+ ///
+ /// Interaction logic for ribbon.xaml
+ ///
+ public partial class Ribbon : IRibbonCommandHandler
+ {
+ private readonly ICommand openChartViewCommand;
+
+ public Ribbon()
+ {
+ InitializeComponent();
+
+ openChartViewCommand = new OpenChartViewCommand();
+ }
+
+ public IEnumerable Commands
+ {
+ get
+ {
+ yield return openChartViewCommand;
+ }
+ }
+
+ public object GetRibbonControl()
+ {
+ return RibbonControl;
+ }
+
+ public void ValidateItems()
+ {
+ }
+
+ public bool IsContextualTabVisible(string tabGroupName, string tabName)
+ {
+ return false;
+ }
+
+ private void ButtonOpenChartView_Click(object sender, System.Windows.RoutedEventArgs e)
+ {
+ openChartViewCommand.Execute();
+ }
+ }
+}