Index: Application/Application.Ringtoets/App.xaml.cs
===================================================================
diff -u -r6a30be3a0a6f87e97e5144b981180aaba1609e54 -rd616e06dd49f563130b2d571107e0e54f09b0bbb
--- Application/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision 6a30be3a0a6f87e97e5144b981180aaba1609e54)
+++ Application/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision d616e06dd49f563130b2d571107e0e54f09b0bbb)
@@ -15,6 +15,7 @@
using Core.Common.Controls.Dialogs;
using Core.Common.Gui;
using Core.Common.Gui.Forms.MainWindow;
+using Core.Plugins.Charting;
using Core.Plugins.CommonTools.Gui;
using Core.Plugins.ProjectExplorer;
using Core.Plugins.SharpMapGis;
@@ -149,6 +150,7 @@
{
new ProjectExplorerGuiPlugin(),
new CommonToolsGuiPlugin(),
+ new ChartingGuiPlugin(),
new SharpMapGisGuiPlugin(),
new RingtoetsGuiPlugin(),
new PipingGuiPlugin()
Index: Application/Application.Ringtoets/Application.Ringtoets.csproj
===================================================================
diff -u -r257d05c151e5c8e1f661870752d8a3783633924b -rd616e06dd49f563130b2d571107e0e54f09b0bbb
--- Application/Application.Ringtoets/Application.Ringtoets.csproj (.../Application.Ringtoets.csproj) (revision 257d05c151e5c8e1f661870752d8a3783633924b)
+++ Application/Application.Ringtoets/Application.Ringtoets.csproj (.../Application.Ringtoets.csproj) (revision d616e06dd49f563130b2d571107e0e54f09b0bbb)
@@ -123,6 +123,10 @@
Core.Common.Version
False
+
+ {16050ED1-3E4F-4540-9B5D-6ADD4FC43D9D}
+ Core.Plugins.Charting
+
{93E73FAB-FAE8-49C6-9ABB-27D24DF761F6}
Core.Plugins.CommonTools.Gui
Index: Core/Plugins/src/Core.Plugins.Charting/ChartingGuiPlugin.cs
===================================================================
diff -u -r477b3dd45b75bf40fcdd4dcba75ae194ea201446 -rd616e06dd49f563130b2d571107e0e54f09b0bbb
--- Core/Plugins/src/Core.Plugins.Charting/ChartingGuiPlugin.cs (.../ChartingGuiPlugin.cs) (revision 477b3dd45b75bf40fcdd4dcba75ae194ea201446)
+++ Core/Plugins/src/Core.Plugins.Charting/ChartingGuiPlugin.cs (.../ChartingGuiPlugin.cs) (revision d616e06dd49f563130b2d571107e0e54f09b0bbb)
@@ -33,7 +33,7 @@
{
ChartLegendView = new ChartLegendView(this)
{
- Text = Resources.CommonToolsGuiPlugin_InitializeChartLegendView_Chart
+ Text = Resources.ChartingGuiPlugin_Chart
};
}
@@ -64,7 +64,7 @@
{
yield return new ViewInfo
{
- Description = Resources.CommonToolsGuiPlugin_GetViewInfoObjects_Chart_View,
+ Description = Resources.ChartingGuiPlugin_Chart,
AfterCreate = (view, chart) => view.Owner = Gui.MainWindow
};
}
Index: Core/Plugins/src/Core.Plugins.Charting/Forms/ChartTreeNodePresenter.cs
===================================================================
diff -u -r477b3dd45b75bf40fcdd4dcba75ae194ea201446 -rd616e06dd49f563130b2d571107e0e54f09b0bbb
--- Core/Plugins/src/Core.Plugins.Charting/Forms/ChartTreeNodePresenter.cs (.../ChartTreeNodePresenter.cs) (revision 477b3dd45b75bf40fcdd4dcba75ae194ea201446)
+++ Core/Plugins/src/Core.Plugins.Charting/Forms/ChartTreeNodePresenter.cs (.../ChartTreeNodePresenter.cs) (revision d616e06dd49f563130b2d571107e0e54f09b0bbb)
@@ -16,7 +16,7 @@
public override void UpdateNode(ITreeNode parentNode, ITreeNode node, IChart chart)
{
node.Tag = chart;
- node.Text = string.IsNullOrEmpty(chart.Title) ? Resources.ChartTreeNodePresenter_UpdateNode_Chart : chart.Title;
+ node.Text = string.IsNullOrEmpty(chart.Title) ? Resources.ChartingGuiPlugin_Chart : chart.Title;
node.Image = Resources.Chart;
}
Index: Core/Plugins/src/Core.Plugins.Charting/Properties/Resources.Designer.cs
===================================================================
diff -u -r477b3dd45b75bf40fcdd4dcba75ae194ea201446 -rd616e06dd49f563130b2d571107e0e54f09b0bbb
--- Core/Plugins/src/Core.Plugins.Charting/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 477b3dd45b75bf40fcdd4dcba75ae194ea201446)
+++ Core/Plugins/src/Core.Plugins.Charting/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d616e06dd49f563130b2d571107e0e54f09b0bbb)
@@ -417,6 +417,15 @@
}
///
+ /// Looks up a localized string similar to Grafiek.
+ ///
+ public static string ChartingGuiPlugin_Chart {
+ get {
+ return ResourceManager.GetString("ChartingGuiPlugin_Chart", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Zichtbaar.
///
public static string ChartingProperties_Visible_DisplayName {
@@ -696,51 +705,6 @@
}
///
- /// Looks up a localized string similar to Grafiek.
- ///
- public static string ChartTreeNodePresenter_UpdateNode_Chart {
- get {
- return ResourceManager.GetString("ChartTreeNodePresenter_UpdateNode_Chart", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Naam.
- ///
- public static string Common_Name_DisplayName {
- get {
- return ResourceManager.GetString("Common_Name_DisplayName", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Browser.
- ///
- public static string CommonToolsGuiPlugin_GetViewInfoObjects_Browser {
- get {
- return ResourceManager.GetString("CommonToolsGuiPlugin_GetViewInfoObjects_Browser", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Grafiek.
- ///
- public static string CommonToolsGuiPlugin_GetViewInfoObjects_Chart_View {
- get {
- return ResourceManager.GetString("CommonToolsGuiPlugin_GetViewInfoObjects_Chart_View", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Grafiek.
- ///
- public static string CommonToolsGuiPlugin_InitializeChartLegendView_Chart {
- get {
- return ResourceManager.GetString("CommonToolsGuiPlugin_InitializeChartLegendView_Chart", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Folder.
///
public static string FolderProperties_DisplayName {
Index: Core/Plugins/src/Core.Plugins.Charting/Properties/Resources.resx
===================================================================
diff -u -r477b3dd45b75bf40fcdd4dcba75ae194ea201446 -rd616e06dd49f563130b2d571107e0e54f09b0bbb
--- Core/Plugins/src/Core.Plugins.Charting/Properties/Resources.resx (.../Resources.resx) (revision 477b3dd45b75bf40fcdd4dcba75ae194ea201446)
+++ Core/Plugins/src/Core.Plugins.Charting/Properties/Resources.resx (.../Resources.resx) (revision d616e06dd49f563130b2d571107e0e54f09b0bbb)
@@ -120,9 +120,6 @@
Algemeen
-
- Naam
-
Folder
@@ -445,9 +442,6 @@
Beeld
-
- Grafiek
-
Grafiek
@@ -472,24 +466,15 @@
Liniaal
-
- Browser
-
-
+
Grafiek
-
- Grafiek
-
Lettertype kan niet leeg zijn.
Lettertype grootte valt niet binnen grenzen (3-200)
-
- Grafiek
-
Gegevensreeks instellingen
@@ -508,4 +493,7 @@
..\resources\ruler-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ Grafiek
+
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Core.Plugins.CommonTools.Gui.csproj
===================================================================
diff -u -r477b3dd45b75bf40fcdd4dcba75ae194ea201446 -rd616e06dd49f563130b2d571107e0e54f09b0bbb
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Core.Plugins.CommonTools.Gui.csproj (.../Core.Plugins.CommonTools.Gui.csproj) (revision 477b3dd45b75bf40fcdd4dcba75ae194ea201446)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Core.Plugins.CommonTools.Gui.csproj (.../Core.Plugins.CommonTools.Gui.csproj) (revision d616e06dd49f563130b2d571107e0e54f09b0bbb)
@@ -91,17 +91,6 @@
-
-
-
-
-
-
-
-
-
-
-
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -r477b3dd45b75bf40fcdd4dcba75ae194ea201446 -rd616e06dd49f563130b2d571107e0e54f09b0bbb
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 477b3dd45b75bf40fcdd4dcba75ae194ea201446)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d616e06dd49f563130b2d571107e0e54f09b0bbb)
@@ -61,46 +61,6 @@
}
///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap Area {
- get {
- object obj = ResourceManager.GetObject("Area", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap ArrowDownIcon {
- get {
- object obj = ResourceManager.GetObject("ArrowDownIcon", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap ArrowUpIcon {
- get {
- object obj = ResourceManager.GetObject("ArrowUpIcon", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap Bars {
- get {
- object obj = ResourceManager.GetObject("Bars", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
/// Looks up a localized string similar to Algemeen.
///
public static string Categories_General {
@@ -110,16 +70,6 @@
}
///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap Chart {
- get {
- object obj = ResourceManager.GetObject("Chart", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
/// Looks up a localized string similar to Naam.
///
public static string Common_Name_DisplayName {
@@ -166,46 +116,6 @@
}
///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap ImageExportIcon {
- get {
- object obj = ResourceManager.GetObject("ImageExportIcon", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap Line {
- get {
- object obj = ResourceManager.GetObject("Line", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap Points {
- get {
- object obj = ResourceManager.GetObject("Points", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap Polygon {
- get {
- object obj = ResourceManager.GetObject("Polygon", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
/// Looks up a localized string similar to Korte beschrijving van het project..
///
public static string ProjectProperties_Description_Description {
@@ -242,26 +152,6 @@
}
///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap RulerIcon {
- get {
- object obj = ResourceManager.GetObject("RulerIcon", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap Stacked {
- get {
- object obj = ResourceManager.GetObject("Stacked", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
/// Looks up a localized string similar to Folder.
///
public static string TreeFolderProperties_DisplayName {
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.resx
===================================================================
diff -u -r477b3dd45b75bf40fcdd4dcba75ae194ea201446 -rd616e06dd49f563130b2d571107e0e54f09b0bbb
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.resx (.../Resources.resx) (revision 477b3dd45b75bf40fcdd4dcba75ae194ea201446)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Properties/Resources.resx (.../Resources.resx) (revision d616e06dd49f563130b2d571107e0e54f09b0bbb)
@@ -159,44 +159,10 @@
Naam van de map getoond aan de gebruiker.
-
-
- ..\Resources\Area.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\bars.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\chart_curve.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\Line.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\Points.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\Polygon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\category.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
Browser
..\Resources\home.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\resources\arrow_down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\resources\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\resources\image-export.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\resources\ruler-3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Resources/Area.png
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd616e06dd49f563130b2d571107e0e54f09b0bbb
Binary files differ
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Resources/Line.png
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd616e06dd49f563130b2d571107e0e54f09b0bbb
Binary files differ
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Resources/Points.png
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd616e06dd49f563130b2d571107e0e54f09b0bbb
Binary files differ
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Resources/Polygon.png
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd616e06dd49f563130b2d571107e0e54f09b0bbb
Binary files differ
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Resources/arrow_down.png
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd616e06dd49f563130b2d571107e0e54f09b0bbb
Binary files differ
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Resources/arrow_up.png
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd616e06dd49f563130b2d571107e0e54f09b0bbb
Binary files differ
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Resources/bars.png
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd616e06dd49f563130b2d571107e0e54f09b0bbb
Binary files differ
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Resources/category.png
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd616e06dd49f563130b2d571107e0e54f09b0bbb
Binary files differ
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Resources/chart_curve.png
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd616e06dd49f563130b2d571107e0e54f09b0bbb
Binary files differ
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Resources/image-export.png
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd616e06dd49f563130b2d571107e0e54f09b0bbb
Binary files differ
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Resources/ruler-3.png
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd616e06dd49f563130b2d571107e0e54f09b0bbb
Binary files differ
Index: Core/Plugins/test/Core.Plugins.CommonTools.Gui.Test/Forms/Charting/ChartTreeNodePresenterTest.cs
===================================================================
diff -u -r477b3dd45b75bf40fcdd4dcba75ae194ea201446 -rd616e06dd49f563130b2d571107e0e54f09b0bbb
--- Core/Plugins/test/Core.Plugins.CommonTools.Gui.Test/Forms/Charting/ChartTreeNodePresenterTest.cs (.../ChartTreeNodePresenterTest.cs) (revision 477b3dd45b75bf40fcdd4dcba75ae194ea201446)
+++ Core/Plugins/test/Core.Plugins.CommonTools.Gui.Test/Forms/Charting/ChartTreeNodePresenterTest.cs (.../ChartTreeNodePresenterTest.cs) (revision d616e06dd49f563130b2d571107e0e54f09b0bbb)
@@ -55,7 +55,7 @@
nodePresenter.UpdateNode(null, node, chart);
// Assert
- Assert.AreEqual(string.IsNullOrEmpty(title) ? Resources.ChartTreeNodePresenter_UpdateNode_Chart : title, node.Text);
+ Assert.AreEqual(string.IsNullOrEmpty(title) ? Resources.ChartingGuiPlugin_Chart : title, node.Text);
TestHelper.AssertImagesAreEqual(Resources.Chart, node.Image);
Assert.AreSame(chart, node.Tag);
}